Merge branch 'master' of http://gitlab.corp.qinqinxiaobao.com:9880/hrs_app_h5/bill

src/views/Bill/index.vue

@@ -244,7 +244,8 @@ export default {
       const payType = 4;
       const payType = 4;
       const selected = 0;
       const selected = 0;
       const fee = this.data.waitPay;
       const fee = this.data.waitPay;
-      let payUrl = `${this.payUrl}&accountType=1&periodId=${this.currentPerId}&payMethod=${payMethod}&payType=${payType}&fee=${fee}&selected=1&failUrl=${failUrl}&successUrl=${successUrl}`;
+      let payUrl = `${this.payUrl}&accountType=1&periodId=${this.currentPerId}&payMethod=${payMethod}&payType=${payType}&fee=${fee}&selected=0&failUrl=${failUrl}&successUrl=${successUrl}`;
+      
       window.location.href = payUrl;
       window.location.href = payUrl;
     },
     },
     toPage(flag) {
     toPage(flag) {
@@ -503,6 +504,9 @@ export default {
     this.setBarHeightLowBee();
     this.setBarHeightLowBee();
     this.globalNavLeftArrowClick(this.navLeftArrowClick);
     this.globalNavLeftArrowClick(this.navLeftArrowClick);
     await this.loadPeriodData();
     await this.loadPeriodData();
+    
+  },
+  async created(){
     this.payUrl = await this.loadPayUrl();
     this.payUrl = await this.loadPayUrl();
   }
   }
 };
 };

src/views/More/index.vue

@@ -77,7 +77,7 @@ export default {
     toPay() {
     toPay() {
       const failUrl=encodeURIComponent("https://pay.qinqinxiaobao.com/callback/fail");
       const failUrl=encodeURIComponent("https://pay.qinqinxiaobao.com/callback/fail");
       const successUrl=encodeURIComponent("https://pay.qinqinxiaobao.com/callback/success");
       const successUrl=encodeURIComponent("https://pay.qinqinxiaobao.com/callback/success");
-      let payUrl=`${this.payUrl}&accountType=19&selected=1&failUrl=${failUrl}&successUrl=${successUrl}`;
+      let payUrl=`${this.payUrl}&accountType=19&selected=0&failUrl=${failUrl}&successUrl=${successUrl}`;
       console.log('payUrl=',payUrl);
       console.log('payUrl=',payUrl);
       window.location.href=payUrl;
       window.location.href=payUrl;
     },
     },
@@ -118,6 +118,8 @@ export default {
     this.setPageNavState();
     this.setPageNavState();
     this.globalNavLeftArrowClick(this.navLeftArrowClick);
     this.globalNavLeftArrowClick(this.navLeftArrowClick);
     await this.getData();   
     await this.getData();   
+  },
+  async created(){
     this.payUrl = await this.loadPayUrl();
     this.payUrl = await this.loadPayUrl();
   }
   }
 };
 };