1

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

@@ -1,11 +1,11 @@
<template>
	<div class="machine-index-Result">
		<div class="tips-img">
			<img v-show="rsType==1" src="../img/order_info.png" alt="">
			<img v-show="rsType==2" src="../img/order_err.png" alt="">
			<img v-show="rsType==3" src="../img/order_suc.png" alt="">
			<img v-show="rsType==4" src="../img/complete.png" alt="">
			<img v-show="rsType==5" src="../img/order_list.png" alt="">
			<img v-show="rsType==1" class="bg-img" src="../img/order_info.png" alt="">
			<img v-show="rsType==2" class="bg-img" src="../img/order_err.png" alt="">
			<img v-show="rsType==3" class="bg-img" src="../img/order_suc.png" alt="">
			<img v-show="rsType==4" class="bg-img" src="../img/complete.png" alt="">
			<img v-show="rsType==5" class="bg-img" src="../img/order_list.png" alt="">
			<div class="order-list" v-if="rsType==5">
				<div>
					<div class="order-list-inner">
@@ -153,7 +153,11 @@ export default {
		
	}
	
	.bg-img{
		user-select: none;
		-webkit-user-select: none;
		-moz-user-select: none;
		-ms-user-select: none;
	}
}
</style>

mini-pro-web/src/views/machine/index.vue

@@ -90,7 +90,7 @@ export default {
  	},
  	data() {
    	return {
			deviceNum: this.$route.query.deviceNum || '',//14912202107000001500000000000000  
			deviceNum: this.$route.query.deviceNum || '',//14912202107000001500000000000000    14912202111000001000000000000000
			step: 0, //0启动页  1首页  2扫码页  3订单页
			curImg: '',
			illustrationMskShow: false,
@@ -109,7 +109,8 @@ export default {
			inCheckBarcode: false,
			orderInfo: '',
			orderList: [],
			times: 30
			times: 30,
			inReadCard: false
    	}
  	},
	watch:{
@@ -294,6 +295,7 @@ export default {
				}
				this.checkOrderAndReturn({pickUpNum: msgobj.mess})
			} else if(msgobj.type == 'CardInfo'){
				this.inReadCard = false
				if (msgobj.mess.indexOf("异常") != -1) {
					this.$toast(msgobj.mess)
					return
@@ -319,11 +321,18 @@ export default {
		},
		sendReadCard: function() {
			this.$loading('加载中..')
			this.inReadCard = true
			var obj = {
				type: "ReadCard",
				mess: ""
			}
			this.socket.send(JSON.stringify(obj));
			setTimeout(()=>{
				if(this.inReadCard){
					this.inReadCard = false
					this.$toast('读取医保卡失败')
				}
			}, 10 * 1000)
		},
		sendShipment: function() {
			this.currindex = 0;
@@ -658,5 +667,13 @@ export default {
			font-size: calc(80px / 6);
		}
	}
	.el-dropdown{
		width: calc(100% / 3);
	}
	// ::v-deep img{
	// 	user-select: none;
	// 	-webkit-user-select: none;
	// }
}
</style>