Merge branch 'sit-Carl' into sit-Leung

# Conflicts:
#	rc-busness/pages/personal/settlement.vue
#	rc-busness/pages/personal/userpay.vue

rc-busness/pages/personal/userpay.vue

@@ -104,7 +104,6 @@ export default {
           payimage: require("../../assets/pay/zfb.png"),
         },
       ],
-      dialogSuccess: false,
       dialogFail: false,
       userPayData: {},
       qrtext:'',
@@ -113,8 +112,10 @@ export default {
   computed: {},
   mounted() {
     this.userPayData = JSON.parse(this.$route.query.userPayData);
-    this.qrtext=this.userPayData.wxPay
-	this.updateOrderWX();
+    //this.qrtext=this.userPayData.wxPay
+    this.qrtext=this.userPayData.wxPay;
+    this.payOrderWX()
+
   },
   methods: {
     closeDialogSuccess() {
@@ -142,15 +143,18 @@ export default {
       }
     },
     //支付监听
-    async updateOrderWX() {
+
+    async payOrderWX() {
       let res = await updateOrderWX();
       if (res.success) {
         this.qrtext = '成功加入群的二维码';
         this.dialogSuccess = true;
-        clearInterval(this.time);
-      } else {
+
+      } else if (res.fail)  {
         this.dialogFail = true;
-        clearInterval(this.time);
+
+      }else{
+        this.payOrderWX()
       }
     },
   },