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

+ 1 - 1
ghsPad/src/pages/home/cash.vue

@@ -164,7 +164,7 @@ export default {
 						}
 					}
 				})
-			}, 8000); 
+			}, 10000)
 		},
 		//开单完成之后更新花材的库存
 		rightItemRefresh(){

+ 11 - 9
ghsPad/src/pages/home/components/toPay.vue

@@ -79,7 +79,7 @@ export default {
                     if(res.data.returnStatus == 'SUCCESS'){
                         uni.hideLoading()
                         that.showSuccess = true
-                        clearInterval(that.T)
+                        //clearInterval(that.T)
                         setTimeout(function(){
                             that.payFinish()
                         },1500)
@@ -118,14 +118,16 @@ export default {
                             that.payFinish()
                         },1200)
                     }else{
-                        that.T = setInterval(function(){
-                            that.checkPay()
-                        }, 1000);      
+                        that.$msg(res.msg)
+                        that.goPay = 0
+                        // that.T = setInterval(function(){
+                        //     that.checkPay()
+                        // }, 1000)
                     }
                 }else{
-                    that.T = setInterval(function(){
-                        that.checkPay()
-                    }, 1000);
+                    // that.T = setInterval(function(){
+                    //     that.checkPay()
+                    // }, 1000)
                 }
             })
         },
@@ -147,14 +149,14 @@ export default {
                     if(res.data.returnStatus == 'SUCCESS'){
                         uni.hideLoading()
                         that.showSuccess = true
-                        clearInterval(that.T)
+                        //clearInterval(that.T)
                         setTimeout(function(){
                             that.payFinish()
                         },1500)
                         return
                     }
                 }
-                clearInterval(that.T)
+                //clearInterval(that.T)
                 cancelOrderFn({id:this.orderId}).then(res=>{
                     if(res.code == 1){
                         that.$msg('已取消')

+ 1 - 1
ghsPad/src/pages/home/waste.vue

@@ -131,7 +131,7 @@ export default {
 						}
 					}
 				})
-			}, 8000); 
+			}, 10000)
 		},
 		//开单完成之后更新花材的库存
 		rightItemRefresh(){

+ 1 - 1
hdPad/src/pages/home/cash.vue

@@ -131,7 +131,7 @@ export default {
 						}
 					}
 				})
-			}, 8000); 
+			}, 10000)
 		},
 		//开单完成之后更新花材的库存
 		rightItemRefresh(){

+ 12 - 10
hdPad/src/pages/home/components/toPay.vue

@@ -79,7 +79,7 @@ export default {
                     if(res.data.returnStatus == 'SUCCESS'){
                         uni.hideLoading()
                         that.showSuccess = true
-                        clearInterval(that.T)
+                        //clearInterval(that.T)
                         setTimeout(function(){
                             that.payFinish()
                         },1500)
@@ -97,7 +97,7 @@ export default {
                     if(res.data.returnStatus == 'SUCCESS'){
                         uni.hideLoading()
                         that.showSuccess = true
-                        clearInterval(that.T)
+                        //clearInterval(that.T)
                         setTimeout(function(){
                             that.payFinish()
                         },1500)
@@ -118,14 +118,16 @@ export default {
                             that.payFinish()
                         },1500)
                     }else{
-                        that.T = setInterval(function(){
-                            that.checkPay()
-                        }, 1000);      
+                        that.$msg(res.msg)
+                        that.goPay = 0
+                        // that.T = setInterval(function(){
+                        //     that.checkPay()
+                        // }, 1000)
                     }
                 }else{
-                    that.T = setInterval(function(){
-                        that.checkPay()
-                    }, 1000);
+                    // that.T = setInterval(function(){
+                    //     that.checkPay()
+                    // }, 1000)
                 }
             })
         },
@@ -149,14 +151,14 @@ export default {
                     if(res.data.returnStatus == 'SUCCESS'){
                         uni.hideLoading()
                         that.showSuccess = true
-                        clearInterval(that.T)
+                        //clearInterval(that.T)
                         setTimeout(function(){
                             that.payFinish()
                         },1500)
                         return
                     }
                 }
-                clearInterval(that.T)
+                //clearInterval(that.T)
                 cancelOrderFn({id:this.orderId}).then(res=>{
                     if(res.code == 1){
                         that.$msg('已取消')