修改订单状态

src/App.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app">
     <keep-alive>
-      <router-view v-if="$route.meta.keepAlive" :key="$route.fullpath"></router-view>
+      <router-view v-if="$route.meta.keepAlive"></router-view>
     </keep-alive>
     <router-view v-if="!$route.meta.keepAlive"></router-view>
   </div>

src/pages/customerMan/myOrder/index.vue

@@ -43,10 +43,21 @@
               <el-table-column prop="status" label="状态" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <div :class="'color' + scope.row.status">
+                    <!-- 状态：0已预约，未支付，1已支付，待使用，2正在使用，3已结算，-1已取消，-2退款审核中，-3已退款 -->
                     {{
-                      scope.row.status != 5
-                        ? statusStr[scope.row.status]
-                        : statusStr[statusStr.length - 1]
+                      scope.row.status == 0
+                        ? "已预约"
+                        : scope.row.status == 1
+                        ? "待使用"
+                        : scope.row.status == 2
+                        ? "正在使用"
+                        : scope.row.status == 3
+                        ? "已结算"
+                        : scope.row.status == -1
+                        ? "已取消"
+                        : scope.row.status == -2
+                        ? "退款审核中"
+                        : "已退款"
                     }}
                   </div>
                 </template>
@@ -184,20 +195,20 @@ status: 5 -->
               ></el-table-column>
               <el-table-column prop="status" label="状态" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <div :class="'classShow' + scope.$index">
-                    <!-- {{
-                      scope.row.status == 1 || scope.row.status == 2
-                        ? goodStatus[scope.row.status]
-                        : goodStatus[goodStatus.length - 1]
-                    }} -->
+                  <div :class="'color' + scope.row.status">
+                    <!-- 状态，0未支付，1已支付，待取货，2已取货，-1已取消，-2退款审核中，-3已退款 -->
                     {{
-                      scope.row.status == 2 || scope.row.status == 3
-                        ? "已取货"
-                        : scope.row.status == 0
+                      scope.row.status == 0
                         ? "未支付"
                         : scope.row.status == 1
                         ? "待取货"
-                        : "已取消"
+                        : scope.row.status == 2
+                        ? "已取货"
+                        : scope.row.status == -1
+                        ? "已取消"
+                        : scope.row.status == -2
+                        ? "退款审核中"
+                        : "已退款"
                     }}
                   </div>
                 </template>
@@ -260,7 +271,7 @@ type: "全额券" -->
               ></el-table-column>
               <el-table-column prop="status" label="状态" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <div :class="'color' + scope.row.status">
+                  <div :class="'colorA' + scope.row.status">
                     {{ couponStatus[scope.row.status] }}
                   </div>
                 </template>
@@ -418,7 +429,6 @@ export default {
           status: 1,
         },
       ],
-      statusStr: ["未支付", "待使用", "正在使用", "已结算", "已取消"],
       couponStatus: ["待使用", "已使用", "已过期"],
       goodStatus: ["未支付", "已支付", "已取货"],
       activeName: "first",
@@ -670,27 +680,35 @@ export default {
   }
 }
 .color0 {
-  color: #fc3019;
+  color: #3ef3ed;
 }
 .color1 {
-  color: #3ef3ed;
+  color: #61d09d;
 }
 .color2 {
   color: #00eeee;
 }
 .color3 {
-  color: #61d09d;
+  color: #a999ea;
 }
-.color4 {
+.color-2 {
   color: #3115cc;
 }
-.color5 {
+.color-1 {
   color: #fc3019;
 }
-.color6 {
-  color: #a999ea;
+.color-3 {
+  color: #fc3019;
+}
+.colorA1{
+  color: #333;
+}
+.colorA2{
+  color: #fc3019;
+}
+.colorA0{
+  color: #61d09d;
 }
-
 .priceColor {
   color: #ff3007;
 }

src/pages/historicalOrder/index.vue

@@ -68,27 +68,22 @@
         ></el-table-column>
         <el-table-column prop="date" label="状态" show-overflow-tooltip>
           <template slot-scope="scope">
-            <div
-              :style="
-                scope.row.status == 0
-                  ? 'color: #FC3019'
-                  : scope.row.status == 5
-                  ? 'color: #A999EA'
-                  : 'color: #61D09D;'
-              "
-            >
+            <div :class="'color' + scope.row.status">
+              <!-- 状态，0已预约，未支付，1已支付，待使用，2正在使用，3已结算，-1已取消，-2退款审核中，-3已退款 -->
               {{
                 scope.row.status == 0
-                  ? "未支付"
-                  : scope.row.status == 5
-                  ? "已取消"
+                  ? "已预约"
                   : scope.row.status == 1
                   ? "待使用"
                   : scope.row.status == 2
                   ? "正在使用"
                   : scope.row.status == 3
                   ? "已结算"
-                  : ""
+                  : scope.row.status == -1
+                  ? "已取消"
+                  : scope.row.status == -2
+                  ? "退款审核中"
+                  : "已退款"
               }}
             </div>
           </template>
@@ -360,25 +355,25 @@ export default {
     }
   }
   .color0 {
-    color: #fc3019;
+    color: #3ef3ed;
   }
   .color1 {
-    color: #3ef3ed;
+    color: #61d09d;
   }
   .color2 {
     color: #00eeee;
   }
   .color3 {
-    color: #61d09d;
+    color: #a999ea;
   }
-  .color4 {
+  .color-2 {
     color: #3115cc;
   }
-  .color5 {
+  .color-1 {
     color: #fc3019;
   }
-  .color6 {
-    color: #a999ea;
+  .color-3 {
+    color: #fc3019;
   }
 }
 </style>

src/pages/home/index.vue

@@ -43,9 +43,24 @@
                   :key="i"><img :src="value.cover_url"
                      alt=""></li>
             </ul>
+            <!-- 状态，0已预约，未支付，1已支付，待使用，2正在使用，3已结算，-1已取消，-2退款审核中，-3已退款 -->
             <div class="status"
-                 :style="item.status==0?'color: #FC3019':item.status==5?'color: #A999EA':'color: #61D09D;'">
-              {{ item.status==0?'未支付':item.status==5?'已取消':'待使用' }}
+                 :class="'color' + item.status">
+                            {{
+                item.status == 0
+                  ? "已预约"
+                  : item.status == 1
+                  ? "待使用"
+                  : item.status == 2
+                  ? "正在使用"
+                  : item.status == 3
+                  ? "已结算"
+                  : item.status == -1
+                  ? "已取消"
+                  : item.status == -2
+                  ? "退款审核中"
+                  : "已退款"
+              }}
             </div>
           </div>
         </van-list>
@@ -339,4 +354,25 @@ export default {
     }
   }
 }
+.color0 {
+  color: #3ef3ed !important;
+}
+.color1 {
+  color: #61d09d !important;
+}
+.color2 {
+  color: #00eeee !important;
+}
+.color3 {
+  color: #a999ea !important;
+}
+.color-2 {
+  color: #3115cc !important;
+}
+.color-1 {
+  color: #fc3019 !important;
+}
+.color-3 {
+  color: #fc3019 !important;
+}
 </style>

src/pages/payUser/myOrder/index.vue

@@ -43,10 +43,21 @@
               <el-table-column prop="status" label="状态" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <div :class="'color' + scope.row.status">
+                    <!-- 状态：0已预约，未支付，1已支付，待使用，2正在使用，3已结算，-1已取消，-2退款审核中，-3已退款 -->
                     {{
-                      scope.row.status != 5
-                        ? statusStr[scope.row.status]
-                        : statusStr[statusStr.length - 1]
+                      scope.row.status == 0
+                        ? "已预约"
+                        : scope.row.status == 1
+                        ? "待使用"
+                        : scope.row.status == 2
+                        ? "正在使用"
+                        : scope.row.status == 3
+                        ? "已结算"
+                        : scope.row.status == -1
+                        ? "已取消"
+                        : scope.row.status == -2
+                        ? "退款审核中"
+                        : "已退款"
                     }}
                   </div>
                 </template>
@@ -178,13 +189,20 @@ status: 5 -->
               ></el-table-column>
               <el-table-column prop="status" label="状态" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <div :class="'classShow' + scope.$index">
-                    <!-- {{
-                      scope.row.status == 1 || scope.row.status == 2
-                        ? goodStatus[scope.row.status]
-                        : goodStatus[goodStatus.length - 1]
-                    }} -->
-                    {{scope.row.status==2||scope.row.status==3?'已取货':scope.row.status==0?'未支付':scope.row.status==1?'待取货':'已取消'}}
+                  <div :class="'color' + scope.row.status">
+                    {{
+                      scope.row.status == 0
+                        ? "未支付"
+                        : scope.row.status == 1
+                        ? "待取货"
+                        : scope.row.status == 2
+                        ? "已取货"
+                        : scope.row.status == -1
+                        ? "已取消"
+                        : scope.row.status == -2
+                        ? "退款审核中"
+                        : "已退款"
+                    }}
                   </div>
                 </template>
               </el-table-column>
@@ -242,11 +260,11 @@ type: "全额券" -->
                 prop="create_time"
                 label="创建时间"
                 width="180"
-                show-overflow-tooltip
+                show-overflow-tooltipA
               ></el-table-column>
               <el-table-column prop="status" label="状态" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <div :class="'color' + scope.row.status">
+                  <div :class="'colorA' + scope.row.status">
                     {{ couponStatus[scope.row.status] }}
                   </div>
                 </template>
@@ -299,7 +317,8 @@ type: "全额券" -->
               >
                 <template slot-scope="scope">
                   <div>
-                    {{ scope.row.is_add == 1 ? "+" : "-" }}{{ scope.row.amount }}
+                    {{ scope.row.is_add == 1 ? "+" : "-"
+                    }}{{ scope.row.amount }}
                   </div>
                 </template>
               </el-table-column>
@@ -453,7 +472,6 @@ export default {
           status: 1,
         },
       ],
-      statusStr: ["未支付", "待使用", "正在使用", "已结算", "已取消"],
       couponStatus: ["待使用", "已使用", "已过期"],
       goodStatus: ["未支付", "已支付", "已取货"],
       activeName: "first",
@@ -658,7 +676,7 @@ export default {
       this.getBalanceRecord();
     }
   },
-  activated(){
+  activated() {
     let id = this.$route.query.id;
     let activeName = this.$route.query.activeName;
     this.activeName = activeName;
@@ -696,27 +714,35 @@ export default {
   }
 }
 .color0 {
-  color: #fc3019;
+  color: #3ef3ed;
 }
 .color1 {
-  color: #3ef3ed;
+  color: #61d09d;
 }
 .color2 {
   color: #00eeee;
 }
 .color3 {
-  color: #61d09d;
+  color: #a999ea;
 }
-.color4 {
+.color-2 {
   color: #3115cc;
 }
-.color5 {
+.color-1 {
   color: #fc3019;
 }
-.color6 {
-  color: #a999ea;
+.color-3 {
+  color: #fc3019;
+}
+.colorA1{
+  color: #333;
+}
+.colorA2{
+  color: #fc3019;
+}
+.colorA0{
+  color: #61d09d;
 }
-
 .priceColor {
   color: #ff3007;
 }

src/router/map/home.js

@@ -91,7 +91,6 @@ export default {
     path: '/payUser/Details',
     meta: {
       isback: true,
-      keepAlive: true
     },
     component: payUserDetails,
   },
@@ -99,7 +98,6 @@ export default {
     path: '/payUser/Order',
     meta: {
       isback: true,
-      keepAlive: true
     },
     component: payUserOrder,
   },