From c84e7b77b8018126ae76c82d31902a113d09c686 Mon Sep 17 00:00:00 2001
From: jscyl13849007907 <13849007907@163.com>
Date: Wed, 20 May 2026 15:05:44 +0800
Subject: [PATCH] no message

---
 root/merchantManagement/teamManage.vue | 88 ++++++++++++++++++++--------------
 static/css/iconfont.css                | 12 +++--
 2 files changed, 60 insertions(+), 40 deletions(-)

diff --git a/root/merchantManagement/teamManage.vue b/root/merchantManagement/teamManage.vue
index b5fda5a..3cbc557 100644
--- a/root/merchantManagement/teamManage.vue
+++ b/root/merchantManagement/teamManage.vue
@@ -46,45 +46,56 @@
 					</view>
 
 					<div class="dom_3 r_box g_ml_10 g_mr_10"  style="margin-top: 10px;"> 
-						<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 v-for="item in memberList" :key="item.id" @click="editMember(item)" 
+								 class="g_flex_row_between g_fs_18" style="padding: 0 10px">
+							<div class="g_flex_c g_flex_none g_mr_10">
+								<img :src="item.avatar || 'https://bocai-cms.oss-cn-beijing.aliyuncs.com/web-resource/pugongying/default.svg'" 
+											alt="" style="width: 40px;height: 40px;border-radius: 50%;">
+							</div>
+							<div class="g_flex_column_between g_flex_1" 
+									 style="border-bottom: 1px solid rgba(0, 0, 0, 0.1);padding: 9px 0;"
+							>
+								<div class="g_flex_1 g_flex_row_start" style="font-size: 17px;color: rgba(0, 0, 0, 0.9);">
+									{{ 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="(role, index) in getDisplayRoles(item.agencyRoleNameList)" 
-									:key="index" 
-									:class="role !== '...' ? (role == '创建人' ? 'creator' : role == '管理员' ? 'manager' : 'member') : ''"
-									v-show="role && role.trim()">
-									{{ role }}
+									<div class="g_flex_column_center">
+										<div class="g_flex_row_start">
+											<div class="g_fs_12 g_pl_2 g_h_18 g_pr_2 g_radius_4 g_flex_c g_ml_4" 
+												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>
+								</div>
+								<div class="g_flex_none" style="font-size: 14px;color: #999999;">
+									@{{ agencyInfo.fullName }}
 								</div>
-
 							</div>
-							<!-- <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>
-							</div> -->
+						</div>
+						<div class="dom_4 g_flex_row_start" style="padding: 10px 0px;"
+							   @click="addMemberShow = true"
+						>
+							<div class="g_flex_column_center" style="padding: 0 10px;">
+								<div class="g_flex_c" style="width: 40px;height: 40px;background-color: rgba(2, 122, 255, 0.1);color: #1890ff;border-radius: 50%;">
+									<i class="iconfont icon-plus"></i>
+								</div>
+							</div>
+							<div class="g_flex_column_center" style="font-size: 17px;height: 40px;color: rgba(2, 122, 255, 1);">添加成员。。。</div>
 						</div>
 					</div>
 					<div class="g_h_40"></div>
 				</div>
-				<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>
-						</div>
-						<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>
 		</scroll-view>
 		<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">
 				<view class="g_bg_f">
 					<view class="g_c_3">
-						<view class="g_p_16 g_border_e_t" @click="goPage('/root/merchantManagement/addOrUpdataMember')">手动填写信息</view>
-						<view class="g_p_16 g_border_e_t" @click="goPage('/root/merchantManagement/memberApplyQRCode')">微信分享邀请</view>
+						<view class="g_p_16 g_border_e_t" @click="goPage('/root/merchantManagement/addOrUpdataMember')">手动添加</view>
+						<view class="g_p_16 g_border_e_t" @click="goPage('/root/merchantManagement/memberApplyQRCode')">微信邀请</view>
 					</view>
 				</view>
 				<view class="g_p_16 g_mt_10 g_bg_f" style="padding-bottom: calc(constant(safe-area-inset-bottom) + 16px); padding-bottom: calc(env(safe-area-inset-bottom) + 16px)" @click="addMemberShow = false">取消</view>
@@ -189,10 +200,10 @@ export default {
 			}
 			// 过滤掉空值并限制最多显示2个加省略号
 			const filteredRoles = (roles || []).filter(role => role && role.trim());
-			if (filteredRoles.length <= 2) {
+			if (filteredRoles.length <= 3) {
 				return filteredRoles;
 			}
-			return [...filteredRoles.slice(0, 2), '...'];
+			return [...filteredRoles.slice(0, 3), '...'];
 		}
 	},
 };
@@ -200,19 +211,22 @@ export default {
 
 <style lang="scss">
 .creator {
-	color: #ff4d4f;
-	// border: 1px solid #46c7bb;
-	background-color: #fff2f0;
+	color: #fff;
+	background-color: #ff4d4f;
+	zoom: 0.9;
+	line-height: 18px;
 }
 .member {
-	color: #666;
-	// border: 1px solid #f9676e;
-	background-color: rgba(0, 0, 0, 0.04);
+	color: #fff;
+	background-color: rgba(0, 0, 0, 0.25);
+	zoom: 0.9;
+	line-height: 18px;
 }
 .manager {
-	color: #1677ff;
-	// border: 1px solid #0066d6;
-	background-color: #e6f4ff;
+	background-color: rgba(0, 145, 255, 1);
+	color: #fff;
+	zoom: 0.9;
+	line-height: 18px;
 }
 .sticky {
 	position: sticky;
diff --git a/static/css/iconfont.css b/static/css/iconfont.css
index c39a645..c88ca35 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_a95grlrpktj.woff2?t=1778668670377') format('woff2'),
-       url('//at.alicdn.com/t/c/font_4374774_a95grlrpktj.woff?t=1778668670377') format('woff'),
-       url('//at.alicdn.com/t/c/font_4374774_a95grlrpktj.ttf?t=1778668670377') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_4374774_gc8z0oarp1.woff2?t=1779260092817') format('woff2'),
+       url('//at.alicdn.com/t/c/font_4374774_gc8z0oarp1.woff?t=1779260092817') format('woff'),
+       url('//at.alicdn.com/t/c/font_4374774_gc8z0oarp1.ttf?t=1779260092817') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-plus:before {
+  content: "\e8fe";
+}
+
 .icon-yuyin:before {
   content: "\e681";
 }
@@ -1215,3 +1219,5 @@
 
 
 
+
+