优化

ghsPad/src/pages/home/components/cashConsole.vue

@@ -144,8 +144,9 @@ export default {
 			this.removeFromSaveDirect()
 			this.customId =0
 			this.customName=''
+			this.$emit('clearAll')
 			//继续监听花材扫码
-			this.listenScanItem()
+			//this.listenScanItem()
 			//开单完成之后更新花材库存
 			this.$emit('rightItemRefresh')
 		},

ghsPad/src/pages/home/components/settlePop.vue

@@ -248,6 +248,11 @@ export default {
         changePayWay(val){
             this.$util.hitVoice()
             this.form.payWay = val
+            if(this.form.payWay == 4){
+                this.changeCheck(3)
+            }else{
+                this.form.cash = 0
+            }
         },
         changeHasPay(val){
             this.$util.hitVoice()

ghsPad/src/pages/home/components/toPay.vue

@@ -103,7 +103,7 @@ export default {
                         that.showSuccess = true
                         setTimeout(function(){
                             that.payFinish()
-                        },1500)
+                        },1200)
                     }else{
                         that.T = setInterval(function(){
                             that.checkPay()