Merge remote-tracking branch 'origin/sit-Leung' into sit-jiamin-v2

rc-busness/pages/personal/userpay.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="page_modules">
     <Myheader></Myheader>
+	<div class="rc-top rc-md-up"></div>
     <div class="cont_modules">
-      <tabs></tabs>
       <el-row class="order_info">
         <el-col :span="6" class="ph_hidden">
           <ul class="li_inline">
@@ -19,7 +19,7 @@
         <el-col :span="6" class="ready_right">
           <div class="inline_right">
             <p>付款金额:</p>
-            <p class="price">{{ userPayData.userprice }}</p>
+            <p class="price">￥{{ userPayData.userprice }}</p>
           </div>
           <div class="inline_right">
             <p>收货信息:</p>
@@ -93,18 +93,20 @@ export default {
     return {
       activeIndex: 0,
       isSucess: false,
+	  dialogSuccess: false,
       paytype: "微信",
       userpaystype: [
         {
           paytype: "微信",
           payimage: require("../../assets/pay/wx.png"),
         },
+		/*
         {
           paytype: "支付宝",
           payimage: require("../../assets/pay/zfb.png"),
         },
+		*/
       ],
-      dialogSuccess: true,
       dialogFail: false,
       userPayData: {},
       qrtext:'',
@@ -163,15 +165,18 @@ export default {
       }
     },
     //支付监听
-    async updateOrderWX() {
-      let res = await updateOrderWX();
+
+    async payOrderWX() {
+      let res = await updateOrderWX(this.userPayData.orderId);
       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()
       }
     },
   },
@@ -311,7 +316,7 @@ export default {
     }
   }
   .paycord {
-    display: none;
+    //display: none;
   }
 }
 </style>