diff --git a/App.vue b/App.vue
index 860e559..2774ed1 100644
--- a/App.vue
+++ b/App.vue
@@ -55,7 +55,7 @@ export default {
 				if (uni.getStorageSync("apply-token")) {
 					that.checkNum();
 				}
-			}, 1 * 30 * 1000);
+			}, 30 * 1000);
 		}
 
 		uni.$on("isGlogin", function (data) {
@@ -69,7 +69,13 @@ export default {
 			// that.initWyyx()
 		}
 	},
-	onHide: function () {},
+	onHide: function () {
+    if (this.globalData.timer) {
+        clearInterval(this.globalData.timer);
+        this.globalData.timer = null;
+        console.log("定时任务已清除");
+    }
+  },
 	methods: {
 		initWyyx() {
 			let that = this;
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..2acbaa0
--- /dev/null
+++ b/README.md
@@ -0,0 +1,6 @@
+# 报名助手
+
+```
+段后注释文本
+上8，#999，左对齐，14px
+```
\ No newline at end of file
diff --git a/components/list/job.vue b/components/list/job.vue
index e3080aa..9371da0 100644
--- a/components/list/job.vue
+++ b/components/list/job.vue
@@ -21,8 +21,10 @@
 		<view v-if="speed > 0" class="link">
 			<block class="" v-for="(item, index) in jobArray" :key="index">
 				<view class="item g_position_rela g_mb_10 g_ml_12 g_mr_12 g_bg_f g_radius_8 g_border_e_b" :class="from == 'share' ? 'g_pr_32' : ''">
-					<view class="g_p_10" @click="handleCard(item, index)">
-						<image v-if="item.recruitment == 2 && from != 'mine'" src="http://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/tingzhao.svg" class="g_w_82 g_h_65" style="position: absolute; left: 50%; top: 0; transform: translateX(-50%)"> </image>
+					<view class="g_p_10" style="position: relative;" @click="handleCard(item, index)">
+						<i class="iconfont icon-yitingzhao" v-if="item.recruitment == 2 && from != 'mine'"
+							style="position: absolute; right: 30px; top: 50%; transform: translateY(-50%);color: #ff4d4f;font-size: 80px;z-index: 1;"
+						></i>
 						<view class="m-top g_flex_row_between">
 							<view class="g_flex_1 g_flex_column_between">
 								<view class="g_flex_1 g_flex_row_between g_lh_1">
diff --git a/components/list/jobChild/top.vue b/components/list/jobChild/top.vue
index 5a815c8..d33a064 100644
--- a/components/list/jobChild/top.vue
+++ b/components/list/jobChild/top.vue
@@ -47,7 +47,9 @@
 				</view>
 			</view>
 
-			<image v-if="info.recruitmentImage == 2" :src="localBaseImg + 'stop.svg'" class="g_w_82 g_h_65" style="position: absolute; left: 50%; top: 0; transform: translateX(-50%)"> </image>
+			<i class="iconfont icon-yitingzhao" v-if="info.recruitmentImage == 2"
+				 style="position: absolute; right: 30px; top: 50%; transform: translateY(-50%);color: #ff4d4f;font-size: 80px;z-index: 1;"
+			></i>
 		</view>
 		<view class="g_ell_1 g_fs_14 g_mt_8" style="color: rgba(0, 0, 0, 0.45)" v-if="item.classify == 2">
 			{{ info.jobInfo || "-" }}
diff --git a/components/quickLogin.vue b/components/quickLogin.vue
index f1ba52b..f421b41 100644
--- a/components/quickLogin.vue
+++ b/components/quickLogin.vue
@@ -32,6 +32,7 @@ export default {
 						openId: wxRes.openId,
 						tel: wxRes.phoneNumber,
 						unionid: wxRes.unionid,
+							createFakerAgency: 1,
 					},
 					(res) => {
 						console.log("res", res);
@@ -82,6 +83,7 @@ export default {
 							openId: wxRes.openId,
 							tel: wxRes.phoneNumber,
 							unionid: wxRes.unionid,
+							createFakerAgency: 1,
 						},
 						(res) => {
 							that.setToken(res);
diff --git a/main.js b/main.js
index 26b595e..9858219 100644
--- a/main.js
+++ b/main.js
@@ -65,14 +65,17 @@ export function createApp () {
           uni.setStorageSync('apply-userinfo-copy', JSON.stringify(res));
           uni.setStorageSync("apply-agencyId", res.user.agencyId); // 单独存储 -- 代理id，方便获取
           uni.setStorageSync("apply-supplierAccount", res.supplierAccount); // 单独存储 -- 是否是发单号，方便获取 0.不是发单号 1.是发单号
-          G.Get(apiInfo.login_agencyInfo, {}, (aRes) => {
-            uni.setStorageSync("agencyInfo", aRes.agency); // 1是创建者 2是普通成员
-            uni.setStorageSync("IS_CREATOR", aRes.agency.userId == res.user.id || res.admin == true ? 1 : 2); // 1是创建者 2是普通成员
+          if (res.agencyStatus == 1) {
+            G.Get(apiInfo.login_agencyInfo, {}, (aRes) => {
+              uni.setStorageSync("agencyInfo", aRes.agency); // 1是创建者 2是普通成员
+              uni.setStorageSync("IS_CREATOR", aRes.agency.userId == res.user.id || res.admin == true ? 1 : 2); // 1是创建者 2是普通成员
+
+              // 登录跳转到首页的判断
+              uni.setStorageSync("SHOW_INVITE", 1);
+              resolve(res)
+            });
+          }
 
-            // 登录跳转到首页的判断
-            uni.setStorageSync("SHOW_INVITE", 1);
-            resolve(res)
-          });
         },
           function fail (err) {
             console.log(err);
@@ -91,13 +94,16 @@ export function createApp () {
           uni.setStorageSync('apply-userinfo-copy', JSON.stringify(res));
           uni.setStorageSync("apply-agencyId", res.user.agencyId); // 单独存储 -- 代理id，方便获取
           uni.setStorageSync("apply-supplierAccount", res.supplierAccount); // 单独存储 -- 是否是发单号，方便获取 0.不是发单号 1.是发单号
-          G.Get(apiInfo.login_agencyInfo, {}, (aRes) => {
-            uni.setStorageSync("agencyInfo", aRes.agency); // 1是创建者 2是普通成员
-            uni.setStorageSync("IS_CREATOR", aRes.agency.userId == res.user.id || res.admin == true ? 1 : 2); // 1是创建者 2是普通成员
-            // 登录跳转到首页的判断
-            uni.setStorageSync("SHOW_INVITE", 1);
-            resolve(res)
-          });
+       if (res.agencyStatus == 1) {
+            G.Get(apiInfo.login_agencyInfo, {}, (aRes) => {
+              uni.setStorageSync("agencyInfo", aRes.agency); // 1是创建者 2是普通成员
+              uni.setStorageSync("IS_CREATOR", aRes.agency.userId == res.user.id || res.admin == true ? 1 : 2); // 1是创建者 2是普通成员
+
+              // 登录跳转到首页的判断
+              uni.setStorageSync("SHOW_INVITE", 1);
+              resolve(res)
+            });
+          }
         })
       })
     },
@@ -188,7 +194,7 @@ export function createApp () {
             },
             fail: function (res) { },
           });
-        } 
+        }
       }, $sourceType);
     },
     /* 上传图片
@@ -326,7 +332,7 @@ export function createApp () {
       });
     }
   });
-	app.config.globalProperties.F = wyyx;
+  app.config.globalProperties.F = wyyx;
   app.use(uView)
   return {
     app
diff --git a/pages/home/child/filter.vue b/pages/home/child/filter.vue
index 89c5e2c..a89fbf5 100644
--- a/pages/home/child/filter.vue
+++ b/pages/home/child/filter.vue
@@ -1,13 +1,13 @@
 <template>
-	<view class="gjFixed" v-if="show == 'special'" @click.stop @touchmove.stop.prevent>
-		<view class="filterContainer filterBox" style>
+	<view class="gjFixed" v-if="show == 'special'" @click.stop="hideDrawer" @touchmove.stop.prevent>
+		<view class="filterContainer filterBox" style @click.stop>
 			<scroll-view class style="padding: 0; background-color: #ededed" scroll-y>
 				<template v-for="item in anchorList">
-					<view :class="item.id == filterTo ? 'filterActive' : ''" class="g_c_3 g_fw_600" style="width: 84px; padding: 12px 0" @click="goAnchor(item)">{{ item.name }}</view>
+					<view :class="item.id == filterTo ? 'filterActive' : ''" class="g_c_3 g_fw_600 g_text_c" style="width: 84px; padding: 12px 0" @click="goAnchor(item)">{{ item.name }}</view>
 				</template>
 			</scroll-view>
 			<scroll-view class=" " :data-filter-to="filterTo" :scroll-into-view="filterTo" scroll-with-animation style="width: calc(100% - 100px); padding: 0 8px" scroll-y>
-				<view style="padding: 0 10px">
+				<view style="padding: 0 10px 32px 0">
 					<view class="sub" id="age">
 						<view class="title">年龄</view>
 						<view class="content g_bg_f">
@@ -315,6 +315,10 @@ export default {
 		// this.getType();
 	},
 	methods: {
+		hideDrawer() {
+      console.log('123123');
+			this.$emit("hideDrawer", "");
+		},
 		format(val) {
 			return val;
 		},
@@ -586,7 +590,7 @@ export default {
 	border: 1px solid transparent;
 }
 .sub .content > view.active {
-	background-color:  v-bind("globalData.themeBackgroundColor");
+	background-color: v-bind("globalData.themeBackgroundColor");
 	color: v-bind("globalData.themeColor");
 	border-color: v-bind("globalData.themeColor");
 }
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 2df63f5..c02c569 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -26,7 +26,7 @@
 						</div>
 					</div>
 					<div>
-						<div class="sticky">
+						<div class="sticky" v-if="isLogin">
 							<div class="g_flex_row_between flex_center" :class="toTop ? 'g_bg_f' : 'g_bg_f_5'" :style="{ 'box-shadow': toTop ? '0px 2px 3px 0px rgba(214, 214, 214, 0.3)' : '' }" id="tttop">
 								<div class="g_flex_1">
 									<u-tabs bg-color="transparent" from="index" gutter="20" :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>
@@ -46,7 +46,6 @@
 										筛选
 										<span class="iconfont icon-shouqi g_fs_12 g_c_9 fst g_ml_4" v-if="whichOneShow == 'special'"></span>
 										<span class="iconfont icon-zhankai g_fs_12 g_c_9 fst g_ml_4" v-if="whichOneShow != 'special'"></span>
-										<g-filter :show="whichOneShow" ref="filterChild" top="43px" :getFilterDataNew="getFilterData" @filterObj="receiveFromChild"></g-filter>
 									</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> -->
@@ -99,9 +98,11 @@
 					</div>
 				</div>
 			</scroll-view>
-			<div hover-class="none" style="position: fixed; right: 20px; bottom: 20px" hover-stop-propagation="false" @click="toRecord" v-if="isLogin">
+			<div hover-class="none" style="position: fixed; right: 20px; bottom: 20px; z-index: 0" hover-stop-propagation="false" @click="toRecord" v-if="isLogin && userInfo.agencyId">
 				<g-panel-image :url="cdnBaseImg + 'quick_application0610.svg'" size="96" />
 			</div>
+			<g-filter :show.sync="whichOneShow" @hideDrawer="(e) => (whichOneShow = e)" ref="filterChild" top="43px" :getFilterDataNew="getFilterData" @filterObj="receiveFromChild"></g-filter>
+
 			<u-popup v-model="showPop" mode="bottom" uZindex="9999" border-radius="12" :closeable="true" :mask-close-able="true">
 				<div class="g_fs_18 g_text_c g_pt_32">
 					<div class="g_bg_f g_fw_600 g_pb_24">以下发单号向你发出关注邀请</div>
@@ -214,6 +215,9 @@ export default {
 		return {
 			scrollTo: "",
 			selectedCity: "全国",
+			agencyInfo: uni.getStorageSync("agencyInfo"),
+			userInfo: uni.getStorageSync("apply-userinfo"),
+			whichOneShow: "",
 			toTop: false, // 筛序栏顶部状态
 			getFilterData: {
 				sex: "-1",
diff --git a/pages/person/index.vue b/pages/person/index.vue
index 19fd559..e753112 100644
--- a/pages/person/index.vue
+++ b/pages/person/index.vue
@@ -65,7 +65,7 @@
 					@clickItem="goPage('/root/bind/order?active=0')"
 				/>
 			</view>
-			<view class="g_mt_10">
+			<view class="g_mt_10" v-if="userInfo.agencyId">
 				<g-panel-card-num :list="billDataList" titleNav="/root/person/applyIndex" :border="true" :speed="1" :marginBottom="16" cusType="num" :height="26" :num="5" cusTitle="报名工单(我报的)" @clickItem="goOrder" />
 				<!-- <g-panel-card-num :list="todayDataList" 
 													titleNav="/root/person/todayData"
@@ -337,8 +337,10 @@ export default {
 				this.getAuthInfo();
 				this.getData();
 				this.getNum();
-
+        if(uni.getStorageSync("apply-userinfo").agencyStatus == 1){
 				this.getCompanyInfo();
+
+        }
 			}
 		} else {
 			that.waitNum_ups = 0;
diff --git a/root/bind/myMain.vue b/root/bind/myMain.vue
index 3f5689a..3384ff8 100644
--- a/root/bind/myMain.vue
+++ b/root/bind/myMain.vue
@@ -2,7 +2,7 @@
 	<view class="p-root-bind-my-main g_flex_column_center flex_center g_w_all g_h_all g_bg_f_5 g_kuaishou" :style="{ 'background-image': showBg ? 'url(' + cdnBaseImg + 'share_bg.svg)' : '' }" :class="showBg ? 'g_pt_32' : ''">
 		<view class="g_flex_row_center g_fs_22 g_c_3 g_fw_600 g_mb_24" v-if="showBg">邀请粉丝（代理）关注我的发单号</view>
 		<!-- #ifdef APP-PLUS || MP-WEIXIN -->
-		<image :src="shareJobImg" show-menu-by-longpress style="width: 343px; height: 555px; margin: 0 auto; display: block" mode=""></image>
+		<image :src="shareJobImg" show-menu-by-longpress style="width: 343px; height: 635px; margin: 0 auto; display: block" mode=""></image>
 		<view class="g_text_c g_fs_16 g_mt_12 g_mb_12 g_fw_600">长按图片转发给微信好友</view>
 		<!-- #endif -->
 		<!-- #ifdef APP-PLUS -->
@@ -69,7 +69,7 @@
 		</view>
 		<!-- #endif -->
 
-		<view v-if="allowClick">
+		<view v-if="allowClick && false">
 			<view class="g_h_100"></view>
 			<g-panel-fixed>
 				<slot>
@@ -348,7 +348,7 @@ export default {
 								success(res) {
 									console.log("res111", res);
 									canvas.width = res.width;
-									canvas.height = res.height;
+									canvas.height = res.height + 250;
 									mycenter = canvas.width;
 									myheight = canvas.height;
 									const img = canvas.createImage();
@@ -356,11 +356,11 @@ export default {
 									console.log("img111", img);
 									img.onload = (info) => {
 										// 绘制背景色
-										that.G.roundRect1(ctx, 0, 0, canvas.width, canvas.height, 0, baseColor);
+										that.G.roundRect1(ctx, 0, 0, canvas.width, canvas.height + 250, 0, baseColor);
 										// 绘制中间白色背景
 										that.G.roundRect1(ctx, (mycenter - canvas.width + 120) / 2, 280, canvas.width - 120, canvas.height - 360, 180, "#fff");
 										// 绘制关注发单号背景色
-										that.G.roundRect1(ctx, (mycenter - 800) / 2, canvas.height - 300, 800, 136, 135, baseColor);
+										that.G.roundRect1(ctx, (mycenter - 800) / 2, canvas.height - 600, 800, 136, 135, baseColor);
 										let qrTop = 1195;
 										// 二维码左上角的
 										that.G.roundRect1(ctx, (mycenter - 600) / 2 - 5, qrTop, 136, 136, 80, baseColor);
@@ -370,7 +370,11 @@ export default {
 										that.G.roundRect1(ctx, (mycenter - 600) / 2 - 5, qrTop + 475, 136, 136, 80, baseColor);
 										// 二维码右下角的
 										that.G.roundRect1(ctx, (mycenter - 600) / 2 + 470, qrTop + 475, 136, 136, 80, baseColor);
-										that.G.fillTextLineBreak(ctx, "扫一扫关注我的发单号", (mycenter - "扫一扫关注我的发单号".length * 54) / 2 + 40, canvas.height - 215, "扫一扫关注我的发单号".length * 54, 58, "#333", 54, 600); // 总职位
+										// 绘制关注发单号文字
+										that.G.fillTextLineBreak(ctx, "扫一扫关注我的发单号", (mycenter - "扫一扫关注我的发单号".length * 54) / 2 + 40, canvas.height - 515, "扫一扫关注我的发单号".length * 54, 58, "#333", 54, 600); // 总职位
+
+										that.G.drawCenteredText(ctx, mycenter, canvas.height - 300, [{ content: "该图片请不要发给工友", color: "#d30000", fontWeight: 500, fontSize: 72 }]);
+										that.G.drawCenteredText(ctx, mycenter, canvas.height - 200, [{ content: "关注后能直接看到单子的代理费/佣金", color: "#333", fontWeight: 500, fontSize: 48 }]);
 
 										// 绘制头像背景色
 										that.G.roundRect_yuan(ctx, (mycenter - 360) / 2, 110, 360, "#ffffff");
@@ -381,7 +385,7 @@ export default {
 												console.log("res333", res);
 												img.src = res.path;
 												img.onload = () => {
-													that.G.roundRect(ctx, img, (mycenter - 800) / 2 + 100, canvas.height - 265, 70, 70, 0);
+													that.G.roundRect(ctx, img, (mycenter - 800) / 2 + 100, canvas.height - 565, 70, 70, 0);
 													resolve(true);
 												};
 											},
@@ -507,9 +511,9 @@ export default {
 											{ content: info.recruitmentJobNum.toString(), color: "#000", fontWeight: 500, fontSize: 80, space: 20 },
 											{ content: "在招数", color: "#666", fontWeight: 500, fontSize: 56, space: 80 },
 											{ content: info.downNum.toString(), color: "#000", fontWeight: 500, fontSize: 80, space: 20 },
-											{ content: "粉丝", color: "#666", fontWeight: 500, fontSize: 56, space: 40  },
+											{ content: "粉丝", color: "#666", fontWeight: 500, fontSize: 56, space: 40 },
 										];
-										that.G.drawCenteredText(ctx, mycenter , 745, textSegments);
+										that.G.drawCenteredText(ctx, mycenter, 745, textSegments);
 										imgres(canvas);
 									};
 								},
diff --git a/root/detail/job.vue b/root/detail/job.vue
index f143c6e..5b0a923 100644
--- a/root/detail/job.vue
+++ b/root/detail/job.vue
@@ -7,29 +7,31 @@
 			<g-loading />
 		</div>
 		<div v-if="speed == 1">
-			<view class="r_box g_flex_row_between flex_center g_pl_16 g_pr_16 g_fs_16" @click="goUserMain" style="height: 60px">
-				<view class="g_fw_600 g_mr_4 g_flex_column_center">项目方</view>
-				<view class="g_flex_row_end flex_center g_flex_1">
-					<span class="g_c_6" selectable="false" space="false" decode="false">{{ jobDetail.fullName ? jobDetail.fullName : jobDetail.agencyName }}</span>
-					<span class="iconfont icon-gengduo11 g_fs_14 g_c_6 g_ml_4"></span>
-				</view>
-			</view>
-			<div class="r_box g_mb_10 g_mt_10 g_pl_16 g_pr_16 servicePrice" @click="showFee" style="height: 60px">
-				<div class="g_flex_row_between flex_center g_fs_16">
-					<div class="g_flex_row_start" style="flex: none">
-						<div class="g_fw_600 g_mr_4 g_hs_67 g_flex_column_center">代理佣金</div>
-						<icon :class="showPrice ? 'icon-zhengyan1' : 'icon-biyan1'" class="iconfont g_c_f40 g_fs_22 g_hs_67 g_flex_column_center" @click.stop="() => (showPrice = !showPrice)" style="width: 67px"></icon>
-					</div>
-					<div class="g_flex_row_end flex_center g_hs_67" style="flex: 1">
-						<span class v-if="showPrice">{{ jobDetail.serverPrice || "详询客服" }}</span>
-						<span class v-else>***</span>
-						<div class="iconfont icon-gengduo11 g_fs_14 g_c_6 g_ml_4"></div>
+			<view class="r_box g_mb_10" v-if="(isSharePage && isFans == 2) || !isSharePage">
+				<div class="g_flex_row_between flex_center g_pl_16 g_pr_16 g_fs_16 g_border_e_b" @click="goUserMain" style="height: 60px">
+					<view class="g_fw_600 g_mr_4 g_flex_column_center">项目方</view>
+					<view class="g_flex_row_end flex_center g_flex_1">
+						<span class="g_c_6" selectable="false" space="false" decode="false">{{ jobDetail.fullName ? jobDetail.fullName : jobDetail.agencyName }}</span>
+						<span class="iconfont icon-gengduo11 g_fs_14 g_c_6 g_ml_4"></span>
+					</view>
+				</div>
+				<div class="g_mb_10 g_pl_16 g_pr_16 servicePrice" @click="showFee" style="height: 60px">
+					<div class="g_flex_row_between flex_center g_fs_16">
+						<div class="g_flex_row_start" style="flex: none">
+							<div class="g_fw_600 g_mr_4 g_hs_67 g_flex_column_center">代理佣金</div>
+							<icon :class="showPrice ? 'icon-zhengyan1' : 'icon-biyan1'" class="iconfont g_c_f40 g_fs_22 g_hs_67 g_flex_column_center" @click.stop="() => (showPrice = !showPrice)" style="width: 67px"></icon>
+						</div>
+						<div class="g_flex_row_end flex_center g_hs_67" style="flex: 1">
+							<span class v-if="showPrice">{{ jobDetail.serverPrice || "详询客服" }}</span>
+							<span class v-else>***</span>
+							<div class="iconfont icon-gengduo11 g_fs_14 g_c_6 g_ml_4"></div>
+						</div>
 					</div>
 				</div>
-			</div>
+			</view>
 
 			<!-- 基本信息 -->
-			<view class="g_bg_f g_pt_10 g_pl_16 g_pr_16 g_mt_10 g_kuaishou g_radius_8 g_pb_16">
+			<view class="g_bg_f g_pt_10 g_pl_16 g_pr_16 g_kuaishou g_radius_8 g_pb_16">
 				<div class="m-info g_mb_12">
 					<view class="g_mb_10 g_flex_row_between flex_center">
 						<view class="g_flex_1 g_c_3 g_fs_20 g_fw_bold">{{ jobDetail.jobName }}</view>
@@ -170,8 +172,8 @@
 									</view>
 								</view>
 								<view class="" v-if="isLogin">
-									<view class="contactInfo" style="white-space: pre-line">{{ userInfo.noticeEndStr ? userInfo.noticeEndStr : "详情咨询：" + userInfo.tel }}</view>
-									<view class="g_fs_14 g_text_c g_mt_16" v-if="userInfo.agencyStatus == 1">
+									<view class="contactInfo" style="white-space: pre-line">{{ loginInfo.noticeEndStr ? loginInfo.noticeEndStr : "详情咨询：" + loginInfo.tel }}</view>
+									<view class="g_fs_14 g_text_c g_mt_16" v-if="loginInfo.agencyStatus == 1">
 										以上联系人，可以
 										<span class="g_fw_600" @click="changeContact" style="color: #576b95; text-decoration: underline">改成我的</span>
 									</view>
@@ -553,11 +555,9 @@ export default {
 		// 											"", this.jobDetail.jobName + " " + this.jobDetail.priceStr + " " + "好厂好工作 火热招聘中");
 		let that = this;
 		let path;
-		if (this.isMember) {
-			path = `/root/detail/job?id=${that.jobDetail.id}&from=home&userId=${that.userInfo.user.id}`;
-		} else {
-			path = `/root/detail/job?id=${that.jobDetail.id}&from=home`;
-		}
+		console.log("that.loginInfo", that.loginInfo);
+		// 职位id_职位项目方_分享人_分享人团队
+		path = `/root/detail/job?scene=id=${that.jobDetail.id}_${that.jobDetail.agencyId}_${that.shareUserId || that.loginInfo.user.id}_${that.shareUserAgencyId ? (that.isFans == 2 ? that.loginInfo.agencyId : that.shareUserAgencyId) : that.loginInfo.agencyId}`;
 		return {
 			promise: new Promise((resolve, reject) => {
 				uni.showLoading({
@@ -586,6 +586,11 @@ export default {
 		return {
 			globalData: getApp().globalData,
 			videoContextTemp: {},
+			isSharePage: false, // 是否是分享页面的判断
+			isFans: false,
+			shareUserId: null, // 分享人id
+			shareJobAgencyId: null, // 分享人id
+			shareUserAgencyId: null, // 分享人id
 			corpUserFlag: false,
 			agreeRadio: ["agree"],
 			isPerson: false,
@@ -673,19 +678,34 @@ export default {
 	},
 	onLoad(options) {
 		console.log("详情", options);
+		let loginUrl;
 		if (options.id) {
 			this.uid = options.id;
+			loginUrl = "/root/person/loginIndex?type=detail&path=/root/detail/job";
+		} else if (options.scene) {
+			var sceneStr = decodeURIComponent(options.scene);
+			var sceneJson = this.G.sceneToJson(sceneStr);
+			console.log("sceneJson===", sceneJson);
+      console.log('id对应的角色','职位id_职位项目方_分享人_分享人团队');
+			// 职位id_职位项目方_分享人_分享人团队
+			this.uid = sceneJson.id.split("_")[0]; //职位id
+			this.shareJobAgencyId = sceneJson.id.split("_")[1]; //职位项目方id
+			this.shareUserId = sceneJson.id.split("_")[2]; //分享人id
+			this.shareUserAgencyId = sceneJson.id.split("_")[3]; //分享人团队id
+			this.isSharePage = true;
+			loginUrl = `/root/person/loginIndex?type=detail&path=/root/detail/job&scene=${JSON.stringify(sceneJson)}`;
 		}
-		if (options.from) {
-			this.from = options.from;
-		}
+		this.from = options.from || "home";
 		if (!uni.getStorageSync("apply-token")) {
 			console.log("apply-token");
-			uni.navigateTo({
-				url: "/root/person/loginIndex?type=detail&path=/root/detail/job&id=" + options.id,
+			console.log("options.scene", options.scene);
+			uni.reLaunch({
+				url: loginUrl,
 			});
 			return;
 		}
+		this.shareJobAgencyId && this.checkIsFans(this.shareJobAgencyId);
+
 		this.loginInfo = uni.getStorageSync("apply-userinfo");
 		// if (uni.getStorageSync("apply-AGENCY_MAMBER_LIST")) {
 		// 	this.applyList = uni.getStorageSync("apply-AGENCY_MAMBER_LIST");
@@ -698,8 +718,6 @@ export default {
 		// 		console.log("this.applyList", this.applyList);
 		// 	});
 		// }
-
-		console.log("this.applyList", this.applyList);
 	},
 	onShow() {
 		let that = this;
@@ -743,7 +761,9 @@ export default {
 						num1++;
 					}
 				});
-				this.toKnowInfo(res.agencyId);
+				that.speed = 1;
+				that.attention = true;
+				// this.toKnowInfo(res.agencyId);
 			});
 		}
 		uni.getSystemInfo({
@@ -962,8 +982,21 @@ export default {
 			if (!this.attention) {
 				return false;
 			}
+			let params = {
+				jobId: this.jobDetail.id,
+				jobName: this.jobDetail.jobName,
+				title: "报名",
+				type: that.jobDetail.jobType,
+				agencyId: that.jobDetail.agencyId,
+			};
+			if (that.isFans !== false) {
+				params.isFans = that.isFans;
+			}
+			that.shareUserId && (params.agencyUserId = that.isFans == 2 ? '' : that.shareUserId);
+      // 如果粉丝自己报名,要把自己的id传到报名页,而不是传分享人的
+			that.shareUserAgencyId && (params.shareUserAgencyId = that.isFans == 2 ? that.loginInfo.agencyId : that.shareUserAgencyId);
 			uni.navigateTo({
-				url: "/root/home/quickApplication?jobId=" + this.jobDetail.id + "&jobName=" + this.jobDetail.jobName + "&title=报名&type=" + that.jobDetail.jobType + "&agencyId=" + that.jobDetail.agencyId,
+				url: `/root/home/quickApplication?params=${JSON.stringify(params)}`,
 			});
 			// if (this.jobDetail.recruitment == 1) {
 			// 	this.formInfo = {
@@ -1422,7 +1455,7 @@ export default {
 				// 根据标签数量调整立即咨询背景位置
 				that.G.roundRect1(ctx, mycenter - 712 / 2, line7, 712, 100, 4, "#00b666"); // 立即咨询背景
 				// 根据标签数量调整立即咨询位置
-				that.G.fillTextLineBreak(ctx, "立即咨询", mycenter - 24 - ctx.measureText("立即咨询").width / 2 + 100, line7 + 65, 300, 120, "#fff", titleFontSize, "500"); // 立即咨询
+				that.G.fillTextLineBreak(ctx, "立即咨询", mycenter - 24 - ctx.measureText("立即咨询").width / 2, line7 + 65, 300, 120, "#fff", titleFontSize, "500"); // 立即咨询
 				// 绘制职位logo
 				uni.downloadFile({
 					url: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/pugongying/goxj2-qpwbo.png",
@@ -1454,6 +1487,13 @@ export default {
 				console.log("all err", err);
 			});
 		},
+		checkIsFans(upAgencyId) {
+			let that = this;
+			that.G.Post("/assistant/circle/agency/checkUserTypeForAssistant", { upAgencyId }, (res) => {
+				console.log("isFans", res);
+				that.isFans = res;
+			});
+		},
 	},
 };
 </script>
diff --git a/root/detail/userShare.vue b/root/detail/userShare.vue
index 9eb7b82..33e72e0 100644
--- a/root/detail/userShare.vue
+++ b/root/detail/userShare.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="p-root-detail-user g_w_all g_bg_page g_kuaishou">
 		<u-navbar backIconColor="#333" :borderBottom="false" :immersive="true" :customBack="goHome" :background="{ background: navColor }" :backIconName="fromShare ? 'home' : 'arrow-left'"></u-navbar>
-		<view class=" u-navbar-fixed" style="background-color: #caf1e0 !important;height:160px"></view>
+		<view class="u-navbar-fixed" style="background-color: #caf1e0 !important; height: 160px"></view>
 		<div class style="background-color: #caf1e0 !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">
@@ -37,7 +37,7 @@
 				</div>
 				<div class="g_h_10"></div>
 				<div class>
-					<quickLogin @successLogin="successLogin" v-if="!agencyInfo.id">
+					<quickLogin @successLogin="successLogin" v-if="!isLogin">
 						<div style="width: calc(100vw - 40px)" class>
 							<g-button btnText="申请关注" size="auto" type="primary" class></g-button>
 						</div>
@@ -96,14 +96,15 @@
 			</div>
 		</div>
 		<!-- 发布职位确认框 -->
-		<u-modal v-model="submitConfirm" width="90%" negativeTop="52" confirmText="发布职位" :showTitle="false" :confirmStyle="{ color: '#576b95', 'font-weight': 600 }" :cancelStyle="{ color: '#000', 'font-weight': 600 }" :showConfirmButton="false">
+		<u-modal v-model="submitConfirm" width="90%" negativeTop="150" confirmText="发布职位" :showTitle="false" :confirmStyle="{ color: '#576b95', 'font-weight': 600 }" :cancelStyle="{ color: '#000', 'font-weight': 600 }" :showConfirmButton="false">
 			<div class="g_fs_17 g_text_c">
 				<div class style="padding: 42px 24px 36px">
 					<div class="g_text_c g_fw_600 g_c_0">创建团队/企业</div>
-					<div class="g_text_c g_c_6 g_mb_16 g_mt_16">创建团队后可关注发单号，浏览职位及工单报名</div>
+					<div class="g_text_l g_c_6 g_mb_8 g_mt_24 g_pl_12">团队名称/企业简称：</div>
 					<div class="g_fs_14 g_pl_12 g_bg_f2 g_border_d g_radius_4 g_flex_row_start flex_center">
-						<u-input v-model="agencyInfo.fullName" :customStyle="{ color: disabled ? '#999' : '#333', fontSize: '17px' }" :disabled="disabled" height="96" placeholder="请填写团队/企业简称"></u-input>
+						<u-input v-model="agencyInfo.fullName" :customStyle="{ color: disabled ? '#999' : '#333', fontSize: '17px' }" :disabled="disabled" height="96" placeholder="如：上海发财劳务"></u-input>
 					</div>
+					<div class="g_text_l g_c_9 g_mt_8 g_fs_14 g_pl_12">创建团队后可关注发单号，浏览职位及工单报名。</div>
 				</div>
 				<div class="g_flex_row_center flex_center g_fw_600 g_border_e_t">
 					<div class="g_flex_1 g_h_50 g_text_c g_c_0 g_border_e_r" hover-class="thover" @click="submitConfirm = false" style="line-height: 50px">取消</div>
@@ -244,6 +245,7 @@ export default {
 	onShow() {
 		let that = this;
 		that.isLogin = uni.getStorageSync("apply-token") ? true : false; // uni.getStorageSync("apply-token");
+		console.log("that.isLogin", that.isLogin);
 		this.loginInfo = uni.getStorageSync("apply-userinfo");
 		that.G.Get("/checkUserLogin", {}, (res) => {
 			console.log("checkUserLogin", res);
@@ -298,10 +300,12 @@ export default {
 			return new Promise((reso, reject) => {
 				that.G.Get(that.api.login_agencyInfo, {}, (aRes) => {
 					console.log("获取团队信息:", aRes);
-					that.disabled = aRes.agency.fullName ? true : false;
-					that.agencyInfo = { ...aRes.agency, fullName: aRes.agency.fullName ? aRes.agency.fullName : that.agencyInfo.fullName };
+					if (aRes.agency) {
+						that.disabled = aRes.agency.fullName ? true : false;
+						that.agencyInfo = { ...aRes.agency, fullName: aRes.agency.fullName ? aRes.agency.fullName : that.agencyInfo.fullName };
+						uni.setStorageSync("agencyInfo", aRes.agency);
+					}
 
-					uni.setStorageSync("agencyInfo", aRes.agency);
 					setTimeout(() => {
 						reso();
 					}, 200);
@@ -607,6 +611,9 @@ export default {
 				}
 			}
 			this.G.Get(this.api.bind_subscribeSubmit + "/" + that.uid, { agencyId: that.agencyInfo.id, agencyName: that.agencyInfo.fullName, source: _code, remark: " " }, (res) => {
+				this.getAgencyInfo().then(() => {
+					that.getAgencyById().then(() => {});
+				});
 				uni.showToast({
 					title: "申请成功",
 					icon: "none",
@@ -615,7 +622,7 @@ export default {
 				uni.navigateTo({
 					url: "/root/person/inviteFollowSuccess",
 				});
-				reso();
+				// reso();
 				// that.checkHasApply();
 				console.log(res);
 			});
@@ -675,10 +682,9 @@ export default {
 			let that = this;
 			this.isLogin = true;
 			console.log("successLogin", e);
-			this.getAgencyInfo().then(() => {
+			that.getAgencyInfo().then(() => {
 				that.getAgencyById().then(() => {
-					that.getDefault("init");
-
+					// that.query.page++;
 					if (that.info.recordStatus == 3 || that.info.recordStatus == 4 || that.info.recordStatus == 6) {
 						that.handleSubmit();
 					} else {
@@ -689,6 +695,7 @@ export default {
 							});
 						}
 					}
+					that.getDefault("init");
 				});
 			});
 		},
diff --git a/root/home/components/AiApply.vue b/root/home/components/AiApply.vue
index eb78fc3..384878e 100644
--- a/root/home/components/AiApply.vue
+++ b/root/home/components/AiApply.vue
@@ -145,7 +145,14 @@ export default {
         uni.getClipboardData({
           success(res) {
             console.log(res)
-            that.aitext = res.data
+            if(res.data){
+              that.aitext = res.data
+            }else{
+              uni.showToast({
+                title: '请先复制内容',
+                icon: 'none',
+              })
+            }
           },
           fail() {
             uni.showToast({
diff --git a/root/home/quickApplication.vue b/root/home/quickApplication.vue
index d75735b..ef6c147 100644
--- a/root/home/quickApplication.vue
+++ b/root/home/quickApplication.vue
@@ -3,10 +3,9 @@
 		<AiApply class="" @outputInfo="getTownsManInfo" />
 
 		<view class="">
-			<view class="card-tip g_pt_12 g_pb_8 g_pl_20 g_c_6">老乡信息</view>
+			<view class="card-tip g_pt_12 g_pb_8 g_pl_20 g_c_6">工友信息</view>
 			<view>
-				<view class="g_bg_f g_pl_15 g_pr_15 g_pt_10 g_ml_10 g_mr_10 g_radius_8 g_mb_12"
-					v-for="(item, index) in persenInfo" :key="index" style="margin-bottom: 12px;">
+				<view class="g_bg_f g_pl_15 g_pr_15 g_pt_10 g_ml_10 g_mr_10 g_radius_8 g_mb_12" v-for="(item, index) in persenInfo" :key="index" style="margin-bottom: 12px">
 					<view class="g_pb_2 g_flex_row_between">
 						<view class="g_flex_1 g_flex_column_center g_mr_10">
 							<view class="g_flex_row_start g_fs_16 g_fw_bold">
@@ -19,8 +18,7 @@
 							</view>
 						</view>
 						<view class="g_flex_none g_flex_row_end">
-							<view class="g_flex_row_end g_pl_16 g_pr_16 g_pt_9 g_pb_9"
-								style="background-color: #f0fff8; border-radius: 17px">
+							<view class="g_flex_row_end g_pl_16 g_pr_16 g_pt_9 g_pb_9" style="background-color: #f0fff8; border-radius: 17px">
 								<view class="g_flex_row_end" @click="goFellow(item, index)">
 									<view class="g_flex_column_center">
 										<i class="iconfont icon-bianji g_c_3"></i>
@@ -46,8 +44,7 @@
 						</view>
 					</view>
 					<view class="g_pb_17 g_flex_row_start">
-						<g-panel-image :url="item.idCardImageUrl" v-if="item.idCardImageUrl" radius="4" size="112"
-							@clickItem="handleClickIDcard" />
+						<g-panel-image :url="item.idCardImageUrl" v-if="item.idCardImageUrl" radius="4" size="112" @clickItem="handleClickIDcard" />
 						<view v-if="item.imgs" class="g_flex_row_start">
 							<view v-for="i in item.imgs" class="g_ml_10">
 								<g-panel-image :url="i" radius="4" size="112" @clickItem="handleClickIDcard" />
@@ -56,30 +53,23 @@
 					</view>
 				</view>
 			</view>
-			<view
-				class="g_flex_row_center flex_center g_flex_1 g_h_48 g_bg_f g_fs_16 g_c_main g_ml_10 g_mr_10 g_radius_8"
-				@click="goFellow('')" v-if="persenInfo.length <= 5">
+			<view class="g_flex_row_center flex_center g_flex_1 g_h_48 g_bg_f g_fs_16 g_c_main g_ml_10 g_mr_10 g_radius_8" @click="goFellow('')" v-if="persenInfo.length <= 5">
 				<!-- <view class="g_w_18 g_h_18 g_mr_6 g_text_c g_radius_20 g_border_main g_fsi_18" style="line-height: 13px">+</view> -->
 				<view class="g_flex_column_center">
 					<i class="iconfont icon-jia1 g_c_min g_mr_6" style="font-size: 18px"></i>
 				</view>
-				<view class="">添加老乡</view>
+				<view class="">添加工友</view>
 			</view>
 			<view>
 				<view class="card-tip g_pt_24 g_pb_8 g_pl_20 g_c_6">职位信息</view>
 				<view class="fs_top text-wrap">
-
-					<g-panel-form-slot :list="jobData" @clickResult="changePage" @changeTime="getInviteTime"
-						@changeAddress="changeAddress" @chooseAddress="chooseAddress"> </g-panel-form-slot>
+					<g-panel-form-slot :list="jobData" @clickResult="changePage" @changeTime="getInviteTime" @changeAddress="changeAddress" @chooseAddress="chooseAddress"> </g-panel-form-slot>
 				</view>
 			</view>
 			<view>
 				<view class="card-tip g_pt_24 g_pb_8 g_pl_20 g_c_6">报名备注</view>
-				<view class="g_flex_row_center g_p_10 g_pt_16 g_ml_10 g_mr_10 g_bg_f g_radius_8"
-					style="width: calc(100vw- 20px)">
-					<textarea class="weui-input g_flex_1 g_fs_16" placeholder="请输入报名备注" v-model="updateInfo.desp"
-						placeholder-style="color:#999" :maxlength="-1" auto-height
-						style="min-height: 137px; width: 100%; z-index: 0"></textarea>
+				<view class="g_flex_row_center g_p_10 g_pt_16 g_ml_10 g_mr_10 g_bg_f g_radius_8" style="width: calc(100vw- 20px)">
+					<textarea class="weui-input g_flex_1 g_fs_16" placeholder="请输入报名备注" v-model="updateInfo.desp" placeholder-style="color:#999" :maxlength="-1" auto-height style="min-height: 137px; width: 100%; z-index: 0"></textarea>
 				</view>
 			</view>
 			<view class="g_mt_12">
@@ -99,8 +89,7 @@
 				<g-panel-fixed>
 					<slot>
 						<view class="g_flex_row_between g_pl_16 g_pr_16" style="z-index: 99">
-							<view class="g_fs_16 g_c_6 g_flex_c g_pl_8 g_pr_8 g_radius_6 g_ml_16" hover-class="thover"
-								@click="goReturn">取消</view>
+							<view class="g_fs_16 g_c_6 g_flex_c g_pl_8 g_pr_8 g_radius_6 g_ml_16" hover-class="thover" @click="goReturn">取消</view>
 							<g-button btnText="立即报名" type="primary" @clickBtn="submitForm" />
 						</view>
 					</slot>
@@ -110,89 +99,164 @@
 	</view>
 </template>
 <script>
-	import {
-		nationlist
-	} from "../../utils/nation.js";
-	import dateUtil from "../../utils/dateUtil.js";
-	import AiApply from "./components/AiApply.vue"
-	export default {
-		components: {
-			AiApply
+import { nationlist } from "../../utils/nation.js";
+import dateUtil from "../../utils/dateUtil.js";
+import AiApply from "./components/AiApply.vue";
+export default {
+	components: {
+		AiApply,
+	},
+	onReady() {
+		this.G.setNavStyle();
+		let that = this;
+		uni.$on("getTownsman", function (data) {
+			console.log("getTownsman", data);
+			if (that.persenInfo.length == 0) {
+				that.persenInfo[0] = {
+					...data.info,
+					index: that.persenInfo.length,
+				};
+			} else if (data.info.index || data.info.index === 0) {
+				that.persenInfo[data.info.index] = data.info;
+			} else {
+				that.persenInfo[that.persenInfo.length] = {
+					...data.info,
+					index: that.persenInfo.length,
+				};
+			}
+			console.log("that.persenInfo", that.persenInfo);
+			that.$forceUpdate();
+		});
+		uni.$on("changeJobInfo", function (data) {
+			that.updateInfo.jobId = data.info.leafCateId;
+			that.updateInfo.jobName = data.info.title;
+			that.jobType = data.info.jobType;
+			console.log("data.info", data.info);
+			that.getJobDetail(data.info);
+			that.$forceUpdate();
+		});
+		uni.$on("resetTownsman", function (data) {
+			if (data.reset) {
+				that.persenInfo = [];
+			}
+			that.$forceUpdate();
+		});
+	},
+	onShareAppMessage() {
+		return this.G.shareFun();
+	},
+	onLoad(options) {
+		let that = this;
+		console.log("options", options);
+		console.log("options.jobId", options.jobId);
+		let params = options.params ? JSON.parse(options.params) : {};
+		if (params.jobId) {
+			this.updateInfo.jobId = params.jobId;
+			this.updateInfo.jobName = params.jobName;
+		}
+		uni.setNavigationBarTitle({
+			title: params.title ? params.title : "报名",
+		});
+		if (params.type == 1 || params.type == 2) that.jobType = params.type;
+		if (params.agencyId) that.updateInfo.upAgencyId = params.agencyId;
+
+		(params.isFans === 0 || params.isFans) && (that.isFans = params.isFans);
+		params.agencyUserId && (that.updateInfo.agencyUserId = params.agencyUserId); // 分享人id
+		params.shareUserAgencyId && (that.updateInfo.agencyId = params.shareUserAgencyId); // 分享人团队id
+		this.updateInfo.interviewTimeStr = "";
+		setTimeout(() => {
+			that.IS_CREATOR = uni.getStorageSync("IS_CREATOR") == 1 ? true : false;
+			that.updateInfo.interviewTimeStr = "";
+			console.log("获取面试时间：", that.updateInfo.interviewTimeStr);
+			// 设置默认时间
+			let hour = new Date().getHours();
+			if (hour < 20 && hour >= 6) {
+				this.updateInfo.interviewTimeStr = dateUtil.formatDateYMD(new Date().toLocaleDateString()) + " " + (hour + 1) + ":00";
+			} else if (hour >= 20) {
+				this.updateInfo.interviewTimeStr = dateUtil.formatDateYMD(new Date().toLocaleDateString()) + " 19:30";
+			} else if (hour < 6) {
+				this.updateInfo.interviewTimeStr = dateUtil.formatDateYMD(new Date().toLocaleDateString()) + " 6:00";
+			}
+			// that.updateInfo.interviewTimeStr = dateUtil.formatDateYMD(new Date().toLocaleDateString()) + " 06:00";
+
+			that.$forceUpdate();
+			if (that.updateInfo.jobId) {
+				that.setFormList();
+				that.getJobDetail({
+					leafCateId: that.updateInfo.jobId,
+				});
+			} else {
+				that.setFormList();
+			}
+		}, 1);
+	},
+	data() {
+		return {
+			IS_CREATOR: false,
+			jobType: 2,
+			isFans: 2,
+			cdnBaseImg: this.G.store().cdnBaseImg,
+			nation: nationlist.map((item, index) => {
+				return item.name;
+			}),
+			nationIndex: 0,
+			userTel: "",
+			info: {
+				name: "",
+				sex: "男",
+				age: "",
+				nation: "",
+				idCard: "",
+				address: "",
+			},
+			updateInfo: {
+				jobId: 0,
+				jobName: "请选择报名职位",
+				desp: "",
+				interviewTimeStr: "",
+			},
+			persenInfo: [],
+			agreeRadio: ["agree"],
+			jobData: [],
+			zhengceTextList: [],
+			btnLaoding: false,
+		};
+	},
+	onShow() {
+		let that = this;
+		that.pageSpeed = -1;
+	},
+	methods: {
+		getTownsManInfo(info) {
+			console.log("info", info);
+			uni.$emit("getTownsman", {
+				info,
+			});
 		},
-		onReady() {
-			this.G.setNavStyle();
+		getJobDetail($data) {
 			let that = this;
-			uni.$on("getTownsman", function(data) {
-				console.log("getTownsman", data);
-				if (that.persenInfo.length == 0) {
-					that.persenInfo[0] = {
-						...data.info,
-						index: that.persenInfo.length
-					};
-				} else if (data.info.index || data.info.index === 0) {
-					that.persenInfo[data.info.index] = data.info;
-				} else {
-					that.persenInfo[that.persenInfo.length] = {
-						...data.info,
-						index: that.persenInfo.length
-					};
-				}
-				console.log("that.persenInfo", that.persenInfo);
-				that.$forceUpdate();
-			});
-			uni.$on("changeJobInfo", function(data) {
-				that.updateInfo.jobId = data.info.leafCateId;
-				that.updateInfo.jobName = data.info.title;
-				that.jobType = data.info.jobType;
-				console.log("data.info", data.info);
-				that.getJobDetail(data.info);
-				that.$forceUpdate();
-			});
-			uni.$on("resetTownsman", function(data) {
-				if (data.reset) {
-					that.persenInfo = [];
+			that.G.Get(
+				that.api.job_personDetail + "/" + $data.leafCateId,
+				{
+					id: $data.leafCateId,
+				},
+				(res) => {
+					let policyStr;
+					if (that.isFans == 2) {
+						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";
+					} else {
+						policyStr = "薪资待遇：" + (res.record.salaryDetail || "详询客服") + "\n\n";
+					}
+					console.log("政策列表：", res);
+					that.setFormList(policyStr);
 				}
-				that.$forceUpdate();
-			});
-		},
-		onShareAppMessage() {
-			return this.G.shareFun();
+			);
 		},
-		onLoad(options) {
+		setFormList(policyStr) {
 			let that = this;
-			console.log("options.jobId", options.jobId);
-			if (options.jobId) {
-				this.updateInfo.jobId = options.jobId;
-				this.updateInfo.jobName = options.jobName;
-			}
-			uni.setNavigationBarTitle({
-				title: options.title ? options.title : "报名",
-			});
-			if (options.type == 1 || options.type == 2) {
-				that.jobType = options.type;
-			}
-			if (options.agencyId) {
-				that.updateInfo.upAgencyId = options.agencyId;
-			}
-			this.updateInfo.interviewTimeStr = "";
-			setTimeout(() => {
-				that.IS_CREATOR = uni.getStorageSync("IS_CREATOR") == 1 ? true : false;
-				that.updateInfo.interviewTimeStr = "";
-				console.log("获取面试时间：", that.updateInfo.interviewTimeStr);
-				// 设置默认时间
-				let hour = new Date().getHours();
-				if (hour < 20 && hour >= 6) {
-					this.updateInfo.interviewTimeStr = dateUtil.formatDateYMD(new Date().toLocaleDateString()) +
-						" " + (hour + 1) + ":00";
-				} else if (hour >= 20) {
-					this.updateInfo.interviewTimeStr = dateUtil.formatDateYMD(new Date().toLocaleDateString()) +
-						" 19:30";
-				} else if (hour < 6) {
-					this.updateInfo.interviewTimeStr = dateUtil.formatDateYMD(new Date().toLocaleDateString()) +
-						" 6:00";
-				}
-				// that.updateInfo.interviewTimeStr = dateUtil.formatDateYMD(new Date().toLocaleDateString()) + " 06:00";
-				that.jobData = [{
+			if (that.isFans == 2) {
+				that.jobData = [
+					{
 						icon: "",
 						label: "报名职位",
 						result: that.updateInfo.jobName,
@@ -205,23 +269,65 @@
 						pColumn: 12,
 					},
 					{
-						icon: '',
-						label: '面试地址',
-						result: '',
-						value: that.updateInfo['interviewAddress'],
-						path: '',
+						icon: "",
+						label: "面试时间",
+						result: "",
+						path: "",
+						value: that.updateInfo.interviewTimeStr,
+						tip: "slot-time",
+						require: true,
+						customRequire: true,
+						type: "slot",
+						pColumn: 12,
+						from: "reservation-time",
+					},
+					{
+						icon: "",
+						label: "面试地址",
+						result: "",
+						value: that.updateInfo["interviewAddress"],
+						path: "",
 						addressDetail: {
-							latitude: that.updateInfo['interviewLat'],
-							longitude: that.updateInfo['interviewLng'],
+							latitude: that.updateInfo["interviewLat"],
+							longitude: that.updateInfo["interviewLng"],
 						},
-						tip: 'slot-choose&input-address',
-						placeholder: '请选择面试地址',
-						type: 'slot',
-						fontSize: '16px',
+						tip: "slot-choose&input-address",
+						placeholder: "请选择面试地址",
+						type: "slot",
+						fontSize: "16px",
 						pColumn: 5,
 						pRow: 12,
 						require: false,
-						suffix: 'icon-dizhi1',
+						suffix: "icon-dizhi1",
+					},
+
+					{
+						icon: "",
+						label: "财务结算",
+						result: "",
+						path: "",
+						value: policyStr || "-",
+						tip: "slot-caiwu",
+						require: false,
+						customRequire: false,
+						type: "slot",
+						pColumn: 12,
+						from: "slot-caiwu",
+					},
+				];
+			} else {
+				that.jobData = [
+					{
+						icon: "",
+						label: "报名职位",
+						result: that.updateInfo.jobName,
+						path: '',
+						placeholder: "请选择报名职位",
+						fontColor: that.updateInfo.jobName == "请选择报名职位" ? "g_c_9" : "g_c_3",
+						tip: "applia-job",
+						require: true,
+						customRequire: true,
+						pColumn: 12,
 					},
 					{
 						icon: "",
@@ -241,7 +347,7 @@
 						label: "财务结算",
 						result: "",
 						path: "",
-						value: "-",
+						value: policyStr || "-",
 						tip: "slot-caiwu",
 						require: false,
 						customRequire: false,
@@ -250,381 +356,257 @@
 						from: "slot-caiwu",
 					},
 				];
-				that.$forceUpdate();
-				if (that.updateInfo.jobId) {
-					that.getJobDetail({
-						leafCateId: that.updateInfo.jobId,
-					});
-				}
-			}, 1);
+			}
 
+			that.$forceUpdate();
 		},
-		data() {
-			return {
-				IS_CREATOR: false,
-				jobType: 2,
-				cdnBaseImg: this.G.store().cdnBaseImg,
-				nation: nationlist.map((item, index) => {
-					return item.name;
-				}),
-				nationIndex: 0,
-				userTel: "",
-				info: {
-					name: "",
-					sex: "男",
-					age: "",
-					nation: "",
-					idCard: "",
-					address: "",
-				},
-				updateInfo: {
-					jobId: 0,
-					jobName: "请选择报名职位",
-					desp: "",
-					interviewTimeStr: "",
-				},
-				persenInfo: [],
-				agreeRadio: ["agree"],
-				jobData: [],
-				zhengceTextList: [],
-				btnLaoding: false
-			};
+		handleClickIDcard(e) {
+			this.info.idCard = e;
 		},
-		onShow() {
-			let that = this;
-			that.pageSpeed = -1;
 
+		clickDesp(e) {
+			this.updateInfo.desp = e.value;
 		},
-		methods: {
-			getTownsManInfo(info) {
-				console.log('info', info);
-				uni.$emit('getTownsman', {
-					info
-				})
-
-			},
-			getJobDetail($data) {
-				let that = this;
-				that.G.Get(
-					that.api.job_personDetail + "/" + $data.leafCateId, {
-						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";
-						console.log("政策列表：", res);
-						that.jobData = [{
-								icon: "",
-								label: "报名职位",
-								result: that.updateInfo.jobName,
-								path: "/root/other/search?from=record",
-								placeholder: "请选择报名职位",
-								fontColor: that.updateInfo.jobName == "请选择报名职位" ? "g_c_9" : "g_c_3",
-								tip: "applia-job",
-								require: true,
-								customRequire: true,
-								pColumn: 12,
-							},
-							{
-								icon: '',
-								label: '面试地址',
-								result: '',
-								value: that.updateInfo['interviewAddress'],
-								path: '',
-								addressDetail: {
-									latitude: that.updateInfo['interviewLat'],
-									longitude: that.updateInfo['interviewLng'],
-								},
-								tip: 'slot-choose&input-address',
-								placeholder: '请选择面试地址',
-								type: 'slot',
-								fontSize: '16px',
-								pColumn: 5,
-								pRow: 12,
-								require: false,
-								suffix: 'icon-dizhi1',
-							},
-							{
-								icon: "",
-								label: "面试时间",
-								result: "",
-								path: "",
-								value: that.updateInfo.interviewTimeStr,
-								tip: "slot-time",
-								require: true,
-								customRequire: true,
-								type: "slot",
-								pColumn: 12,
-								from: "reservation-time",
-							},
-							{
-								icon: "",
-								label: "财务结算",
-								result: "",
-								path: "",
-								value: policyStr,
-								tip: "slot-caiwu",
-								require: false,
-								customRequire: false,
-								type: "slot",
-								pColumn: 12,
-								from: "slot-caiwu",
-							},
-						];
-					}
-				);
-			},
-
-			handleClickIDcard(e) {
-				this.info.idCard = e;
-			},
-
-			clickDesp(e) {
-				this.updateInfo.desp = e.value;
-			},
-			changePage(e) {
+		changePage(e) {
+			uni.navigateTo({
+				url: e.path,
+			});
+		},
+		getInviteTime(e) {
+			console.log("获取预约面试时间：", e);
+			this.updateInfo.interviewTimeStr = e;
+		},
+		updateDom() {},
+		chooseAddress(e) {
+			let that = this;
+			console.log(e);
+			this.updateInfo.interviewLat = e.lat;
+			this.updateInfo.interviewLng = e.lng;
+			this.updateInfo.interviewAddress = e.address;
+			this.jobData[1].value = this.updateInfo.interviewAddress;
+			// billForm.value.storeAddr = e.address;
+			console.log("this.updateInfo", this.updateInfo);
+			console.log("e", e);
+			this.$forceUpdate();
+		},
+		changeAddress(e) {
+			this.updateInfo.interviewAddress = e;
+			console.log("this.updateInfo", this.updateInfo);
+			console.log("e", e);
+			// this.info.address = e;
+			this.$forceUpdate();
+		},
+		radioGroupChange(e) {},
+		goReturn() {
+			uni.navigateBack();
+		},
+		goPage($path) {
+			uni.navigateTo({
+				url: $path,
+			});
+		},
+		goFellow($item, $index) {
+			let that = this,
+				params = {},
+				info = null;
+			// 如果第一个老乡信息没有编辑, 则进行提示
+			// if (!that.persenInfo[0].userName && $item === "") {
+			// 	uni.showToast({
+			// 		title: "请先编辑第一个老乡信息",
+			// 		icon: "none",
+			// 	});
+			// 	return;
+			// }
+			if ($item) {
+				info = $item;
+				params = {
+					name: info.userName || "",
+					sex: info.sex,
+					age: info.age || "",
+					nation: info.nation || "",
+					tel: info.tel ? info.tel : "" || "",
+					idCard: info.idCard ? info.idCard : "" || "",
+					idCardImageUrl: info.idCardImageUrl ? info.idCardImageUrl : "",
+					address: info.address ? info.address : "",
+					imgs: info.imgs || "",
+					userName: info.userName || "",
+					index: $index,
+				};
+			}
+			console.log("params", params);
+			if (info) {
 				uni.navigateTo({
-					url: e.path,
+					url: "/root/home/editTownsman?" + that.G.objToStr(params),
 				});
-			},
-			getInviteTime(e) {
-				console.log("获取预约面试时间：", e);
-				this.updateInfo.interviewTimeStr = e;
-			},
-			updateDom() {
-
-			},
-			chooseAddress(e) {
-				let that = this;
-				console.log(e);
-				this.updateInfo.interviewLat = e.lat;
-				this.updateInfo.interviewLng = e.lng;
-				this.updateInfo.interviewAddress = e.address;
-				this.jobData[1].value = this.updateInfo.interviewAddress
-				// billForm.value.storeAddr = e.address;
-				console.log('this.updateInfo', this.updateInfo);
-				console.log('e', e);
-				this.$forceUpdate()
-			},
-			changeAddress(e) {
-				this.updateInfo.interviewAddress = e;
-				console.log('this.updateInfo', this.updateInfo);
-				console.log('e', e);
-				// this.info.address = e;
-				this.$forceUpdate()
-			},
-			radioGroupChange(e) {},
-			goReturn() {
-				uni.navigateBack();
-			},
-			goPage($path) {
+			} else {
 				uni.navigateTo({
-					url: $path,
+					url: "/root/home/editTownsman",
 				});
-			},
-			goFellow($item, $index) {
-				let that = this,
-					params = {},
-					info = null;
-				// 如果第一个老乡信息没有编辑, 则进行提示
-				// if (!that.persenInfo[0].userName && $item === "") {
-				// 	uni.showToast({
-				// 		title: "请先编辑第一个老乡信息",
-				// 		icon: "none",
-				// 	});
-				// 	return;
-				// }
-				if ($item) {
-					info = $item;
-					params = {
-						name: info.userName || "",
-						sex: info.sex,
-						age: info.age || "",
-						nation: info.nation || "",
-						tel: info.tel ? info.tel : "" || "",
-						idCard: info.idCard ? info.idCard : "" || "",
-						idCardImageUrl: info.idCardImageUrl ? info.idCardImageUrl : "",
-						address: info.address ? info.address : "",
-						imgs: info.imgs || "",
-						userName: info.userName || "",
-						index: $index,
+			}
+		},
+		handleClickMobile() {},
+		submitForm() {
+			let that = this;
+			if (!that.agreeRadio) {
+				uni.showToast({
+					icon: "none",
+					title: "请阅读协议",
+				});
+				return false;
+			}
+			if (!that.updateInfo.jobId) {
+				uni.showToast({
+					icon: "none",
+					title: "请选择职位",
+				});
+				return false;
+			}
+			if (that.persenInfo.length == 0) {
+				uni.showToast({
+					icon: "none",
+					title: "请输入老乡信息",
+				});
+				return false;
+			}
+			if (that.btnLaoding) {
+				return false;
+			}
+			that.btnLaoding = true;
+
+			let submitInfo = {
+				...that.updateInfo,
+			};
+			submitInfo.applyUserJson = JSON.stringify(
+				that.persenInfo.map((item) => {
+					return {
+						// interviewTime: dayjs(item.interviewTime).format("YYYY-MM-DD HH:mm"),
+						// receptionTime: item.receptionTime ? dayjs(item.receptionTime).format("YYYY-MM-DD HH:mm") : dayjs(item.interviewTime).format("YYYY-MM-DD HH:mm"),
+						idCard: item.idCard,
+						idCardImageUrl: item.idCardImageUrl,
+						userName: item.userName,
+						sex: item.sex,
+						age: item.age,
+						nation: item.nation,
+						tel: item.tel,
+						address: item.address,
+						userApplyOrderFiles:
+							item.imgs && item.imgs.length > 0
+								? item.imgs
+										.map((itm) => {
+											return itm;
+										})
+										.join(",")
+								: "",
+						// desp: item.desp,
+						// policyIdx: item.policyIdx,
+						// pickerStr: item.pickerStr,
 					};
-				}
-				console.log('params', params);
-				if (info) {
-					uni.navigateTo({
-						url: "/root/home/editTownsman?" + that.G.objToStr(params),
-					});
-				} else {
-					uni.navigateTo({
-						url: "/root/home/editTownsman",
-					});
-				}
-			},
-			handleClickMobile() {},
-			submitForm() {
-				let that = this;
-				if (!that.agreeRadio) {
-					uni.showToast({
-						icon: "none",
-						title: "请阅读协议",
-					});
-					return false;
-				}
-				if (!that.updateInfo.jobId) {
-					uni.showToast({
-						icon: "none",
-						title: "请选择职位",
-					});
-					return false;
-				}
-				if (that.persenInfo.length == 0) {
-					uni.showToast({
-						icon: "none",
-						title: "请输入老乡信息",
-					});
-					return false;
-				}
-				if (that.btnLaoding) {
-					return false
-				}
-				that.btnLaoding = true
+				})
+			);
+			console.log("submitInfo", submitInfo);
+			// return
+			that.G.Post("/yishoudan/common/order/addBatch", submitInfo, (res) => {
+				// uni.hideLoading();
+				uni.showToast({
+					icon: "success",
+					title: "报名成功",
+					duration: 2000,
+				});
+				// that.persenInfo = [];
+				that.btnLaoding = false;
 
-				let submitInfo = {
-					...that.updateInfo,
-				}
-				submitInfo.applyUserJson = JSON.stringify(
-					that.persenInfo.map((item) => {
-						return {
-							// interviewTime: dayjs(item.interviewTime).format("YYYY-MM-DD HH:mm"),
-							// receptionTime: item.receptionTime ? dayjs(item.receptionTime).format("YYYY-MM-DD HH:mm") : dayjs(item.interviewTime).format("YYYY-MM-DD HH:mm"),
-							idCard: item.idCard,
-							idCardImageUrl: item.idCardImageUrl,
-							userName: item.userName,
-							sex: item.sex,
-							age: item.age,
-							nation: item.nation,
-							tel: item.tel,
-							address: item.address,
-							userApplyOrderFiles: item.imgs && item.imgs.length > 0 ?
-								item.imgs
-								.map((itm) => {
-									return itm
-								})
-								.join(',') :
-								'',
-							// desp: item.desp,
-							// policyIdx: item.policyIdx,
-							// pickerStr: item.pickerStr,
-						}
-					})
-				)
-				console.log('submitInfo', submitInfo);
-				// return
-				that.G.Post('/yishoudan/common/order/addBatch', submitInfo, (res) => {
-					// uni.hideLoading();
-					uni.showToast({
-						icon: "success",
-						title: "报名成功",
-						duration: 2000,
+				// that.$forceUpdate();
+				setTimeout(() => {
+					uni.navigateTo({
+						url: "/root/home/applicationSuccess",
 					});
-					// that.persenInfo = [];
-					that.btnLaoding = false
-
-					// that.$forceUpdate();
-					setTimeout(() => {
-						uni.navigateTo({
-							url: "/root/home/applicationSuccess",
-						});
-					}, 1500);
+				}, 1500);
+			});
+		},
+		submitFormSub($item) {
+			let that = this;
+			// uni.navigateTo({
+			// 	url: "/root/home/applicationSuccess",
+			// });
+			// return;
+			let submitInfo = {
+				...that.updateInfo,
+				...$item,
+			};
+			if (!submitInfo.userName) {
+				uni.showToast({
+					icon: "none",
+					title: "请编辑用户信息",
 				});
-			},
-			submitFormSub($item) {
-				let that = this;
-				// uni.navigateTo({
-				// 	url: "/root/home/applicationSuccess",
-				// });
-				// return;
-				let submitInfo = {
-					...that.updateInfo,
-					...$item,
-				};
-				if (!submitInfo.userName) {
-					uni.showToast({
-						icon: "none",
-						title: "请编辑用户信息",
-					});
-					return false;
-				}
-				uni.showLoading({
-					title: "提交中",
+				return false;
+			}
+			uni.showLoading({
+				title: "提交中",
+			});
+			// submitInfo.sex = submitInfo.sex == "男" ? 1 : 2;
+			if (submitInfo.imgs && submitInfo.imgs.length > 0) {
+				submitInfo.imgs = submitInfo.imgs.join(",");
+			}
+			that.G.Post(that.api.job_recordJob, submitInfo, (res) => {
+				// uni.hideLoading();
+				uni.showToast({
+					icon: "success",
+					title: "报名成功",
+					duration: 2000,
 				});
-				// submitInfo.sex = submitInfo.sex == "男" ? 1 : 2;
-				if (submitInfo.imgs && submitInfo.imgs.length > 0) {
-					submitInfo.imgs = submitInfo.imgs.join(",");
-				}
-				that.G.Post(that.api.job_recordJob, submitInfo, (res) => {
-					// uni.hideLoading();
-					uni.showToast({
-						icon: "success",
-						title: "报名成功",
-						duration: 2000,
-					});
-					// that.persenInfo = [];
+				// that.persenInfo = [];
 
-					// that.$forceUpdate();
-					setTimeout(() => {
-						uni.navigateTo({
-							url: "/root/home/applicationSuccess",
-						});
-					}, 1500);
-				});
-				// setTimeout(() => {
-				// 	uni.navigateTo({
-				// 		url: "/root/home/applicationSuccess",
-				// 	});
-				// }, 500);
-			},
+				// that.$forceUpdate();
+				setTimeout(() => {
+					uni.navigateTo({
+						url: "/root/home/applicationSuccess",
+					});
+				}, 1500);
+			});
+			// setTimeout(() => {
+			// 	uni.navigateTo({
+			// 		url: "/root/home/applicationSuccess",
+			// 	});
+			// }, 500);
 		},
-	};
+	},
+};
 </script>
 
 <style lang="scss">
-	.p-root-home-quick {
-		min-height: 100%;
+.p-root-home-quick {
+	min-height: 100%;
 
-		.fs_top {
-			.m-set {
-				border-bottom-left-radius: 0;
-				border-bottom-right-radius: 0;
-			}
+	.fs_top {
+		.m-set {
+			border-bottom-left-radius: 0;
+			border-bottom-right-radius: 0;
 		}
+	}
 
-		.fs_bottom {
-			.m-set {
-				border-top-left-radius: 0;
-				border-top-right-radius: 0;
+	.fs_bottom {
+		.m-set {
+			border-top-left-radius: 0;
+			border-top-right-radius: 0;
 
-				.item {
-					position: relative;
+			.item {
+				position: relative;
 
-					&::before {
-						content: "";
-						position: absolute;
-						top: 0;
-						left: 10px;
-						border-top: 1rpx solid #eee;
-						height: 1rpx solid #eee;
-						width: calc(100% - 20px);
-					}
+				&::before {
+					content: "";
+					position: absolute;
+					top: 0;
+					left: 10px;
+					border-top: 1rpx solid #eee;
+					height: 1rpx solid #eee;
+					width: calc(100% - 20px);
 				}
 			}
 		}
+	}
 
-		.text-wrap {
-			white-space: pre-wrap;
-		}
+	.text-wrap {
+		white-space: pre-wrap;
 	}
-</style>
\ No newline at end of file
+}
+</style>
diff --git a/root/person/changeUser.vue b/root/person/changeUser.vue
index acf2a67..1310f5b 100644
--- a/root/person/changeUser.vue
+++ b/root/person/changeUser.vue
@@ -40,6 +40,18 @@
 					<!-- #endif -->
 				</slot>
 			</g-panel-form-slot>
+			<view class="g_flex_row_end" hover-class="none" hover-stop-propagation="false"
+				    style="padding: 10px 22px;"
+			>
+				<view class="" 
+					    style="position: relative;font-size: 14px;color: #576b95;"
+				>
+					获取微信昵称
+					<button open-type="getUserInfo" @getuserinfo="getUserInfo"
+								  style="position: absolute;left: 0;top: 0;width: 100%;height: 100%;opacity: 0;color: #576b95;"
+					>获取微信昵称</button>
+				</view>
+			</view>
 			<view class="g_flex_row_center" style="margin-top:90px">
 				<g-button btnText="提交" type="primary" @clickBtn="submitForm" />
 			</view>
@@ -105,6 +117,10 @@ export default {
 		});
 	},
 	methods: {
+		getUserInfo(e){
+			console.log(e)
+			this.info.value = e.detail.userInfo.nickName;
+		},
 		submitForm() {
 			let that = this;
 			if (that.info.value == "") {
diff --git a/root/person/loginIndex.vue b/root/person/loginIndex.vue
index 02d109f..ae1082e 100644
--- a/root/person/loginIndex.vue
+++ b/root/person/loginIndex.vue
@@ -1,51 +1,51 @@
 <template>
-  <view class="p-login-index">
-    <!-- 15936360682 -->
-    <view class="g_h_70"></view>
-    <view class="g_flex_row_center g_mb_10">
-      <img :src="v3BaseImg + 'bmzz.svg'" alt class="g_w_56 g_h_56 g_radius_8" />
-    </view>
-    <view style="font-size: 18px; font-weight: 400; color: #919191; line-height: 25px; margin-bottom: 60px; text-align: center">劳务上下游收发单工具</view>
-    <view class="m-form g_mb_50 g_pl_40 g_pr_40">
-      <view class="g_bg_f_5 g_radius_6 g_pl_16 g_pr_16 g_flex_column_center g_pt_10 g_pb_10 g_mb_20">
-        <u-input maxlength="11" v-model="form.tel" type="number" class="g_fs_16" placeholder="请输入手机号" placeholder-style="color:#999999;font-size:32rpx;line-height:1" />
-      </view>
-      <view class="g_bg_f_5 g_radius_6 g_pl_16 g_flex_column_center g_position_rela" v-if="isLoginCode">
-        <view class="g_flex_row_between">
-          <view class="g_flex_1 g_mr_20 g_pt_10 g_pb_10">
-            <u-input maxlength="4" v-model="msgCode.code" @input="hideKeyboard" type="number" class="g_fs_16" placeholder="请输入验证码" placeholder-style="color:#999999;font-size:32rpx;line-height:1" />
-          </view>
-          <view class="btn-text g_flex_column_center g_bg_f_5 g_radius_6 g_flex_none g_pt_8 g_pb_8" @click="handleSendMsg">
-            <button :class="form.tel.length == 11 ? (msgCode.countdown > 0 ? 'g_c_9' : 'g_c_main') : 'g_c_9'" class="btn-con g_w_126 g_flex_row_center" style="font-size: 32rpx">{{ msgCode.btnText }}</button>
-          </view>
-        </view>
-      </view>
-      <view v-if="!isLoginCode" class="g_bg_f_5 g_radius_6 g_pl_16 g_pr_16 g_flex_column_center g_pt_10 g_pb_10">
-        <u-input v-model="form.pwd" type="password" class="g_fs_16" placeholder="请输入密码" placeholder-style="color:#999999;font-size:32rpx;line-height:1" />
-      </view>
-      <view class="g_fs_14 g_pl_16 g_mt_8" style="color: #576b95" @click="isLoginCode = !isLoginCode" v-if="false">{{ isLoginCode ? "密码登录" : "验证码登录" }}</view>
-    </view>
-    <view>
-      <view class="g_flex_row_center">
-        <g-button btnText="登录/注册" type="primary" @clickBtn="goHome" width="260" height="48" />
-      </view>
+	<view class="p-login-index">
+		<!-- 15936360682 -->
+		<view class="g_h_70"></view>
+		<view class="g_flex_row_center g_mb_10">
+			<img :src="v3BaseImg + 'bmzz.svg'" alt class="g_w_56 g_h_56 g_radius_8" />
+		</view>
+		<view style="font-size: 18px; font-weight: 400; color: #919191; line-height: 25px; margin-bottom: 60px; text-align: center">劳务上下游收发单工具</view>
+		<view class="m-form g_mb_50 g_pl_40 g_pr_40">
+			<view class="g_bg_f_5 g_radius_6 g_pl_16 g_pr_16 g_flex_column_center g_pt_10 g_pb_10 g_mb_20">
+				<u-input maxlength="11" v-model="form.tel" type="number" class="g_fs_16" placeholder="请输入手机号" placeholder-style="color:#999999;font-size:32rpx;line-height:1" />
+			</view>
+			<view class="g_bg_f_5 g_radius_6 g_pl_16 g_flex_column_center g_position_rela" v-if="isLoginCode">
+				<view class="g_flex_row_between">
+					<view class="g_flex_1 g_mr_20 g_pt_10 g_pb_10">
+						<u-input maxlength="4" v-model="msgCode.code" @input="hideKeyboard" type="number" class="g_fs_16" placeholder="请输入验证码" placeholder-style="color:#999999;font-size:32rpx;line-height:1" />
+					</view>
+					<view class="btn-text g_flex_column_center g_bg_f_5 g_radius_6 g_flex_none g_pt_8 g_pb_8" @click="handleSendMsg">
+						<button :class="form.tel.length == 11 ? (msgCode.countdown > 0 ? 'g_c_9' : 'g_c_main') : 'g_c_9'" class="btn-con g_w_126 g_flex_row_center" style="font-size: 32rpx">{{ msgCode.btnText }}</button>
+					</view>
+				</view>
+			</view>
+			<view v-if="!isLoginCode" class="g_bg_f_5 g_radius_6 g_pl_16 g_pr_16 g_flex_column_center g_pt_10 g_pb_10">
+				<u-input v-model="form.pwd" type="password" class="g_fs_16" placeholder="请输入密码" placeholder-style="color:#999999;font-size:32rpx;line-height:1" />
+			</view>
+			<view class="g_fs_14 g_pl_16 g_mt_8" style="color: #576b95" @click="isLoginCode = !isLoginCode" v-if="false">{{ isLoginCode ? "密码登录" : "验证码登录" }}</view>
+		</view>
+		<view>
+			<view class="g_flex_row_center">
+				<g-button btnText="登录/注册" type="primary" @clickBtn="goHome" width="260" height="48" />
+			</view>
+
+			<!-- #ifdef MP-WEIXIN -->
+			<view class="g_flex_row_center g_mt_24 g_mb_24">
+				<view class="g_flex_column_center">
+					<view class="bor g_w_90 g_h_1 g_border_e_b"></view>
+				</view>
+				<view class="g_flex_column_center g_fs_15 g_c_9 g_ml_9 g_mr_9">或</view>
+				<view class="g_flex_column_center">
+					<view class="bor g_w_90 g_h_1 g_border_e_b"></view>
+				</view>
+			</view>
+			<view class="g_mt_24 g_flex_row_center">
+				<g-button width="260" height="48" btnText="一键免密登录" type="default" openType="getPhoneNumber" @clickTel="getphonenumber" />
+			</view>
+			<!-- #endif -->
+		</view>
 
-      <!-- #ifdef MP-WEIXIN -->
-      <view class="g_flex_row_center g_mt_24 g_mb_24">
-        <view class="g_flex_column_center">
-          <view class="bor g_w_90 g_h_1 g_border_e_b"></view>
-        </view>
-        <view class="g_flex_column_center g_fs_15 g_c_9 g_ml_9 g_mr_9">或</view>
-        <view class="g_flex_column_center">
-          <view class="bor g_w_90 g_h_1 g_border_e_b"></view>
-        </view>
-      </view>
-      <view class="g_mt_24 g_flex_row_center">
-        <g-button width="260" height="48" btnText="一键免密登录" type="default" openType="getPhoneNumber" @clickTel="getphonenumber" />
-      </view>
-      <!-- #endif -->
-    </view>
-	
 		<!-- <view class="g_flex_column_between g_flex_1 g_pb_24">
 			<view class="g_fs_12 g_c_9 g_flex_row_center g_mb_32" style="align-items: center; margin-top: 16px">
 				<radio-group class="dib">
@@ -57,350 +57,354 @@
 				<navigator url="/root/person/agreePrive" class="g_c_sub">《隐私政策》</navigator>
 			</view>
 		</view> -->
-  </view>
+	</view>
 </template>
 
 <script>
 export default {
-  onShareAppMessage() {
-    return this.G.shareFun()
-  },
-  data() {
-    return {
-		switchChecked: false,
-      localBaseImg: this.G.store().localBaseImg,
-      v3BaseImg: this.G.store().v3BaseImg,
-      isLoginCode: false,
-      form: {
-        tel: '',
-        pwd: '',
-      },
+	onShareAppMessage() {
+		return this.G.shareFun();
+	},
+	data() {
+		return {
+			switchChecked: false,
+			localBaseImg: this.G.store().localBaseImg,
+			v3BaseImg: this.G.store().v3BaseImg,
+			isLoginCode: false,
+			form: {
+				tel: "",
+				pwd: "",
+			},
 
-      path: '',
-      level: '',
+			path: "",
+			level: "",
 
-      msgCode: {
-        // 短信倒计时
-        code: '',
-        btnText: '获取验证码', // 6s
-        countdown: 0,
-        timer: null,
-      },
-      fromPageType: '',
-      currentId: null,
-    }
-  },
-  onLoad(options) {
-    console.log('登录页：', options)
-    this.path = options.path ? options.path : ''
-    this.level = options.level ? options.level : ''
-    if (options.type) {
-      this.setOptions(options)
-    }
-    console.log('123')
-    this.getCode((res) => {
-      uni.setStorageSync('apply-code', res)
-    })
-  },
+			msgCode: {
+				// 短信倒计时
+				code: "",
+				btnText: "获取验证码", // 6s
+				countdown: 0,
+				timer: null,
+			},
+			fromPageType: "",
+			currentId: null,
+		};
+	},
+	onLoad(options) {
+		console.log("登录页：", options);
+		this.path = options.path ? options.path : "";
+		this.level = options.level ? options.level : "";
+		if (options.type) {
+			this.setOptions(options);
+		}
+		console.log("123");
+		this.getCode((res) => {
+			uni.setStorageSync("apply-code", res);
+		});
+	},
 
-  onShow() {
-    this.G.clearLocalStorage()
-  },
-  onHide() {
-    if (this.msgCode.timer) {
-      clearInterval(this.msgCode.timer)
-    }
-  },
-  methods: {
-	  switchChange() {
-	  	  console.log('switchChecked', this.switchChecked);
-	  	console.log(this.switchChecked);
-	  	this.switchChecked = !this.switchChecked;
-	  },
-    hideKeyboard(e) {
-      console.log(e)
-      if (e.length >= 4) {
-        console.log('123123123')
-        uni.hideKeyboard()
-      }
-    },
-    setOptions(options) {
-      console.log('options', options)
-      this.fromPageType = options.type
-      if (options.type == 'detail') {
-        this.currentId = options.id
-      }
-    },
-    goHome() {
-      let that = this,
-        url = '',
-        params = {}
-      if (that.form.tel == '') {
-        uni.showToast({
-          title: '请输入手机号',
-          icon: 'none',
-        })
-        return false
-      }
-      if (!/^[1][3,4,5,6,7,8,9][0-9]{9}$/.test(that.form.tel)) {
-        uni.showToast({
-          title: '请输入正确的手机号',
-          icon: 'none',
-        })
-        return false
-      }
+	onShow() {
+		this.G.clearLocalStorage();
+	},
+	onHide() {
+		if (this.msgCode.timer) {
+			clearInterval(this.msgCode.timer);
+		}
+	},
+	methods: {
+		switchChange() {
+			console.log("switchChecked", this.switchChecked);
+			console.log(this.switchChecked);
+			this.switchChecked = !this.switchChecked;
+		},
+		hideKeyboard(e) {
+			console.log(e);
+			if (e.length >= 4) {
+				console.log("123123123");
+				uni.hideKeyboard();
+			}
+		},
+		setOptions(options) {
+			console.log("options", options);
+			this.fromPageType = options.type;
+			if (options.type == "detail") {
+				this.currentId = `id%3D${JSON.parse(options.scene).id}`;
+        console.log('this.currentId',this.currentId);
+			}
+		},
+		goHome() {
+			let that = this,
+				url = "",
+				params = {};
+			if (that.form.tel == "") {
+				uni.showToast({
+					title: "请输入手机号",
+					icon: "none",
+				});
+				return false;
+			}
+			if (!/^[1][3,4,5,6,7,8,9][0-9]{9}$/.test(that.form.tel)) {
+				uni.showToast({
+					title: "请输入正确的手机号",
+					icon: "none",
+				});
+				return false;
+			}
 
-      if (that.isLoginCode) {
-        // 验证码登录
-        if (that.msgCode.code == '') {
-          uni.showToast({
-            title: '请输入验证码',
-            icon: 'none',
-          })
-          return false
-        }
-        url = that.api.login_code
-        params = {
-          tel: that.form.tel,
-          code: that.msgCode.code,
-          loginType: 'login',
-          wxCode: '',
-        }
-      } else {
-        // 密码登录
-        if (that.form.pwd == '') {
-          uni.showToast({
-            title: '请输入密码',
-            icon: 'none',
-          })
-          return false
-        }
-        url = that.api.login_user
-        params = {
-          tel: that.form.tel,
-          password: that.form.pwd,
-          loginType: 'password',
-          wxCode: '',
-        }
-      }
-      uni.showLoading({
-        title: '登录中...',
-        mask: true,
-      })
-      // #ifdef MP-WEIXIN
-      uni.checkSession({
-        success() {
-          //session_key 未过期，并且在本生命周期一直有效
-          that.loginAccount(url, params)
-        },
-        fail() {
-          // session_key 已经失效，需要重新执行登录流程
-          that.getCode((res) => {
-            uni.setStorageSync('apply-code', res)
-            setTimeout(() => {
-              that.loginAccount(url, params)
-            }, 300)
-          })
-        },
-      })
-      // #endif
-      // #ifdef H5 || APP-PLUS || MP-TOUTIAO || MP-KUAISHOU
-      that.loginAccount(url, params)
-      // #endif
-    },
+			if (that.isLoginCode) {
+				// 验证码登录
+				if (that.msgCode.code == "") {
+					uni.showToast({
+						title: "请输入验证码",
+						icon: "none",
+					});
+					return false;
+				}
+				url = that.api.login_code;
+				params = {
+					tel: that.form.tel,
+					code: that.msgCode.code,
+					loginType: "login",
+					wxCode: "",
+					createFakerAgency: 1,
+				};
+			} else {
+				// 密码登录
+				if (that.form.pwd == "") {
+					uni.showToast({
+						title: "请输入密码",
+						icon: "none",
+					});
+					return false;
+				}
+				url = that.api.login_user;
+				params = {
+					tel: that.form.tel,
+					password: that.form.pwd,
+					loginType: "password",
+					wxCode: "",
+					createFakerAgency: 1,
+				};
+			}
+			uni.showLoading({
+				title: "登录中...",
+				mask: true,
+			});
+			// #ifdef MP-WEIXIN
+			uni.checkSession({
+				success() {
+					//session_key 未过期，并且在本生命周期一直有效
+					that.loginAccount(url, params);
+				},
+				fail() {
+					// session_key 已经失效，需要重新执行登录流程
+					that.getCode((res) => {
+						uni.setStorageSync("apply-code", res);
+						setTimeout(() => {
+							that.loginAccount(url, params);
+						}, 300);
+					});
+				},
+			});
+			// #endif
+			// #ifdef H5 || APP-PLUS || MP-TOUTIAO || MP-KUAISHOU
+			that.loginAccount(url, params);
+			// #endif
+		},
 
-    loginAccount(url, params) {
-      let that = this,
-        _params = {}
-      params.wxCode = uni.getStorageSync('apply-code')
-      _params = Object.assign(params, {
-        path: that.path,
-      })
-      console.log('登录参数：', _params, ' 获取分享参数：', uni.getStorageSync('apply-jobdetail-id'))
-      that.G.Get(url, _params, (res) => {
-        console.log('登录成功：', res)
-        that.setToken(res)
-      })
-    },
-    getCode(callback = () => {}) {
-      uni.login({
-        success(wxRes) {
-          callback(wxRes.code)
-        },
-        fail(res) {
-          console.log(res)
-        },
-      })
-    },
-    getphonenumber(e) {
-      let that = this
-      if (e.detail.code) {
-        // 允许授权。拿button返回信息换取token
-        uni.checkSession({
-          success() {
-            //session_key 未过期，并且在本生命周期一直有效
-            that.loginWX(e)
-          },
-          fail() {
-            // session_key 已经失效，需要重新执行登录流程
-            that.getCode((res) => {
-              uni.setStorageSync('apply-code', res)
-              setTimeout(() => {
-                that.loginWX(e)
-              }, 300)
-            })
-          },
-        })
-      } else {
-        // 拒绝授权。
-      }
-    },
-    loginWX(e) {
-      let that = this
-      that.G.Get(
-        that.api.login_getWxInfo,
-        {
-          code: uni.getStorageSync('apply-code'),
-          btnCode: e.detail.code,
-          iv: e.detail.iv,
-          encryptedData: e.detail.encryptedData,
-        },
-        (wxRes) => {
-          that.G.Get(
-            that.api.login_wechat,
-            {
-              openId: wxRes.openId,
-              tel: wxRes.phoneNumber,
-              unionid: wxRes.unionid,
-            },
-            (res) => {
-              that.setToken(res)
-            }
-          )
-        }
-      )
-    },
-    // 处理存储token
+		loginAccount(url, params) {
+			let that = this,
+				_params = {};
+			params.wxCode = uni.getStorageSync("apply-code");
+			_params = Object.assign(params, {
+				path: that.path,
+			});
+			console.log("登录参数：", _params, " 获取分享参数：", uni.getStorageSync("apply-jobdetail-id"));
+			that.G.Get(url, _params, (res) => {
+				console.log("登录成功：", res);
+				that.setToken(res);
+			});
+		},
+		getCode(callback = () => {}) {
+			uni.login({
+				success(wxRes) {
+					callback(wxRes.code);
+				},
+				fail(res) {
+					console.log(res);
+				},
+			});
+		},
+		getphonenumber(e) {
+			let that = this;
+			if (e.detail.code) {
+				// 允许授权。拿button返回信息换取token
+				uni.checkSession({
+					success() {
+						//session_key 未过期，并且在本生命周期一直有效
+						that.loginWX(e);
+					},
+					fail() {
+						// session_key 已经失效，需要重新执行登录流程
+						that.getCode((res) => {
+							uni.setStorageSync("apply-code", res);
+							setTimeout(() => {
+								that.loginWX(e);
+							}, 300);
+						});
+					},
+				});
+			} else {
+				// 拒绝授权。
+			}
+		},
+		loginWX(e) {
+			let that = this;
+			that.G.Get(
+				that.api.login_getWxInfo,
+				{
+					code: uni.getStorageSync("apply-code"),
+					btnCode: e.detail.code,
+					iv: e.detail.iv,
+					encryptedData: e.detail.encryptedData,
+				},
+				(wxRes) => {
+					that.G.Get(
+						that.api.login_wechat,
+						{
+							openId: wxRes.openId,
+							tel: wxRes.phoneNumber,
+							unionid: wxRes.unionid,
+							createFakerAgency: 1,
+						},
+						(res) => {
+							that.setToken(res);
+						}
+					);
+				}
+			);
+		},
+		// 处理存储token
 
-    setToken($data) {
-      let that = this
-      console.log('获取登录用户信息：', $data)
-      uni.hideLoading()
-      uni.setStorageSync('apply-userinfo', $data) // 获取用户信息, 参与实际逻辑
-      uni.setStorageSync('apply-userinfo-copy', JSON.stringify($data)) // 仅用于查看数据，不参与实际逻辑
-      uni.setStorageSync('apply-avatar', $data.imgSrc) // 单独存储 -- 头像，方便修改
-      uni.setStorageSync('apply-username', $data.userName) // 单独存储 -- 用户名，方便修改
-      uni.setStorageSync('apply-tel', $data.tel) // 单独存储 -- 手机号，方便修改
-      uni.setStorageSync('apply-token', $data.token) // 单独存储 -- token，方便获取
-      uni.setStorageSync('apply-agencyId', $data.user.agencyId) // 单独存储 -- 代理id，方便获取
-      uni.setStorageSync('apply-uid', $data.user.id) // 单独存储 -- 用户名，方便修改
-      uni.setStorageSync('apply-supplierAccount', $data.supplierAccount) // 单独存储 -- 是否是发单号，方便获取 0.不是发单号 1.是发单号
-      uni.$emit('isGlogin', {
-        uid: $data.user.id,
-      })
-      if (!that.path) {
-        uni.switchTab({
-          url: '/pages/home/index',
-        })
-      } else if (that.fromPageType == 'detail') {
-        uni.reLaunch({
-          url: `${that.path}?id=${that.currentId}`,
-        })
-        uni.navigateBack({
-          delta: 1,
-        })
-        return
-      } else {
-        // 固定跳首页
-        uni.reLaunch({
-          url: that.path,
-        })
-      }
-      // if ($data.agencyStatus == 1) {
-      that.G.Get(that.api.login_agencyInfo, {}, (aRes) => {
-        console.log('获取团队信息:', aRes)
-        uni.setStorageSync('agencyInfo', aRes.agency) // 1是创建者 2是普通成员
-        uni.setStorageSync('IS_CREATOR', aRes.agency.userId == $data.user.id || $data.admin == true ? 1 : 2) // 1是创建者 2是普通成员
+		setToken($data) {
+			let that = this;
+			console.log("获取登录用户信息：", $data);
+			uni.hideLoading();
+			uni.setStorageSync("apply-userinfo", $data); // 获取用户信息, 参与实际逻辑
+			uni.setStorageSync("apply-userinfo-copy", JSON.stringify($data)); // 仅用于查看数据，不参与实际逻辑
+			uni.setStorageSync("apply-avatar", $data.imgSrc); // 单独存储 -- 头像，方便修改
+			uni.setStorageSync("apply-username", $data.userName); // 单独存储 -- 用户名，方便修改
+			uni.setStorageSync("apply-tel", $data.tel); // 单独存储 -- 手机号，方便修改
+			uni.setStorageSync("apply-token", $data.token); // 单独存储 -- token，方便获取
+			uni.setStorageSync("apply-agencyId", $data.user.agencyId); // 单独存储 -- 代理id，方便获取
+			uni.setStorageSync("apply-uid", $data.user.id); // 单独存储 -- 用户名，方便修改
+			uni.setStorageSync("apply-supplierAccount", $data.supplierAccount); // 单独存储 -- 是否是发单号，方便获取 0.不是发单号 1.是发单号
+			uni.$emit("isGlogin", {
+				uid: $data.user.id,
+			});
+			if (!that.path) {
+				uni.switchTab({
+					url: "/pages/home/index",
+				});
+			} else if (that.fromPageType == "detail") {
+				uni.reLaunch({
+					url: `${that.path}?scene=${that.currentId}`,
+				});
+				// uni.navigateBack({
+				//   delta: 1,
+				// })
+				return;
+			} else {
+				// 固定跳首页
+				uni.reLaunch({
+					url: that.path,
+				});
+			}
+			if ($data.agencyStatus == 1) {
+				that.G.Get(that.api.login_agencyInfo, {}, (aRes) => {
+					console.log("获取团队信息:", aRes);
+					uni.setStorageSync("agencyInfo", aRes.agency); // 1是创建者 2是普通成员
+					uni.setStorageSync("IS_CREATOR", aRes.agency.userId == $data.user.id || $data.admin == true ? 1 : 2); // 1是创建者 2是普通成员
 
-        // 登录跳转到首页的判断
-        uni.setStorageSync('SHOW_INVITE', 1)
-      })
-      // }
-    },
+					// 登录跳转到首页的判断
+					uni.setStorageSync("SHOW_INVITE", 1);
+				});
+			}
+		},
 
-    // 发送验证码
-    handleSendMsg() {
-      let that = this
-      if (this.msgCode.countdown > 0) {
-        return false
-      }
-      if (that.form.tel == '') {
-        uni.showToast({
-          title: '请输入手机号后再获取',
-          icon: 'none',
-        })
-        return false
-      }
-      if (!/^[1][3,4,5,6,7,8,9][0-9]{9}$/.test(that.form.tel)) {
-        uni.showToast({
-          title: '请输入正确的手机号',
-          icon: 'none',
-        })
-        return false
-      }
-      that.G.Get(
-        that.api.login_sendMsg,
-        {
-          tel: that.form.tel,
-		  type:"assistant",
-        },
-        (res) => {
-          that.msgCode.countdown = 60
-          that.msgCode.btnText = that.msgCode.countdown + 's'
-          clearInterval(that.msgCode.timer)
-          that.msgCode.timer = setInterval(() => {
-            if (that.msgCode.countdown > 0) {
-              that.msgCode.countdown--
-              that.msgCode.btnText = that.msgCode.countdown + 's'
-            } else {
-              clearInterval(that.msgCode.timer)
-              that.msgCode.timer = null
-              that.msgCode.btnText = '获取验证码'
-            }
-          }, 1000)
-        }
-      )
-    },
-  },
-}
+		// 发送验证码
+		handleSendMsg() {
+			let that = this;
+			if (this.msgCode.countdown > 0) {
+				return false;
+			}
+			if (that.form.tel == "") {
+				uni.showToast({
+					title: "请输入手机号后再获取",
+					icon: "none",
+				});
+				return false;
+			}
+			if (!/^[1][3,4,5,6,7,8,9][0-9]{9}$/.test(that.form.tel)) {
+				uni.showToast({
+					title: "请输入正确的手机号",
+					icon: "none",
+				});
+				return false;
+			}
+			that.G.Get(
+				that.api.login_sendMsg,
+				{
+					tel: that.form.tel,
+					type: "assistant",
+				},
+				(res) => {
+					that.msgCode.countdown = 60;
+					that.msgCode.btnText = that.msgCode.countdown + "s";
+					clearInterval(that.msgCode.timer);
+					that.msgCode.timer = setInterval(() => {
+						if (that.msgCode.countdown > 0) {
+							that.msgCode.countdown--;
+							that.msgCode.btnText = that.msgCode.countdown + "s";
+						} else {
+							clearInterval(that.msgCode.timer);
+							that.msgCode.timer = null;
+							that.msgCode.btnText = "获取验证码";
+						}
+					}, 1000);
+				}
+			);
+		},
+	},
+};
 </script>
 
 <style lang="scss">
 .p-login-index {
-  /* #ifdef MP-TOUTIAO || MP-KUAISHOU */
-  min-height: 100%;
-  background-color: #fff;
-  /* #endif */
-  .btn-text {
-    .btn-con {
-      border-left: 2rpx solid #e5e5e5;
-      padding: 0 32rpx;
-      background-color: transparent;
-      border-radius: 0;
-      height: 40rpx;
-      line-height: 40rpx;
-    }
-  }
+	/* #ifdef MP-TOUTIAO || MP-KUAISHOU */
+	min-height: 100%;
+	background-color: #fff;
+	/* #endif */
+	.btn-text {
+		.btn-con {
+			border-left: 2rpx solid #e5e5e5;
+			padding: 0 32rpx;
+			background-color: transparent;
+			border-radius: 0;
+			height: 40rpx;
+			line-height: 40rpx;
+		}
+	}
 
-  .tel-btn {
-    width: 500rpx;
-    height: 84rpx;
-    border: 2rpx solid #00b666;
-    left: 50%;
-    transform: translateX(-50%);
-    top: 0;
-    border-radius: 48rpx;
-    opacity: 0;
-  }
+	.tel-btn {
+		width: 500rpx;
+		height: 84rpx;
+		border: 2rpx solid #00b666;
+		left: 50%;
+		transform: translateX(-50%);
+		top: 0;
+		border-radius: 48rpx;
+		opacity: 0;
+	}
 }
 </style>
diff --git a/root/person/set.vue b/root/person/set.vue
index 25324ef..f360b07 100644
--- a/root/person/set.vue
+++ b/root/person/set.vue
@@ -19,7 +19,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="g_fs_14 g_mt_4 g_pl_10 g_c_9"> 关闭后，首页收到的发单号邀请不再主动弹出 </view>
+			<view class="g_fs_14 g_mt_8 g_pl_20 g_c_9"> 关闭后，首页收到的发单号邀请不再主动弹出 </view>
 		</view>
 		<g-panel-form-item
 			:list="[
diff --git a/root/person/teamManage.vue b/root/person/teamManage.vue
index 592efe3..3b8224a 100644
--- a/root/person/teamManage.vue
+++ b/root/person/teamManage.vue
@@ -11,29 +11,53 @@
 							<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_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="g_mb_12">
+						<g-panel-form-item
+							:list="[
+								{
+									icon: '',
+									label: agencyInfo.fullName || agencyInfo.userName,
+									result: '',
+									path: '',
+									pRow: 12,
+									itype: 'icon',
+								},
+							]"
+							@clickItem="openChoose"
+						/>
+					</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">
+						<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 g_fw_500" v-for="i in item.agencyRoleNameList" :class="i ? (i == '创建人' ? 'creator' : i == '管理员' ? 'manager' : 'member') : ''">{{ i }}</div>
+								<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>
 							</div>
-							<div class="g_flex_row_end flex_center g_c_6">
+							<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_9"></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 v-if="false">
 					<div class="g_flex_row_center">
-						<div class="g_w_128 g_mr_20">
+						<div class="g_w_200 g_mr_20">
 							<g-button btnText="手动添加" size="auto" @clickBtn="goPage('/root/person/addOrUpdataMember')"></g-button>
 						</div>
-						<div class="g_w_128">
+						<!-- <div class="g_w_128">
 							<g-button btnText="微信邀请" size="auto" type="primary" class @clickBtn="goPage('/root/person/memberApplyQRCode')"></g-button>
-						</div>
+						</div> -->
 					</div>
 				</g-panel-fixed>
 				<!-- <div class="g_h_24"></div> -->
@@ -129,6 +153,20 @@ export default {
 				that.applyNum = res;
 			});
 		},
+		openChoose(){
+			console.log('openChoose')
+			uni.showActionSheet({
+				itemList: ['添加团队成员', '修改企业资料'],
+				success: (res) => {
+					console.log(res)
+					if(res.tapIndex == 0){
+						this.goPage('/root/person/addOrUpdataMember')
+					}else if(res.tapIndex == 1){
+						this.goPage('/root/person/info?active=1')
+					}
+				}
+			})
+		}
 	},
 };
 </script>
@@ -140,7 +178,7 @@ export default {
 	background-color: #fff2f0;
 }
 .member {
-	color: rgba(0, 0, 0, 0.88);
+	color: #666;
 	// border: 1px solid #f9676e;
 	background-color: rgba(0, 0, 0, 0.04);
 }
diff --git a/static/css/iconfont.css b/static/css/iconfont.css
index 6a1e456..feb28a3 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('https://at.alicdn.com/t/c/font_4374774_rju4btsrrtq.woff2?t=1751011994815') format('woff2'),
-       url('https://at.alicdn.com/t/c/font_4374774_rju4btsrrtq.woff?t=1751011994815') format('woff'),
-       url('https://at.alicdn.com/t/c/font_4374774_rju4btsrrtq.ttf?t=1751011994815') format('truetype');
+  font-family: 'iconfont';  /* Project id 4374774 */
+  src: url('https://at.alicdn.com/t/c/font_4374774_t8oxmpbiwsm.woff2?t=1753957543436') format('woff2'),
+       url('https://at.alicdn.com/t/c/font_4374774_t8oxmpbiwsm.woff?t=1753957543436') format('woff'),
+       url('https://at.alicdn.com/t/c/font_4374774_t8oxmpbiwsm.ttf?t=1753957543436') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-yitingzhao:before {
+  content: "\e67b";
+}
+
 .icon-time-circle:before {
   content: "\e784";
 }
@@ -876,3 +880,4 @@
 .icon-leftArrows:before {
   content: "\100c6";
 }
+
diff --git a/utils/ajax.js b/utils/ajax.js
index f709e58..aadb6c7 100644
--- a/utils/ajax.js
+++ b/utils/ajax.js
@@ -116,6 +116,7 @@ let data = {
         // console.log('测试报错123123123123123123',res);
         // console.log('测试报错123123123123123123$url',$url);
         let resData = res.data;
+		
         if (resData.status == 200) {// 正常
           callback(resData.data, resData.msg);
         } else if (resData.status == 9999) {// 登录过期或者身份变动等需要登录的场景
@@ -137,6 +138,7 @@ let data = {
           // } else {
           uni.showToast({
             title: resData.msg,
+			// title:'系统异常，请稍后',
             icon: "none"
           });
           failback(resData.msg);
@@ -167,7 +169,8 @@ let data = {
       },
       fail (error) {
         uni.showToast({
-          title: error.errMsg,
+          // title: error.errMsg,
+		  title:'系统异常，请稍后',
           icon: "none"
         })
         failback(error);
diff --git a/utils/common.js b/utils/common.js
index 2ac06b8..f6a40ec 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -1260,7 +1260,7 @@ let data = {
     let totalWidth = 0;
     segments.forEach((segment) => {
       ctx.font = `${segment.fontWeight} ${segment.fontSize}px Arial`;
-      totalWidth += ((ctx.measureText(segment.content).width) + segment.space || 0);
+      totalWidth += ((ctx.measureText(segment.content).width) + (segment.space || 0));
     });
     return totalWidth;
   },
@@ -1269,7 +1269,7 @@ let data = {
 
     // 计算总宽度
     const totalWidth = this.calculateTotalWidth(ctx, textSegments);
-
+    console.log('totalWidth', totalWidth, textSegments);
     // 计算起始X坐标（居中位置）
     const centerX = x;
     const startX = (centerX - totalWidth) / 2;
@@ -1288,7 +1288,7 @@ let data = {
       ctx.fillText(segment.content, currentX, centerY);
 
       // 更新X坐标，为下一段文本做准备, 文本长度为1的时候，使用字体大小
-      currentX += ((ctx.measureText(segment.content).width) + segment.space || 0);
+      currentX += ((ctx.measureText(segment.content).width) + (segment.space || 0));
     });
   },
   /**