From 37e2c5a6419d4cb1863a61f8b333482d689aefa5 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Fri, 19 Jul 2024 15:52:24 +0800
Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=20=E4=BF=AE=E5=A4=8D=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pagesApp/components/addRole.vue |  2 +-
 src/pagesApp/shipmentType.vue       |  2 +-
 src/pagesConfig/otherConfig.vue     |  5 -----
 src/pagesLogin/login/index.vue      |  2 +-
 src/static/style/common.scss        |  6 +++++-
 src/store/modules/member.ts         | 14 ++++++++------
 src/utils/http.ts                   |  3 ++-
 7 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/pagesApp/components/addRole.vue b/src/pagesApp/components/addRole.vue
index 6cc8720..49309a7 100644
--- a/src/pagesApp/components/addRole.vue
+++ b/src/pagesApp/components/addRole.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="c-card">
+  <view class="c-card app-container">
     <u-form
       labelPosition="left"
       :model="model1"
diff --git a/src/pagesApp/shipmentType.vue b/src/pagesApp/shipmentType.vue
index efdc3b5..44f0236 100644
--- a/src/pagesApp/shipmentType.vue
+++ b/src/pagesApp/shipmentType.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="c-card">
+  <view class="c-card app-container">
     <view class="collapse-box box">
       <view v-for="(item, index) in pageList.list" :key="index">
         <view class="item">
diff --git a/src/pagesConfig/otherConfig.vue b/src/pagesConfig/otherConfig.vue
index 8270972..fa9e4b8 100644
--- a/src/pagesConfig/otherConfig.vue
+++ b/src/pagesConfig/otherConfig.vue
@@ -250,9 +250,4 @@ const selectClick = (v: any) => {
   border-radius: 5px;
   margin: 0rpx 16rpx;
 }
-.app-container {
-  height: calc(100vh - 70px);
-  overflow: scroll;
-  position: relative;
-}
 </style>
diff --git a/src/pagesLogin/login/index.vue b/src/pagesLogin/login/index.vue
index 153eafc..0cdee74 100644
--- a/src/pagesLogin/login/index.vue
+++ b/src/pagesLogin/login/index.vue
@@ -140,7 +140,7 @@ const getCode = () => {
     (res: any) => {
       if (res.code === 200) {
         if (res.data.length > 0) {
-          store.setMechanismCode(res.data[0].mechanismCode);
+          store.setMechanism({mechanismCode: res.data[0].mechanismCode, mechanismName: res.data[0].mechanismName});
           sendMsg();
         } else {
           uni.showToast({
diff --git a/src/static/style/common.scss b/src/static/style/common.scss
index df916fd..9231de1 100644
--- a/src/static/style/common.scss
+++ b/src/static/style/common.scss
@@ -38,7 +38,11 @@ body {
   max-height: 600rpx;
   overflow-y: auto;
 }
-
+.app-container {
+  height: calc(100vh - 70px);
+  overflow: scroll;
+  position: relative;
+}
 .btn-box-fix-btn {
   margin-top: 60rpx;
   display: flex;
diff --git a/src/store/modules/member.ts b/src/store/modules/member.ts
index 24d4b67..3196461 100644
--- a/src/store/modules/member.ts
+++ b/src/store/modules/member.ts
@@ -24,7 +24,6 @@ export const useMemberStore = defineStore(
       profile.value.menusNameList = _.pluck(val.menusList, "name");
     };
 
-
     const setErr = (v: any) => {
       profile.value.err = v;
     };
@@ -42,9 +41,12 @@ export const useMemberStore = defineStore(
       };
     };
 
-    const mechanismCode = ref<string>();
-    const setMechanismCode = (v:string) => {
-      mechanismCode.value = v
+    const mechanism = ref<any>({
+      mechanismCode: "",
+      mechanismName: "",
+    });
+    const setMechanism = (v: { mechanismCode: ""; mechanismName: "" }) => {
+      mechanism.value = v;
     };
 
     // 记得 return
@@ -53,8 +55,8 @@ export const useMemberStore = defineStore(
       setProfile,
       setErr,
       clearProfile,
-      mechanismCode,
-      setMechanismCode
+      mechanism,
+      setMechanism,
     };
   },
   {
diff --git a/src/utils/http.ts b/src/utils/http.ts
index 81b4db6..ae412e7 100644
--- a/src/utils/http.ts
+++ b/src/utils/http.ts
@@ -30,7 +30,8 @@ const obj = {
       options.header["x-userToken"] = token;
     }
     if (options.url.indexOf("/api/db/getCommonDbPhone") === -1) {
-      options.header["mechanismCode"] = store.mechanismCode;
+      options.header["mechanismCode"] = store.mechanism.mechanismCode;
+      options.header["mechanismName"] = store.mechanism.mechanismName;
     }
   },
 };