submit

App.vue

@@ -3,7 +3,7 @@ import tabBar from "./util/tabbar";
 
 export default {
   onLaunch: function() {
-    // uni.setStorageSync("token",'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJJRCI6MCwiT3BlbklkIjoib01qYXY2eFFjQUttUW1ZUTFXV20zOXlCQUZ4byIsIk5pY2tOYW1lIjoiIiwiVGVsTnVtIjoiMTgyMDUwNTI2MjciLCJBdmF0YXIiOiIiLCJJRE51bSI6IiIsImV4cCI6MTY5NTQzNjEwMSwiaXNzIjoibWFsbCJ9.qYzFMtoOOBuawYDTl7iuwlTTz7Fakhr8657PjxWhQ8I')
+    uni.setStorageSync("token",'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJJRCI6MCwiT3BlbklkIjoib01qYXY2NjlHMEtKcFlKNE1qWGhyNEh5cHhBUSIsIk5pY2tOYW1lIjoi5YiY5bCP5benIiwiVGVsTnVtIjoiMTUyNjI0ODE0OTgiLCJBdmF0YXIiOiJodHRwczovL2NkbnMuZm9udHJlZS5jbi9pbnZlbnRvcnkvZmlsZXMvaW1nL2MzNWQ1ODVhLTVjNTMtMTFlZS04OGRmLTAyNDJhYzEzMDAyNS5qcGciLCJJRE51bSI6IjMyMDMyNDE5OTAwNTA5NjY0WCIsImV4cCI6MTY5NTgxMTk4NCwiaXNzIjoibWFsbCJ9.QDDAiN5xFtL7BelKfgbnej_nO52T_UxQ7GFicHnQA2U')
     uni.hideTabBar();
     uni.setStorageSync("tabBar", tabBar);
   },

components/uiq-tabbar/uiq-tabbar.vue

@@ -1,11 +1,11 @@
 <template>
   <view class="tabbar">
-    <u-tabbar :safeAreaInsetBottom="true" :placeholder="true" :border="false" class="tabbar-ios-fix"  activeColor='#22bf8e' :value="current?current:0" :fixed="true"
-                @change="handleTabClick">
+    <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;margin-top: 34rpx" slot="inactive-icon" class="u-page__item__slot-icon" :src="item.iconPath">
+        <image style="width: 52rpx;height: 52rpx;" slot="inactive-icon" class="u-page__item__slot-icon" :src="item.iconPath">
         </image>
-        <image style="width: 52rpx;height: 52rpx;margin-top: 34rpx" slot="active-icon" class="u-page__item__slot-icon" :src="item.selectedIconPath">
+        <image style="width: 52rpx;height: 52rpx;" slot="active-icon" class="u-page__item__slot-icon" :src="item.selectedIconPath">
         </image>
       </u-tabbar-item>
     </u-tabbar>
@@ -42,7 +42,7 @@ export default {
 }
 
 
-.tabbar-ios-fix {
+/*.tabbar-ios-fix {
   bottom: calc(120rpx + env(safe-area-inset-bottom));
-}
+}*/
 </style>

pages/contract/index.vue

@@ -51,9 +51,13 @@ export default {
   },
   methods:{
     async getDistanceFromTopToPageBottom(classValue) {
-      const { windowHeight, windowWidth } = await uni.getSystemInfo();
-      const [{ top }] = await new Promise(resolve => uni.createSelectorQuery().select(classValue).boundingClientRect().exec(resolve));
+      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;
+      }else {
+        this.elementBottom = ((windowHeight - top) / windowWidth) * 750 - 110;
+      }
     },
     loadMore(){
 

pages/mine/index.vue

@@ -61,7 +61,7 @@ export default {
       const res = await this.$api.mine.infoOrders()
       if(res.status === 0){
         this.orderTotal = res.data.totalCount
-        this.validContractDays = res.data.nowCount
+        this.validContractDays = res.data.nearCount
       }else{
         this.$common.msgToast(res.msg);
       }

pages/order-goods/index.vue

@@ -50,8 +50,8 @@
 <!--            <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!==1">
-                {{ item.startAt ||''}}-{{ item.endAt||'' }}
+              <div v-if="item.artworkStatus!==4">
+                {{ item.startAt }}-{{ item.endAt }}
               </div>
               <div v-else>{{item.cycleName}} </div>
 
@@ -85,7 +85,6 @@
                         @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>
@@ -165,7 +164,11 @@ 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;
+      }else {
+        this.elementBottom = ((windowHeight - top) / windowWidth) * 750 - 110;
+      }
     },
     openDelete(item) {
       this.messageText = `确认删除吗`