From 4be018f47996a5c9ec2d7b01bc8bd488a4d03c2d Mon Sep 17 00:00:00 2001
From: admin <>
Date: Tue, 7 May 2024 13:41:43 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E7=99=BB=E9=99=86=20=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=20=E6=88=91=E7=9A=84=20=E5=8E=BB=E6=8E=89=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/PagesStatistics/index.vue                 | 18 ++--
 src/components/Box/index.vue                  | 47 ++++++++-
 src/components/NavBar/NavBar.vue              |  9 +-
 src/pages.json                                |  4 +
 src/pagesHome/index.vue                       |  2 +-
 .../login/components/loginLayout.vue          |  2 +-
 src/pagesLogin/login/index.vue                |  1 +
 src/pagesLogin/profile/index.vue              | 96 +++++++++++--------
 8 files changed, 124 insertions(+), 55 deletions(-)

diff --git a/src/PagesStatistics/index.vue b/src/PagesStatistics/index.vue
index 8148cca..5efd812 100644
--- a/src/PagesStatistics/index.vue
+++ b/src/PagesStatistics/index.vue
@@ -1,8 +1,10 @@
 <template>
+  <NavBar :count="0" :title="'数据统计'"></NavBar>
   <Box
     v-if="
       isShowModule(list[0].child.concat(list[1].child).concat(list[2].child))
     "
+    :isShow="true"
   >
     <view
       v-for="(item, index) in list"
@@ -17,10 +19,10 @@
           v-for="(child, index) in item.child"
           :key="index"
           @click="(child as any).fn(child)"
-          v-show="isShowModule([{title: child.title}])"
-          :class="{'box': isShowModule([{title: child.title}])}"
+          v-show="isShowModule([{ title: child.title }])"
+          :class="{ box: isShowModule([{ title: child.title }]) }"
         >
-          <view v-if="isShowModule([{title: child.title}])"> 
+          <view v-if="isShowModule([{ title: child.title }])">
             <up-image
               :src="`https://backend-common.obs.cn-east-3.myhuaweicloud.com/static/pagesStatistics/${child.icon}`"
               mode="aspectFill"
@@ -28,13 +30,16 @@
               height="60rpx"
             ></up-image>
           </view>
-          <view v-if="isShowModule([{title: child.title}])">{{ child.title }}</view>
+          <view v-if="isShowModule([{ title: child.title }])">{{
+            child.title
+          }}</view>
         </view>
       </view>
 
       <view class="line" v-show="index < list.length - 1"></view>
     </view>
   </Box>
+
   <!-- 当收货 出货 常用app全部为空 显示暂无权限 -->
   <up-empty
     v-else
@@ -51,6 +56,7 @@ import Title from "@/components/Title/index.vue";
 import TabBar from "@/components/TabBar/index.vue";
 import { useMemberStore } from "@/store/index";
 import { ProfileApi } from "@/services";
+
 const store = useMemberStore();
 const list = reactive([
   {
@@ -147,9 +153,9 @@ const isShowModule = (list: any) => {
 
 onMounted(() => {
   // 重新获取权限
-  ProfileApi.getUserInfo().then((res:any) => {
+  ProfileApi.getUserInfo().then((res: any) => {
     if (res.code === 200) {
-      store.setProfile({...res.data, token: store.profile.token});
+      store.setProfile({ ...res.data, token: store.profile.token });
     }
   });
 });
diff --git a/src/components/Box/index.vue b/src/components/Box/index.vue
index 51e69de..a06a814 100644
--- a/src/components/Box/index.vue
+++ b/src/components/Box/index.vue
@@ -1,9 +1,52 @@
 <template>
-  <view class="box">
+  <view
+    :class="{'box': isShow}"
+    :style="{
+      marginTop: navbarRect.height + navbarRect.top + 'px',
+      height: navbarRect.safeHeight + 'px',
+    }"
+  >
     <slot></slot>
   </view>
 </template>
-<script setup lang="ts"></script>
+<script setup lang="ts">
+const props = withDefaults(
+  defineProps<{
+    isShow: boolean;
+  }>(),
+  {
+    isShow: false
+  }
+);
+const navbarRect = reactive({
+  height: 32,
+  top: 28,
+  safeHeight: 500,
+});
+const getSafeHeight = () => {
+  // #ifdef APP-PLUS || MP-WEIXIN
+  uni.getSystemInfo({
+    success: (res) => {
+      navbarRect.safeHeight =
+        res.windowHeight -
+        uni.upx2px(80) -
+        navbarRect.height -
+        navbarRect.top -
+        40 -
+        17;
+    },
+  });
+  // #endif
+};
+onMounted(() => {
+  // #ifdef APP-PLUS || MP-WEIXIN
+  let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+  navbarRect.height = menuButtonInfo.height;
+  navbarRect.top = menuButtonInfo.top;
+  getSafeHeight();
+  // #endif
+});
+</script>
 <style lang="scss">
 .box {
   background: #ffffff;
diff --git a/src/components/NavBar/NavBar.vue b/src/components/NavBar/NavBar.vue
index 77b3b6e..0ee865c 100644
--- a/src/components/NavBar/NavBar.vue
+++ b/src/components/NavBar/NavBar.vue
@@ -6,7 +6,7 @@
     }"
     class="navbar"
   >
-    <view class="left" @click="handleMsg()">
+    <view class="left" @click="handleMsg()" v-if="title === '工作台'">
       <view class="msg-badge">
         <up-badge max="99" :value="count"></up-badge>
       </view>
@@ -18,7 +18,7 @@
       ></up-image>
     </view>
 
-    <view class="title">工作台</view>
+    <view class="title">{{ title }}</view>
   </view>
 </template>
 <script setup lang="ts">
@@ -30,7 +30,8 @@ console.log(ProfileApi,ReceiveApi,ShipmentApi,PictureApi,ReceiveProductApi,Devic
 
 const props = withDefaults(
   defineProps<{
-    count: number
+    count: number,
+    title: string
   }>(),
   {
     count: 0
@@ -58,7 +59,7 @@ const handleMsg = () => {
 <style lang="scss">
 .navbar {
   background: #f9f9f9;
-  box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.18);
+  // box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.18);
   padding: 15rpx;
   position: fixed;
   width: 100%;
diff --git a/src/pages.json b/src/pages.json
index 32dd35d..0bd104d 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -39,6 +39,7 @@
         {
           "path": "login/index",
           "style": {
+            "navigationStyle": "custom", // 控制头部是否显示
             "navigationBarTitleText": "登陆"
           }
         },
@@ -57,7 +58,9 @@
         {
           "path": "profile/index",
           "style": {
+            "navigationStyle": "custom", 
             "navigationBarTitleText": "个人中心"
+            
           }
         },
         {
@@ -175,6 +178,7 @@
         {
           "path": "index",
           "style": {
+            "navigationStyle": "custom", 
             "navigationBarTitleText": "数据统计"
           }
         },
diff --git a/src/pagesHome/index.vue b/src/pagesHome/index.vue
index b4d85c4..341243f 100644
--- a/src/pagesHome/index.vue
+++ b/src/pagesHome/index.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 自定义工作台头部 -->
-  <NavBar :count="state.count"></NavBar>
+  <NavBar :count="state.count" :title="'工作台'"></NavBar>
   <view
     class="contaner"
     :style="{
diff --git a/src/pagesLogin/login/components/loginLayout.vue b/src/pagesLogin/login/components/loginLayout.vue
index 4cf9c4a..3211eb2 100644
--- a/src/pagesLogin/login/components/loginLayout.vue
+++ b/src/pagesLogin/login/components/loginLayout.vue
@@ -17,7 +17,7 @@
 <style lang="scss" scoped>
 .c-login-container {
   height: 80vh;
-  margin-top: 10vh;
+  margin-top: 20vh;
   .logo {
     text-align: center;
     image {
diff --git a/src/pagesLogin/login/index.vue b/src/pagesLogin/login/index.vue
index 0ec8fa2..8f1bddc 100644
--- a/src/pagesLogin/login/index.vue
+++ b/src/pagesLogin/login/index.vue
@@ -1,4 +1,5 @@
 <template>
+  <NavBar :count="0" :title="'登陆'"></NavBar>
   <LoginLayout>
     <template #form-box>
       <u-form
diff --git a/src/pagesLogin/profile/index.vue b/src/pagesLogin/profile/index.vue
index de1c13c..d3da542 100644
--- a/src/pagesLogin/profile/index.vue
+++ b/src/pagesLogin/profile/index.vue
@@ -1,42 +1,54 @@
 <template>
-  <view class="profile">
-    <view>
-      <image class="bg" :src="`https://backend-common.obs.cn-east-3.myhuaweicloud.com/static/pages/profile/bg.png`" />
-    </view>
-    <view class="baseinfo">
-      <view class="head">
-        <image :src="`https://backend-common.obs.cn-east-3.myhuaweicloud.com/static/pages/profile/user.png`" class="user"></image>
-        <view>
+  <NavBar :count="0" :title="'个人中心'"></NavBar>
+  <Box>
+    <view class="profile">
+      <view>
+        <image
+          class="bg"
+          :src="`https://backend-common.obs.cn-east-3.myhuaweicloud.com/static/pages/profile/bg.png`"
+        />
+      </view>
+      <view class="baseinfo">
+        <view class="head">
+          <image
+            :src="`https://backend-common.obs.cn-east-3.myhuaweicloud.com/static/pages/profile/user.png`"
+            class="user"
+          ></image>
           <view>
-            <text class="name">{{ profile.userName || "-" }}</text>
-          </view>
-          <view>
-            <text class="company">{{ profile.factory_name || "-" }}</text>
+            <view>
+              <text class="name">{{ profile.userName || "-" }}</text>
+            </view>
+            <view>
+              <text class="company">{{ profile.factory_name || "-" }}</text>
+            </view>
           </view>
         </view>
-      </view>
-      <view class="content">
-        <u-list :height="'130px'">
-          <u-list-item v-for="(item, index) in list" :key="index">
-            <u-cell
-              :title="item.name"
-              arrow-direction="right"
-              isLink
-              :url="item.path"
-              :border="false"
-              @click="hanldeClick(item)"
-            >
-              <template #icon>
-                <view style="width: 40rpx">
-                  <image :src="`https://backend-common.obs.cn-east-3.myhuaweicloud.com/static/pages/profile/${item.icon}`" />
-                </view>
-              </template>
-            </u-cell>
-          </u-list-item>
-        </u-list>
+        <view class="content">
+          <u-list :height="'130px'">
+            <u-list-item v-for="(item, index) in list" :key="index">
+              <u-cell
+                :title="item.name"
+                arrow-direction="right"
+                isLink
+                :url="item.path"
+                :border="false"
+                @click="hanldeClick(item)"
+              >
+                <template #icon>
+                  <view style="width: 40rpx">
+                    <image
+                      :src="`https://backend-common.obs.cn-east-3.myhuaweicloud.com/static/pages/profile/${item.icon}`"
+                    />
+                  </view>
+                </template>
+              </u-cell>
+            </u-list-item>
+          </u-list>
+        </view>
       </view>
     </view>
-  </view>
+  </Box>
+
   <TabBar></TabBar>
   <SmallModal
     :title="'确认退出吗？'"
@@ -52,8 +64,10 @@
 import { ProfileApi } from "@/services/index";
 import { reactive } from "vue";
 import { useMemberStore } from "@/store/index";
-import TabBar from '@/components/TabBar/index.vue'
+import TabBar from "@/components/TabBar/index.vue";
 import SmallModal from "@/components/Modal/smallModal.vue";
+import Box from "@/components/Box/index.vue";
+
 const isShowCancelModal = ref(false);
 
 const handleModal = (v: boolean) => {
@@ -61,12 +75,12 @@ const handleModal = (v: boolean) => {
 };
 const handleOk = () => {
   ProfileApi.logOut().then((res: any) => {
-      if (res.code === 200) {
-        uni.reLaunch({
-          url: "/pagesLogin/login/index", // 要跳转到的页面路径
-        });
-      }
-    });
+    if (res.code === 200) {
+      uni.reLaunch({
+        url: "/pagesLogin/login/index", // 要跳转到的页面路径
+      });
+    }
+  });
 };
 const store = useMemberStore();
 const profile = store.profile.userInfo;
@@ -90,7 +104,7 @@ const list = reactive([
 
 const hanldeClick = (item: any) => {
   if (item.name === "退出登录") {
-    handleModal(true)
+    handleModal(true);
   }
 };
 </script>