From 32a71ba4da758945876984633a106dada9c99b36 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Thu, 9 Apr 2026 14:02:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 root/merchantManagement/teamManage.vue | 83 +++++++++++++++++++++-------------
 root/person/child/resume.vue           |  2 +-
 2 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/root/merchantManagement/teamManage.vue b/root/merchantManagement/teamManage.vue
index d5613cd..640b359 100644
--- a/root/merchantManagement/teamManage.vue
+++ b/root/merchantManagement/teamManage.vue
@@ -1,11 +1,11 @@
 <template>
 	<div class="team-manage-container g_flex_column_between g_bg_page">
-		<scroll-view class="g_flex_1" enable-flex :style="{ 'min-height': `calc(100vh - ${0}px)`,paddingBottom:'120px' }" :scroll-y="true">
+		<scroll-view class="g_flex_1" enable-flex :style="{ 'min-height': `calc(100vh - ${0}px)`, paddingBottom: '120px' }" :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/merchantManagement/applyManage')" v-if="applyNum !== 0">
-						<div class="g_mr_16 iconfont icon-wodetuandui g_c_main" style="background-repeat: no-repeat;font-size:48px"></div>
+						<div class="g_mr_16 iconfont icon-wodetuandui g_c_main" style="background-repeat: no-repeat; font-size: 48px"></div>
 						<div>
 							<div class="g_fs_18">新的成员</div>
 							<div class="g_c_9 g_fs_14">您有{{ applyNum }}条申请等待审核</div>
@@ -30,45 +30,46 @@
 						/>
 					</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: 19px 12px 19px 22px"
-						>
-							<div class="g_flex_row_start flex_center" style="font-size: 16px;color: #333333;">
+						<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: 19px 12px 19px 22px">
+							<div class="g_flex_row_start flex_center" style="font-size: 16px; color: #333333">
 								{{ 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" 
-											v-for="i in item.agencyRoleNameList" 
-											:class="i ? (i == '创建人' ? 'creator' : i == '管理员' ? 'manager' : 'member') : ''"
-								>{{ i }}</div>
+									v-for="(role, index) in getDisplayRoles(item.agencyRoleNameList)" 
+									:key="index" 
+									:class="role !== '...' ? (role == '创建人' ? 'creator' : role == '管理员' ? 'manager' : 'member') : ''"
+									v-show="role && role.trim()">
+									{{ role }}
+								</div>
+
 							</div>
-							<div class="g_flex_row_end flex_center g_c_6" style="font-size: 16px;color: #888;">
+							<div class="g_flex_row_end flex_center g_c_6" style="font-size: 16px; color: #888">
 								{{ item.tel }}
-								<i class="iconfont icon-gengduo11 g_c_c" style="font-size: 16px;"></i>
+								<i class="iconfont icon-gengduo11 g_c_c" style="font-size: 16px"></i>
 							</div>
 						</div>
 					</div>
 					<div class="g_h_40"></div>
 				</div>
-				<g-panel-fixed >
+				<g-panel-fixed>
 					<div class="g_flex_row_center g_pl_16 g_pr_16">
 						<div class="g_flex_1 g_mr_20">
-							<rh-button  btnText="手动添加" size="auto" @clickBtn="goPage('/root/merchantManagement/addOrUpdataMember')"></rh-button>
+							<rh-button btnText="手动添加" size="auto" @clickBtn="goPage('/root/merchantManagement/addOrUpdataMember')"></rh-button>
 						</div>
-						<div class="g_flex_1"> 
-							<rh-button  btnText="微信邀请" size="auto" type="primary" class @clickBtn="goPage('/root/merchantManagement/memberApplyQRCode')"></rh-button>
+						<div class="g_flex_1">
+							<rh-button btnText="微信邀请" size="auto" type="primary" class @clickBtn="goPage('/root/merchantManagement/memberApplyQRCode')"></rh-button>
 						</div>
 					</div>
 				</g-panel-fixed>
 				<!-- <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)">
-					<rh-button  icon="icon-tianjia g_fsi_16 g_mr_8" btnText="添加成员" class="" @clickBtn="addMember"></rh-button>
+					<rh-button icon="icon-tianjia g_fsi_16 g_mr_8" btnText="添加成员" class="" @clickBtn="addMember"></rh-button>
 				</div> -->
 			</div>
 		</scroll-view>
 		<!-- <div class="g_flex_row_end g_bg_f" style="padding: 14px 16px 34px"> -->
 
-		<!-- <rh-button  btnText="添加部门" size="small" class="g_ml_16" @clickBtn="goLogin"></rh-button> -->
+		<!-- <rh-button btnText="添加部门" size="small" class="g_ml_16" @clickBtn="goLogin"></rh-button> -->
 		<!-- </div> -->
 		<u-popup v-model="addMemberShow" mode="bottom" z-index="999999" border-radius="12" :closeable="false" :mask-close-able="true" @close="addMemberShow = false">
 			<view class="g_text_c g_bg_f_5 g_fs_17">
@@ -85,12 +86,16 @@
 </template>
 
 <script>
+import gPanelFormItem from "@/components/panel/formItem.vue";
 export default {
+	components: {
+		gPanelFormItem,
+	},
 	data() {
 		return {
 			memberList: [],
 			addMemberShow: false,
-			agencyInfo: uni.getStorageSync("apply-userinfo"),
+			agencyInfo: uni.getStorageSync("agencyInfo"),
 			applyNum: 0,
 		};
 	},
@@ -105,7 +110,7 @@ export default {
 
 	methods: {
 		compare(a, b) {
-			let sortList = ["创建人", "管理员",'成员'];
+			let sortList = ["创建人", "管理员", "成员"];
 			if (sortList.includes(a) && sortList.includes(b)) {
 				return sortList.indexOf(a) - sortList.indexOf(b);
 			} else if (sortList.includes(a)) {
@@ -153,19 +158,33 @@ export default {
 				that.applyNum = res;
 			});
 		},
-		openChoose(){
-			console.log('openChoose')
+		openChoose() {
+			console.log("openChoose");
 			uni.showActionSheet({
-				itemList: ['添加团队成员', '修改企业资料'],
+        title: "请选择操作",
+				itemList: ["添加团队成员", "修改企业资料"],
 				success: (res) => {
-					console.log(res)
-					if(res.tapIndex == 0){
-						this.goPage('/root/merchantManagement/addOrUpdataMember')
-					}else if(res.tapIndex == 1){
-						this.goPage('/root/person/info?active=1')
+					console.log(res);
+					if (res.tapIndex == 0) {
+						this.goPage("/root/merchantManagement/addOrUpdataMember");
+					} else if (res.tapIndex == 1) {
+						this.goPage("/root/person/info?active=1");
 					}
-				}
-			})
+				},
+			});
+		},
+		// 新增方法：获取要显示的角色列表
+		getDisplayRoles(roles) {
+			if (!roles || roles.length <= 2) {
+				// 过滤掉空值
+				return (roles || []).filter(role => role && role.trim());
+			}
+			// 过滤掉空值并限制最多显示2个加省略号
+			const filteredRoles = (roles || []).filter(role => role && role.trim());
+			if (filteredRoles.length <= 2) {
+				return filteredRoles;
+			}
+			return [...filteredRoles.slice(0, 2), '...'];
 		}
 	},
 };
@@ -193,4 +212,4 @@ export default {
 	left: 0;
 	z-index: 999;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/root/person/child/resume.vue b/root/person/child/resume.vue
index 1ccf2aa..e8392c5 100644
--- a/root/person/child/resume.vue
+++ b/root/person/child/resume.vue
@@ -28,7 +28,7 @@
 					</view>
 					<view style="width: 100vw" class="g_border_e_b">
 						<!-- item-width="126"  itemWidth="auto"  -->
-						<g-tabs :list="tabInfo" v-if="!numLoading" item-width="126" :current="menuActive" active-color="#6A81FF" bar-width="60" bar-height="6" font-size="32" @change="handleUpdateMenu" :gutter="22" duration="0.1" itemWidth="auto" height="84"></g-tabs>
+						<g-tabs :list="tabInfo" v-if="!numLoading" item-width="126" :current="menuActive"  bar-width="60" bar-height="6" font-size="32" @change="handleUpdateMenu" :gutter="22" duration="0.1" itemWidth="auto" height="84"></g-tabs>
 
 						<!-- <u-tabs :list="tabInfo" v-model="menuActive" active-color="#6A81FF" bar-width="60" bar-height="6" font-size="32" @change="handleUpdateMenu" :gutter="22" duration="0.1" height="84"></u-tabs> -->
 					</view>