充值订单支付

src/views/order/payment.ts

@@ -187,24 +187,40 @@ export default class UserIndex extends Vue {
                 package: res.data.package, // 统一支付接口返回的prepay_id参数值，提交格式如：prepay_id=***）
                 signType: res.data.signType, // 签名方式，默认为'SHA1'，使用新版支付需传入'MD5'
                 paySign: res.data.paySign, // 支付签名
-                success: function (r) {
+                success: (r) => {
                     alert('支付成功');
                     if (r.errMsg == "chooseWXPay:ok") {
                         alert('支付成功');
-                        router.replace('/order/list');
+                        if (this.data.recharfe) {
+                            router.replace('/order/list');
+                        } else {
+                            router.replace('/recharge/list');  
+                        }
                     } else {
                         alert('支付失败')
-                        router.replace('/order/list');
+                        if (this.data.recharfe) {
+                            router.replace('/order/list');
+                        } else {
+                            router.replace('/recharge/list');  
+                        }
                     }
                 },
-                cancel: function(r) {
+                cancel: (r) => {
                     //支付取消
                     alert('支付取消')
-                    router.replace('/order/list');
+                    if (this.data.recharfe) {
+                        router.replace('/order/list');
+                    } else {
+                        router.replace('/recharge/list');  
+                    }
                 },
-                fail: function (res) {
+                fail: (res) => {
                     alert('支付失败');
-                    router.replace('/order/list');
+                    if (this.data.recharfe) {
+                        router.replace('/order/list');
+                    } else {
+                        router.replace('/recharge/list');  
+                    }
                 }
             });
         });

src/views/recharge/detail.vue

@@ -106,7 +106,7 @@ export default {
         cardno: this.card_no,
         amount: this.refill_amount
       });
-      console.log('充值', res);
+      console.log('石化充值', res);
       if (res && res.msg == '请求成功') {
         localStorage.setItem('order_paying', JSON.stringify(res.data));
         this.$router.replace({

src/views/recharge/list.vue

@@ -24,7 +24,7 @@
               <div class="section">
                   <p class="d-flex align-items-center">
                       <span class="leftColor">办理进度</span>
-                      <span class="ml-auto" style="color:#fb2e2e">{{item.pay_status_text}}</span>
+                      <span class="ml-auto" style="color:#fb2e2e">{{item.order_state_text}}</span>
                   </p>
                   <p class="d-flex align-items-center">
                       <span class="leftColor">实付金额</span>
@@ -59,7 +59,7 @@
               <div class="section">
                   <p class="d-flex align-items-center">
                       <span class="leftColor">办理进度</span>
-                      <span class="ml-auto" style="color:#fb2e2e">{{item.pay_status_text}}</span>
+                      <span class="ml-auto" style="color:#fb2e2e">{{item.order_state_text}}</span>
                   </p>
                   <p class="d-flex align-items-center">
                       <span class="leftColor">实付金额</span>
@@ -92,7 +92,7 @@
               <div class="section">
                   <p class="d-flex align-items-center">
                       <span class="leftColor">办理进度</span>
-                      <span class="ml-auto" style="color:#fb2e2e">{{item.pay_status_text}}</span>
+                      <span class="ml-auto" style="color:#fb2e2e">{{item.order_state_text}}</span>
                   </p>
                   <p class="d-flex align-items-center">
                       <span class="leftColor">实付金额</span>
@@ -125,7 +125,7 @@
               <div class="section">
                   <p class="d-flex align-items-center">
                       <span class="leftColor">办理进度</span>
-                      <span class="ml-auto" style="color:#fb2e2e">{{item.pay_status_text}}</span>
+                      <span class="ml-auto" style="color:#fb2e2e">{{item.order_state_text}}</span>
                   </p>
                   <p class="d-flex align-items-center">
                       <span class="leftColor">实付金额</span>
@@ -351,8 +351,7 @@ export default {
         name: "rdetail", params: {
           id: data["id"],
           card_no: data['card_no'],
-          pay_status_text: data["pay_status_text"],
-          pay_status_text: data["pay_status_text"],
+          order_state_text: data["order_state_text"],
           order_time: data["order_time"],
           refill_order_sn: data["refill_order_sn"],
           order_price: data['order_price']
@@ -361,7 +360,25 @@ export default {
       localStorage.setItem('rechageId', JSON.stringify(data["id"]))
     },
     // 付款
-    gopay() {}
+    async gopay(event) {
+      let data = this.list[event.target.getAttribute("data-key")];
+      let res = await Http.getInstance().RechargeOrder({
+        cardno: data.card_no,
+        amount: data.refill_amount
+      });
+      console.log('详情充值', res);
+      if (res && res.msg == '请求成功') {
+        localStorage.setItem('order_paying', JSON.stringify(res.data));
+        this.$router.replace({
+          name: 'opayment',
+          params: {
+            order_sn: res.data.order_sn,
+            type: '1',
+            recharfe: 'false'
+          }
+        });
+      }
+    }
   }
 }
 </script>