Merge branch 'ah-simple' of http://192.168.0.75:3000/bonus/Zlpt_Portal into ah-simple

src/views/user/orderManagement/components/order-details.vue

@@ -170,7 +170,8 @@ if (props.orderStatus == 20) {
 
 if (props.orderStatus == 99) {
     currentActive.value = 6
-    stepList.value[6].title = '订单取消'
+    stepList.value[0].title = '订单取消'
+    currentActive.value = 0
     isReject.value = true
 }
 

src/views/user/orderManagement/components/order-home.vue

@@ -62,7 +62,7 @@ const statusList: any = [
     { id: '2', name: '待出库' },
     { id: '3', name: '待收货' },
     { id: '4', name: '租赁中' },
-    // { id: '5', name: '已退租' },
+    { id: '5', name: '已退租' },
     // { id: '15', name: '结算待确认' },
     // { id: '8', name: '已驳回' },
     // { id: '10', name: '已检修待结算' },