From 35735c1d80a3aca48eb9e0c5f1f50e8e998b44d6 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Sat, 14 Sep 2024 14:16:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=BC=E5=AE=B9=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=20h5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Layout/index.vue  |  8 +++++---
 src/components/Tabbar/index.vue  | 19 ++++++++++++-------
 src/pages.json                   |  4 ++--
 src/pagesHome/profile.vue        |  7 +++++--
 src/pagesVehicle/recycleFlow.vue |  2 --
 src/static/style/common.scss     | 32 ++++++++++++++++++++++++++++++++
 6 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/src/components/Layout/index.vue b/src/components/Layout/index.vue
index c29b901..895bb9e 100644
--- a/src/components/Layout/index.vue
+++ b/src/components/Layout/index.vue
@@ -11,12 +11,12 @@
   <view
     :style="{
       paddingBottom: navbarRect.bottom + 'rpx',
-      
+
       height: '50px',
     }"
     class="bottom"
   >
-    <Tabbar :select="select"/>
+    <Tabbar :select="select" />
   </view>
 </template>
 
@@ -37,6 +37,7 @@ const navbarRect = reactive({
   layoutHeight: 0,
 });
 
+// #ifndef H5
 const menuButtonInfo = uni.getMenuButtonBoundingClientRect();
 navbarRect.height = menuButtonInfo.height;
 navbarRect.top = menuButtonInfo.top;
@@ -53,6 +54,7 @@ uni.getSystemInfo({
       50;
   },
 });
+// #endif
 </script>
 
 <style lang="scss" scoped>
@@ -65,7 +67,7 @@ uni.getSystemInfo({
   background-color: bisque;
 }
 .layout {
-  background-color: #FFF;
+  background-color: #fff;
 }
 .bottom {
   position: fixed;
diff --git a/src/components/Tabbar/index.vue b/src/components/Tabbar/index.vue
index c5500c9..3e6d63b 100644
--- a/src/components/Tabbar/index.vue
+++ b/src/components/Tabbar/index.vue
@@ -1,17 +1,22 @@
 <template>
   <!-- 工作台底部菜单 -->
   <view class="custom-tabbar">
-    <view v-for="item in state.list" :key="item.text" @click="handleClick(item)">
+    <view
+      v-for="item in state.list"
+      :key="item.text"
+      @click="handleClick(item)"
+    >
       <view>
         <image
-        :src="`${url}/static/img/tabbar/${select === item.text ? item.activeIcon : item.icon}`"
-        class="custom-img"
-      ></image>
+          :src="`${url}/static/img/tabbar/${
+            select === item.text ? item.activeIcon : item.icon
+          }`"
+          class="custom-img"
+        ></image>
       </view>
-      <view :class="{'active': select === item.text}">
+      <view :class="{ active: select === item.text }">
         {{ item.text }}
       </view>
-     
     </view>
     <!-- <view v-for="item in state.list" :key="item.text">
       <image
@@ -79,7 +84,7 @@ onLaunch(() => {
   background: #ffffff;
   // box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 56, 93, 0.12);
   border-radius: 13rpx 13rpx 0rpx 0rpx;
-  border-top: 1px solid rgba(0,0,0,0.05);
+  border-top: 1px solid rgba(0, 0, 0, 0.05);
   display: flex;
   align-items: center;
   justify-content: space-around;
diff --git a/src/pages.json b/src/pages.json
index bb9335c..ea8aa0f 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -15,14 +15,14 @@
     {
       "path": "pagesHome/index",
       "style": {
-        "navigationStyle": "custom", // 控制头部是否显示
+        // "navigationStyle": "custom", // 控制头部是否显示
         "navigationBarTitleText": "首页"
       }
     },
     {
       "path": "pagesHome/profile",
       "style": {
-        "navigationStyle": "custom", // 控制头部是否显示
+        // "navigationStyle": "custom", // 控制头部是否显示
         "navigationBarTitleText": "我的"
       }
     }
diff --git a/src/pagesHome/profile.vue b/src/pagesHome/profile.vue
index 27023fe..f40b94c 100644
--- a/src/pagesHome/profile.vue
+++ b/src/pagesHome/profile.vue
@@ -6,7 +6,7 @@
           <image :src="`${url}/static/img/profile/user.png`" class="user"></image>
           <view>
             <view>
-              <text class="name">{{ '抖音用户' || "-" }}</text>
+              <text class="name">{{ '用户' || "-" }}</text>
             </view>
             <view>
               <text class="company">{{ '-' || "-" }}</text>
@@ -65,8 +65,10 @@ const hanldeClick = (item: any) => {
 
 const openDoc = (item: string) => {
   //文件预览
+  const isWX = uni.getSystemInfoSync().uniPlatform === 'mp-weixin'
+  console.log(`${url}/static/${isWX && (item === '在生万有隐私政策') ? 'weixin/' : ''}${item}.docx`)
   uni.downloadFile({
-    url: `${url}/static/${item}.docx`,
+    url: `${url}/static/${isWX && (item === '在生万有隐私政策') ? 'weixin/' : ''}${item}.docx`,
     success: function (res) {
       setTimeout(
         () =>
@@ -92,6 +94,7 @@ const openDoc = (item: string) => {
     },
   });
 };
+
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pagesVehicle/recycleFlow.vue b/src/pagesVehicle/recycleFlow.vue
index 69146d3..49b57ef 100644
--- a/src/pagesVehicle/recycleFlow.vue
+++ b/src/pagesVehicle/recycleFlow.vue
@@ -4,10 +4,8 @@
     :padding="'0px'"
     :margin="'20px'"
     :border="false"
-    :cover="'cover'"
   >
     <image
-      slot="cover"
       style="height: 680rpx"
       :src="`${url}/static/img/vehicle/flow.png`"
       mode="'aspectFit'"
diff --git a/src/static/style/common.scss b/src/static/style/common.scss
index edc9c8d..643103f 100644
--- a/src/static/style/common.scss
+++ b/src/static/style/common.scss
@@ -72,3 +72,35 @@ body {
 .u-empty {
   margin-bottom: 10px !important;
 }
+
+.uni-tabbar {
+  bottom: -10px !important;
+}
+
+
+.custom-tabbar {
+  background: #ffffff;
+  // box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 56, 93, 0.12);
+  border-radius: 13rpx 13rpx 0rpx 0rpx;
+  border-top: 1px solid rgba(0, 0, 0, 0.05);
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  font-weight: 500;
+  font-size: 30rpx;
+  color: #999;
+  text-align: center;
+  padding-top: 20rpx;
+  .custom-img {
+    width: 48rpx;
+    height: 48rpx;
+  }
+  .active {
+    color: $u-primary;
+  }
+}
+// #ifdef H5
+.bottom {
+  padding-bottom: 30rpx !important;
+}
+// #endif
\ No newline at end of file