优化

src/layout/index.vue

@@ -116,7 +116,7 @@ export default {
     }
   },
   created() {
-    this.checkPasswordStatus()
+    // this.checkPasswordStatus()
     if (this.roles.includes("audit") || this.roles.includes("systemAdmin")) {
       this.connectWebSocket();
     }

src/views/search/order/detail.vue

@@ -416,14 +416,14 @@ export default {
         title: '租赁中',
         description: '',
     },
-    {
+    // {
-        title: '已退租待检修',
+    //     title: '已退租待检修',
-        description: '',
+    //     description: '',
-    },
+    // },
-    {
+    // {
-        title: '已检修待结算',
+    //     title: '已检修待结算',
-        description: '',
+    //     description: '',
-    },
+    // },
 
     {
         title: '订单完成',
@@ -457,15 +457,6 @@ export default {
         title: '租赁中',
         description: '',
     },
-    {
-        title: '已退租待检修',
-        description: '',
-    },
-    {
-        title: '已检修待结算',
-        description: '',
-    },
-
     {
         title: '订单完成',
         description: '',
@@ -495,31 +486,36 @@ export default {
         this.stepList[2].title = '已收货'
         this.currentActive = 4
     }
-    if (this.orderStatus == 10) {
+    // if (this.orderStatus == 10) {
-      this.stepList[0].title = '已接单'
+    //   this.stepList[0].title = '已接单'
-      this.stepList[1].title = '已出库'
+    //   this.stepList[1].title = '已出库'
-      this.stepList[2].title = '已收货'
+    //   this.stepList[2].title = '已收货'
-      this.stepList[3].title = '租赁结束'
+    //   this.stepList[3].title = '租赁结束'
-      this.stepList[4].title = '退租已检修'
+    //   this.stepList[4].title = '退租已检修'
-      this.currentActive = 5
+    //   this.currentActive = 5
-    }
+    // }
-    if (this.orderStatus == 15) {
+    // if (this.orderStatus == 15) {
-        this.stepList[0].title = '已接单'
+    //     this.stepList[0].title = '已接单'
-        this.stepList[1].title = '已出库'
+    //     this.stepList[1].title = '已出库'
-        this.stepList[2].title = '已收货'
+    //     this.stepList[2].title = '已收货'
-        this.stepList[3].title = '租赁结束'
+    //     this.stepList[3].title = '租赁结束'
-        this.stepList[4].title = '退租已检修'
+    //     this.stepList[4].title = '退租已检修'
-        this.stepList[5].title = '已结算待确认'
+    //     this.stepList[5].title = '已结算待确认'
-        this.currentActive = 5
+    //     this.currentActive = 5
-    }
+    // }
     if (this.orderStatus == 20) {
         this.stepList[0].title = '已接单'
         this.stepList[1].title = '已出库'
         this.stepList[2].title = '已收货'
         this.stepList[3].title = '租赁结束'
-        this.stepList[4].title = '退租已检修'
+        // this.stepList[4].title = '退租已检修'
-        this.stepList[5].title = '结算完成'
+        // this.stepList[5].title = '结算完成'
-        this.currentActive = 7
+        this.currentActive = 5
+    }
+    if (this.orderStatus == 99) {
+        this.stepList[0].title = '订单取消'
+        this.isReject  = true
+        this.currentActive = 0
     }
     this.$forceUpdate();
     this.getList();

src/views/system/user/profile/index.vue

@@ -48,9 +48,9 @@
             <el-tab-pane label="基本资料" name="userinfo">
               <userInfo :user="user" />
             </el-tab-pane>
-            <el-tab-pane label="修改密码" name="resetPwd">
+            <!-- <el-tab-pane label="修改密码" name="resetPwd">
               <resetPwd />
-            </el-tab-pane>
+            </el-tab-pane> -->
           </el-tabs>
         </el-card>
       </el-col>