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

App.vue

@@ -26,6 +26,9 @@ export default {
   justify-content: center;
   align-items: center;
 }
+.u-tabbar__content{
+  height: 166rpx;
+}
 .tm-poup-wk{
   height: initial!important;
 }

components/uiq-tabbar/uiq-tabbar.vue

@@ -3,9 +3,9 @@
     <u-tabbar class="tabbar-ios-fix" :border="false" activeColor='#22bf8e' :value="current?current:0" :fixed="true"
               :placeholder="true" :safeAreaInsetBottom="true" @change="handleTabClick">
       <u-tabbar-item v-for='(item,index) in tabList' :key="index" :text="item.text">
-        <image style="width: 52rpx;height: 52rpx;" slot="inactive-icon" class="u-page__item__slot-icon" :src="item.iconPath">
+        <image style="width: 52rpx;height: 52rpx;margin-top: 65rpx" slot="inactive-icon" class="u-page__item__slot-icon" :src="item.iconPath">
         </image>
-        <image style="width: 52rpx;height: 52rpx;" slot="active-icon" class="u-page__item__slot-icon" :src="item.selectedIconPath">
+        <image style="width: 52rpx;height: 52rpx;margin-top: 65rpx" slot="active-icon" class="u-page__item__slot-icon" :src="item.selectedIconPath">
         </image>
       </u-tabbar-item>
     </u-tabbar>

pages/consignment-painting/index.vue

@@ -167,7 +167,7 @@
             <image src="../../static/zu611@3x.png"></image>
           </div>
         </div>
-        <div class="wrap1_1" @click="show_1=true">
+        <div class="wrap1_1" @click="openShow1()">
           <div class="wrap1_1_1">寄存时限</div>
           <div class="wrap1_1_2"></div>
           <div class="wrap1_1_3">
@@ -256,6 +256,17 @@ export default {
     this.data = [today.getFullYear(), today.getMonth() + 1, today.getDate()]
   },
   methods: {
+    openShow1(){
+      if (!this.info.artworkSquareSize){
+        uni.showToast({
+          title: "请先填写画作平尺数",
+          duration: 2000,
+          icon: "none",
+        });
+        return
+      }
+      this.show_1=true
+    },
     uploadFilePromise(url, type = null) {
       return new Promise((resolve) => {
         uni.uploadFile({

pages/order-goods/index.vue

@@ -50,7 +50,7 @@
 <!--            <div class="wrap1_2_2">订单号:{{ item.artworkName }}</div>-->
             <div class="wrap1_2_3">{{ item.artworkSquareSize }}平尺</div>
             <div class="wrap1_2_4">
-              <div v-if="item.artworkStatus!==4">
+              <div v-if="![1,4].includes(item.artworkStatus)">
                 {{ item.startAt }}-{{ item.endAt }}
               </div>
               <div v-else>{{item.cycleName}} </div>
@@ -164,11 +164,12 @@ export default {
     async getDistanceFromTopToPageBottom(classValue) {
       const {windowHeight, windowWidth} = await uni.getSystemInfo();
       const [{top}] = await new Promise(resolve => uni.createSelectorQuery().select(classValue).boundingClientRect().exec(resolve));
-      if(uni.getSystemInfoSync().platform === 'ios'){
+      this.elementBottom = ((windowHeight - top) / windowWidth) * 750 - 175;
+  /*    if(uni.getSystemInfoSync().platform === 'ios'){
         this.elementBottom = ((windowHeight - top) / windowWidth) * 750 - 175;
       }else {
         this.elementBottom = ((windowHeight - top) / windowWidth) * 750 - 110;
-      }
+      }*/
     },
     openDelete(item) {
       this.messageText = `确认删除吗`

pages/order-goods/order-details.vue

@@ -78,20 +78,24 @@
         <div class="wrap1_1_1" >寄存时限</div>
         <div class="wrap1_1_2"></div>
         <div class="wrap1_1_3" >
-          <div class="wrap1_1_3_1" style="position: absolute;display: flex;top: 50%;transform: translateY(-50%);">
+          <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:#fff;height: 30rpx;background: #76C458;font-size: 16rpx;display: flex;justify-content: center;align-items: center;margin-right: 2rpx">{{info.cycleName}}</div>
-            <div v-if="info.artworkStatus!==1" class="wrap1_1_3_1_2" style="color: #939393;font-size: 24rpx">{{`${info.startAt || ''}-${info.endAt || ''}`}}</div>
+            <div v-if="info.artworkStatus!==1" class="wrap1_1_3_1_2" style="color: #939393;font-size: 24rpx;vertical-align: middle">{{`${info.startAt || ''}-${info.endAt || ''}`}}</div>
           </div>
         </div>
         <div class="wrap1_1_4">
 
         </div>
       </div>
-      <div class="wrap1_1">
+      <div class="wrap1_1" style="position: relative;">
         <div class="wrap1_1_1">剩余天数</div>
         <div class="wrap1_1_2"></div>
         <div class="wrap1_1_3">
-          <input disabled :placeholder-style="daysRemainingStyle" :placeholder="info.levelDays"/>
+          <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>
+
         </div>
         <div class="wrap1_1_4">
         </div>