订单详情修改缴费按钮

src/static/common.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.4.11"
+  "version": "1.4.12"
 }

src/views/order/list.vue

@@ -377,7 +377,7 @@ import login from "@/store/module/login";
         //     return false;
         // }
         get cHeigth() {
-            if (this.data.list.length > 4) {
+            if (this.data.list.length > 3) {
                 return 'auto'
             } else {
                 return '100%'

src/views/recharge/detail.vue

@@ -16,8 +16,12 @@
         <label class="small" style=" font-size: 1.3rem;">{{this.order_time}}</label>
       </h6>
       <h6 class="d-flex justify-content-between align-items-center two-h6" style=" font-size: 1.5rem;">
-          用户姓名：
-          <label class="small" style=" font-size: 1.3rem;">{{realname}}</label>
+          支付状态：
+          <label class="small" style=" font-size: 1.3rem;">{{this.pay_status_text}}</label>
+      </h6>
+      <h6 class="d-flex justify-content-between align-items-center two-h6" style=" font-size: 1.5rem;">
+          订单状态：
+          <label class="small" style=" font-size: 1.3rem;">{{this.order_state_text}}</label>
       </h6>
       <h6 class="d-flex justify-content-between align-items-center two-h6" style=" font-size: 1.5rem;">
         充值类别：
@@ -39,7 +43,7 @@
         实付款：<span style="color: #EC2C2C">&yen;{{order_price}}</span>
       </h6>
     </div>
-    <div class="bottom-twobtn">
+    <div class="bottom-twobtn" v-if="order_state_text == '未支付'">
       <button type="button" class="button-1" @click="gopay" v-if="!isShow">
           <img class="button-2-img" src="../../assets/image/payFoot@2x.png" alt="">
           去缴费
@@ -76,8 +80,9 @@ export default {
       order_price: '',
       // 卡类型
       card_type: '',
-      realname: localStorage.getItem('realname') || '',
-      isShow: false
+      isShow: false,
+      // 充值状态
+      pay_status_text: ''
     }
   },
   created() {
@@ -98,26 +103,19 @@ export default {
         this.order_price = res.data.order_price
         this.card_type = res.data.card_type
         this.id = res.data.id
+        this.pay_status_text = res.data.pay_status_text
       }
     },
     // 去缴费
     async gopay(){
-      let res = await Http.getInstance().RechargeOrder({
-        cardno: this.card_no,
-        amount: this.refill_amount
+      this.$router.replace({
+        name: 'opayment',
+        params: {
+          order_sn: this.refill_order_sn,
+          type: '1',
+          recharfe: 'false'
+        }
       });
-      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'
-          }
-        });
-      }
     },
     // 取消订单
     async cancel() {

src/views/recharge/list.vue

@@ -173,7 +173,7 @@ export default {
   },
   computed: {
     cHeigth() {
-      if (this.list.length > 4) {
+      if (this.list.length > 3) {
         return 'auto'
       } else {
         return '100%'
@@ -357,7 +357,8 @@ export default {
           order_state_text: data["order_state_text"],
           order_time: data["order_time"],
           refill_order_sn: data["refill_order_sn"],
-          order_price: data['order_price']
+          order_price: data['order_price'],
+          pay_status_text: data['pay_status_text']
         }
       });
       localStorage.setItem('rechageId', JSON.stringify(data["id"]))