From 52cb02d9b5bbcec683d0dd95d5f1c70c1c19ad82 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Fri, 27 Jun 2025 16:55:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BA=AB=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 root/detail/userShare.vue           | 41 ++++++++++++++++++++++++++---------
 root/person/inviteFollowSuccess.vue |  2 +-
 root/person/teamManage.vue          | 43 +++++++++++++++++++------------------
 static/css/iconfont.css             | 13 ++++++-----
 4 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/root/detail/userShare.vue b/root/detail/userShare.vue
index 28493b3..02af4b6 100644
--- a/root/detail/userShare.vue
+++ b/root/detail/userShare.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="p-root-detail-user g_w_all g_bg_page g_kuaishou">
-    <view class="g_h_136" style="background-color: #48aaf9 !important"></view>
+    <u-navbar backIconColor="#333" :borderBottom="false" immersive="true" :customBack="goHome" :background="{background:navColor}" backIconName="home"></u-navbar>
+    <view class="g_h_136 u-navbar-fixed" style="background-color: #48aaf9 !important"></view>
     <div class style="background-color: #48aaf9 !important">
       <view class="m-info g_p_20 g_pt_12 g_pb_0 g_bg_f g_position_rela" hover-class="none" style="margin-top: 0;border-radius:8px 8px 0 0 ">
         <view class="g_flex_row_start">
@@ -12,7 +13,7 @@
           <view class="g_flex_1 g_ml_11">
             <view class="g_flex_row_between flex_center">
               <view class="g_flex_row_start flex_center" style="line-height: 22px">
-                <view class="g_flex_none g_ell_1 g_fs_18 g_fw_bold g_c_3" style="max-width: 240rpx">{{ info.fullName || info.agencyName || "-" }}</view>
+                <view class="g_flex_none g_ell_1 g_fs_18 g_fw_bold g_c_3" style="max-width: 300rpx">{{ info.fullName || info.agencyName || "-" }}</view>
               </view>
             </view>
           </view>
@@ -37,30 +38,39 @@
         <div class="g_h_10"></div>
         <div class>
           <quickLogin @successLogin="successLogin" v-if="!agencyInfo.id">
-            <g-button btnText="申请关注" type="primary" class></g-button>
+            <div style="width: calc(100vw - 40px)" class>
+              <g-button btnText="申请关注" size="auto" type="primary" class></g-button>
+            </div>
           </quickLogin>
-          <g-button v-else-if="isSelf" btnText="不能关注自己" type="disabled"></g-button>
+
+          <div style="width: calc(100vw - 40px)" v-else-if="isSelf">
+            <g-button btnText="不能关注自己" size="auto" type="disabled"></g-button>
+          </div>
+          <!--  -->
           <div v-else>
             <div class="g_flex_row_center" v-if="beFllowAgencyInfo.recordStatus == 1">
               <!-- 已关注 1 -->
               <div style="width:calc((100vw - 50px) / 2);" class="g_mr_10">
-                <g-button btnText="已关注发单号" type="disabled" class></g-button>
+                <g-button btnText="已关注发单号" size="auto" type="disabled" class></g-button>
               </div>
               <div style="width:calc((100vw - 50px) / 2);">
-                <g-button btnText="联系客服" type="disabled" class></g-button>
+                <g-button btnText="联系客服" size="auto" type="disabled" class></g-button>
               </div>
             </div>
+
             <div style="width: calc(100vw - 40px)" v-else-if="beFllowAgencyInfo.recordStatus == 2">
-              <g-button btnText="互相关注" type="disabled" class></g-button>
+              <g-button btnText="互相关注" size="auto" type="disabled" class></g-button>
             </div>
+
             <div style="width: calc(100vw - 40px)" v-else-if="(beFllowAgencyInfo.recordStatus == 3 || beFllowAgencyInfo.recordStatus == 4) && !isSelf">
-              <g-button btnText="申请关注" type="primary" class @clickBtn="handleSubmit"></g-button>
+              <g-button btnText="申请关注" size="auto" type="primary" class @clickBtn="handleSubmit"></g-button>
             </div>
+            <!--  -->
             <div style="width: calc(100vw - 40px)" v-else-if="beFllowAgencyInfo.recordStatus == 5">
-              <g-button btnText="等待通过" type="disabled" class></g-button>
+              <g-button btnText="申请中" icon="icon-time-circle g_mr_4" size="auto" type="disabled" class></g-button>
             </div>
             <div style="width: calc(100vw - 40px)" v-else-if="beFllowAgencyInfo.recordStatus == 6 && !isSelf">
-              <g-button btnText="申请关注" type="primary" class @clickBtn="handleSubmit"></g-button>
+              <g-button btnText="申请关注" size="auto" type="primary" class @clickBtn="handleSubmit"></g-button>
             </div>
           </div>
         </div>
@@ -133,6 +143,7 @@ export default {
   data() {
     return {
       numSlot: [],
+      navColor: 'rgb(255,255,255,0)',
       isLogin: null,
       submitConfirm: false,
       pageSpeed: 0,
@@ -210,6 +221,11 @@ export default {
       beFllowAgencyInfo: {},
     }
   },
+  onPageScroll(e) {
+    if (e.scrollTop <= 100) {
+      this.navColor = `rgb(255,255,255,${e.scrollTop / 50})`
+    }
+  },
   onLoad(options) {
     console.log('用户详情页：', options, ' version:', 1)
 
@@ -268,6 +284,11 @@ export default {
     }
   },
   methods: {
+    goHome() {
+      uni.switchTab({
+        url: '/pages/home/index',
+      })
+    },
     getAgencyInfo() {
       let that = this
       return new Promise((reso, reject) => {
diff --git a/root/person/inviteFollowSuccess.vue b/root/person/inviteFollowSuccess.vue
index 56755ce..9efcf3e 100644
--- a/root/person/inviteFollowSuccess.vue
+++ b/root/person/inviteFollowSuccess.vue
@@ -23,7 +23,7 @@
         </div>
       </div>
       <div class="g_mt_40 g_flex_row_center">
-        <div class="g_w_160 g_mr_24">
+        <div class="g_w_160">
           <g-button btnText="去添加" size="auto" type="primary" @clickBtn="goPage('/root/person/teamManage')"></g-button>
           <!-- <g-button btnText="手动添加" size="auto" @clickBtn="goPage('/root/person/addOrUpdataMember')"></g-button> -->
         </div>
diff --git a/root/person/teamManage.vue b/root/person/teamManage.vue
index 270bf53..82ea9b1 100644
--- a/root/person/teamManage.vue
+++ b/root/person/teamManage.vue
@@ -1,30 +1,31 @@
 <template>
   <div class="team-manage-container g_flex_column_between g_bg_page">
-    <scroll-view class="g_flex_1" :style="{ 'max-height': `calc(100vh - ${0}px)` }" :scroll-y="true">
-      <div class="g_h_all">
-        <div class="g_h_10"></div>
-        <div class="g_flex_row_start g_bg_f g_mb_10" style="padding: 12px 16px" @click="goPage('/root/person/applyManage')" v-if="applyNum !== 0">
-          <div class="g_mr_16 g_w_48 g_h_48 t-icon t-icon-wodetuandui" style="background-repeat: no-repeat"></div>
-          <div>
-            <div class="g_fs_18">新的成员</div>
-            <div class="g_c_9 g_fs_14">您有{{ applyNum }}条申请等待审核</div>
-          </div>
-        </div>
-        <div class="r_box g_fs_20 g_text_c g_h_60 g_ml_10 g_mr_10 g_mb_10 g_fw_600" style="line-height: 60px">{{ agencyInfo.fullName || agencyInfo.userName }}</div>
-        <div class="r_box g_ml_10 g_mr_10">
-          <div v-for="item in memberList" :key="item.id" @click="editMember(item)" class="g_border_e_b g_flex_row_between g_fs_18" style="padding: 18px 10px">
-            <div class="g_flex_row_start flex_center g_fw_600">
-              {{ item.aliasName || item.userName }}
-              <div class="g_fs_12 g_pl_2 g_h_18 g_pr_2 g_radius_4 g_flex_row_center flex_center g_ml_4 g_fw_500" v-for="i in item.agencyRoleNameList" :class="i ? (i == '创建人' ? 'creator' : i == '管理员' ? 'manager' : 'member') : ''">{{ i }}</div>
+    <scroll-view class="g_flex_1" enable-flex :style="{ 'min-height': `calc(100vh - ${0}px)` }" :scroll-y="true">
+      <div class="g_flex_column_between" :style="{ 'min-height': `calc(100vh - ${0}px)` }">
+        <div class>
+          <div class="g_h_10"></div>
+          <div class="g_flex_row_start g_bg_f g_mb_10" style="padding: 12px 16px" @click="goPage('/root/person/applyManage')" v-if="applyNum !== 0">
+            <div class="g_mr_16 g_w_48 g_h_48 t-icon t-icon-wodetuandui" style="background-repeat: no-repeat"></div>
+            <div>
+              <div class="g_fs_18">新的成员</div>
+              <div class="g_c_9 g_fs_14">您有{{ applyNum }}条申请等待审核</div>
             </div>
-            <div class="g_flex_row_end flex_center g_c_6">
-              {{ item.tel }}
-              <i class="iconfont icon-gengduo11 g_c_9"></i>
+          </div>
+          <div class="r_box g_fs_20 g_text_c g_h_60 g_ml_10 g_mr_10 g_mb_10 g_fw_600" style="line-height: 60px">{{ agencyInfo.fullName || agencyInfo.userName }}</div>
+          <div class="r_box g_ml_10 g_mr_10">
+            <div v-for="item in memberList" :key="item.id" @click="editMember(item)" class="g_border_e_b g_flex_row_between g_fs_18" style="padding: 18px 10px">
+              <div class="g_flex_row_start flex_center g_fw_600">
+                {{ item.aliasName || item.userName }}
+                <div class="g_fs_12 g_pl_2 g_h_18 g_pr_2 g_radius_4 g_flex_row_center flex_center g_ml_4 g_fw_500" v-for="i in item.agencyRoleNameList" :class="i ? (i == '创建人' ? 'creator' : i == '管理员' ? 'manager' : 'member') : ''">{{ i }}</div>
+              </div>
+              <div class="g_flex_row_end flex_center g_c_6">
+                {{ item.tel }}
+                <i class="iconfont icon-gengduo11 g_c_9"></i>
+              </div>
             </div>
           </div>
+          <div class="g_h_40"></div>
         </div>
-        <div class="g_h_40"></div>
-
         <!-- <div class="g_h_24"></div> -->
         <div class="sticky g_bg_f g_flex_row_center g_pt_8" style="padding-bottom: calc(constant(safe-area-inset-bottom) + 16px); padding-bottom: calc(env(safe-area-inset-bottom) + 16px);box-shadow:0px -4px 10px rgba(0, 0, 0, 0.06);">
           <div class="g_w_128 g_mr_20">
diff --git a/static/css/iconfont.css b/static/css/iconfont.css
index 30759a9..e886ab6 100644
--- a/static/css/iconfont.css
+++ b/static/css/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
-  font-family: 'iconfont';  /* Project id 4374774 */
-  src: url('//at.alicdn.com/t/c/font_4374774_8550a9gnhmb.woff2?t=1750644934966') format('woff2'),
-       url('//at.alicdn.com/t/c/font_4374774_8550a9gnhmb.woff?t=1750644934966') format('woff'),
-       url('//at.alicdn.com/t/c/font_4374774_8550a9gnhmb.ttf?t=1750644934966') format('truetype');
+  font-family: "iconfont"; /* Project id 4374774 */
+  src: url('//at.alicdn.com/t/c/font_4374774_rju4btsrrtq.woff2?t=1751011994815') format('woff2'),
+       url('//at.alicdn.com/t/c/font_4374774_rju4btsrrtq.woff?t=1751011994815') format('woff'),
+       url('//at.alicdn.com/t/c/font_4374774_rju4btsrrtq.ttf?t=1751011994815') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-time-circle:before {
+  content: "\e784";
+}
+
 .icon-tuandui1:before {
   content: "\e613";
 }
@@ -872,4 +876,3 @@
 .icon-leftArrows:before {
   content: "\100c6";
 }
-