Merge branch 'master' of http://192.168.12.3:3000/xingyy/uni-Identify-quality

main.js

@@ -20,6 +20,7 @@ app.$mount();
 // #endif
 // #ifdef VUE3
 import { createSSRApp } from "vue";
+
 export function createApp() {
   const app = createSSRApp(App);
   return {

pages/confirm-order/index.vue

@@ -132,7 +132,7 @@ export default {
         label: '已入库',
         value: 2,
         style:'color: #76C458;font-size: 24rpx'
-      }, {label: '即将到期', value: 3,style:'color: #FF4848;font-size: 24rpx'}, {label: '延期待补款', value: 4,style:'color: #FF4848;font-size: 24rpx'}, {label: '已取出', value: 5}]
+      }, {label: '即将到期', value: 3,style:'color: #FF4848;font-size: 24rpx'}, {label: '延期未补款', value: 4,style:'color: #FF4848;font-size: 24rpx'}, {label: '已取出', value: 5}, {label: '延期已补款', value: 6}]
     }
   },
   computed:{

pages/mine/set-up.vue

@@ -57,6 +57,7 @@
 </template>
 <script>
 import http from "@/http/api";
+import tabBarJs from "../../util/tabbar";
 export default {
   name: "set-up",
   data() {
@@ -116,6 +117,7 @@ export default {
 			if (res.status === 0) {
         this.$common.msgToast('注销成功');
         uni.clearStorageSync();
+        uni.setStorageSync("tabBar", tabBarJs);
         uni.navigateTo({
         url: '/pages/login/login'
       })

pages/order-goods/index.vue

@@ -111,7 +111,7 @@ export default {
       statusValue: [{label: '全部状态', value: 0}, {label: '待入库', value: 1}, {
         label: '已入库',
         value: 2
-      }, {label: '即将到期', value: 3}, {label: '已延期', value: 4}, {label: '已取出', value: 5}]
+      }, {label: '即将到期', value: 3}, {label: '延期未补款', value: 4}, {label: '已取出', value: 5}, {label: '延期已补款', value: 6}]
     }
   },
   components: {UImage, tabbar},

pages/order-goods/order-details.vue

@@ -93,14 +93,12 @@
         <div class="wrap1_1_3">
           <div class="wrap1_1_3_1" style="position: absolute;display: flex;align-items:center;top: 50%;transform: translateY(-50%);">
             <div class="wrap1_1_3_1_1" style="width: 70rpx;color:#FF4848;height: 30rpx;font-size: 24rpx;display: flex;justify-content: center;align-items: center;margin-right: 2rpx">{{info.levelDays}}天</div>
-            <div v-if="info.artworkStatus!==1" class="wrap1_1_3_1_2" style="color: #FF4848;font-size: 16rpx;vertical-align: middle">（{{info.endAt || ''}}已超时）</div>
+            <div v-if="info.artworkStatus===4" class="wrap1_1_3_1_2" style="color: #FF4848;font-size: 16rpx;vertical-align: middle">（{{info.endAt || ''}}已超时）</div>
           </div>
-
         </div>
         <div class="wrap1_1_4">
         </div>
       </div>
-
       <div class="wrap1_1">
         <div class="wrap1_1_1">订单金额</div>
         <div class="wrap1_1_2"></div>
@@ -150,7 +148,7 @@ export default {
         label: '已入库',
         value: 2,
         style:'color: #76C458;font-size: 24rpx'
-      }, {label: '即将到期', value: 3,style:'color: #FF4848;font-size: 24rpx'}, {label: '延期待补款', value: 4,style:'color: #FF4848;font-size: 24rpx'}, {label: '已取出', value: 5}]
+      }, {label: '即将到期', value: 3,style:'color: #FF4848;font-size: 24rpx'}, {label: '延期未补款', value: 4,style:'color: #FF4848;font-size: 24rpx'}, {label: '已取出', value: 5}, {label: '延期已补款', value: 6}]
     }
   },
   computed:{