1.4.8版本

mini-pro-web/src/views/machine/components/DrugTaking.vue

@@ -24,6 +24,11 @@
					<div v-if="contentType==4&&!showSettleInfoList.length" class="nodata">
						<img src="../img/i-quesheng.png" alt="">
						<div class="pt20 tc">无就诊结算信息</div>
						<div class="bottom-button ">
							<div class="">
								<van-button @click="show({ contentType: 20 })" class="history-btn" block type="primary">{{!showSettleInfoList.length? '历史结算记录' : '历史记录'}}</van-button>
							</div>
						</div>
					</div>
					<template v-else>

mini-pro-web/src/views/machine/components/TipsDialog.vue

@@ -77,7 +77,10 @@
					<div v-else-if="contentType==8" class="tc fs-13 pt50">
						<div><img class="icon" src="../img/i-chenggong.png" alt=""></div>
						<div class="lh30 pt10 pb40">您的结算小票已打印，请注意取走</div>
						<div class="bottom-button ">
						<div v-if="isHis" class="bottom-button ">
							<div class=""><van-button @click="onClose()" class="c-999" color="#fff" block type="primary">返回</van-button></div>
						</div>
						<div v-else class="bottom-button ">
							<div class=""><van-button @click="emitDrugTakingEvent('backToIndex')" class="c-999" color="#fff" block type="primary">返回</van-button></div>
							<div><van-button @click="emitDrugTakingEvent('settleSuccessBack', 1)" color="#22a9fa" block type="primary">立即取药</van-button></div>
						</div>
@@ -218,7 +221,8 @@ export default {
			lastContentType: 0,
			payType: '',
			payScene: '', //支付场景 1自主充值
			qrcode: ''
			qrcode: '',
			isHis: false
    	}
  	},
	watch:{
@@ -251,7 +255,8 @@ export default {
			close = false,
			payType = '',
			payScene = '',
			isPickComplete = false
			isPickComplete = false,
			isHis = false
		}){
			if(close){
				this.onClose()
@@ -263,6 +268,7 @@ export default {
			if(nextContentType){
				this.nextContentType = nextContentType
			}
			this.isHis = isHis
			this.isPickComplete = isPickComplete
			this.lastContentType = this.contentType
			this.payScene = payScene

mini-pro-web/src/views/machine/scss/DrugTaking.scss

@@ -289,7 +289,7 @@
        &.panel-no-data{
            background-color: #fff;
            height: 283px;
            height: 350px;
        }
        .nodata{
            img{
@@ -298,6 +298,9 @@
                height: 114px;
                margin: 45px auto 0;
            }
            .bottom-button{
                margin-top: 71px;
            }
        }
        .count-panel{
            position: absolute;