From c97a2587518285c3281d8468c76eb255d8bd7708 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Thu, 5 Jun 2025 16:06:01 +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

---
 api/user.js                       |  11 +-
 components/button.vue             |  10 +-
 pages.json                        |   9 ++
 pages/home/index.vue              |  92 +++++------
 pages/login/index.vue             |  14 +-
 root/detail/job.vue               | 321 ++++++++++++++++++++------------------
 root/person/applyManage.vue       | 112 +++++++++++++
 root/person/memberApplyAdd.vue    |  41 +++--
 root/person/memberApplyQRCode.vue |   6 +-
 root/person/teamManage.vue        |  32 ++--
 static/css/base.scss              |   7 +-
 11 files changed, 423 insertions(+), 232 deletions(-)
 create mode 100644 root/person/applyManage.vue

diff --git a/api/user.js b/api/user.js
index b75808d..6288c9f 100644
--- a/api/user.js
+++ b/api/user.js
@@ -17,16 +17,23 @@ let userInfo = {// 用户信息模块
   user_updateInviteId: "/assistant/circle/agency/agreeManualAdd",// 批量通过关注信息
   user_getTeamList: "/yishoudan/agency/group/user/listByUser",// 获取登录人团队列表
   user_toggleTeam: "/yishoudan/agency/group/user/changeGroup",// 切换团队
+
+  /**
+  * 团队成员相关
+  */
   order_peopleList: "/yishoudan/user/getAgencyCorpUsers",// 团队成员列表
   order_addMember: "/yishoudan/user/addAgencyUser",// 添加团队成员
   order_updateMember: "/yishoudan/user/updateAgencyCorpUser",// 编辑团队成员
-  order_checkMemberDel: "/yishoudan/user/checkDelAgencyCorpUser",// 删除角色前校验
+  order_checkMemberDel: "/yishoudan/user/checkDelAgencyCorpUser",// 删除成员前校验
   order_delMember: "/yishoudan/user/delAgencyCorpUser",// 删除成员
   order_getCompanyQRCode: "/yishoudan/agency/group/user/apply/inviteImage",// 获取团队二维码
   order_getAgencyById: "/agency/getAgencyById",// 获取代理信息
   order_addApply: "/yishoudan/agency/group/user/apply/addApply",// 申请加入团队
   order_checkHasApply: "/yishoudan/agency/group/user/apply/checkHasApply",// 是否申请过加入团队
-
+  order_getNewApplyNum: "/yishoudan/agency/group/user/apply/getNewApplyNum",// 获取申请加入的成员数量
+  order_getUserApplyList: "/yishoudan/agency/group/user/apply/userApplyList",// 获取申请加入的成员列表
+  order_userApplyApprove: "/yishoudan/agency/group/user/apply/approve",// 申请加入审批
+  
 }
 
 export default userInfo;
\ No newline at end of file
diff --git a/components/button.vue b/components/button.vue
index a159af1..674a73e 100644
--- a/components/button.vue
+++ b/components/button.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="g-components-button">
-		<button class="bocai-btn" :class="['bocai_btn_size_' + size, 'bocai_btn_mode_' + mode, 'bocai_btn_type_' + type, 'g_w_' + width, 'g_h_' + height, customBgColor ? 'customBgColor' : '']" :style="{ lineHeight: height - 2 + 'px', padding: 0 }" :hover-stop-propagation="true" hover-class="thover" @click="handleClick" :form-type="formType" :open-type="openType" @getphonenumber="getphonenumber">
+		<button class="bocai-btn" :class="['bocai_btn_size_' + size, 'bocai_btn_mode_' + mode, 'bocai_btn_type_' + type, 'g_w_' + width, 'g_h_' + height, customBgColor ? 'customBgColor' : '']" :style="{ lineHeight: height - 2 + 'px', padding: 0, color: color ? color : '' }" :hover-stop-propagation="true" hover-class="thover" @click="handleClick" :form-type="formType" :open-type="openType" @getphonenumber="getphonenumber">
 			<view class="g_flex_row_center">
 				<view class="g_flex_column_center g_mr_4" v-if="loading">
 					<u-loading mode="flower"></u-loading>
@@ -105,6 +105,12 @@ export default {
 				return "16";
 			},
 		},
+		color: {
+			default: () => {
+				return "";
+			},
+		},
+
 		loading: {
 			default: () => {
 				return false;
@@ -235,6 +241,7 @@ $main_color: #00b666;
 		&_primary {
 			background-color: $main_color;
 			color: #fff;
+			border: 1px solid $main_color;
 			&.thover {
 				opacity: 0.8;
 			}
@@ -278,6 +285,7 @@ $main_color: #00b666;
 		&_disabled {
 			background-color: rgba(0, 0, 0, 0.05);
 			color: rgba(0, 0, 0, 0.2);
+			border: 1rpx solid rgba(0, 0, 0, 0.05);
 			&.thover {
 				// background-color: rgba(0, 0, 0, 0.05);
 				opacity: 1;
diff --git a/pages.json b/pages.json
index 432abe1..b0a480a 100644
--- a/pages.json
+++ b/pages.json
@@ -208,6 +208,15 @@
             "backgroundColorBottom": "#f5f5f5"
           }
         },
+        {
+          "path": "applyManage",
+          "style": {
+            "navigationBarTitleText": "新的成员",
+            "backgroundColor": "#ffffff",
+            "backgroundColorTop": "#ffffff",
+            "backgroundColorBottom": "#ffffff"
+          }
+        },
         {
           "path": "memberApplyQRCode",
           "style": {
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 0819deb..6986a05 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,73 +1,73 @@
 <template>
-	<view class="p-home-inedx g_w_all g_bg_f_5 g_kuaishou" :class="computeCode == -1 ? 'g_flex_column_center' : ''">
-		<view v-show="computeCode == -1" class="g_flex_column_center">
+	<div class="p-home-inedx g_w_all g_bg_f_5 g_kuaishou" :class="computeCode == -1 ? 'g_flex_column_center' : ''">
+		<div v-show="computeCode == -1" class="g_flex_column_center">
 			<g-loading marginBottom="g_mb_130" />
-		</view>
+		</div>
 
-		<view v-show="computeCode > -1">
+		<div v-show="computeCode > -1">
 			<!-- 列表区 -->
-			<!-- <view @click="showPop = true"> 1123 </view> -->
+			<!-- <div @click="showPop = true"> 1123 </div> -->
 			<!-- `calc(${navInfo.windowHeight}px - ${navInfo.navigationBarHeight + navInfo.statusBarHeight}px)` -->
 			<scroll-view class="m-list" id="listBox" :style="{ height: `calc(${navInfo.windowHeight}px)` }" :scroll-y="true" @scrolltolower="reachBottom">
-				<view class="" hover-class="none" hover-stop-propagation="false">
-					<view class="g_position_rela">
+				<div class="" hover-class="none" hover-stop-propagation="false">
+					<div class="g_position_rela">
 						<!-- 搜索区 -->
-						<view class="m-search g_p_10 g_pt_8 g_position_rela bg_shawdoc" style="" id="searchInputBox">
+						<div class="m-search g_p_10 g_pt_8 g_position_rela bg_shawdoc" style="" id="searchInputBox">
 							<u-search height="80" v-model="keyword" class="g_flex_1" placeholder="搜索职位名称" bg-color="#fff" :show-action="false" placeholder-class="g_c_c" search-icon-color="#999999" :maxlength="20"></u-search>
-							<view class="g_w_all g_h_40 g_position_abso" style="left: 0; z-index: 9999; top: 0; height: 100%" @click.stop="goSearch"></view>
-						</view>
-					</view>
+							<div class="g_w_all g_h_40 g_position_abso" style="left: 0; z-index: 9999; top: 0; height: 100%" @click.stop="goSearch"></div>
+						</div>
+					</div>
 					<!-- #ifdef APP-PLUS || H5 || MP-TOUTIAO || MP-KUAISHOU -->
-					<view>
-						<view class="g_mb_10 g_bg_f_5 sticky g_flex_row_between">
-							<view class="g_flex_1">
+					<div>
+						<div class="g_mb_10 g_bg_f_5 sticky g_flex_row_between">
+							<div class="g_flex_1">
 								<u-tabs bg-color="transparent" from="index" :list="tabInfo.list" :is-scroll="true" :current="tabInfo.active" active-color="#00b666" bar-width="64" bar-height="6" @change="handleUpdateTab" font-size="34" duration="0.05" height="76"></u-tabs>
-							</view>
-							<view class="g_flex_none g_flex_column_center g_fs_17 g_pr_26 g_pb_4" style="color: #576b95; text-decoration: underline" @click="goPage('/root/home/ignore')">忽略</view>
-						</view>
+							</div>
+							<div class="g_flex_none g_flex_column_center g_fs_17 g_pr_26 g_pb_4" style="color: #576b95; text-decoration: underline" @click="goPage('/root/home/ignore')">忽略</div>
+						</div>
 						<g-list-job from="home" @uploadList="getList" bg="#f5f5f5" class="g_h_all" :list="query.list" :active="tabInfo.active" @shareJob="shareJob" :loading="loading" :speed="speed" :query="query" :isShowLoginBtn="isLogin ? false : true" :emptyText="isLogin ? (tabInfo.active == 0 || tabInfo.active == 2 ? '嘿，这里还没有数据呢' : '您还未收藏职位，快去试试收藏职位吧') : '您还有没有登录，请登录后查看职位'" :emptySubText="isLogin ? (tabInfo.active == 0 ? '关注发单号，我们会第一时间通知您新的动态' : tabInfo.active == 2 ? '快去试试发布职位吧' : '') : ''" />
-					</view>
+					</div>
 					<!-- #endif -->
 					<!-- #ifdef MP-WEIXIN -->
-					<view>
-						<view class="g_mb_10 g_bg_f_5 sticky g_flex_row_between">
-							<view class="g_flex_1">
+					<div>
+						<div class="g_mb_10 g_bg_f_5 sticky g_flex_row_between">
+							<div class="g_flex_1">
 								<u-tabs bg-color="transparent" from="index" :list="tabInfo.list" :is-scroll="true" :current="tabInfo.active" active-color="#00b666" bar-width="64" bar-height="6" @change="handleUpdateTab" font-size="34" duration="0.05" height="76"></u-tabs>
-							</view>
-							<view class="g_flex_none g_flex_column_center g_fs_17 g_pr_26 g_pb_4" style="color: #576b95; text-decoration: underline" @click="goPage('/root/home/ignore')">忽略</view>
-						</view>
+							</div>
+							<div class="g_flex_none g_flex_column_center g_fs_17 g_pr_26 g_pb_4" style="color: #576b95; text-decoration: underline" @click="goPage('/root/home/ignore')">忽略</div>
+						</div>
 						<g-list-job from="home" @uploadList="getList" bg="#f5f5f5" class="g_h_all" :list="query.list" :active="tabInfo.active" @shareJob="shareJob" :loading="loading" :speed="speed" :query="query" :isShowLoginBtn="isLogin ? false : true" :emptyText="isLogin ? (tabInfo.active == 0 || tabInfo.active == 2 ? '嘿，这里还没有数据呢' : '您还未收藏职位，快去试试收藏职位吧') : '您还有没有登录，请登录后查看职位'" :emptySubText="isLogin ? (tabInfo.active == 0 ? '关注发单号，我们会第一时间通知您新的动态' : tabInfo.active == 2 ? '快去试试发布职位吧' : '') : ''" />
-					</view>
+					</div>
 
 					<!-- #endif -->
-				</view>
+				</div>
 			</scroll-view>
-			<view hover-class="none" style="position: fixed; right: 10px; bottom: 54px" hover-stop-propagation="false" @click="toRecord" v-if="isLogin">
+			<div hover-class="none" style="position: fixed; right: 10px; bottom: 54px" hover-stop-propagation="false" @click="toRecord" v-if="isLogin">
 				<g-panel-image :url="cdnBaseImg + 'quick_application.svg'" size="136" />
-			</view>
+			</div>
 			<u-popup v-model="showPop" mode="bottom" uZindex="9999" border-radius="12" :closeable="true" :mask-close-able="true">
-				<view class="g_fs_18 g_text_c g_pt_32">
-					<view class="g_bg_f g_fw_600 g_pb_24">以下发单号向你发出关注邀请</view>
+				<div class="g_fs_18 g_text_c g_pt_32">
+					<div class="g_bg_f g_fw_600 g_pb_24">以下发单号向你发出关注邀请</div>
 					<scroll-view class="g_flex_row_between" style="height: 500px" :scroll-y="true" @scrolltolower="onScrollToLower">
-						<view class="g_flex_row_start g_pl_12">
+						<div class="g_flex_row_start g_pl_12">
 							<!-- :key="item.id" -->
-							<view v-for="(item, index) in attentionList" :class="item.checked ? 'g_bg_e7' : 'g_bg_f_5'" class="g_h_140 g_mb_12 g_mr_12 g_radius_6 g_position_rela" style="width: calc(33% - 12px)" :key="index" @click="checkChange(item)">
+							<div v-for="(item, index) in attentionList" :class="item.checked ? 'g_bg_e7' : 'g_bg_f_5'" class="g_h_140 g_mb_12 g_mr_12 g_radius_6 g_position_rela" style="width: calc(33% - 12px)" :key="index" @click="checkChange(item)">
 								<u-checkbox shape="circle" class="g_position_abso g_w_18" style="right: 8px; top: 8px" active-color="#00B666" v-model="item.checked"></u-checkbox>
-								<view class="logo g_mt_32 g_mb_12">
+								<div class="logo g_mt_32 g_mb_12">
 									<g-panel-image class="" :url="item.logo" size="96" />
-								</view>
-								<view class="g_fs_14"> {{ item.agencyName }} </view>
-							</view>
-						</view>
+								</div>
+								<div class="g_fs_14">{{ item.agencyName }}</div>
+							</div>
+						</div>
 					</scroll-view>
-					<view class="g_text_c g_pt_16 g_pb_24 g_pl_24 g_pr_16 g_bg_f g_flex_row_between flex_center" style="box-shadow: 0px -2px 4px 0px rgba(218, 218, 218, 0.5)">
-						<u-checkbox @change="checkAllChange" shape="circle" active-color="#00B666" v-model="checkAll"><view class="g_c_6 g_ml_8">全选</view></u-checkbox>
+					<div class="g_text_c g_pt_16 g_pb_24 g_pl_24 g_pr_16 g_bg_f g_flex_row_between flex_center" style="box-shadow: 0px -2px 4px 0px rgba(218, 218, 218, 0.5)">
+						<u-checkbox @change="checkAllChange" shape="circle" active-color="#00B666" v-model="checkAll"><div class="g_c_6 g_ml_8">全选</div></u-checkbox>
 						<g-button :btnText="`一键关注(${upInfo.num})`" type="primary" @clickBtn="submitInfo" />
-					</view>
-				</view>
+					</div>
+				</div>
 			</u-popup>
-		</view>
-	</view>
+		</div>
+	</div>
 </template>
 
 <script>
@@ -284,6 +284,8 @@ export default {
 		},
 		getList($type = "init") {
 			let that = this;
+			console.log("job_list __________________________",1);
+			let time = new Date().getTime();
 			that.G.Post(
 				that.api.job_list,
 				{
@@ -295,7 +297,7 @@ export default {
 				},
 				(res) => {
 					that.computeCode = 1;
-
+					console.log("job_list __________________________", (new Date().getTime() - time) / 1000);
 					// res.recordCount  = 0;
 					// res.recordList = [];
 
@@ -333,7 +335,7 @@ export default {
 									tip: that.tabInfo.list[that.tabInfo.active].tip,
 								};
 							});
-						} 
+						}
 					} else {
 						that.query.list = that.query.list.concat(
 							res.recordList.map((item, index) => {
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 967afa4..a0409b1 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -78,8 +78,8 @@ export default {
 	},
 	onLoad(options) {
 		console.log("登录页：", options);
-		this.path = options.path;
-		this.level = options.level;
+		this.path = options.path ? options.path : "";
+		this.level = options.level ? options.level : "";
 		if (options.type) {
 			this.setOptions(options);
 		}
@@ -273,15 +273,15 @@ export default {
 				}
 				// 登录跳转到首页的判断
 				uni.setStorageSync("SHOW_INVITE", 1);
-
-				if (that.path == "") {
+				console.log("that.path", that.path);
+				if (!that.path) {
 					uni.switchTab({
 						url: "/pages/home/index",
 					});
 				} else {
 					// 固定跳首页
-					uni.switchTab({
-						url: "/pages/home/index",
+					uni.reLaunch({
+						url: that.path,
 					});
 				}
 			});
@@ -293,7 +293,7 @@ export default {
 			if (this.msgCode.countdown > 0) {
 				return false;
 			}
-      	if (that.form.tel == "") {
+			if (that.form.tel == "") {
 				uni.showToast({
 					title: "请输入手机号后再获取",
 					icon: "none",
diff --git a/root/detail/job.vue b/root/detail/job.vue
index 152ba41..c19b2b4 100644
--- a/root/detail/job.vue
+++ b/root/detail/job.vue
@@ -21,23 +21,6 @@
 					</div>
 				</div>
 			</div>
-			<!-- <div class="servicePrice g_flex_row_between flex_center g_p_14 g_pl_20 g_pr_20 g_mb_16" style="" hover-class="none" hover-stop-propagation="false">
-				<div class="left">
-					<div class="g_fs_18 g_c_f40 g_fw_600" v-if="jobDetail.policyClassify == 1">
-						服务费：
-						<span class v-if="attention && showPrice">{{ jobDetail.serverPrice || "--" }}</span>
-						<span class v-else>***</span>
-					</div>
-					<div class="g_fs_18 g_c_f40 g_fw_600" v-else>
-						总价：
-						<span class v-if="attention && showPrice">{{ jobDetail.totalPrice / 100 + "元/月" || "--" }}</span>
-						<span class v-else>***</span>
-					</div>
-				</div>
-				<div class="right">
-					<icon class="iconfont ysd-base-color g_fsi_22 g_c_f40" :class="showPrice ? 'icon-zhengyan1' : 'icon-biyan1'" color @click="showPrice = !showPrice"></icon>
-				</div>
-			</div> -->
 			<div class="m-info g_mb_12">
 				<div class="g_flex_1">
 					<div class="g_mb_10 g_flex_row_between">
@@ -156,133 +139,101 @@
 				</div>
 			</div> -->
 			<div class="g_position_rela" v-if="attention && tabInfo.list[tabInfo.active].tip == 1">
-				<template v-for="(item, index) in templateArr">
-					<div class="g_flex_row_start flex_center g_fw_600 g_mt_12 g_mb_8 g_fs_16" :key="index" v-if="item.show">
-						<div class="" v-if="item.num == 1">一、</div>
-						<div class="" v-if="item.num == 2">二、</div>
-						<div class="" v-if="item.num == 3">三、</div>
-						<div class="" v-if="item.num == 4">四、</div>
-						<div class="" v-if="item.num == 5">五、</div>
-						<div class="" v-if="item.num == 6">六、</div>
-						<div class="">
-							{{ item.type }}
+				<view class="" v-if="!jobDetail.cozeStructureRes">
+					<view v-if="jobDetail.notes">
+						<view class="detailH3">注意事项</view>
+						<view class="pri g_c_f40" style="line-height: 24px; padding: 3px 8px; border-radius: 4px; text-align: justify">{{ jobDetail.notes }}</view>
+					</view>
+					<view class="detailH3">一、薪资待遇</view>
+					<view class="g_radius_4">
+						<view class="g_flex_row_between">
+							<view class="rb1">1. 薪资明细：</view>
+							<view class="textb1">{{ jobDetail.salaryDetail }}</view>
+						</view>
+					</view>
+					<view class="detailH3">二、职位要求</view>
+					<view class="g_radius_4">
+						<view class="g_flex_row_between">
+							<view class="rb1">1. 性别年龄：</view>
+							<view class="textb1">{{ (jobDetail.genderRestrict || "-") + " " + (jobDetail.age || "-") }}</view>
+						</view>
+					</view>
+					<view class="detailH3">三、岗位说明</view>
+					<view class="g_radius_4">
+						<view class="g_flex_row_between">
+							<view class="rb1">1. 班次工时：</view>
+							<view class="textb1">{{ jobDetail.workClasses }}</view>
+						</view>
+						<view class="g_flex_row_between">
+							<view class="rb1">2. 其他说明：</view>
+							<view class="textb1">{{ jobDetail.otherDesp }}</view>
+						</view>
+					</view>
+					<view class="detailH3">四、面试对接</view>
+					<view class="g_radius_4">
+						<view class="g_flex_row_between">
+							<view class="rb1">1. 面试地点：</view>
+							<view class="textb1 g_flex_row_end g_flex_1">
+								<view class>{{ jobDetail.interviewAddr || "-" }}</view>
+								<i v-if="jobDetail.interviewLat" class="iconfont icon-dizhi11 f16 mr4 biggerSize" style="color: #027aff" data-type="interview"></i>
+							</view>
+						</view>
+					</view>
+					<view v-if="jobDetail.OtherInfo">
+						<view class="detailH3">其它信息</view>
+						<view class="pri" style="line-height: 24px; padding: 3px 8px; border-radius: 4px; color: #333">{{ jobDetail.OtherInfo }}</view>
+					</view>
+				</view>
+				<div v-else>
+					<template v-for="(item, index) in templateArr">
+						<div class="g_flex_row_start flex_center g_fw_600 g_mt_12 g_mb_8 g_fs_16" :key="index" v-if="item.show">
+							<div class="" v-if="item.num == 1">一、</div>
+							<div class="" v-if="item.num == 2">二、</div>
+							<div class="" v-if="item.num == 3">三、</div>
+							<div class="" v-if="item.num == 4">四、</div>
+							<div class="" v-if="item.num == 5">五、</div>
+							<div class="" v-if="item.num == 6">六、</div>
+							<div class="">
+								{{ item.type }}
+							</div>
 						</div>
-					</div>
-					<template v-for="(inner, index) in item.children">
-						<div class="g_flex_row_start g_fs_14" :key="index" style="line-height: 22px; padding-left: 16px" v-if="inner.show">
-							<div class="g_flex_row_start flex_start g_fw_600">
-								<div class="g_mr_4" hover-class="none" hover-stop-propagation="false">
-									{{ `${inner.num}. ` }}
-								</div>
-								<div class="g_flex_1">
-									{{ `${inner.key}: ` }}
-									<text class="g_fw_400 g_ml_4" selectable="false" space="false" decode="false">
-										{{ inner.value }}
-									</text>
+						<template v-for="(inner, index) in item.children">
+							<div class="g_flex_row_start g_fs_14" :key="index" style="line-height: 22px; padding-left: 16px" v-if="inner.show">
+								<div class="g_flex_row_start flex_start g_fw_600">
+									<div class="g_mr_4" hover-class="none" hover-stop-propagation="false">
+										{{ `${inner.num}. ` }}
+									</div>
+									<div class="g_flex_1">
+										{{ `${inner.key}: ` }}
+										<text class="g_fw_400 g_ml_4" selectable="false" space="false" decode="false">
+											{{ inner.value }}
+										</text>
+									</div>
 								</div>
+								<!-- @blur="inner.edit = false" -->
 							</div>
-							<!-- @blur="inner.edit = false" -->
-						</div>
+						</template>
 					</template>
-				</template>
+				</div>
 			</div>
 
 			<div v-if="tabInfo.list[tabInfo.active].tip == 2">
-				<!-- v-if="IS_CREATOR && selfJob && jobDetail.daotian == 1" -->
-				<div class="g_position_rela" v-if="(IS_CREATOR && selfJob && jobDetail.daotian == 1) || (IS_CREATOR && selfJob && jobDetail.jobType == 1)">
-					<div class="g_fs_16 g_c_3 g_fw_600 g_flex_column_center g_mb_12">服务费</div>
-					<div class="g_fs_14 g_c_6 contactInfo g_border_e_r g_border_e_t g_border_e_l g_mb_16" style="white-space: pre-line">
-						<div class="g_flex_row_start g_border_e_b">
-							<div class="g_w_110 g_border_e_r g_flex_column_center g_text_c" style="padding: 4px 12px">服务费</div>
-							<div class="g_flex_1 g_c_3" style="padding: 4px 8px">
-								{{ jobDetail.serverPrice || "-" }}
-							</div>
-						</div>
-						<div class="g_flex_row_start g_border_e_b">
-							<div class="g_w_110 g_border_e_r g_flex_column_center g_text_c" style="padding: 4px 12px">服务费详情</div>
-							<div class="g_flex_1 g_c_3" style="padding: 4px 8px">
-								{{ jobDetail.returnFeeDesp || "-" }}
-							</div>
-						</div>
-						<div class="g_flex_row_start g_border_e_b" v-if="jobDetail.daotian == 1">
-							<div class="g_w_110 g_border_e_r g_flex_column_center g_text_c" style="padding: 4px 12px">调单费</div>
-							<div class="g_flex_1 g_c_3" style="padding: 4px 8px">
-								<div v-if="jobDetail.transferFeeRadio == 0">无调度费</div>
-								<div v-if="jobDetail.transferFeeRadio == 1">有调单费 {{ jobDetail.transferFee }}</div>
-								<div v-if="jobDetail.transferFeeRadio == 2">后期确认 {{ jobDetail.transferFee }}</div>
-							</div>
-						</div>
-						<div class="g_flex_row_start g_border_e_b" v-if="jobDetail.daotian == 1">
-							<div class="g_w_110 g_border_e_r g_flex_column_center g_text_c" style="padding: 4px 12px">补充说明</div>
-							<div class="g_flex_1 g_c_3" style="padding: 4px 8px">
-								{{ jobDetail.storeJobDetail.otherDesp || jobDetail.otherDesp || "-" }}
-							</div>
-						</div>
-						<div class="g_flex_row_start g_border_e_b" v-if="jobDetail.jobType == 1">
-							<div class="g_w_110 g_border_e_r g_flex_column_center g_text_c" style="padding: 4px 12px">扣税说明</div>
-							<div class="g_flex_1 g_c_3" style="padding: 4px 8px">
-								{{ jobDetail.storeJobDetail.deductTaxDesp || "-" }}
-							</div>
-						</div>
-						<div class="g_flex_row_start g_border_e_b" v-if="jobDetail.jobType == 1">
-							<div class="g_w_110 g_border_e_r g_flex_column_center g_text_c" style="padding: 4px 12px">账单日</div>
-							<div class="g_flex_1 g_c_3" style="padding: 4px 8px">
-								{{ jobDetail.storeJobDetail.outListTime || "-" }}
-							</div>
-						</div>
-						<div class="g_flex_row_start g_border_e_b" v-if="jobDetail.jobType == 1">
-							<div class="g_w_110 g_border_e_r g_flex_column_center g_text_c" style="padding: 4px 12px">结算说明</div>
-							<div class="g_flex_1 g_c_3" style="padding: 4px 8px">
-								{{ jobDetail.storeJobDetail.settlementTime || "-" }}
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="g_position_rela">
-					<div class="g_fs_16 g_c_3 g_fw_600 g_flex_column_center g_mb_12">代理费</div>
-
-					<div class="g_fs_14 g_c_6 contactInfo g_border_e_r g_border_e_t g_border_e_l" style="white-space: pre-line">
-						<div class="g_flex_row_start g_border_e_b">
-							<div class="g_w_110 g_border_e_r g_flex_column_center g_text_c" style="padding: 4px 12px">{{ IS_CREATOR && selfJob ? "代理费" : "代理费" }}</div>
-							<div class="g_flex_1 g_c_3" style="padding: 4px 8px">
-								{{ jobDetail.agencyServerPrice || "-" }}
-							</div>
-						</div>
-						<div class="g_flex_row_start g_border_e_b">
-							<div class="g_w_110 g_border_e_r g_flex_column_center g_text_c" style="padding: 4px 12px">{{ IS_CREATOR && selfJob ? "代理费详情" : "代理费详情" }}</div>
-							<div class="g_flex_1 g_c_3" style="padding: 4px 8px">
-								{{ jobDetail.agencyReturnFeeDesp || "-" }}
-							</div>
-						</div>
-						<div class="g_flex_row_start g_border_e_b" v-if="jobDetail.daotian == 0">
-							<div class="g_w_110 g_border_e_r g_flex_column_center g_text_c" style="padding: 4px 12px">政策模式</div>
-							<div class="g_flex_1 g_c_3" style="padding: 4px 8px">
-								{{ jobDetail.policyNumStr || "-" }}
-							</div>
-						</div>
-					</div>
-					<!-- <div class="g_fs_16 g_c_6 g_pt_12 g_pb_12 contactInfo" style="white-space: pre-line">
+				<div class="g_fs_16 g_pb_32">
+					<div class="g_c_3 g_pt_16 pri">
 						<div class="">
-							{{ (IS_CREATOR && selfJob ? "代理费：" : "服务费：") + (G.setReturnFee(jobDetail.agencyReturnFee, jobDetail.agencyReturnFeeType) || "-") }}
-						</div>
-						<div style="white-space: pre-line; line-height: 26px">
-							{{ (IS_CREATOR && selfJob ? "代理费详情：" : "服务费详情：") + (jobDetail.agencyReturnFeeDesp || "-") }}
+							<div @click="setCopy('new')" v-if="jobDetail.jobInfoWithoutReturnFee || jobDetail.jobInfo"><span class="desp-copy g_c_main g_border_main">复制</span></div>
+							{{ jobDetail.jobInfoWithoutReturnFee || jobDetail.jobInfo || "-" }}
 						</div>
-					</div> -->
+					</div>
 				</div>
 			</div>
 			<div class="g_position_rela" v-if="attention && tabInfo.list[tabInfo.active].tip == 3">
-				<!-- style="position: absolute; right: 16px; top: -28px" -->
-				<div class="g_flex_row_end" hover-class="thover" @click="setCopy" style="position: absolute; right: 16px; top: 0px">
-					<div class="g_c_9 g_flex_row_start flex_center">
-						<i class="iconfont icon-fuzhi g_mr_4"></i>
-						复制
+				<div class="g_pt_16 g_fs_16 pri" style="">
+					<div @click.stop="setCopy('old')">
+						<span class="desp-copy g_c_main g_border_main">复制</span>
 					</div>
-					<!-- <g-button btnText="复制" type="none" size="mini" /> -->
+					<rich-text class style="text-align: justify" :nodes="jobDetail.lastNotice"></rich-text>
 				</div>
-				<div class="g_fs_16 g_c_6 g_pt_12 g_pb_12 contactInfo" v-if="jobDetail.jobType == 2 && jobDetail.daotian == 0" :data-info="jobDetail.jobInfo" style="white-space: pre-line" v-html="jobDetail.jobInfo || '-'"></div>
-				<div class="g_fs_16 g_c_6 g_pt_12 g_pb_12 contactInfo" v-if="jobDetail.jobType == 2 && jobDetail.daotian == 1" :data-info="jobDetail.storeJobDetail.jobDesp3" style="white-space: pre-line" v-html="jobDetail.jobDesp || '-'"></div>
-				<div class="g_fs_16 g_c_6 g_pt_12 g_pb_12 contactInfo" v-if="jobDetail.jobType == 1" :data-info="jobDetail.storeJobDetail.jobDesp3" style="white-space: pre-line" v-html="jobDetail.storeJobDetail.jobDesp2 || '-'"></div>
 			</div>
 			<div v-if="tabInfo.list[tabInfo.active].tip == 4">
 				<div class="g_position_rela">
@@ -571,7 +522,8 @@ export default {
 		});
 		this.getDetail().then((res) => {
 			console.log("res", res);
-			let objMiddle = JSON.parse(res.cozeStructureRes);
+			let objMiddle = res.cozeStructureRes ? JSON.parse(res.cozeStructureRes) : {};
+			// let objMiddle = JSON.parse(res.cozeStructureRes);
 			console.log("objMiddle", objMiddle);
 			delete objMiddle["佣金"];
 			delete objMiddle["佣金详情"];
@@ -688,26 +640,42 @@ export default {
 							jobDesp: "",
 						};
 					}
-					that.tabInfo.list = [
-						{
-							name: "基本信息",
-							active: 1,
-							tip: 1,
-						},
-						{
-							name: "财务结算",
-							active: 2,
-							tip: 2,
-						},
-						{
-							name: "职位描述",
-							active: 3,
-							tip: 3,
-						},
-					];
 
 					console.log("职位详情1：", res);
 					that.isPerson = res.agencyId == uni.getStorageSync("apply-agencyId") ? true : false;
+					if (that.isPerson) {
+						that.tabInfo.list = [
+							{
+								name: "职位详情",
+								active: 1,
+								tip: 1,
+							},
+							{
+								name: "通告分享",
+								active: 2,
+								tip: 2,
+							},
+							{
+								name: "原始通告",
+								active: 3,
+								tip: 3,
+							},
+						];
+					} else {
+						that.tabInfo.list = [
+							{
+								name: "职位详情",
+								active: 1,
+								tip: 1,
+							},
+							{
+								name: "通告分享",
+								active: 2,
+								tip: 2,
+							},
+						];
+					}
+
 					// res.serverPrice = that.G.setReturnFee(res.returnFee, res.returnFeeType);
 					res.agencyServerPrice = that.G.setReturnFee(res.agencyReturnFee, res.agencyReturnFeeType);
 					res.serverPrice = that.G.setReturnFee(res.returnFee, res.returnFeeType);
@@ -1106,6 +1074,34 @@ export default {
 				success(res) {},
 			});
 		},
+		// 复制通告
+		setCopy(e) {
+			var that = this;
+			let text;
+			console.log(e);
+			if (e == "new") {
+				text = that.from != "new" ? that.jobDetail.jobInfoWithoutReturnFee || that.jobDetail.jobInfo : that.jobDetail.cozeJobInfoWithoutReturnFee;
+			} else if (e == "old") {
+				text = that.jobDetail.lastNotice;
+			} else if (e == "jobName") {
+				text = that.jobDetail.jobName + "@" + (that.jobDetail.supplier.supplierName || "-");
+			}
+			console.log("text", text);
+			uni.setClipboardData({
+				data: text,
+				success(res) {
+					uni.getClipboardData({
+						success(res) {
+							console.log(res.data); // data
+							uni.showToast({
+								title: "复制成功",
+								icon: "success",
+							});
+						},
+					});
+				},
+			});
+		},
 	},
 };
 </script>
@@ -1215,5 +1211,34 @@ export default {
 			z-index: 9999;
 		}
 	}
+	.desp-copy {
+		font-size: 12px;
+		float: right;
+		/* top: 11px;
+  right: 8px;
+  position: relative; */
+		border-radius: 25rpx;
+		padding: 0px 8px;
+		height: 16px;
+		line-height: 16px;
+
+		margin-right: 16px;
+	}
+	.detailH3 {
+		font-size: 16px;
+		font-weight: 400;
+		color: #000;
+		line-height: 22px;
+		margin-top: 16px;
+		margin-bottom: 8px;
+	}
+	.pri {
+		white-space: pre-line;
+	}
+	.pri:empty:before,
+	.textb1:empty:before {
+		content: "-" !important;
+		color: #333;
+	}
 }
 </style>
diff --git a/root/person/applyManage.vue b/root/person/applyManage.vue
new file mode 100644
index 0000000..2747712
--- /dev/null
+++ b/root/person/applyManage.vue
@@ -0,0 +1,112 @@
+<template>
+	<div class="g_pb_32">
+		<div v-for="(item, index) in applyList">
+			<div class="g_pb_8 g_pt_16 g_pl_16 g_border_e_b g_c_9">
+				{{ index == "near" ? "近三天" : "三天前" }}
+			</div>
+			<div class="g_flex_row_between flex_center i-items" style="padding: 20px 16px 8px" v-for="i in item" :key="item.id">
+				<div class="g_mr_12">
+					<img class="g_w_48 g_h_48 g_radius_50" :src="i.imgSrc || 'https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/APP/default.svg'" alt="" />
+				</div>
+				<div class="g_flex_row_between flex_center g_flex_1 g_h_48">
+					<div>
+						<div class="g_fs_18">
+							{{ i.applyUsername }}
+						</div>
+						<div class="g_fs_14 g_c_9 g_mt_4">
+							{{ i.userName }}
+						</div>
+					</div>
+					<div>
+						<span v-if="i.past && i.status === 0" class="g_fs_14 g_c_9">已过期</span>
+						<span v-else-if="i.status == 1" class="g_fs_14 g_c_9">已通过</span>
+						<span v-else-if="i.status == 2" class="g_fs_14 g_c_9">已拒绝</span>
+						<div class="g_flex_row_end" v-else>
+							<div class="g_mr_8">
+								<g-button btnText="拒绝" fontSize="14" color="#000" customBgColor="#d8d8d8" size="height" type="disabled" height="24" width="50" @clickBtn="approve(i, 'reject')"></g-button>
+							</div>
+							<div>
+								<g-button btnText="通过" type="primary" fontSize="14" size="height" height="24" width="50" @clickBtn="approve(i, 'resolve')"></g-button>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			applyList: [],
+			query: { page: 1, size: 30 },
+		};
+	},
+	onShow() {
+		this.getUserApplyList();
+	},
+	created() {},
+
+	methods: {
+		getUserApplyList() {
+			let that = this;
+			this.G.Post(this.api.order_getUserApplyList, { pageNum: that.query.page, pageSize: that.query.size }, (res) => {
+				console.log("order_getUserApplyList", res);
+				let obj = {
+					near: [],
+					far: [],
+				};
+				res.forEach((item) => {
+					let diffTime = new Date().getTime() - item.createTime;
+					if (diffTime <= 3 * 24 * 60 * 60 * 1000) {
+						obj.near.push(item);
+					} else {
+						if (diffTime > 10 * 24 * 60 * 60 * 1000) {
+							item.past = true;
+						} else {
+							item.past = false;
+						}
+						obj.far.push(item);
+					}
+				});
+				that.applyList = obj;
+			});
+		},
+		approve(_item, type) {
+			console.log(_item);
+			console.log(type);
+			// return;
+			this.G.Post(this.api.order_userApplyApprove, { id: _item.id, status: type == "reject" ? 2 : 1 }, (res) => {
+				console.log(res);
+				_item.status = type == "reject" ? 2 : 1;
+				uni.showToast({
+					title: "操作成功",
+					icon: "none",
+				});
+			});
+		},
+	},
+};
+</script>
+
+<style lang="scss">
+.i-items {
+	// border-bottom: 1px solid #eee;
+	position: relative;
+	&:not(:first-child):after {
+		content: "";
+		display: block;
+		height: 1rpx;
+		width: calc(100% - 76px);
+		background: #eee;
+		position: absolute;
+		bottom: 0;
+		right: 0;
+	}
+	// &:last-child:after {
+	// 	border-bottom: none;
+	// }
+}
+</style>
diff --git a/root/person/memberApplyAdd.vue b/root/person/memberApplyAdd.vue
index 99adc65..f5d962d 100644
--- a/root/person/memberApplyAdd.vue
+++ b/root/person/memberApplyAdd.vue
@@ -12,7 +12,7 @@
 			</div>
 		</div>
 		<div class="g_mt_60 r_box g_pl_10">
-			<u-input v-model="userName" height="88" placeholder="请输入你的姓名"></u-input>
+			<u-input v-model="userInfo.userName" height="88" placeholder="请输入你的姓名"></u-input>
 		</div>
 		<div class="g_mt_84">
 			<g-button v-if="applying" btnText="已申请" type="disabled" class=""></g-button>
@@ -29,29 +29,38 @@ export default {
 				agencyName: "",
 				fullName: "",
 			},
-			userName: "",
+			userInfo: {
+				userName: "",
+				userId: "",
+			},
 			applying: false,
-			userId: "",
+			inviteUserId: "",
 			uid: "",
 		};
 	},
 	onLoad(options) {
 		console.log(options);
-		options.scene = "id=3087AAAAA101125";
+		options.scene = "id=3087_101125";
 		if (options.scene) {
 			console.log("XXXXXXXXXXXX");
 			//扫小程序码携带参数
 			var sceneStr = decodeURIComponent(options.scene);
 			var sceneJson = this.G.sceneToJson(sceneStr);
 			console.log("sceneJson===", sceneJson);
-			this.inviteUserId = sceneJson.storeJobId || sceneJson.id.split("AAAAA")[1];
-			this.uid = sceneJson.id.split("AAAAA")[0];
-			if (uni.getStorageSync("apply-token")) {
-				this.getAgencyById();
-				this.checkHasApply();
-			}
+			this.inviteUserId = sceneJson.id.split("_")[1];
+			this.uid = sceneJson.id.split("_")[0];
+			this.G.checkToken().then((info) => {
+				console.log("info", info);
+				if (info) {
+					this.getAgencyById();
+					this.checkHasApply();
+				} else {
+					uni.reLaunch({
+						url: "/pages/login/index?path=/pages/person/memberApplyAdd&scene=" + options.scene,
+					});
+				}
+			});
 
-			console.log("this.userId", this.userId, "this.uid", this.uid);
 			// uni.setStorageSync("AGENCY_USER_ID", this.userId);
 		}
 	},
@@ -60,7 +69,7 @@ export default {
 	methods: {
 		applyAdd() {
 			let that = this;
-			this.G.Post(this.api.order_addApply, { agencyId: that.uid, username: this.userName, inviteUserId: this.inviteUserId }, (res) => {
+			this.G.Post(this.api.order_addApply, { agencyId: that.uid, username: this.userInfo.userName, inviteUserId: this.inviteUserId }, (res) => {
 				console.log(res);
 			});
 		},
@@ -73,7 +82,13 @@ export default {
 		},
 		checkHasApply() {
 			let that = this;
-			this.G.Post(this.api.order_checkHasApply, { agencyId: that.uid, username: this.userName, userId: this.inviteUserId }, (res) => {
+			this.G.Post(this.api.order_checkHasApply, { agencyId: that.uid, userId: this.inviteUserId }, (res) => {
+				if (res.length > 0) {
+					that.applying = true;
+				} else {
+					that.applying = false;
+				}
+
 				console.log(res);
 			});
 		},
diff --git a/root/person/memberApplyQRCode.vue b/root/person/memberApplyQRCode.vue
index 5b3200f..048185e 100644
--- a/root/person/memberApplyQRCode.vue
+++ b/root/person/memberApplyQRCode.vue
@@ -320,7 +320,7 @@ export default {
 					})
 					.exec((res) => {
 						console.log("uni 获取节点信息：", res);
-						// console.log("sharelImg", sharelImg);
+						console.log("sharelImg", sharelImg);
 						const canvas = res[0].node;
 						const ctx = canvas.getContext("2d");
 						new Promise(function (resolve) {
@@ -342,7 +342,9 @@ export default {
 										resolve(true);
 									};
 								},
-								fail(err) {},
+								fail(err) {
+									console.log("err", err);
+								},
 							});
 						}).then(() => {
 							//使用：
diff --git a/root/person/teamManage.vue b/root/person/teamManage.vue
index 21db7ea..6399150 100644
--- a/root/person/teamManage.vue
+++ b/root/person/teamManage.vue
@@ -1,20 +1,19 @@
 <template>
-	<div class="team-manage-container g_bg_page">
-		<div class="g_h_10"></div>
-		<div class="g_flex_row_start g_bg_f" style="padding: 12px 16px">
-			<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">您有{{ 8 }}条申请等待审核</div>
-			</div>
-		</div>
-		<scroll-view class="" style="height: calc(100vh - 180px)" :scroll-y="true">
+	<div class="team-manage-container g_flex_column_between g_bg_page">
+		<scroll-view class="g_flex_1" :style="{ 'max-height': `calc(100vh - ${98}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_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.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" :class="item.agencyRoleName ? (item.agencyRoleName == '创建人' ? 'creator' : item.agencyRoleName == '管理员' ? 'manager' : 'member') : ''">{{ item.agencyRoleName }}</div>
 						</div>
 						<div class="g_flex_row_end flex_center g_c_6">
@@ -28,7 +27,7 @@
 		</scroll-view>
 		<div class="g_flex_row_end g_bg_f" style="padding: 14px 16px 34px">
 			<g-button btnText="添加成员" size="small" class="" @clickBtn="addMember"></g-button>
-			<g-button btnText="添加部门" size="small" class="g_ml_16" @clickBtn="goLogin"></g-button>
+			<!-- <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">
@@ -50,10 +49,12 @@ export default {
 		return {
 			memberList: [],
 			addMemberShow: false,
+			applyNum: 0,
 		};
 	},
 	onShow() {
 		this.getMemberList();
+		this.getNewApplyNum();
 	},
 	onLoad() {},
 	created() {
@@ -86,6 +87,13 @@ export default {
 			});
 			this.addMemberShow = false;
 		},
+		getNewApplyNum() {
+			let that = this;
+			this.G.Get(this.api.order_getNewApplyNum, {}, (res) => {
+				console.log("order_getNewApplyNum", res);
+				that.applyNum = res;
+			});
+		},
 	},
 };
 </script>
diff --git a/static/css/base.scss b/static/css/base.scss
index 1c0fee1..a20a3a1 100644
--- a/static/css/base.scss
+++ b/static/css/base.scss
@@ -529,10 +529,10 @@ $min-size: 0;
 $max-size: 300;
 @for $i from $min-size through $max-size {
 	.g_w_#{$i} {
-		width: #{$i}px;
+		width: #{$i}px !important;
 	}
 	.g_h_#{$i} {
-		height: #{$i}px;
+		height: #{$i}px !important;
 	}
 }
 
@@ -640,4 +640,7 @@ $max-radius: 50;
 .r_box{
   border-radius: 8px;
   background-color: #fff;
+}
+.pri {
+	white-space: pre-line;
 }
\ No newline at end of file