From 58e73273b18719d64d4e0228377e793be4f4c993 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Tue, 8 Jul 2025 11:04:42 +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

---
 components/list/apply.vue      |   1 +
 pages/workBench/index.vue      |   6 +-
 root/detail/apply.vue          | 158 ++++++++++++------------
 root/home/quickApplication.vue |   2 +-
 root/person/set.vue            |   3 +-
 root/person/teamManage.vue     | 272 +++++++++++++++++++++--------------------
 static/css/base.scss           |   3 +
 7 files changed, 224 insertions(+), 221 deletions(-)

diff --git a/components/list/apply.vue b/components/list/apply.vue
index ae48f9c..2675265 100644
--- a/components/list/apply.vue
+++ b/components/list/apply.vue
@@ -1,5 +1,6 @@
 <template>
 	<view :class="isLogin ? '' : 'm-login-false'">
+		<g-loading paddingBottom="g_pb_120" v-if="loading && speed == -1" />
 		<view class="m-panel" :class="!loading && speed == 0 ? 'g_bg_f_5' : ''">
 			<view class="link" :class="!loading && speed == 0 ? '' : ''">
 				<!-- <g-loading bg="#ededed" v-if="loading && speed == -1" /> -->
diff --git a/pages/workBench/index.vue b/pages/workBench/index.vue
index 145eb83..6816aa0 100644
--- a/pages/workBench/index.vue
+++ b/pages/workBench/index.vue
@@ -186,9 +186,9 @@ export default {
 		that.isLogin = uni.getStorageSync("apply-token") ? true : false;
 		console.log("that.isLogin", that.isLogin);
 		that.loginInfo = uni.getStorageSync("apply-userinfo");
-		if (uni.getStorageSync("applyType")||uni.getStorageSync("applyType") === 0) {
+		if (uni.getStorageSync("applyType") || uni.getStorageSync("applyType") === 0) {
 			that.menuActive = uni.getStorageSync("applyType");
-      uni.removeStorageSync("applyType");
+			uni.removeStorageSync("applyType");
 		}
 
 		if (!that.isLogin) {
@@ -197,6 +197,7 @@ export default {
 			this.menuList = this.tabInfo[this.tabActive].childList;
 		} else {
 			this.query.page = 1;
+			that.loading = true;
 			this.menuList = this.tabInfo[this.tabActive].childList;
 			this.getList();
 		}
@@ -336,6 +337,7 @@ export default {
 			let that = this;
 			console.log("$item", $item);
 			this.menuActive = $item;
+			this.loading = true;
 			this.speed = -1;
 			this.query.page = 1;
 			that.G.isLogin();
diff --git a/root/detail/apply.vue b/root/detail/apply.vue
index 63d1d7e..f374517 100644
--- a/root/detail/apply.vue
+++ b/root/detail/apply.vue
@@ -9,43 +9,41 @@
 				<view class="g_h_10"></view>
 				<view class="link g_bg_f g_pt_10">
 					<g-panel-detail-item label="状态" :value="orderDetail.status_text" valueColor="#ff4400" />
-          <g-panel-detail-item label="报名备注" :value="orderDetail.desp" v-if="orderDetail.status== '10' || orderDetail.status== '20' || orderDetail.status== '21' || orderDetail.status== '26'"/>
+					<g-panel-detail-item label="报名备注" :value="orderDetail.desp" v-if="orderDetail.status == '10' || orderDetail.status == '20' || orderDetail.status == '21' || orderDetail.status == '26'" />
 
 					<!-- afterIcon="icon-gengduo11"  @clickItem="goBossDetail" -->
 					<!-- <g-panel-detail-item label="项目方" :value="orderDetail.upFullName || orderDetail.upAgencyName" valueColor="#333" /> -->
 					<!-- @clickItem="handleOpenPeopleModal"  -->
 					<view>
-            <view class=" " v-if="orderDetail.reception_time && (orderDetail.status== '10' ||orderDetail.status== '20' ||orderDetail.status== '21' ||orderDetail.status== '26')">
-							<g-panel-detail-item from="times" label="接待时间" :value="orderDetail.reception_time"   />
+						<view class=" " v-if="orderDetail.reception_time && (orderDetail.status == '10' || orderDetail.status == '20' || orderDetail.status == '21' || orderDetail.status == '26')">
+							<g-panel-detail-item from="times" label="接待时间" :value="orderDetail.reception_time" />
 						</view>
-            <view class=" " v-if="orderDetail.interview_time && orderDetail.status!='50'">
-							<g-panel-detail-item from="times" label="面试时间" :value="orderDetail.interview_time"   />
+						<view class=" " v-if="orderDetail.interview_time && orderDetail.status != '50'">
+							<g-panel-detail-item from="times" label="面试时间" :value="orderDetail.interview_time" />
 						</view>
-            <view class=" " v-if="orderDetail.willEntry_time &&(orderDetail.status== '45' ||orderDetail.status== '30')">
-							<g-panel-detail-item from="times" label="约入职时间" :value="orderDetail.willEntry_time"   />
+						<view class=" " v-if="orderDetail.willEntry_time && (orderDetail.status == '45' || orderDetail.status == '30')">
+							<g-panel-detail-item from="times" label="约入职时间" :value="orderDetail.willEntry_time" />
 						</view>
-            <view class=" " v-if="orderDetail.entry_time &&(orderDetail.status== '40' ||orderDetail.status== '48' ||orderDetail.status== '50')">
-							<g-panel-detail-item from="times" label="入职时间" :value="orderDetail.entry_time"   />
+						<view class=" " v-if="orderDetail.entry_time && (orderDetail.status == '40' || orderDetail.status == '48' || orderDetail.status == '50')">
+							<g-panel-detail-item from="times" label="入职时间" :value="orderDetail.entry_time" />
 						</view>
-            <view class=" " v-if="orderDetail.willLeave_time &&orderDetail.status == 48">
-							<g-panel-detail-item from="times" label="约离职时间" :value="orderDetail.willLeave_time"   />
+						<view class=" " v-if="orderDetail.willLeave_time && orderDetail.status == 48">
+							<g-panel-detail-item from="times" label="约离职时间" :value="orderDetail.willLeave_time" />
 						</view>
-            <view class=" " v-if="orderDetail.leave_time && orderDetail.status == 50">
-							<g-panel-detail-item from="times" label="离职时间" :value="orderDetail.leave_time"   />
-						</view> 
-            <view class=" " v-if="orderDetail.create_time && orderDetail.status != 50">
-							<g-panel-detail-item from="times" label="报名时间" :value="orderDetail.create_time"   />
-						</view> 
-            
+						<view class=" " v-if="orderDetail.leave_time && orderDetail.status == 50">
+							<g-panel-detail-item from="times" label="离职时间" :value="orderDetail.leave_time" />
+						</view>
+						<view class=" " v-if="orderDetail.create_time && orderDetail.status != 50">
+							<g-panel-detail-item from="times" label="报名时间" :value="orderDetail.create_time" />
+						</view>
+
 						<!-- <view class=" " v-if="orderDetail.status == 21 || orderDetail.status == 26 || orderDetail.status == 35 || orderDetail.status == 45">
 							<g-panel-detail-item from="times" label="更新时间" :value="orderDetail.update_time" />
 						</view> -->
 					</view>
-          <view class=" ">
-				  <g-panel-detail-item label="报名人" from="resident-info" beforeIcon="icon-phone" @clickItem="goTel(orderDetail.agencyTel)" :remarkValue="orderDetail.agencyTel" :value="orderDetail.downFullName ||orderDetail.downProviderName  " />
-
-          </view>
-
+					<view class=" ">
+						<g-panel-detail-item label="报名人" from="resident-info" beforeIcon="icon-phone" @clickItem="goTel(orderDetail.agencyTel)" :remarkValue="orderDetail.agencyTel" :value="orderDetail.downFullName || orderDetail.downProviderName" />
+					</view>
 				</view>
 			</view>
 			<!-- 用户信息 -->
@@ -98,9 +96,9 @@
 			<!-- 费用 -->
 			<view class="m-price" v-if="false">
 				<view class="g_h_12"></view>
-				<view class="link g_bg_f g_pt_10" >
+				<view class="link g_bg_f g_pt_10">
 					<!-- v-if="(!orderDetail.nextRecordId && !orderDetail.prevRecordId && isCreator) || (isCreator && orderDetail.nextRecordId)" -->
-					<view >
+					<view>
 						<g-panel-detail-item label="上游佣金" :value="setReturnFee(orderDetail.returnFee, orderDetail.returnFeeType)" />
 						<g-panel-detail-item label="上游佣金详情" :value="orderDetail.returnFeeDesp" afterIcon="icon-gengduo11" @clickItem="goInfo(orderDetail.returnFeeDesp, '上游佣金详情', 'view')" />
 					</view>
@@ -124,12 +122,12 @@
 
 					<!-- <g-panel-detail-item label="报名时间" :value="orderDetail.create_time" /> -->
 					<g-panel-detail-item label="薪资明细" :value="orderDetail.employeeSalary" afterIcon="icon-gengduo11" @clickItem="goInfo(orderDetail.employeeSalary, '薪资明细', 'view')" />
-          <view >
+					<view>
 						<g-panel-detail-item label="上游项目方" :value="orderDetail.upFullName || orderDetail.upProviderName || '-'" />
 						<g-panel-detail-item label="上游佣金" :value="setReturnFee(orderDetail.returnFee, orderDetail.returnFeeType)" />
 						<g-panel-detail-item label="上游佣金详情" :value="orderDetail.returnFeeDesp" afterIcon="icon-gengduo11" @clickItem="goInfo(orderDetail.returnFeeDesp, '上游佣金详情', 'view')" />
 					</view>
-					<g-panel-detail-item label="驻场信息" :labelSubStr="orderDetail.onSiteInfo ? '复制' :''" :value="orderDetail.onSiteInfo || '-'" from="resident-info" afterType="multi" @clickLabelBtn="handleClickLabelBtn(orderDetail.onSiteInfo || '-')" />
+					<g-panel-detail-item label="驻场信息" :labelSubStr="orderDetail.onSiteInfo ? '复制' : ''" :value="orderDetail.onSiteInfo || '-'" from="resident-info" afterType="multi" @clickLabelBtn="handleClickLabelBtn(orderDetail.onSiteInfo || '-')" />
 					<g-panel-detail-item label="面试地址" :value="orderDetail.interviewAddress" afterIcon="icon-gengduo11" @clickItem="handleChooseAddressModal" />
 
 					<view class="g_h_15"></view>
@@ -351,26 +349,22 @@
 				</slot>
 			</g-panel-fixed>
 		</u-popup>
-		
-		<view class="g_h_104" style="background-color: #ededed;"></view>
-		<g-panel-fixed style="box-shadow: 0 -4px 12px #ededed;">
+
+		<view class="g_h_104" style="background-color: #ededed"></view>
+		<g-panel-fixed style="box-shadow: 0 -4px 12px #ededed">
 			<slot>
 				<view class="g_pl_20 g_pr_20 g_flex_row_center flex_center flex_nw" style="width: 100%">
 					<view class="g_flex_1 g_flex_column_center">
 						<view class="">
-							<button 
-							    @click="createImage"
-								class="g_flex_c"
-								style="background-color: #00b666;color: #fff;width: 250px;height: 42px;font-size: 18px;border-radius: 60px;"
-							>分享</button>
+							<button @click="createImage" class="g_flex_c" style="background-color: #00b666; color: #fff; width: 250px; height: 42px; font-size: 18px; border-radius: 60px">分享</button>
 						</view>
 					</view>
 				</view>
 			</slot>
 		</g-panel-fixed>
 
-		<u-popup v-model="shareModal.isShow" mode="bottom" border-radius="16" height='600px' :mask-close-able="true">
-			<mainPanel :showBg="true" :rid='rid' :oid='oid' :active="1" :name='orderDetail.userName' :job="orderDetail.storeJobName" :recommendList="recommendList[0]" />
+		<u-popup v-model="shareModal.isShow" mode="bottom" border-radius="16" height="600px" :mask-close-able="true">
+			<mainPanel :showBg="true" :rid="rid" :oid="oid" :active="1" :name="orderDetail.userName" :job="orderDetail.storeJobName" :recommendList="recommendList[0]" />
 		</u-popup>
 	</view>
 </template>
@@ -378,8 +372,8 @@
 <script>
 import mainPanel from "./myMain.vue";
 export default {
-	components:{
-		mainPanel
+	components: {
+		mainPanel,
 	},
 	onReady() {
 		this.G.setNavStyle();
@@ -390,10 +384,10 @@ export default {
 	},
 	data() {
 		return {
-			rid:0,
-			recommendList:[],
-			shareModal:{
-				isShow:false,
+			rid: 0,
+			recommendList: [],
+			shareModal: {
+				isShow: false,
 			},
 			cdnBaseImg: this.G.store().cdnBaseImg,
 			agencyId: uni.getStorageSync("apply-agencyId"),
@@ -476,38 +470,42 @@ export default {
 		};
 	},
 	onLoad(options) {
-		console.log('工单详情页：',options)
+		console.log("工单详情页：", options);
 
 		if (options.scene) {
 			let _str = decodeURIComponent(options.scene);
-			console.log('邀请 codeRes 1',_str)
+			console.log("邀请 codeRes 1", _str);
 			let codeRes = _str.split("=");
-			console.log('邀请 codeRes 2',codeRes)
-			this.oid = codeRes[1].split('_')[1];
-			this.relationId = codeRes[1].split('_')[2];
-			uni.setStorageSync('order_oid',this.oid)
-			uni.setStorageSync('order_relationId',this.relationId)
-			this.type = '1';
-			console.log('邀请 codeRes 3 oid:',this.oid,' rid:',this.relationId)
+			console.log("邀请 codeRes 2", codeRes);
+			this.oid = codeRes[1].split("_")[1];
+			this.relationId = codeRes[1].split("_")[2];
+			uni.setStorageSync("order_oid", this.oid);
+			uni.setStorageSync("order_relationId", this.relationId);
+			this.type = "1";
+			console.log("邀请 codeRes 3 oid:", this.oid, " rid:", this.relationId);
 		} else {
-			if(options.id){
+			if (options.id) {
 				this.oid = options.id;
 				this.relationId = options.relationId;
 				this.type = options.type;
-			}else if(uni.getStorageSync('order_oid')){
-				this.oid = uni.getStorageSync('order_oid');
-				this.relationId = uni.getStorageSync('order_relationId');
+			} else if (uni.getStorageSync("order_oid")) {
+				this.oid = uni.getStorageSync("order_oid");
+				this.relationId = uni.getStorageSync("order_relationId");
 				this.type = options.type;
 			}
-			
 		}
+		this.getResident();
+		this.getPeople();
+		this.getDetail();
+		uni.$on("infoUpdate", () => {
+			uni.$emit("infoUpdateList");
+			this.getDetail();
+		});
 	},
 	onShow() {
 		let that = this;
 		this.isCreator = uni.getStorageSync("IS_CREATOR") == 1 ? true : false;
-		this.getResident();
-		this.getPeople();
-		this.getDetail();
+
 		that.G.Get(
 			that.api.bind_enterpriseDetail + "/" + uni.getStorageSync("apply-agencyId"),
 			{
@@ -520,9 +518,6 @@ export default {
 				console.log("--", that.recommendList);
 			}
 		);
-		uni.$on("infoUpdate", () => {
-			this.getDetail();
-		});
 	},
 	methods: {
 		setShareImg(e) {
@@ -534,7 +529,7 @@ export default {
 			this.wxCode = e.code;
 			this.agencyName = e.agencyName;
 		},
-		createImage(){
+		createImage() {
 			let that = this;
 			that.shareModal.isShow = true;
 		},
@@ -610,12 +605,12 @@ export default {
 					relationId: that.relationId,
 				},
 				(res) => {
-					uni.removeStorageSync('order_oid')
-					uni.removeStorageSync('order_relationId')
+					uni.removeStorageSync("order_oid");
+					uni.removeStorageSync("order_relationId");
 					console.log("工单详情：", res);
-					if(res.prevRecordId){
+					if (res.prevRecordId) {
 						that.rid = res.prevRecordId;
-					}else{
+					} else {
 						that.rid = that.relationId;
 					}
 					// return;
@@ -735,21 +730,20 @@ export default {
 					that.$forceUpdate();
 					that.speed = 1;
 				},
-				(err)=>{
+				(err) => {
 					uni.showModal({
-						title:' ',
-						content:err,
-						confirmText:'回首页',
+						title: " ",
+						content: err,
+						confirmText: "回首页",
 						success(era) {
-							if(era.confirm){
+							if (era.confirm) {
 								uni.switchTab({
-									url:'/pages/home/index'
-								})
-							}else{
-								
+									url: "/pages/home/index",
+								});
+							} else {
 							}
-						}
-					})
+						},
+					});
 				}
 			);
 		},
@@ -832,12 +826,12 @@ export default {
 		handleCopy() {
 			let that = this,
 				params = {};
-				// {{ orderDetail.userName }}{{ orderDetail.setTitle }}
+			// {{ orderDetail.userName }}{{ orderDetail.setTitle }}
 			params = {
 				"姓名：": this.orderDetail.userName + this.orderDetail.setTitle,
 				"\n身份证号：": this.orderDetail.idCard ? this.orderDetail.idCard : "-",
 				"\n企业岗位：": this.orderDetail.storeJobName ? this.orderDetail.storeJobName : "-",
-				'\n电话：': this.orderDetail.tel ? this.orderDetail.tel : "-",
+				"\n电话：": this.orderDetail.tel ? this.orderDetail.tel : "-",
 			};
 			if (this.orderDetail.status == 10 || this.orderDetail.status == 20 || this.orderDetail.status == 25) {
 				params["\n面试时间"] = this.orderDetail.interview_time ? this.orderDetail.interview_time : "-";
@@ -863,7 +857,7 @@ export default {
 			let that = this,
 				params = {};
 			params = {
-        id:this.orderDetail.id,
+				id: this.orderDetail.id,
 				name: this.orderDetail.userName,
 				sex: this.orderDetail.sex,
 				age: this.orderDetail.age,
diff --git a/root/home/quickApplication.vue b/root/home/quickApplication.vue
index 68b08f7..9f48872 100644
--- a/root/home/quickApplication.vue
+++ b/root/home/quickApplication.vue
@@ -292,7 +292,7 @@ export default {
 					id: $data.leafCateId,
 				},
 				(res) => {
-					let policyStr = "1. 服务费：" + (res.record.returnFeeType !== "" ? that.G.setReturnFee(res.record.returnFee, res.record.returnFeeType) : "详询客服") + " \n\n" + "2. 服务费详情：" + (res.record.returnFeeDesp || "详询客服") + " \n\n" + "3. 薪资待遇：" + (res.record.salaryDetail || "详询客服") + "\n\n";
+					let policyStr = "1. 佣金：" + (res.record.returnFeeType !== "" ? that.G.setReturnFee(res.record.returnFee, res.record.returnFeeType) : "详询客服") + " \n\n" + "2. 佣金详情：" + (res.record.returnFeeDesp || "详询客服") + " \n\n" + "3. 薪资待遇：" + (res.record.salaryDetail || "详询客服") + "\n\n";
 					console.log("政策列表：", res);
 					that.jobData = [
 						{
diff --git a/root/person/set.vue b/root/person/set.vue
index a112ea7..25324ef 100644
--- a/root/person/set.vue
+++ b/root/person/set.vue
@@ -8,11 +8,10 @@
 				result: '', 
 				path: '/root/person/feedback', 
 				tip: 'message', 
-				pRow: 12 
 			}]" @clickItem="handleClickItem" />
 		</view>
 		<view class="g_pl_10 g_pr_10 g_pb_16" v-if="isCreator">
-			<view class="g_bg_f g_pl_16 g_pr_16 g_radius_8">
+			<view class="g_bg_f g_pl_20 g_pr_20 g_radius_8">
 				<view class="g_flex_row_between g_h_56">
 					<view class="g_flex_column_center g_fs_16 g_c_3">关注邀请</view>
 					<view class="g_flex_column_center">
diff --git a/root/person/teamManage.vue b/root/person/teamManage.vue
index 82ea9b1..592efe3 100644
--- a/root/person/teamManage.vue
+++ b/root/person/teamManage.vue
@@ -1,154 +1,158 @@
 <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)` }" :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>
-          <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_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">
-            <g-button btnText="手动添加" size="auto" @clickBtn="goPage('/root/person/addOrUpdataMember')"></g-button>
-          </div>
-          <div class="g_w_128">
-            <g-button btnText="微信邀请" size="auto" type="primary" class @clickBtn="goPage('/root/person/memberApplyQRCode')"></g-button>
-          </div>
-          <!-- <g-button icon="icon-tianjia g_fsi_16 g_mr_8" btnText="添加成员" class="" @clickBtn="addMember"></g-button> -->
-        </div>
-      </div>
-    </scroll-view>
-    <!-- <div class="g_flex_row_end g_bg_f" style="padding: 14px 16px 34px"> -->
+	<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">
+			<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>
+					<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>
+				<g-panel-fixed>
+					<div class="g_flex_row_center">
+						<div class="g_w_128 g_mr_20">
+							<g-button btnText="手动添加" size="auto" @clickBtn="goPage('/root/person/addOrUpdataMember')"></g-button>
+						</div>
+						<div class="g_w_128">
+							<g-button btnText="微信邀请" size="auto" type="primary" class @clickBtn="goPage('/root/person/memberApplyQRCode')"></g-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)">
+					<g-button icon="icon-tianjia g_fsi_16 g_mr_8" btnText="添加成员" class="" @clickBtn="addMember"></g-button>
+				</div> -->
+			</div>
+		</scroll-view>
+		<!-- <div class="g_flex_row_end g_bg_f" style="padding: 14px 16px 34px"> -->
 
-    <!-- <g-button btnText="添加部门" size="small" class="g_ml_16" @clickBtn="goLogin"></g-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">
-        <view class="g_bg_f">
-          <view class="g_c_3">
-            <view class="g_p_16 g_border_e_t" @click="goPage('/root/person/addOrUpdataMember')">手动填写信息</view>
-            <view class="g_p_16 g_border_e_t" @click="goPage('/root/person/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>
-      </view>
-    </u-popup>
-  </div>
+		<!-- <g-button btnText="添加部门" size="small" class="g_ml_16" @clickBtn="goLogin"></g-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">
+				<view class="g_bg_f">
+					<view class="g_c_3">
+						<view class="g_p_16 g_border_e_t" @click="goPage('/root/person/addOrUpdataMember')">手动填写信息</view>
+						<view class="g_p_16 g_border_e_t" @click="goPage('/root/person/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>
+			</view>
+		</u-popup>
+	</div>
 </template>
 
 <script>
 export default {
-  data() {
-    return {
-      memberList: [],
-      addMemberShow: false,
-      agencyInfo: uni.getStorageSync('agencyInfo'),
-      applyNum: 0,
-    }
-  },
-  onShow() {
-    this.getMemberList()
-    this.getNewApplyNum()
-  },
-  onLoad() {},
-  created() {
-    console.log(123123)
-  },
+	data() {
+		return {
+			memberList: [],
+			addMemberShow: false,
+			agencyInfo: uni.getStorageSync("agencyInfo"),
+			applyNum: 0,
+		};
+	},
+	onShow() {
+		this.getMemberList();
+		this.getNewApplyNum();
+	},
+	onLoad() {},
+	created() {
+		console.log(123123);
+	},
 
-  methods: {
-    compare(a, b) {
-      let sortList = ['创建人', '管理员']
-      if (sortList.includes(a) && sortList.includes(b)) {
-        return sortList.indexOf(a) - sortList.indexOf(b)
-      } else if (sortList.includes(a)) {
-        return -1
-      } else if (sortList.includes(b)) {
-        return 1
-      } else {
-        return a.localeCompare(b)
-      }
-    },
-    getMemberList() {
-      let that = this
-      uni.showLoading({
-        title: '加载中...',
-      })
-      this.G.Get(this.api.order_peopleList, { pageSize: 500 }, (res) => {
-        console.log('报名人列表：', res)
-        that.memberList = res.recordList
-        that.memberList.forEach((item) => {
-          item.agencyRoleNameList = item.agencyRoleName.split('；')
-          item.agencyRoleNameList = item.agencyRoleNameList.sort(this.compare)
-        })
+	methods: {
+		compare(a, b) {
+			let sortList = ["创建人", "管理员",'成员'];
+			if (sortList.includes(a) && sortList.includes(b)) {
+				return sortList.indexOf(a) - sortList.indexOf(b);
+			} else if (sortList.includes(a)) {
+				return -1;
+			} else if (sortList.includes(b)) {
+				return 1;
+			} else {
+				return a.localeCompare(b);
+			}
+		},
+		getMemberList() {
+			let that = this;
+			uni.showLoading({
+				title: "加载中...",
+			});
+			this.G.Get(this.api.order_peopleList, { pageSize: 500 }, (res) => {
+				console.log("报名人列表：", res);
+				that.memberList = res.recordList;
+				that.memberList.forEach((item) => {
+					item.agencyRoleNameList = item.agencyRoleName.split("；");
+					item.agencyRoleNameList = item.agencyRoleNameList.sort(this.compare);
+				});
 
-        uni.hideLoading()
-      })
-    },
-    addMember() {
-      this.addMemberShow = true
-    },
-    editMember(_item) {
-      uni.navigateTo({
-        url: '/root/person/addOrUpdataMember?info=' + JSON.stringify(_item),
-      })
-    },
-    goPage(url) {
-      uni.navigateTo({
-        url,
-      })
-      this.addMemberShow = false
-    },
-    getNewApplyNum() {
-      let that = this
-      this.G.Get(this.api.order_getNewApplyNum, {}, (res) => {
-        console.log('order_getNewApplyNum', res)
-        that.applyNum = res
-      })
-    },
-  },
-}
+				uni.hideLoading();
+			});
+		},
+		addMember() {
+			this.addMemberShow = true;
+		},
+		editMember(_item) {
+			uni.navigateTo({
+				url: "/root/person/addOrUpdataMember?info=" + JSON.stringify(_item),
+			});
+		},
+		goPage(url) {
+			uni.navigateTo({
+				url,
+			});
+			this.addMemberShow = false;
+		},
+		getNewApplyNum() {
+			let that = this;
+			this.G.Get(this.api.order_getNewApplyNum, {}, (res) => {
+				console.log("order_getNewApplyNum", res);
+				that.applyNum = res;
+			});
+		},
+	},
+};
 </script>
 
 <style lang="scss">
 .creator {
-  color: #ff4d4f;
-  // border: 1px solid #46c7bb;
-  background-color: #fff2f0;
+	color: #ff4d4f;
+	// border: 1px solid #46c7bb;
+	background-color: #fff2f0;
 }
 .member {
-  color: rgba(0, 0, 0, 0.88);
-  // border: 1px solid #f9676e;
-  background-color: rgba(0, 0, 0, 0.04);
+	color: rgba(0, 0, 0, 0.88);
+	// border: 1px solid #f9676e;
+	background-color: rgba(0, 0, 0, 0.04);
 }
 .manager {
-  color: #1677ff;
-  // border: 1px solid #0066d6;
-  background-color: #e6f4ff;
+	color: #1677ff;
+	// border: 1px solid #0066d6;
+	background-color: #e6f4ff;
 }
 .sticky {
-  position: sticky;
-  bottom: 0;
-  left: 0;
-  z-index: 999;
+	position: sticky;
+	bottom: 0;
+	left: 0;
+	z-index: 999;
 }
 </style>
diff --git a/static/css/base.scss b/static/css/base.scss
index f8cc8a0..e7b6fc9 100644
--- a/static/css/base.scss
+++ b/static/css/base.scss
@@ -639,6 +639,9 @@ $max-mp: 20;
 .g_mt_42 {
 	margin-top: 42px;
 }
+.g_mt_65 {
+	margin-top: 42px;
+}
 .g_mt_40 {
 	margin-top: 40px;
 }