Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/commonPage/payMall.vue

@@ -143,6 +143,10 @@
         }
         this.chaTime -= 1000
         // 一秒后递归
+      },
+      //取消清除
+      clearCount(){
+        clearInterval(this.timer)
       }
     },
   };

src/components/mall/goodlist.vue

@@ -678,7 +678,7 @@
       //调用取消
       cancelPay() {
         this.payVisible = false;
-        this.$refs.payChild.parentHandleclick();
+        this.$refs.payChild.clearCount();
       },
       //关闭
       closeDia() {