shish 1 год назад
Родитель
Сommit
31352eabcc

+ 1 - 1
ghsPad/src/pages/home/components/cashConsole.vue

@@ -168,7 +168,7 @@ export default {
 				this.$msg('请选择商品')
 				this.$msg('请选择商品')
 				return false
 				return false
 			}
 			}
-			uni.showLoading({mask:true})
+			uni.showLoading({mask:false})
 
 
 			let productList = []
 			let productList = []
 
 

+ 1 - 1
ghsPad/src/pages/home/components/toPay.vue

@@ -95,7 +95,7 @@ export default {
                 if(res.code == 1){
                 if(res.code == 1){
                     if(res.data.payStatus == 1){
                     if(res.data.payStatus == 1){
                         that.showSuccess = true
                         that.showSuccess = true
-                        payOkReport({id:this.orderId})
+                        //payOkReport({id:this.orderId})
                         setTimeout(function(){
                         setTimeout(function(){
                             that.payFinish()
                             that.payFinish()
                         },900)
                         },900)

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

@@ -221,7 +221,7 @@ export default {
 				this.$msg('请选择商品')
 				this.$msg('请选择商品')
 				return false
 				return false
 			}
 			}
-			uni.showLoading({mask:true})
+			uni.showLoading({mask:false})
 			let product = this.selectList.map(i=>({ productId:i.id, unitType: i.unitType||0, num: i.currentNum, property: i.property, unitPrice: i.unitPrice }))
 			let product = this.selectList.map(i=>({ productId:i.id, unitType: i.unitType||0, num: i.currentNum, property: i.property, unitPrice: i.unitPrice }))
 			//isCashier=1时收银台播放 总金额139元,请扫码付款
 			//isCashier=1时收银台播放 总金额139元,请扫码付款
 			createOrder({...params,product:JSON.stringify(product),isCashier:1,customId:this.customId}).then(res=>{
 			createOrder({...params,product:JSON.stringify(product),isCashier:1,customId:this.customId}).then(res=>{