Browse Source

no message

DaMowang 3 years ago
parent
commit
fe207da140
2 changed files with 10 additions and 9 deletions
  1. 1 1
      src/pages/szw-order-details/index.vue
  2. 9 8
      src/pages/szw-order-list/index.vue

+ 1 - 1
src/pages/szw-order-details/index.vue

@@ -262,13 +262,13 @@ export default {
         tidyStatus() {
             return (da) => {
                 let str;
-                if (da[0] === 0) str = "待支付";
                 if (da[1] === 0) str = "待发货";
                 if (da[1] === 1) str = "待收货";
                 if (da[1] === 2) str = "已收货";
                 if (da[1] === 3) str = "申请退货";
                 if (da[1] === 4) str = "已退货";
                 if (da[1] === 5) str = "已作废";
+                if (da[0] === 0 && da[1] != 5) str = "待支付";
                 return str
             };
         },

+ 9 - 8
src/pages/szw-order-list/index.vue

@@ -258,14 +258,15 @@ export default {
     // 0  支付状态   1 订单状态
     tidyStatus() {
       return (da) => {
-        if (da[0] === 0 && da[1] != 5) return "待支付";
-        if (da[1] === 0 && da[0] == 1) return "待发货";
-        if (da[1] === 0 && da[0] != 1) return "待支付";
-        if (da[1] == 1) return "待收货";
-        if (da[1] == 2) return "已收货";
-        if (da[1] == 3) return "申请退货";
-        if (da[1] == 4) return "已退货";
-        if (da[1] == 5) return "已作废";
+        let str;
+        if (da[1] === 0) str = "待发货";
+        if (da[1] === 1) str = "待收货";
+        if (da[1] === 2) str = "已收货";
+        if (da[1] === 3) str = "申请退货";
+        if (da[1] === 4) str = "已退货";
+        if (da[1] === 5) str = "已作废";
+        if (da[0] === 0 && da[1] != 5) str = "待支付";
+        return str
       };
     },
     tidyTpye() {