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

components/uiq-tabbar/uiq-tabbar.vue

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

pages/contract/index.vue

@@ -7,7 +7,6 @@
         </div>
       </template>-->
     </title-block>
-
     <div class="content2">
       <div class="wrap1">合同名称</div>
       <div class="wrap2">合同编号</div>
@@ -42,8 +41,11 @@ export default {
       elementBottom:''
     }
   },
-  mounted(){
+  onShow(){
     this.getData()
+  },
+  mounted(){
+
     this.getDistanceFromTopToPageBottom('.content3')
 
   },

pages/mine/index.vue

@@ -3,12 +3,12 @@
   <div class="content1">
     <div class="wrap1">
       <div class="wrap1_1">{{orderTotal}}</div>
-      <div class="wrap1_2">当前订单总量</div>
+      <div class="wrap1_2">画作寄存量</div>
     </div>
     <div class="wrap2"></div>
     <div class="wrap3">
       <div class="wrap3_1">{{validContractDays}}</div>
-      <div class="wrap3_2">当前有效合同数</div>
+      <div class="wrap3_2">寄存即将到期画作</div>
     </div>
   </div>
   <div class="content2">

pages/order-goods/index.vue

@@ -47,9 +47,15 @@
           </div>
           <div class="wrap1_2">
             <div class="wrap1_2_1">{{ item.artworkName }}</div>
-            <div class="wrap1_2_2">订单号:{{ item.artworkName }}</div>
+<!--            <div class="wrap1_2_2">订单号:{{ item.artworkName }}</div>-->
             <div class="wrap1_2_3">{{ item.artworkSquareSize }}平尺</div>
-            <div class="wrap1_2_4">{{ item.startAt }}-{{ item.endAt }}</div>
+            <div class="wrap1_2_4">
+              <div v-if="item.artworkStatus!==1">
+                {{ item.startAt ||''}}-{{ item.endAt||'' }}
+              </div>
+              <div v-else>{{item.cycleName}} </div>
+
+            </div>
           </div>
           <div class="wrap1_3" :class="[`status${item.artworkStatus}`]">
             <div class="wrap1_3_1" v-if="item.artworkStatus===4">
@@ -60,10 +66,13 @@
             <div class="wrap1_3_3" v-if="item.artworkStatus!==4">
               <div class="wrap1_3_3_1">{{ statusValue.find(x => x.value === item.artworkStatus).label }}</div>
             </div>
-            <div class="wrap1_3_2">
-              <div class="wrap1_3_2_1">货架号:</div>
+            <div v-if="item.shelvesNum" class="wrap1_3_2">
+              <div  class="wrap1_3_2_1">货架号:</div>
               <div class="wrap1_3_2_2">{{ item.shelvesNum }}</div>
             </div>
+            <div class="wrap1_3_2" v-if="!item.shelvesNum">
+              <div class="wrap1_3_2_2">{{item.warehouseName}}</div>
+            </div>
           </div>
           <div class="wrap1_4" v-if="item.isRight&&item.artworkStatus===5" @click.stop="openDelete(item)">
             <image style="width: 80rpx;height: 80rpx" src="../../static/zu154@3x.png"></image>
@@ -76,6 +85,7 @@
                         @confirm="popForward"
       ></uni-popup-dialog>
     </uni-popup>
+    <div style="width: 100rpx;height: 100rpx;background: red;position: fixed;bottom: 0;z-index: 999"></div>
     <tabbar :current="1"></tabbar>
   </div>
 </template>
@@ -108,7 +118,7 @@ export default {
   },
   components: {UImage, tabbar},
   mounted() {
-    this.getData()
+
     uni.getSystemInfo({
       success: (res) => {
         this.windowWidth = res.windowWidth
@@ -116,6 +126,10 @@ export default {
     })
     this.getDistanceFromTopToPageBottom('.content3')
   },
+  onShow(){
+    this.getData()
+  },
+
   computed: {},
   methods: {
     popForward() {

pages/order-goods/order-details.vue

@@ -80,7 +80,7 @@
         <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_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 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">{{`${info.startAt || ''}-${info.endAt || ''}`}}</div>
           </div>
         </div>
         <div class="wrap1_1_4">