shish 4 anni fa
parent
commit
d0952abedc

+ 6 - 4
hdPad/src/mixins/product.js

@@ -261,7 +261,7 @@ export default {
 			}else{
 				//花材
 				current = this.globalAllProduct.find(function(val){
-					return val.itemId == code
+					return Number(val.itemId) == Number(code)
 				})
 				if(current == undefined){
 					return false
@@ -277,7 +277,7 @@ export default {
 				this.replaceItemFn(params,1)
 			}
 		},
-		getNewItemAndListenScan(){
+		listenScanGetItem(){
 			// #ifdef APP-PLUS
 			//避免重复,每次进来先移除全局自定义事件监听器
 			uni.$off('listenGetScanCode')
@@ -286,8 +286,10 @@ export default {
 				that.takeItem(data.code)
 			})
 			allProduct().then(res=>{
-				this.allProduct = res.data.list
-				console.log('载入最新花材...')
+				if(res.code == 1){
+					that.globalAllProduct = res.data.list
+					console.log('载入最新花材...')
+				}
 			})
 			// #endif
 		},

+ 1 - 1
hdPad/src/mixins/scan.js

@@ -11,7 +11,7 @@ export default {
     },
 	methods: {
         listenScan(){
-            //let that = this
+            let that = this
             //商米收银台
             if(plus.device.vendor == 'SUNMI'){
                 //https://ext.dcloud.net.cn/plugin?id=3514

+ 3 - 3
hdPad/src/pages/home/components/console.vue

@@ -97,7 +97,7 @@ export default {
         }
     },
 	created(){
-		this.getNewItemAndListenScan()
+		this.listenScanGetItem()
 	},
 	destroyed(){
 		// #ifdef APP-PLUS
@@ -127,7 +127,7 @@ export default {
 		payFinish(){
 			this.$innerAudioContext.play()
 			this.$refs.toPayRef.close()
-			this.getNewItemAndListenScan()
+			this.listenScanGetItem()
 		},
 		calcFn(){
 			this.calc = this.calc == 'add' ? 'sub' : 'add'
@@ -163,7 +163,7 @@ export default {
 		cancelPay(){
 			this.$innerAudioContext.play()
 			this.$refs.toPayRef.close()
-			this.getNewItemAndListenScan()
+			this.listenScanGetItem()
 		},
 		cancelSettle(){
 			this.$innerAudioContext.play()

+ 1 - 1
hdPad/src/pages/home/components/leftGroup.vue

@@ -98,7 +98,7 @@ export default {
 		cancelPay(){
 			this.$innerAudioContext.play()
 			this.$refs.toPayRef.close()
-			this.getNewItemAndListenScan()
+			this.listenScanGetItem()
 		},
         reachBottom() {
             if (!this.list.finished) {