feat： 版本迭代

project.config.json

@@ -18,7 +18,9 @@
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
-    }
+    },
+    "ignoreDevUnusedFiles": false,
+    "ignoreUploadUnusedFiles": false
   },
   "condition": {},
   "editorSetting": {

src/App.vue

@@ -17,7 +17,7 @@ onLaunch(() => {
   });
   // #endif
 
-  // #ifndef MP-ALIPAY
+  // #ifdef MP-WEIXN || MP-TOUTIAO || H5
   uni.hideTabBar();
   // #endif
 });

src/pagesHome/index.vue

@@ -34,27 +34,27 @@
       >
         <view class="title">爱梵达</view>
         <image
-          :src="`/static/avatar/1.jpg`"
+          :src="`${url}/static/avatar/1.jpg`"
           :mode="'widthFix'"
           style="width: 100%"
         />
         <image
-          :src="`/static/avatar/2.jpg`"
+          :src="`${url}/static/avatar/2.jpg`"
           :mode="'widthFix'"
           style="width: 100%"
         />
         <image
-          :src="`/static/avatar/3.jpg`"
+          :src="`${url}/static/avatar/3.jpg`"
           :mode="'widthFix'"
           style="width: 100%"
         />
         <image
-          :src="`/static/avatar/4.jpg`"
+          :src="`${url}/static/avatar/4.jpg`"
           :mode="'widthFix'"
           style="width: 100%"
         />
         <image
-          :src="`/static/avatar/5.jpg`"
+          :src="`${url}/static/avatar/5.jpg`"
           :mode="'widthFix'"
           style="width: 100%"
         />

src/pagesHome/profile.vue

@@ -45,7 +45,10 @@
         </view>
         <view class="content">
           <u-list :height="'200px'">
-            <u-list-item v-for="(item, index) in list" :key="index">
+            <u-list-item
+              v-for="(item, index) in isHasToken() ? list : list1"
+              :key="index"
+            >
               <u-cell
                 :title="item.name"
                 arrow-direction="right"
@@ -69,14 +72,14 @@
       </view>
     </view>
     <SmallModal
-    :title="'确认退出吗？'"
+      :title="'确认退出吗？'"
-    :content="'退出后将返回至登陆页'"
+      :content="'退出后将返回至登陆页'"
-    :okText="'确认退出'"
+      :okText="'确认退出'"
-    :isMain="true"
+      :isMain="true"
-    :show="isShowCancelModal"
+      :show="isShowCancelModal"
-    @handleModal="(v:boolean) => {handleModal(v)}"
+      @handleModal="(v:boolean) => {handleModal(v)}"
-    @handleOk="handleOk()"
+      @handleOk="handleOk()"
-  />
+    />
   </Layout>
 </template>
 
@@ -89,7 +92,10 @@ import { UserApi } from "@/services";
 import SmallModal from "@/components/Modal/smallModal.vue";
 const store = useMemberStore(pinia);
 const profile = store.profile.userInfo;
-const list = reactive([
+function isHasToken () {
+  return store.profile.token !== ""
+}
+const list = reactive<any>([
   {
     name: "收款信息",
     icon: "pay.png",
@@ -108,6 +114,20 @@ const list = reactive([
     path: "",
   },
 ]);
+const list1 = reactive<any>([
+  {
+    name: "收款信息",
+    icon: "pay.png",
+  },
+  {
+    name: "用户协议",
+    icon: "4.png",
+  },
+  {
+    name: "隐私政策",
+    icon: "5.png",
+  }
+]);
 
 const entryItemList = ref([
   {
@@ -139,10 +159,9 @@ const hanldeClick = (item: any) => {
   } else if (item.name === "隐私政策") {
     openDoc("在生万有隐私政策");
   } else if (item.name === "收款信息") {
-    
     uni.navigateTo({
-    url: '/pagesOrder/collection', // 要跳转到的页面路径
+      url: "/pagesOrder/collection", // 要跳转到的页面路径
-  });
+    });
   } else if (item.name === "退出登录") {
     handleModal(true);
   }
@@ -156,6 +175,7 @@ const handleModal = (v: boolean) => {
 const handleOk = () => {
   UserApi.logOut({}).then((res: any) => {
     if (res.code === 200) {
+      store.clearProfile();
       uni.reLaunch({
         url: "/pagesLogin/index", // 要跳转到的页面路径
       });
@@ -215,7 +235,7 @@ my.hideTabBar({
 });
 // #endif
 
-// #ifndef MP-ALIPAY
+// #ifdef MP-WEIXN || MP-TOUTIAO || H5
 uni.hideTabBar();
 // #endif
 </script>

src/pagesOrder/battery/index.vue

@@ -42,7 +42,7 @@
       :isLoading="pageList.isLoading"
     >
       <view class="box">
-        <scroll-view scroll-x class="scroll-view">
+        <scroll-view :enable-flex="true" scroll-x class="scroll-view">
           <uni-table stripe emptyText="">
             <!-- 表头行 -->
             <uni-tr>
@@ -68,7 +68,7 @@
                     {{ item[tItem.key] ? "已处理" : "待处理" }}
                   </text>
                   <text
-                    v-else-if="tItem.key === 'photoUrl'"
+                    v-else-if="tItem.key === 'photoUrl' && item[tItem.key]"
                     class="btn"
                     @click="showImage(item)"
                   >

src/pagesOrder/joinus/index.vue

@@ -36,7 +36,7 @@
       :isLoading="pageList.isLoading"
     >
       <view class="box">
-        <scroll-view scroll-x class="scroll-view">
+        <scroll-view :enable-flex="true" scroll-x class="scroll-view">
           <uni-table stripe emptyText="">
             <!-- 表头行 -->
             <uni-tr>

src/pagesOrder/vehicle/index.vue

@@ -36,7 +36,7 @@
       :isLoading="pageList.isLoading"
     >
       <view class="box">
-        <scroll-view scroll-x class="scroll-view">
+        <scroll-view :enable-flex="true" scroll-x class="scroll-view">
           <uni-table stripe emptyText="">
             <!-- 表头行 -->
             <uni-tr>

src/pagesVehicle/inquiry.vue

@@ -374,7 +374,7 @@ const formAttrList = reactive<any>([
     key: "totalWeight",
     type: "input",
     required: true,
-    unit: "",
+    unit: "KG",
   },
   {
     name: "车牌号",

src/pagesVehicle/recovery.vue

@@ -339,7 +339,7 @@ const formAttrList = reactive<any>([
     key: "totalWeight",
     type: "input",
     required: true,
-    unit: "",
+    unit: "KG",
   },
   {
     name: "车牌号",

src/pagesVehicle/regisList.vue

@@ -12,7 +12,7 @@
       :isLoading="pageList.isLoading"
     >
       <view class="box">
-        <scroll-view scroll-x class="scroll-view">
+        <scroll-view :enable-flex="true" scroll-x class="scroll-view">
           <uni-table stripe emptyText="">
             <!-- 表头行 -->
             <uni-tr>

src/pagesVehicle/registration.vue

@@ -340,7 +340,7 @@ const formAttrList = reactive<any>([
     key: "totalWeight",
     type: "input",
     required: true,
-    unit: "",
+    unit: "KG",
   },
   {
     name: "车牌号",

src/static/style/common.scss

@@ -53,7 +53,7 @@ body {
   position: fixed;
   width: calc(100vw - 100rpx);
   bottom: 0rpx;
-  z-index: 98;
+  z-index: 20;
 }
 
 .uni-calendar-item--multiple .uni-calendar-item--before-checked,