diff --git a/App.vue b/App.vue
index e6df8ae..2fe5f81 100644
--- a/App.vue
+++ b/App.vue
@@ -1,6 +1,10 @@
 <script>
 export default {
+	globalData: {
+		timer: null, // 定时器变量
+	},
 	onShow: function (options) {
+		let that = this;
 		console.log("show 项目init：", options, decodeURIComponent(options.query.scene));
 		// 清除扫码获取的id信息
 		uni.removeStorageSync("scene");
@@ -25,8 +29,42 @@ export default {
 		} else {
 			uni.setStorageSync("apply-invite-code", "");
 		}
+		if (uni.getStorageSync("apply-token")) {
+			this.G.checkToken();
+		}
+		if (!that.globalData.timer) {
+			that.globalData.timer = setInterval(() => {
+				that.checkNum();
+			}, 1 * 30 * 1000);
+		}
 	},
 	onHide: function () {},
+	methods: {
+		checkNum() {
+			let that = this;
+			if (uni.getStorageSync("apply-token")) {
+				that.G.Get(
+					that.api.bind_getWaitNum + "/" + 1,
+					{
+						type: 2,
+					},
+					(res) => {
+						console.log("获取待处理数量：", res);
+						if (res.unread > 0) {
+							uni.setTabBarBadge({
+								index: 1,
+								text: String(res.unread),
+							});
+						} else {
+							uni.removeTabBarBadge({
+								index: 1,
+							});
+						}
+					}
+				);
+			}
+		},
+	},
 };
 </script>
 
diff --git a/api/order.js b/api/order.js
index 687fed9..4f6e6fd 100644
--- a/api/order.js
+++ b/api/order.js
@@ -1,6 +1,6 @@
 let orderInfo = {
 	order_list:"/assistant/apply/order/list",// 工单列表(旧)
-	order_list_new:"/yishoudan/user/apply/order/V2/list",// 工单列表(新)
+	order_list_new:"/yishoudan/user/apply/order/web/list",// 工单列表(新)
 	order_detail :"/assistant/apply/order/detail",// 工单详情(旧)
 	order_detail_new :"/yishoudan/user/apply/order/V2/details",// 工单详情(新)
 	order_update_detail :"/yishoudan/user/apply/order/V2/updateOrderInfo",// 工单信息修改
diff --git a/api/user.js b/api/user.js
index 8eed690..9192c02 100644
--- a/api/user.js
+++ b/api/user.js
@@ -28,7 +28,7 @@ let userInfo = {// 用户信息模块
   order_checkMemberDel: "/yishoudan/user/checkDelAgencyCorpUser",// 删除成员前校验
   order_delMember: "/yishoudan/user/delAgencyCorpUser",// 删除成员
   order_getCompanyQRCode: "/yishoudan/agency/group/user/apply/inviteImage",// 获取团队二维码
-  order_getAgencyById: "/agency/getAgencyById",// 获取代理信息
+  order_getAgencyByIdForApply: "/agency/getAgencyByIdForApply",// 获取代理信息
   order_addApply: "/yishoudan/agency/group/user/apply/addApply",// 申请加入团队
   order_checkHasApply: "/yishoudan/agency/group/user/apply/checkHasApply",// 是否申请过加入团队
   order_getNewApplyNum: "/yishoudan/agency/group/user/apply/getNewApplyNum",// 获取申请加入的成员数量
diff --git a/components/list/job.vue b/components/list/job.vue
index 97ea397..e0e608a 100644
--- a/components/list/job.vue
+++ b/components/list/job.vue
@@ -110,7 +110,7 @@
 								<i class="iconfont icon-gengduo2 icon g_c_b1" style="font-size: 32rpx"></i>
 							</view>
 						</view>
-						<view class="g_flex_row_between flex_center g_border_e_t g_p_8" v-else-if="from != 'mine' && userinfo.corpUserFlag">
+						<view class="g_flex_row_between flex_center g_border_e_t g_p_8">
 							<view class="g_c_6 g_fs_12 g_pr_4 g_radius_4 g_flex_row_start flex_center" style="background: #f1faff">
 								<img class="g_w_33 g_h_22 g_mr_4" src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/bocaigongyinglian/xmf.svg" alt="" />
 								{{ item.agencyName || "-" }}
diff --git a/components/quickLogin.vue b/components/quickLogin.vue
new file mode 100644
index 0000000..8a44c0d
--- /dev/null
+++ b/components/quickLogin.vue
@@ -0,0 +1,167 @@
+<template>
+	<button open-type="getPhoneNumber" @getphonenumber="onGetPhoneNumber" class="no_style">
+		<span class="biggerSize" hover-class="none" hover-stop-propagation="false">
+			<slot></slot>
+		</span>
+	</button>
+</template>
+
+<script>
+export default {
+	data() {
+		return {};
+	},
+	created() {
+		this.getCode((res) => {
+			uni.setStorageSync("apply-code", res);
+		});
+	},
+	props: {},
+	methods: {
+		onGetPhoneNumber(e) {
+			let that = this;
+			// that.$emit("successLogin");
+			// return;
+			console.log("e", e);
+			// 进行临时变量的判断, 如果在注册页面获取过手机号授权, 则不再重新获取手机号, 直接登录
+			if (uni.getStorageSync("TEMPORARY_CODE")) {
+				let wxRes = uni.getStorageSync("TEMPORARY_CODE");
+				that.G.Get(
+					that.api.login_wechat,
+					{
+						openId: wxRes.openId,
+						tel: wxRes.phoneNumber,
+						unionid: wxRes.unionid,
+					},
+					(res) => {
+						console.log("res", res);
+						that.setToken(res);
+					}
+				);
+				return;
+			}
+			if (e.detail.code) {
+				// 允许授权。拿button返回信息换取token
+				uni.checkSession({
+					success(e1) {
+						console.log("success", e1);
+						//session_key 未过期，并且在本生命周期一直有效
+						that.loginWX(e);
+					},
+					fail() {
+						// session_key 已经失效，需要重新执行登录流程
+						that.getCode((res) => {
+							console.log("res", res);
+
+							uni.setStorageSync("apply-code", res);
+							setTimeout(() => {
+								that.loginWX(e);
+							}, 300);
+						});
+					},
+				});
+			} else {
+				// 拒绝授权。
+			}
+		},
+		loginWX(e) {
+			let that = this;
+			console.log("loginWX", e);
+			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);
+						}
+					);
+				}
+			);
+		},
+		setToken($data) {
+			let that = this;
+
+			console.log("获取登录用户信息：", $data);
+			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-uid", $data.user.id); // 单独存储 -- 用户名，方便修改
+			uni.setStorageSync("apply-agencyId", $data.user.agencyId); // 单独存储 -- 代理id，方便获取
+			uni.setStorageSync("apply-supplierAccount", $data.supplierAccount); // 单独存储 -- 是否是发单号，方便获取 0.不是发单号 1.是发单号
+			uni.$emit("isGlogin", {
+				uid: $data.user.id,
+			});
+			that.G.Get(
+				that.api.user_checkPermission,
+				{},
+				(res) => {
+					console.log(res);
+					uni.setStorageSync("HAS_PERMISSION", 1); // 1.有权限 2.无权限
+				},
+				(err) => {
+					console.log(err);
+					if (err) {
+						uni.setStorageSync("HAS_PERMISSION", 2);
+					}
+				}
+			);
+			uni.removeStorageSync("TEMPORARY_CODE");
+			that.$emit("successLogin", $data);
+		},
+		getCode(callback = () => {}) {
+			uni.login({
+				success(wxRes) {
+					console.log("wxRes", wxRes);
+					callback(wxRes.code);
+				},
+				fail(res) {
+					console.log(res);
+				},
+			});
+		},
+	},
+};
+</script>
+
+<style>
+.no_style {
+	width: 100%;
+	height: 100%;
+	background-color: transparent;
+	border: none;
+	padding: 0;
+	margin: 0;
+	color: inherit;
+	font-size: inherit;
+	/* line-height: 0; */
+}
+.biggerSize {
+	position: relative;
+}
+.biggerSize::after {
+	content: "";
+	/* display: inline-block; */
+	width: 150%;
+	height: 140%;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	z-index: 99;
+	transform: translate(-50%, -50%);
+}
+</style>
diff --git a/components/unloginInfo.vue b/components/unloginInfo.vue
new file mode 100644
index 0000000..810dd1c
--- /dev/null
+++ b/components/unloginInfo.vue
@@ -0,0 +1,57 @@
+<template>
+	<div>
+		<view class="g_flex_column_between g_flex_1" style="background-color: #ededed; height: 100%; padding-top: 100px">
+			<view class="g_flex_column_start flex_center">
+				<view class="iconfont icon-info-circle-fill g_c_027" style="font-size: 80px"> </view>
+				<view class="g_fs_17 g_mb_16 g_mt_16"> 温馨提示 </view>
+				<view class="g_fs_13 g_c_9 g_mb_32 g_text_c g_ml_20 g_mr_20"> {{ !isLogin ? "相关功能仅对注册用户开放，请注册登录后查看。" : "平台仅面向企业用户开放，您需完成企业认证后使用。" }} </view>
+			</view>
+
+			<view class="" style="margin-bottom: 80px">
+				<g-button :btnText="!isLogin ? '登录查看' : '马上认证'" type="primary" @clickBtn="goPage('/root/other/tobeAgencyChoose')" />
+        <view class=""></view>
+				<!-- <view class="g_c_sub g_flex_row_center flex_center g_fs_14 g_mt_32" @click="serverPopShow = true"> <i class="iconfont icon-kefu"> </i>联系客服 </view> -->
+			</view>
+		</view>
+		<u-popup v-model="serverPopShow" mode="center" :mask-close-able="false" :closeable="true" @close="serverPopShow = false" border-radius="30">
+			<view style="">
+				<view style="text-align: center; font-size: 16px; color: #333; font-weight: 500; margin-bottom: 32px; padding-top: 32px">加客服微信</view>
+				<view style="padding: 64px; padding-top: 0">
+					<image :src="serviceInfo.qrCode" alt="" @longpress="downLoadImg" show-menu-by-longpress style="width: 184px; height: 184px" />
+				</view>
+			</view>
+		</u-popup>
+	</div>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			userInfo: {},
+			isLogin: false,
+			serverPopShow: false,
+			serviceInfo: {},
+		};
+	},
+	created() {
+		let that = this;
+		that.userInfo = uni.getStorageSync("apply-userinfo");
+		that.isLogin = uni.getStorageSync("apply-token") ? true : false;
+		// this.serviceInfo = uni.getStorageSync("bc-server");
+	},
+
+	methods: {
+		goPage(url) {
+			this.G.isLogin();
+			if (this.G.isLogin()) {
+				uni.navigateTo({
+					url,
+				});
+			}
+		},
+	},
+};
+</script>
+
+<style></style>
diff --git a/main.js b/main.js
index b6d7d5d..e2708a8 100644
--- a/main.js
+++ b/main.js
@@ -63,8 +63,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.是发单号
+          console.log('resresresresresresresres', res);
+          G.Get(apiInfo.login_agencyInfo, {}, (aRes) => {
+            console.log("获取团队信息:", 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是普通成员
 
-          resolve(res)
+            // 登录跳转到首页的判断
+            uni.setStorageSync("SHOW_INVITE", 1);
+            resolve(res)
+          });
         },
           function fail (err) {
             console.log(err);
@@ -85,7 +93,15 @@ export function createApp () {
           uni.setStorageSync("apply-agencyId", res.user.agencyId); // 单独存储 -- 代理id，方便获取
           uni.setStorageSync("apply-supplierAccount", res.supplierAccount); // 单独存储 -- 是否是发单号，方便获取 0.不是发单号 1.是发单号
 
-          resolve(res)
+          G.Get(apiInfo.login_agencyInfo, {}, (aRes) => {
+            console.log("获取团队信息:", 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)
+          });
         })
       })
     },
diff --git a/pages.json b/pages.json
index 7532baa..2260185 100644
--- a/pages.json
+++ b/pages.json
@@ -235,6 +235,24 @@
             "backgroundColorBottom": "#f5f5f5"
           }
         },
+        {
+          "path": "inviteFollowMe",
+          "style": {
+            "navigationBarTitleText": "邀请关注",
+            "backgroundColor": "#f5f5f5",
+            "backgroundColorTop": "#f5f5f5",
+            "backgroundColorBottom": "#f5f5f5"
+          }
+        },
+        {
+          "path": "inviteFollowSuccess",
+          "style": {
+            "navigationBarTitleText": "申请关注",
+            "backgroundColor": "#f5f5f5",
+            "backgroundColorTop": "#f5f5f5",
+            "backgroundColorBottom": "#f5f5f5"
+          }
+        },
         {
           "path": "feedback",
           "style": {
diff --git a/pages/apply/index.vue b/pages/apply/index.vue
index c9451e9..9e9e39e 100644
--- a/pages/apply/index.vue
+++ b/pages/apply/index.vue
@@ -28,7 +28,7 @@
 						<view class="g_h_10 g_bg_f_5"></view>
 					</view>
 					<view style="width: 100vw" class="g_border_e_b" v-if="isLogin">
-						<u-tabs :list="menuList" item-width="126" :current="menuActive" active-color="#00b666" bar-width="60" bar-height="6" font-size="32" @change="handleUpdateMenu" :gutter="22" duration="0.1" itemWidth="auto" height="84"></u-tabs>
+						<u-tabs :list="menuList" item-width="126" v-model="menuActive" active-color="#00b666" bar-width="60" bar-height="6" font-size="32" @change="handleUpdateMenu" :gutter="22" duration="0.1" itemWidth="auto" height="84"></u-tabs>
 					</view>
 				</view>
 				<!-- 面板 -->
@@ -157,11 +157,15 @@ export default {
 		let that = this;
 		if (options.status) {
 			that.menuActive = Number(options.status);
-			setTimeout(() => {
-				that.menuActive = Number(options.status);
-			}, 100);
+			// setTimeout(() => {
+			// 	that.menuActive = Number(options.status);
+			// }, 200);
 		}
 	},
+	created() {
+		let that = this;
+    console.log(12312312312);
+	},
 	onShow() {
 		let that = this;
 		// 导航栏高度信息
diff --git a/pages/login/index.vue b/pages/login/index.vue
index c2e1c92..6ccc2d1 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -41,7 +41,7 @@
 				</view>
 			</view>
 			<view class="g_mt_24 g_flex_row_center">
-				<g-button icon="icon-weixindibulan g_mr_8" width="260" height="48" btnText="微信快捷登录" type="default" openType="getPhoneNumber" @clickTel="getphonenumber" />
+				<g-button icon="icon-yemian-1 " width="260" height="48" btnText="一键免密登录" type="default" openType="getPhoneNumber" @clickTel="getphonenumber" />
 			</view>
 			<!-- #endif -->
 		</view>
diff --git a/pages/person/index.vue b/pages/person/index.vue
index eb97e82..dd1326b 100644
--- a/pages/person/index.vue
+++ b/pages/person/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="p-person-inedx g_w_all g_bg_f_5 g_kuaishou">
-		<view class="g_h_10"></view>
+		<view :class="isLogin ? 'g_h_36' : 'g_h_10'"></view>
 		<!-- 基本信息 -->
 		<g-panel-card-info
 			:info="{
@@ -10,7 +10,44 @@
 				isHaveOrder: isHaveOrder,
 			}"
 			@clickCard="goPage('/root/person/info')"
+			v-if="false"
 		/>
+		<view class="m-info g_p_16 g_bg_f g_m_10 g_radius_8 g_position_rela" v-if="isLogin" hover-class="none" style="margin-top: 0">
+			<view class="g_flex_row_start">
+				<view class="g_w_71">
+					<view class="g_position_abso g_p_4 g_radius_13 g_bg_f" style="top: -20px">
+						<g-panel-image :radius="13" :size="134" :url="userInfo.avatar" />
+					</view>
+				</view>
+				<view class="g_flex_1 g_ml_11">
+					<view class="g_flex_row_between flex_center">
+						<view class="g_flex_row_start flex_center" style="line-height: 22px">
+							<view class="g_flex_none g_ell_1 g_fs_20 g_fw_bold g_c_3" style="max-width: 240rpx">
+								{{ userInfo.name ? userInfo.name : "-" }}
+							</view>
+							<!-- <view class="g_ml_4 iconfont icon-gerenshiming g_fs_14" :class="userInfo.user.realName ? 'g_c_027' : 'g_c_8'"> </view> -->
+						</view>
+						<view class="g_flex_row_start flex_center g_fs_14 g_border_d g_radius_4 g_c_8 g_p_4" hover-class="thover" @click="goPage('/root/person/info?active=0')">
+							<i class="iconfont icon-edit g_fs_12 g_mr_4"></i>
+							编辑资料
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="g_flex_row_start flex_center g_mt_26 g_fs_16 g_c_8" hover-class="thover" @click="goPage('/root/person/info?active=1')">
+				<view class="">
+					{{ userInfo.agencyName || "未创建/加入企业" }}
+				</view>
+				<i class="iconfont icon-gengduo11" style="line-height: 22px; font-size: 10px"></i>
+			</view>
+		</view>
+		<view v-else @click="goPage" class="g_text_c g_pt_24 g_pb_24 g_c_f g_radius_8 g_bg_main g_ml_10 g_mr_10">
+			<view class="g_mb_12">
+				<image class="g_w_64 g_h_64 g_radius_50" src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/defaultAva.svg" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""> </image>
+			</view>
+			<view class="g_fs_18 g_fw_600 g_mb_4"> 登录/注册 </view>
+			<view class="g_fs_14"> 让天下没有难做的劳务 </view>
+		</view>
 		<view class="g_flex_row_between g_m_10" v-if="false">
 			<g-panel-fond
 				style="width: 100%"
@@ -245,34 +282,34 @@ export default {
 				},
 			];
 			// if (uni.getStorageSync("apply-supplierAccount") == 1) {
-				// 有
-				that.isHaveOrder = true;
-				if (that.isCreator) {
-					that.itemList = defaultList;
-				} else {
-					that.itemList = [
-						{
-							icon: "icon-wodetuandui",
-							label: "团队管理",
-							result: "",
-							path: "/root/person/teamManage",
-							pRow: 12,
-						},
-						{
-							icon: "icon-fankuiyujianyi",
-							label: "反馈与建议",
-							result: "",
-							path: "/root/person/feedback",
-							tip: "message",
-							pRow: 12,
-						},
-					];
-				}
+			// 有
+			that.isHaveOrder = true;
+			if (that.isCreator) {
+				that.itemList = defaultList;
+			} else {
+				that.itemList = [
+					{
+						icon: "icon-wodetuandui",
+						label: "团队管理",
+						result: "",
+						path: "/root/person/teamManage",
+						pRow: 12,
+					},
+					{
+						icon: "icon-fankuiyujianyi",
+						label: "反馈与建议",
+						result: "",
+						path: "/root/person/feedback",
+						tip: "message",
+						pRow: 12,
+					},
+				];
+			}
 			// }
 			let userInfo = uni.getStorageSync("apply-userinfo");
 			that.isLogin = true;
 			that.userInfo = { ...userInfo };
-        console.log(that.userInfo,'that.userInfo');
+			console.log(that.userInfo, "that.userInfo");
 			that.userInfo.avatar = uni.getStorageSync("apply-avatar");
 			that.userInfo.name = userInfo.userName || userInfo.aliasName;
 			that.userInfo.tel = uni.getStorageSync("apply-tel");
diff --git a/pages/workBench/index.vue b/pages/workBench/index.vue
index 30ddf42..a0ba2cf 100644
--- a/pages/workBench/index.vue
+++ b/pages/workBench/index.vue
@@ -8,7 +8,10 @@
 			<!-- 账单 -->
 			<!-- v-if="userInfo.user.agencyRole == 1 || userInfo.user.agencyRole == 2 || userInfo.hasBill || true" -->
 			<view class="g_radius_8 g_p_16 g_bg_f g_text_c g_ml_10 g_mr_10" hover-class="thover" @click="goPage('/root/bind/order?active=0')">
-				<view class="g_fw_600 g_mb_10 g_fs_20">{{ upNum }}</view>
+				<view class="g_fw_600 g_mb_10 g_fs_20 g_position_rela">
+					{{ upNum }}
+					<view class="g_w_6 g_h_6 g_radius_50 g_bg_f0a" v-if="!readed" style="position: absolute; left: calc(50% + 10px); top: 0"></view>
+				</view>
 				<view class="g_c_6">关注发单号</view>
 			</view>
 			<!-- v-if="agencyInfo.supplierAccount == 1" -->
@@ -76,8 +79,9 @@ export default {
 		return {
 			globalData: getApp().globalData,
 			showService: false,
+			readed: true,
 			isLogin: false,
-			authInfo: {}, // 认证信息
+			authInfo: { realNameAuth: 0 }, // 认证信息
 			userInfo: {},
 			agencyInfo: {},
 			upNum: 0,
@@ -180,10 +184,14 @@ export default {
 		console.log("that.agencyInfo", that.agencyInfo);
 		that.isLogin = uni.getStorageSync("apply-token") ? true : false;
 		// if (that.userInfo.agencyStatus == 1) {
-		this.getAuthInfo();
-		// this.getData();
-		this.getJobList();
-		this.getCompanyInfo();
+		if (that.isLogin) {
+			this.getAuthInfo();
+			this.getData();
+			this.getNum();
+
+			this.getCompanyInfo();
+		}
+
 		// }
 		// if (typeof that.$scope.getTabBar === "function" && that.$scope.getTabBar()) {
 		// 	that.$scope.getTabBar().setData({
@@ -209,39 +217,6 @@ export default {
 				that.authInfo = res;
 			});
 		},
-		getJobList($type = "init") {
-			let that = this;
-			this.G.Get(this.api.get_user_supplieraccount_data, {}, (res) => {
-				console.log("res", res);
-				that.orderDataList = [
-					{
-						name: "在招",
-						num: res.customJobStatus1Num,
-						path: "/root/merchantManagement/orderManagement?recruitment=1",
-					},
-					{
-						name: "总职位",
-						num: res.customJobStatusNum,
-						path: "/root/merchantManagement/orderManagement",
-					},
-					{
-						name: "互关",
-						num: "-",
-						path: "",
-					},
-					{
-						name: "关注",
-						num: "-",
-						path: "",
-					},
-					{
-						name: "粉丝",
-						num: "-",
-						path: "",
-					},
-				];
-			});
-		},
 		getData() {
 			let that = this;
 			this.G.Get(this.api.user_dataValue, {}, (res) => {
@@ -331,6 +306,31 @@ export default {
 				url: e.item.path,
 			});
 		},
+		getNum() {
+			let that = this;
+			that.G.Get(
+				that.api.bind_getWaitNum + "/" + 1,
+				{
+					type: 2,
+				},
+				(res) => {
+					console.log("获取待处理数量：", res);
+					if (res.unread > 0) {
+						uni.setTabBarBadge({
+							index: 1,
+							text: String(res.unread),
+						});
+						that.readed = false;
+					} else {
+						uni.removeTabBarBadge({
+							index: 1,
+						});
+						that.readed = true;
+					}
+				}
+			);
+		},
+
 		goLogin() {
 			console.log("123");
 			uni.reLaunch({
diff --git a/root/home/applicationSuccess.vue b/root/home/applicationSuccess.vue
index 4dc25ed..50ced44 100644
--- a/root/home/applicationSuccess.vue
+++ b/root/home/applicationSuccess.vue
@@ -34,7 +34,7 @@ export default {
 		},
 		goList() {
 			uni.setStorageSync("apply-tab-active", 1);
-			uni.switchTab({
+			uni.navigateTo({
 				url: "/pages/apply/index",
 			});
 		},
diff --git a/root/person/agencyAvatar.vue b/root/person/agencyAvatar.vue
new file mode 100644
index 0000000..2642f63
--- /dev/null
+++ b/root/person/agencyAvatar.vue
@@ -0,0 +1,132 @@
+<template>
+    <view class="p-person-avatar g_flex_column_center g_w_all g_h_all g_bg_0 g_kuaishou">
+        <view>
+            <view
+                :style="{
+                    width: size.width + 'px',
+                    height: size.width + 'px',
+                }"
+                style="overflow: hidden"
+                class="g_flex_c"
+            >
+                <img
+                    :src="avatar"
+                    :style="{
+                        width: size.width + 'px',
+                        height: size.width + 'px',
+                    }"
+                />
+            </view>
+            <view class="g_flex_row_center g_mt_30">
+                <view v-if="!isEdit" class="g_flex_row_center">
+                    <!-- || MP-WEIXIN -->
+                    <!-- #ifdef APP-PLUS || H5 || MP-TOUTIAO || MP-KUAISHOU  -->
+                    <button aria-role="button" class="g_w_110 g_h_32 g_flex_c g_radius_17 g_c_f" style="border: 1px solid #fff; background-color: transparent; font-size: 14px" @click="handleOpenAvatar">更换图片</button>
+                    <!-- #endif -->
+                    <!-- #ifdef MP-WEIXIN -->
+                    <!-- <button open-type="chooseAvatar" @chooseavatar="handleStartChangeAvatar" aria-role="button" class="g_w_110 g_h_32 g_flex_c g_radius_17 g_c_f" style="border: 1px solid #fff; background-color: transparent; font-size: 14px">更换图片</button> -->
+                    <button @click="handleOpenAvatar" aria-role="button" class="g_w_110 g_h_32 g_flex_c g_radius_17 g_c_f" style="border: 1px solid #fff; background-color: transparent; font-size: 14px">更换图片</button>
+                    <!-- #endif -->
+                </view>
+                <view v-if="isEdit" class="g_flex_row_center">
+                    <view class="g_w_110 g_h_32 g_flex_c g_radius_17 g_c_f g_mr_16" style="border: 1px solid #fff" @click="handleCancel">取消</view>
+                    <view class="g_w_112 g_h_34 g_flex_c g_radius_17 g_c_f g_bg_f40" style="border: 2px solid #ff4400" @click="handleConfirm">确认</view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    onReady() {
+        uni.setNavigationBarColor({
+            backgroundColor: "#000000",
+            frontColor: "#ffffff",
+        });
+    },
+    onLoad(options) {
+        let that = this;
+        console.log("options", options);
+        this.info = options;
+        this.avatar = options.value;
+        uni.setNavigationBarTitle({
+            title: `修改${options.label}`,
+        });
+    },
+    onShareAppMessage() {
+        return this.G.shareFun();
+    },
+    data() {
+        return {
+            avatar: '',
+            isEdit: false,
+            size: {
+                width: uni.getSystemInfoSync().windowWidth,
+                height: uni.getSystemInfoSync().windowHeight,
+            },
+        };
+    },
+    methods: {
+        handleOpenAvatar() {
+            let that = this;
+            uni.showActionSheet({
+                itemList: ["从相册选择", "使用相机"],
+                success: function (res) {
+                    if (res.tapIndex == 0) {
+                        console.log("点击相册");
+                        // 相册
+                        that.setAvatar(["album"]);
+                    } else {
+                        console.log("点击拍照");
+                        // 拍照
+                        that.setAvatar(["camera"]);
+                    }
+                },
+                fail: function (res) {},
+            });
+        },
+        setAvatar($type) {
+            let that = this;
+            that.G.uploadImg(
+                (res) => {
+                    console.log("获取数据", res);
+                    that.avatar = res.image;
+                    that.isEdit = true;
+                },
+                "default",
+                1,
+                $type
+            );
+        },
+        handleCancel() {
+            let that = this;
+            that.isEdit = false;
+            // that.avatar =  this.avatar;
+        },
+        handleConfirm() {
+            let that = this;
+            that.G.Put(
+                "/yishoudan/agency/updateField",
+                {
+                    fieldName: this.info.fieldName,
+                    fieldValue: that.avatar,
+                },
+                (res) => {
+                    that.isEdit = false;
+                    uni.showToast({
+                        title: "修改成功",
+                        icon: "success",
+                    });
+                    that.G.checkToken();
+                    setTimeout(() => {
+                        uni.navigateBack();
+                    }, 1500);
+                }
+            );
+        },
+    },
+};
+</script>
+
+<style></style>
\ No newline at end of file
diff --git a/root/person/change copy.vue b/root/person/change copy.vue
new file mode 100644
index 0000000..c5f21c6
--- /dev/null
+++ b/root/person/change copy.vue	
@@ -0,0 +1,166 @@
+<template>
+	<view class="p-person-change g_w_all g_h_all g_bg_f_5 g_kuaishou">
+		<view class="g_h_10"></view>
+
+		<view v-if="info.title == '设置用户名'">
+			<g-panel-form-slot
+				:list="[
+					{
+						icon: '',
+						label: '用户名',
+						result: '',
+						path: '',
+						tip: 'user-name',
+						type: 'slot',
+						pColumn: 12,
+					},
+				]"
+			>
+				<slot>
+					<!-- #ifdef APP-PLUS || H5 || MP-TOUTIAO || MP-KUAISHOU -->
+					<u-input type="text"
+					 :clearable="false" 
+					 :password-icon="false"
+					 placeholder="请输入用户名" input-align="right" 
+					 class="g_text_r g_w_all" 
+					 placeholder-style="color:#999999;font-size:32rpx;line-height:1" 
+					 v-model="info.value"
+					 style="width: calc(100vw - (106px);flex: none;"
+					/>
+					<!-- #endif -->
+					<!-- #ifdef MP-WEIXIN -->
+					<u-input type="text"
+					 :clearable="false" 
+					 :password-icon="false"
+					 placeholder="请输入用户名" input-align="right" 
+					 class="g_text_r g_w_all" 
+					 placeholder-style="color:#999999;font-size:32rpx;line-height:1" 
+					 v-model="info.value"
+					/>
+					<!-- #endif -->
+				</slot>
+			</g-panel-form-slot>
+			<view class="g_mt_90 g_flex_row_center">
+				<g-button btnText="提交" type="primary" @clickBtn="submitForm" />
+			</view>
+		</view>
+		<view v-if="info.type == 'order'">
+			<g-panel-form-slot
+				:list="[
+					{
+						icon: '',
+						label: info.remark,
+						result: '',
+						path: '',
+						tip: 'user-name',
+						type: 'slot',
+						pColumn: 12,
+					},
+				]"
+			>
+				<slot>
+					<u-input type="text" :clearable="false" :password-icon="false" :placeholder="info.place" input-align="right" class="g_text_r g_w_all" placeholder-style="color:#999999;font-size:32rpx;line-height:1" v-model="info.value" />
+				</slot>
+			</g-panel-form-slot>
+			<view class="g_mt_90 g_flex_row_center">
+				<g-button btnText="提交" type="primary" @clickBtn="submitOrderForm" />
+			</view>
+		</view>
+		<view v-if="info.title == '设置手机号'">
+			<g-panel-form-item
+				:list="[
+					{
+						icon: '',
+						label: '手机号',
+						result: info.value,
+						path: '',
+						tip: 'user-tel',
+						type: 'slot',
+					},
+				]"
+			/>
+			<view class="g_fs_14 g_c_9 g_flex_row_center g_mt_10">暂不支持修改</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	onReady() {
+		this.G.setNavStyle();
+	},
+	onShareAppMessage() {
+		return this.G.shareFun();
+	},
+	data() {
+		return {
+			info: {},
+		};
+	},
+	onLoad(options) {
+		console.log("options", options);
+		this.info = options;
+		uni.setNavigationBarTitle({
+			title: options.title,
+		});
+	},
+	methods: {
+		submitForm() {
+			let that = this;
+			if (that.info.value == "") {
+				uni.showToast({
+					title: "请输入用户名",
+					icon: "none",
+				});
+				return false;
+			}
+			that.G.Post(
+				that.api.user_changeName,
+				{
+					userName: that.info.value,
+					formdata: true,
+				},
+				() => {
+					uni.showToast({
+						title: "修改成功",
+						icon: "success",
+					});
+					that.G.checkToken();
+
+					// uni.setStorageSync('apply-username', that.info.value)
+					setTimeout(() => {
+						uni.navigateBack();
+					}, 1500);
+				}
+			);
+		},
+		submitOrderForm(info) {
+			let that = this;
+			console.log(that.info.value);
+			if (!this.info.value.trim()) {
+				uni.showToast({
+					title: "名称不能为空",
+					icon: "none",
+				});
+				return false;
+			}
+			if (that.info.title == "修改账号名称") {
+				if (that.info.value.length > 10) {
+					uni.showToast({
+						title: "账号名称最多10个字",
+						icon: "none",
+					});
+					return;
+				}
+				uni.$emit("changeAccountName", { info: this.info.value });
+				uni.navigateBack();
+			} else if (that.info.title == "修改企业名称") {
+				uni.$emit("changeStoreName", { info: this.info.value });
+				uni.navigateBack();
+			}
+		},
+	},
+};
+</script>
+
+<style></style>
diff --git a/root/person/change.vue b/root/person/change.vue
index c5f21c6..07b9769 100644
--- a/root/person/change.vue
+++ b/root/person/change.vue
@@ -1,85 +1,53 @@
 <template>
 	<view class="p-person-change g_w_all g_h_all g_bg_f_5 g_kuaishou">
 		<view class="g_h_10"></view>
-
-		<view v-if="info.title == '设置用户名'">
-			<g-panel-form-slot
-				:list="[
-					{
-						icon: '',
-						label: '用户名',
-						result: '',
-						path: '',
-						tip: 'user-name',
-						type: 'slot',
-						pColumn: 12,
-					},
-				]"
-			>
-				<slot>
-					<!-- #ifdef APP-PLUS || H5 || MP-TOUTIAO || MP-KUAISHOU -->
-					<u-input type="text"
-					 :clearable="false" 
-					 :password-icon="false"
-					 placeholder="请输入用户名" input-align="right" 
-					 class="g_text_r g_w_all" 
-					 placeholder-style="color:#999999;font-size:32rpx;line-height:1" 
-					 v-model="info.value"
-					 style="width: calc(100vw - (106px);flex: none;"
-					/>
-					<!-- #endif -->
-					<!-- #ifdef MP-WEIXIN -->
-					<u-input type="text"
-					 :clearable="false" 
-					 :password-icon="false"
-					 placeholder="请输入用户名" input-align="right" 
-					 class="g_text_r g_w_all" 
-					 placeholder-style="color:#999999;font-size:32rpx;line-height:1" 
-					 v-model="info.value"
-					/>
-					<!-- #endif -->
-				</slot>
-			</g-panel-form-slot>
-			<view class="g_mt_90 g_flex_row_center">
-				<g-button btnText="提交" type="primary" @clickBtn="submitForm" />
-			</view>
-		</view>
-		<view v-if="info.type == 'order'">
-			<g-panel-form-slot
-				:list="[
-					{
-						icon: '',
-						label: info.remark,
-						result: '',
-						path: '',
-						tip: 'user-name',
-						type: 'slot',
-						pColumn: 12,
-					},
-				]"
-			>
-				<slot>
-					<u-input type="text" :clearable="false" :password-icon="false" :placeholder="info.place" input-align="right" class="g_text_r g_w_all" placeholder-style="color:#999999;font-size:32rpx;line-height:1" v-model="info.value" />
-				</slot>
-			</g-panel-form-slot>
-			<view class="g_mt_90 g_flex_row_center">
-				<g-button btnText="提交" type="primary" @clickBtn="submitOrderForm" />
-			</view>
-		</view>
-		<view v-if="info.title == '设置手机号'">
-			<g-panel-form-item
-				:list="[
-					{
-						icon: '',
-						label: '手机号',
-						result: info.value,
-						path: '',
-						tip: 'user-tel',
-						type: 'slot',
-					},
-				]"
-			/>
-			<view class="g_fs_14 g_c_9 g_flex_row_center g_mt_10">暂不支持修改</view>
+		<g-panel-form-slot
+			:list="[
+				{
+					icon: '',
+					label: info.label,
+					result: '',
+					path: '',
+					tip: 'user-name',
+					type: 'slot',
+					pColumn: 12,
+				},
+			]"
+			v-if="info.fieldName != 'address'"
+		>
+			<slot>
+				<!-- #ifdef APP-PLUS || H5 || MP-TOUTIAO || MP-KUAISHOU -->
+				<u-input type="text" :clearable="false" :password-icon="false" :customStyle="{ fontSize: '17px' }" :placeholder="info.placeholder" input-align="right" class="g_text_r g_w_all" placeholder-style="color:#999999;font-size:17px;line-height:1" v-model="info.value" style="width: calc(100vw - (106px));flex: none;font-size: 17px;" />
+				<!-- #endif -->
+				<!-- #ifdef MP-WEIXIN -->
+				<u-input type="text" :clearable="false" :customStyle="{ fontSize: '17px' }" :password-icon="false" :placeholder="info.placeholder" input-align="right" class="g_text_r g_w_all" placeholder-style="color:#999999;font-size:17px;line-height:1" v-model="info.value" />
+				<!-- #endif -->
+			</slot>
+		</g-panel-form-slot>
+		<g-panel-form-slot
+			v-else
+			:list="[
+				{
+					icon: '',
+					label: '企业地址',
+					result: '',
+					addressDetail: { latitude: info.value.lat, longitude: info.value.lng },
+					value: info.value.address,
+					path: '',
+					tip: 'slot-choose-address',
+					placeholder: '请选择企业地址',
+					type: 'slot',
+					fontSize: '16px',
+					pColumn: 17,
+					pRow: 12,
+					require: false,
+					suffix: 'icon-dizhi1',
+				},
+			]"
+			@chooseAddress="chooseAddress"
+		></g-panel-form-slot>
+		<view class="g_mt_90 g_flex_row_center">
+			<g-button btnText="提交" type="primary" @clickBtn="submitForm" />
 		</view>
 	</view>
 </template>
@@ -92,6 +60,8 @@ export default {
 	onShareAppMessage() {
 		return this.G.shareFun();
 	},
+	components: {
+	},
 	data() {
 		return {
 			info: {},
@@ -100,8 +70,15 @@ export default {
 	onLoad(options) {
 		console.log("options", options);
 		this.info = options;
+		if (this.info.fieldName != "address") {
+			this.info.value = options.value;
+		} else {
+			this.info.value = JSON.parse(options.value);
+		}
+		this.info.placeholder = `请输入${options.label}`;
+
 		uni.setNavigationBarTitle({
-			title: options.title,
+			title: `修改${options.label}`,
 		});
 	},
 	methods: {
@@ -109,16 +86,24 @@ export default {
 			let that = this;
 			if (that.info.value == "") {
 				uni.showToast({
-					title: "请输入用户名",
+					title: `请输入${that.info.label}`,
 					icon: "none",
 				});
 				return false;
 			}
-			that.G.Post(
-				that.api.user_changeName,
+			if (this.info.fieldName == "address") {
+				this.submitAddress();
+			} else {
+				this.submitWithoutAddress();
+			}
+		},
+		submitWithoutAddress() {
+			let that = this;
+			that.G.Put(
+				"/yishoudan/agency/updateField",
 				{
-					userName: that.info.value,
-					formdata: true,
+					fieldName: that.info.fieldName,
+					fieldValue: that.info.value,
 				},
 				() => {
 					uni.showToast({
@@ -127,37 +112,40 @@ export default {
 					});
 					that.G.checkToken();
 
-					// uni.setStorageSync('apply-username', that.info.value)
 					setTimeout(() => {
+						uni.$emit("changeCompanyDesp",'测试');
 						uni.navigateBack();
 					}, 1500);
 				}
 			);
 		},
-		submitOrderForm(info) {
+		submitAddress() {
 			let that = this;
-			console.log(that.info.value);
-			if (!this.info.value.trim()) {
-				uni.showToast({
-					title: "名称不能为空",
-					icon: "none",
-				});
-				return false;
-			}
-			if (that.info.title == "修改账号名称") {
-				if (that.info.value.length > 10) {
+			that.G.Put(
+				this.api.user_changeTobeSupplierAddress,
+				{
+					address: that.info.value.address,
+					lng: that.info.value.lng,
+					lat: that.info.value.lat,
+				},
+				() => {
 					uni.showToast({
-						title: "账号名称最多10个字",
-						icon: "none",
+						title: "修改成功",
+						icon: "success",
 					});
-					return;
+					that.G.checkToken();
+
+					setTimeout(() => {
+						uni.navigateBack();
+					}, 1500);
 				}
-				uni.$emit("changeAccountName", { info: this.info.value });
-				uni.navigateBack();
-			} else if (that.info.title == "修改企业名称") {
-				uni.$emit("changeStoreName", { info: this.info.value });
-				uni.navigateBack();
-			}
+			);
+		},
+		chooseAddress(e) {
+			console.log("eeeeeee", e);
+			this.info.value.address = e.address;
+			this.info.value.lat = e.lat;
+			this.info.value.lng = e.lng;
 		},
 	},
 };
diff --git a/root/person/info copy.vue b/root/person/info copy.vue
new file mode 100644
index 0000000..126078a
--- /dev/null
+++ b/root/person/info copy.vue	
@@ -0,0 +1,126 @@
+<template>
+	<view class="p-person-info g_w_all g_h_all g_bg_f_5 g_kuaishou">
+		<view class="g_pt_16">
+			<g-panel-form-item :list="list" @clickItem="handleClickItem" />
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	onReady() {
+		this.G.setNavStyle();
+	},
+	onShareAppMessage() {
+		return this.G.shareFun();
+	},
+	data() {
+		return {
+			userinfo: {},
+			list: [],
+			cdnBaseImg: this.G.store().cdnBaseImg,
+			localBaseImg: this.G.store().localBaseImg,
+		};
+	},
+	onLoad() {
+		let that = this;
+		uni.$on("changePersonDesp", function (data) {
+			console.log(data.info);
+			console.log("监听到事件来自 update ，携带参数 msg 为：" + data.info);
+			that.userinfo.desp = data.info;
+			let info = {
+				fieldName: "desp",
+				fieldValue: that.userinfo.desp,
+			};
+			setTimeout(() => {
+				that.editField(info);
+			}, 100);
+			that.$forceUpdate();
+		});
+	},
+	onShow() {
+		let that = this;
+		that.init();
+	},
+	methods: {
+		init() {
+			let that = this;
+			that.userinfo = {
+				imgSrc: uni.getStorageSync("apply-avatar") || that.localBaseImg + "default.svg",
+				userName: uni.getStorageSync("apply-userinfo").userName,
+				tel: uni.getStorageSync("apply-tel"),
+				desp: that.userinfo.desp || "请简单介绍",
+			};
+			let defaultList = [
+				{
+					icon: "",
+					label: "头像",
+					result: "",
+					value: that.userinfo.imgSrc,
+					path: "/root/person/avatar",
+					tip: "avatar",
+					pColumn: 22,
+				},
+				{
+					icon: "",
+					label: "用户名",
+					result: that.userinfo.userName,
+					path: "/root/person/change?title=设置用户名&remark=好的花名，让团队成员更好记住你&value=" + that.userinfo.userName,
+					tip: "username",
+				},
+				{
+					icon: "",
+					label: "手机号",
+					result: that.userinfo.tel,
+					path: "/root/person/change?title=设置手机号&remark=&value=" + that.userinfo.tel,
+					tip: "mobile",
+				},
+				// {
+				// 	icon: "",
+				// 	label: "个人简介",
+				// 	result: "",
+				// 	value: that.userinfo.desp,
+				// 	path: "/root/person/inputAccountInfo?from=person&val=" + that.userinfo.desp,
+				// 	tip: "desp",
+				// 	placeholder: "请简单介绍",
+				// 	type: "",
+				// 	result: that.userinfo.desp,
+				// 	fontSize: "16px",
+				// 	fontColor: that.userinfo.desp == "请简单介绍" ? "g_c_9" : "g_c_3",
+				// 	pColumn: 18,
+				// },
+			];
+			if (uni.getStorageSync("apply-supplierAccount") == 1) {
+				// 有
+				that.list = defaultList.concat([
+					{
+						icon: "",
+						label: "二维码名片",
+						result: "",
+						path: "/root/bind/search?active=1",
+						tip: "code",
+					},
+				]);
+			} else {
+				// 无
+				that.list = defaultList;
+			}
+		},
+		editField(info) {
+			let that = this;
+			console.log(info);
+			that.G.Put(that.api.user_changeTobeSupplierField, info, (res) => {
+				that.showSuccess();
+			});
+		},
+		handleClickItem(e) {
+			let that = this;
+			uni.navigateTo({
+				url: e.item.path,
+			});
+		},
+	},
+};
+</script>
+
+<style></style>
diff --git a/root/person/info.vue b/root/person/info.vue
index 126078a..84c194f 100644
--- a/root/person/info.vue
+++ b/root/person/info.vue
@@ -1,12 +1,32 @@
 <template>
 	<view class="p-person-info g_w_all g_h_all g_bg_f_5 g_kuaishou">
-		<view class="g_pt_16">
-			<g-panel-form-item :list="list" @clickItem="handleClickItem" />
+		<view class="g_bg_f sticky" :style="{ boxShadow: '0px 4px 4px 0px rgba(218, 218, 218, 0.5)' }">
+			<u-tabs bg-color="transparent" from="index" :list="menuList" :is-scroll="false" :current="menuActive" :active-color="globalData.themeColor" bar-width="64" bar-height="6" @change="handleUpdateMenu" font-size="32" duration="0.05" height="76"></u-tabs>
 		</view>
+		<scroll-view class="" :scroll-y="true" style="height: calc(100vh - 38px)">
+			<view class="g_h_10"> </view>
+			<!-- 根据menuActive显示不同内容 -->
+			<view v-if="menuActive === 0" class="g_flex_column_start" style="height: calc(100% - 9px)">
+				<!-- 个人资料内容 -->
+				<view class="">
+					<g-panel-form-item :list="list" @clickItem="handleClickItem" />
+				</view>
+				<!-- <view class="g_pt_16">
+					<g-panel-form-item :list="[{ icon_after: userinfo.realName ? 'yirenzheng g_c_main' : '', label: '实名认证', result: userinfo.realName ? '' : '去认证', path: '/root/person/idcardForm', type: userinfo.realName ? 'slot' : '' }]" @clickItem="goRealName" />
+				</view> -->
+			</view>
+			<view v-else>
+				<!-- 企业资料内容，直接引入组件 -->
+				<OrderEdit v-if="reset" />
+			</view>
+		</scroll-view>
 	</view>
 </template>
 
 <script>
+import gPanelFormItem from "@/components/panel/formItem.vue";
+import OrderEdit from "./orderEdit.vue";
+
 export default {
 	onReady() {
 		this.G.setNavStyle();
@@ -14,16 +34,38 @@ export default {
 	onShareAppMessage() {
 		return this.G.shareFun();
 	},
+	components: {
+		gPanelFormItem,
+		OrderEdit,
+	},
 	data() {
 		return {
+			isAdmin: uni.getStorageSync("apply-userinfo").admin,
+			globalData: getApp().globalData,
 			userinfo: {},
 			list: [],
 			cdnBaseImg: this.G.store().cdnBaseImg,
 			localBaseImg: this.G.store().localBaseImg,
+			svgBaseImg: this.G.store().svgBaseImg,
+			menuList: [
+				{
+					name: "个人资料",
+					tip: "0",
+				},
+				{
+					name: "企业资料",
+					tip: "1",
+				},
+			],
+			menuActive: 0,
+			reset: true,
 		};
 	},
-	onLoad() {
+	onLoad(options) {
 		let that = this;
+		if (options.active) {
+			that.menuActive = parseInt(options.active);
+		}
 		uni.$on("changePersonDesp", function (data) {
 			console.log(data.info);
 			console.log("监听到事件来自 update ，携带参数 msg 为：" + data.info);
@@ -35,22 +77,31 @@ export default {
 			setTimeout(() => {
 				that.editField(info);
 			}, 100);
-			that.$forceUpdate();
 		});
 	},
 	onShow() {
 		let that = this;
+		// this.reset = false;
+		// console.log("this.reset", this.reset);
+		// setTimeout(() => {
+		// 	this.reset = true;
+		// }, 10);
+		console.log("this.reset", this.reset);
 		that.init();
 	},
 	methods: {
 		init() {
 			let that = this;
+			let userinfo = uni.getStorageSync("apply-userinfo");
 			that.userinfo = {
-				imgSrc: uni.getStorageSync("apply-avatar") || that.localBaseImg + "default.svg",
-				userName: uni.getStorageSync("apply-userinfo").userName,
-				tel: uni.getStorageSync("apply-tel"),
+				imgSrc: userinfo.user.imgSrc || that.svgBaseImg + "defaultAva.svg",
+				userName: userinfo.userName,
+				tel: userinfo.user.tel,
 				desp: that.userinfo.desp || "请简单介绍",
+				realName: userinfo.user.realName,
+				id: userinfo.user.id,
 			};
+			console.log("userinfo", that.userinfo);
 			let defaultList = [
 				{
 					icon: "",
@@ -75,20 +126,6 @@ export default {
 					path: "/root/person/change?title=设置手机号&remark=&value=" + that.userinfo.tel,
 					tip: "mobile",
 				},
-				// {
-				// 	icon: "",
-				// 	label: "个人简介",
-				// 	result: "",
-				// 	value: that.userinfo.desp,
-				// 	path: "/root/person/inputAccountInfo?from=person&val=" + that.userinfo.desp,
-				// 	tip: "desp",
-				// 	placeholder: "请简单介绍",
-				// 	type: "",
-				// 	result: that.userinfo.desp,
-				// 	fontSize: "16px",
-				// 	fontColor: that.userinfo.desp == "请简单介绍" ? "g_c_9" : "g_c_3",
-				// 	pColumn: 18,
-				// },
 			];
 			if (uni.getStorageSync("apply-supplierAccount") == 1) {
 				// 有
@@ -119,6 +156,27 @@ export default {
 				url: e.item.path,
 			});
 		},
+		goRealName(e) {
+			if (!this.userinfo.realName) {
+				uni.navigateTo({
+					url: e.item.path,
+				});
+			}
+		},
+		handleUpdateMenu(index) {
+			this.menuActive = index;
+		},
+		onCopyVal(e) {
+			uni.setClipboardData({
+				data: e.item.result,
+				success(res) {
+					uni.showToast({
+						title: "复制成功",
+						icon: "success",
+					});
+				},
+			});
+		},
 	},
 };
 </script>
diff --git a/root/person/inviteFollowMe.vue b/root/person/inviteFollowMe.vue
new file mode 100644
index 0000000..9613c19
--- /dev/null
+++ b/root/person/inviteFollowMe.vue
@@ -0,0 +1,143 @@
+<template>
+	<div class="g_bg_page g_pl_10 g_pr_10">
+		<div class="g_h_20"></div>
+		<div class="g_mb_10 g_fs_18 g_pl_10">「{{ agencyInfo.inviteUserName || "-" }}」邀请您加入他的团队：</div>
+		<div class="r_box g_pt_24 g_text_c g_pl_20 g_pr_20">
+			<div class="g_pb_16">
+				<img class="g_h_80 g_w_80 g_radius_50" :src="agencyInfo.logo || 'https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/APP/default.svg'" alt="" />
+				<div class="g_fs_20 g_mt_12 g_mb_12 g_fw_600">
+					{{ agencyInfo.agencyName || "-" }}
+				</div>
+				<div class="g_c_9 g_fs_14">
+					{{ agencyInfo.desp || "-" }}
+				</div>
+			</div>
+			<div class="g_flex_row_between g_pb_12 g_pt_12" style="border-top: 1rpx dotted #eee">
+				<div v-for="item in numList" class="g_flex_row_center flex_end">
+					<div class="g_fs_20 g_fw_600">{{ item.num }}</div>
+					<div class="g_fs_14 g_c_9">{{ item.label }}</div>
+				</div>
+			</div>
+		</div>
+		<div class="g_mt_30">
+			<div class="g_fs_18 g_mb_8 g_pl_12">填写企业简称:</div>
+			<div class="r_box g_pl_10">
+				<u-input v-model="userInfo.userName" height="88" placeholder="区域+名称，如:上海发财劳务"></u-input>
+			</div>
+			<div class="g_fs_12 g_c_9 g_mt_6 g_pl_12">设置后系统将自动创建团队并关注该发单号，您作为创建人可在我的页面管理团队。</div>
+		</div>
+
+		<div class="g_mt_84">
+			<g-button v-if="!applying && agencyInfo.agencyName" btnText="申请加入团队" type="primary" class="" @clickBtn="applyAdd"></g-button>
+			<g-button v-else btnText="已申请" type="disabled" class=""></g-button>
+		</div>
+	</div>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			agencyInfo: {
+				agencyName: "",
+				fullName: "",
+			},
+			userInfo: {
+				userName: "",
+				userId: "",
+			},
+			numList: [
+				{ label: "总职位", num: 0 },
+				{ label: "最近更新", num: 0 },
+				{ label: "粉丝", num: 0 },
+			],
+			applying: false,
+			inviteUserId: "",
+			uid: "",
+			ing: false,
+		};
+	},
+	onLoad(options) {
+		console.log(options);
+		// options.scene = "id=3087_101125";
+		if (uni.getStorageSync("scene") || options.scene) {
+			console.log("XXXXXXXXXXXX");
+			//扫小程序码携带参数
+			var sceneStr = uni.getStorageSync("scene") ? decodeURIComponent(uni.getStorageSync("scene")) : decodeURIComponent(options.scene);
+			var sceneJson = this.G.sceneToJson(sceneStr);
+			console.log("sceneJson===", sceneJson);
+			this.inviteUserId = sceneJson.id.split("_")[1];
+			this.uid = sceneJson.id.split("_")[0];
+			// this.G.checkToken().then((info) => {
+				console.log("info11", info);
+				if (!info.msg) {
+					this.userInfo = uni.getStorageSync("apply-userinfo");
+					this.getAgencyById();
+					this.checkHasApply();
+					uni.removeStorageSync("scene");
+				} else {
+					// uni.reLaunch({
+					// 	url: `/pages/login/index?path='/root1/person/memberApplyAdd'&scene=${options.scene}`,
+					// });
+					uni.setStorageSync("scene", options.scene);
+				}
+			// });
+
+			// uni.setStorageSync("AGENCY_USER_ID", this.userId);
+		}
+	},
+	created() {},
+
+	methods: {
+		applyAdd() {
+			let that = this;
+
+			if (!this.userInfo.userName) {
+				uni.showToast({
+					title: "请输入你的姓名",
+					icon: "none",
+				});
+				return;
+			}
+			if (this.ing) {
+				return;
+			}
+			that.ing = true;
+			this.G.Post(this.api.bind_subscribeSubmit, { agencyId: that.uid, username: this.userInfo.userName, inviteUserId: this.inviteUserId }, (res) => {
+				uni.showToast({
+					title: "申请成功",
+					icon: "none",
+				});
+				that.checkHasApply();
+				console.log(res);
+			});
+		},
+		getAgencyById() {
+			let that = this;
+			this.G.Get(this.api.order_getAgencyByIdForApply, { agencyId: that.uid, inviteUserId: this.inviteUserId }, (res) => {
+				console.log(res);
+				that.agencyInfo = res;
+				that.numList = [
+					{ label: "总职位", num: res.jobNum },
+					{ label: "最近更新", num: res.jobUpdateNum },
+					{ label: "粉丝", num: res.downNum },
+				];
+			});
+		},
+		checkHasApply() {
+			let that = this;
+			this.G.Post(this.api.order_checkHasApply, { agencyId: that.uid, userId: this.userInfo.id }, (res) => {
+				if (res.length > 0) {
+					that.applying = true;
+				} else {
+					that.applying = false;
+				}
+				that.ing = false;
+				console.log(res);
+			});
+		},
+	},
+};
+</script>
+
+<style></style>
diff --git a/root/person/inviteFollowSuccess.vue b/root/person/inviteFollowSuccess.vue
new file mode 100644
index 0000000..fd0c4b2
--- /dev/null
+++ b/root/person/inviteFollowSuccess.vue
@@ -0,0 +1,55 @@
+<template>
+	<div class="g_bg_page g_pl_10 g_pr_10">
+		<div class="g_h_10"></div>
+		<div class="r_box g_pt_24 g_text_c g_pt_32 g_pb_24">
+			<div>
+				<i class="icon-time-circle-fill iconfont g_c_10a" style="font-size: 84px"></i>
+			</div>
+			<div class="g_mt_20">已提交申请</div>
+		</div>
+		<div class="r_box g_pl_10 g_pr_10 g_mt_10 g_pb_24">
+			<div class="g_text_c g_fs_20 g_fw_600 g_pt_12 g_pb_12" style="border-bottom: 1rpx dotted #eee">添加团队成员</div>
+			<div class="g_pt_12 g_c_9 g_fs_14">
+				<p class="g_mb_10">为什么要添加成员到团队?</p>
+				<div class="g_pl_20">
+					<p>1.发单号是以团队为单位进行发单和关注的。</p>
+					<p>2.创建人关注发单号后，内部成员均可报名。</p>
+					<p>3.团队成员无需再次关注，共享报名权限。</p>
+					<p>4.系统自动完成团队内部数据汇总与统计。</p>
+				</div>
+			</div>
+			<div class="g_mt_84 g_flex_row_center">
+				<div class="g_w_120 g_mr_24">
+					<g-button btnText="手动添加" size="auto" @clickBtn="goPage('/root/person/addOrUpdataMember')"></g-button>
+				</div>
+				<div class="g_w_120">
+					<g-button btnText="微信邀请" size="auto" type="primary" class="" @clickBtn="goPage('/root/person/memberApplyQRCode')"></g-button>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			ing: false,
+		};
+	},
+	onLoad(options) {
+		console.log(options);
+	},
+	created() {},
+
+	methods: {
+		goPage(url) {
+			uni.navigateTo({
+				url,
+			});
+		},
+	},
+};
+</script>
+
+<style></style>
diff --git a/root/person/memberApplyAdd.vue b/root/person/memberApplyAdd.vue
index 7fdf9d9..edd4808 100644
--- a/root/person/memberApplyAdd.vue
+++ b/root/person/memberApplyAdd.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="g_bg_page g_pl_10 g_pr_10">
 		<div class="g_h_20"></div>
-		<div class="g_mb_10 g_fs_18 g_pl_10">「{{ agencyInfo.fullName || "-" }}」邀请您加入他的团队：</div>
+		<div class="g_mb_10 g_fs_18 g_pl_10">「{{ agencyInfo.userName || "-" }}」邀请您加入他的团队：</div>
 		<div class="r_box g_pt_24 g_pb_16 g_text_c">
 			<img class="g_h_80 g_w_80 g_radius_50" :src="agencyInfo.logo || 'https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/APP/default.svg'" alt="" />
 			<div class="g_fs_20 g_mt_12 g_mb_12 g_fw_600">
@@ -11,8 +11,12 @@
 				{{ agencyInfo.desp || "-" }}
 			</div>
 		</div>
-		<div class="g_mt_60 r_box g_pl_10">
-			<u-input v-model="userInfo.userName" height="88" placeholder="请输入你的姓名"></u-input>
+		<div class="g_mt_30"> 
+			<div class="g_fs_20 g_mb_8 g_pl_12">填写个人信息:</div>
+			<div class="r_box g_pl_10">
+				<u-input v-model="userInfo.userName" height="88" placeholder="请输入你的姓名"></u-input>
+			</div>
+			<div class="g_fs_12 g_c_9 g_pl_12">该名称会在团队成员列表显示，创建人可以修改。</div>
 		</div>
 		<div class="g_mt_84">
 			<g-button v-if="!applying && agencyInfo.agencyName" btnText="申请加入团队" type="primary" class="" @clickBtn="applyAdd"></g-button>
@@ -96,7 +100,7 @@ export default {
 		},
 		getAgencyById() {
 			let that = this;
-			this.G.Get(this.api.order_getAgencyById, { agencyId: that.uid }, (res) => {
+			this.G.Get(this.api.order_getAgencyById, { agencyId: that.uid, inviteUserId: this.inviteUserId }, (res) => {
 				console.log(res);
 				that.agencyInfo = res;
 			});
diff --git a/root/person/memberApplyQRCode.vue b/root/person/memberApplyQRCode.vue
index 048185e..6941be0 100644
--- a/root/person/memberApplyQRCode.vue
+++ b/root/person/memberApplyQRCode.vue
@@ -1,7 +1,7 @@
 <template>
 	<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' : ''">
 		<!-- #ifdef APP-PLUS || MP-WEIXIN -->
-		<image :src="shareJobImg" style="width: 343px; height: 555px; margin: 0 auto; display: block" mode=""></image>
+		<image :src="shareJobImg" show-menu-by-longpress style="width: 343px; height: 555px; margin: 0 auto; display: block" mode=""></image>
 		<!-- #endif -->
 		<!-- #ifdef APP-PLUS -->
 		<canvas
@@ -139,7 +139,7 @@ export default {
 		let that = this;
 
 		uni.getImageInfo({
-			src: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/canvasBg.png", // 网络图片
+			src: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/joinTeam.png", // 网络图片
 			success(res) {
 				that.canvasWidth = res.width;
 				that.canvasHeight = res.height;
diff --git a/root/person/orderEdit.vue b/root/person/orderEdit.vue
new file mode 100644
index 0000000..6aace54
--- /dev/null
+++ b/root/person/orderEdit.vue
@@ -0,0 +1,381 @@
+<template>
+	<view class="" style="height: calc(100vh - 47px)" v-if="userInfo.agencyStatus != 1" hover-class="none" hover-stop-propagation="false">
+		<unloginInfo></unloginInfo>
+	</view>
+	<div class="g_pb_32" style="min-height: calc(100vh - 47px)" v-else
+			 :data-admin="isAdmin"
+	>
+		<view class="">
+			<g-panel-form-item
+				:list="[
+					{
+						icon: '',
+						label: '当前团队',
+						result: userInfo.agencyName,
+						path: '',
+						tip: 'userAgreement',
+					},
+				]"
+				@clickItem="teamSet"
+			/>
+		</view>
+		<view class="g_mt_10">
+			<g-panel-form-item :isDisabled="isAdmin ? 0 : 1" class="g_mb_10" :list="companyConfig" @clickItem="handleItemClick"> </g-panel-form-item>
+		</view>
+		<view class="g_mt_10">
+			<g-panel-form-item
+				class="g_mb_10"
+				:isDisabled="isAdmin ? 0 : 1"
+				:list="[
+					{
+						icon: '',
+						label: '联系人',
+						result: info.contactUserName || '请输入联系人姓名',
+						value: info.contactUserName,
+						fontColor: !info.contactUserName ? 'g_c_9' : 'g_c_3',
+						path: '/root/person/change?label=联系人&fieldName=contactUserName&value=' + info.contactUserName,
+						tip: 'user-name',
+						placeholder: '请输入联系人姓名',
+						fontSize: '16px',
+						type: 'text',
+						pColumn: 19,
+						pRow: 12,
+						require: false,
+						params: {
+							label: '联系人',
+							fieldName: 'contactUserName',
+						},
+					},
+					{
+						icon: '',
+						label: '联系电话',
+						result: info.contactTel || '请输入联系电话',
+						value: info.contactTel,
+						fontColor: !info.contactTel ? 'g_c_9' : 'g_c_3',
+						path: '/root/person/change?label=联系电话&fieldName=contactTel&value=' + info.contactTel,
+						tip: 'user-name',
+						placeholder: '请输入联系电话',
+						fontSize: '16px',
+						type: 'text',
+						pColumn: 19,
+						pRow: 12,
+						require: false,
+						params: {
+							label: '联系电话',
+							fieldName: 'contactTel',
+						},
+					},
+					{
+						icon: '',
+						label: '联系人二维码',
+						fontColor: !info.contactWechatQrcode ? 'g_c_9' : 'g_c_3',
+						value: info.contactWechatQrcode,
+						path: '/root/agency/agencyAvatar?label=联系人二维码&fieldName=contactWechatQrcode&value=' + info.contactWechatQrcode,
+						tip: 'avatar',
+						radius: 2,
+						type: 'text',
+						fontSize: '16px',
+						pColumn: 22,
+						pRow: 12,
+						params: {
+							fieldName: 'contactWechatQrcode',
+						},
+					},
+				]"
+				@clickItem="handleItemClick"
+			>
+			</g-panel-form-item>
+		</view>
+		<!-- <view class="g_mt_24"  >
+			<g-button btnText="保存" type="primary" @clickBtn="save"></g-button>
+		</view> -->
+
+		<u-popup v-model="teamSetShow" mode="bottom" uZindex="9999" height="880" border-radius="12" :mask-close-able="true" width="694rpx">
+			<view class="g_text_c g_fw_600 g_fs_18 g_border_e_b" style="line-height: 56px">切换团队</view>
+			<scroll-view class="g_pb_32 g_fs_16" scroll-y="true" style="height: calc(100% - 92px)">
+				<view class="g_flex_row_between g_p_16 g_border_e_b" hover-class="thover" hover-stop-propagation="true" v-for="(item, index) in teamList" :key="index" @click="toogleTeam(item)">
+					<view class="g_flex_row_between">
+						<view class="f17">{{ item.agencyName }}</view>
+					</view>
+					<view class style="color: #1890ff"> {{ item.checked ? "当前" : "" }}</view>
+				</view>
+			</scroll-view>
+		</u-popup>
+	</div>
+</template>
+
+<script>
+import gEmpty from "@/components/empty.vue";
+import gPanelFormItem from "@/components/panel/formItem.vue";
+import unloginInfo from "@/components/unloginInfo.vue";
+export default {
+	components: {
+		gEmpty,
+		gPanelFormItem,
+		unloginInfo,
+	},
+	data() {
+		return {
+			isAdmin: uni.getStorageSync("apply-userinfo").admin,
+			userInfo: uni.getStorageSync("apply-userinfo"),
+			teamSetShow: false,
+			teamList: [],
+			companyConfig: [],
+			info: {
+				userName: "",
+				desp: "",
+			},
+			shopImg: [],
+		};
+	},
+	onLoad() {},
+	onShow() {},
+	created() {
+		var that = this;
+		console.log("createdcreatedcreatedcreatedcreatedcreatedcreatedcreatedcreatedcreatedcreatedcreated");
+		uni.$on("changeCompanyDesp", function (data) {
+			console.log("data", data);
+			console.log("changeCompanyDespchangeCompanyDespchangeCompanyDespchangeCompanyDesp");
+			that.getAgencyInfo();
+		});
+		that.resetInfo();
+		that.getTeamList();
+		if (that.userInfo.agencyStatus == 1) {
+			that.getAgencyInfo();
+		}
+	},
+
+	methods: {
+		save() {
+			let that = this;
+			let subObj = {
+				recordId: that.info.id,
+				fullName: that.info.fullName,
+				logo: that.info.logo,
+				agencyName: that.info.agencyName,
+				desp: that.info.desp,
+				imgs: that.shopImg.map((item) => item.url).join(","),
+				aboutUs: that.info.aboutUs,
+				contactUserName: that.info.contactUserName,
+				contactTel: that.info.contactTel,
+				contactAvatar: that.info.contactAvatar,
+				contactWechatQrcode: that.info.contactWechatQrcode,
+				address: that.info.address,
+				lat: that.info.lat,
+				lng: that.info.lng,
+				district: that.info.district,
+				codeUSC: that.info.codeUSC,
+				registerTel: that.info.registerTel,
+				storeStatus: that.info.storeStatus,
+				bank: that.info.bank,
+				registerAddress: that.info.registerAddress,
+				bankCardNo: that.info.bankCardNo,
+				slogan: that.info.slogan,
+			};
+			this.G.Post("/yishoudan/agency/updageAgencyInfo", subObj, (res) => {
+				console.log("resresresresresres", res);
+				that.getAgencyInfo();
+			});
+		},
+		getAgencyInfo() {
+			let that = this;
+			this.G.Get(this.api.login_agencyInfo, {}, (res) => {
+				console.log("resresres", res);
+				that.info = res.agency;
+				if (res.agency.imgs) {
+					let imgList = res.agency.imgs.split(",");
+					that.shopImg = imgList.map((item) => {
+						return {
+							url: item,
+						};
+					});
+				}
+				that.resetInfo();
+			});
+		},
+		resetInfo() {
+			let that = this;
+			that.companyConfig = [
+				{
+					icon: "",
+					label: "企业头像",
+					value: that.info.logo,
+					path: "/root/agency/agencyAvatar?label=企业头像&fieldName=logo&value=" + that.info.logo,
+					tip: "avatar",
+					type: "text",
+					fontSize: "16px",
+					radius: 2,
+					pColumn: 19,
+					pRow: 12,
+					require: false,
+				},
+				{
+					icon: "",
+					label: "企业名称",
+					result: that.info.agencyName || "请输入企业名称",
+					value: that.info.agencyName,
+					fontColor: !that.info.agencyName ? "g_c_9" : "g_c_3",
+					path: "/root/person/change?label=企业名称&fieldName=agencyName&value=" + that.info.agencyName,
+					tip: "user-name",
+					placeholder: "请输入企业名称",
+					fontSize: "16px",
+					type: "text",
+					pColumn: 19,
+					pRow: 12,
+					require: false,
+					params: {
+						label: "企业名称",
+						fieldName: "agencyName",
+					},
+				},
+				{
+					icon: "",
+					label: "企业简称",
+					result: that.info.fullName || "请输入企业简称",
+					value: that.info.fullName,
+					fontColor: !that.info.fullName ? "g_c_9" : "g_c_3",
+					path: "/root/person/change?label=企业简称&fieldName=fullName&value=" + that.info.fullName,
+					tip: "user-name",
+					placeholder: "请输入企业简称",
+					fontSize: "16px",
+					type: "text",
+					pColumn: 19,
+					pRow: 12,
+					require: false,
+					params: {
+						label: "企业简称",
+						fieldName: "fullName",
+					},
+				},
+				{
+					icon: "",
+					label: "宣传口号",
+					result: that.info.slogan || "请输入宣传口号",
+					value: that.info.slogan,
+					fontColor: !that.info.slogan ? "g_c_9" : "g_c_3",
+					path: "/root/person/change?label=宣传口号&fieldName=slogan&value=" + that.info.slogan,
+					tip: "user-name",
+					placeholder: "请输入宣传口号",
+					fontSize: "16px",
+					type: "text",
+					pColumn: 19,
+					pRow: 12,
+					require: false,
+					params: {
+						label: "宣传口号",
+						fieldName: "slogan",
+					},
+				},
+				{
+					icon: "",
+					label: "企业地址",
+					result: that.info.address || "请选择企业地址",
+					fontColor: !that.info.address ? "g_c_9" : "g_c_3",
+					path: "/root/person/change?label=企业地址&fieldName=address&value=" + JSON.stringify({ address: that.info.address, lat: that.info.lat, lng: that.info.lng }),
+					tip: "dizhi",
+					placeholder: "请选择企业地址",
+					type: "slot",
+					fontSize: "16px",
+					pColumn: 19,
+					pRow: 12,
+					require: false,
+					suffix: "icon-dizhi1",
+				},
+
+				{
+					icon: "",
+					label: "企业简介",
+					result: that.info.desp || "请输入企业简介",
+					fontColor: !that.info.desp ? "g_c_9" : "g_c_3",
+					// value: that.info.desp || '请输入企业简介',
+					path: "/root/person/change?label=企业简介&fieldName=desp&value=" + that.info.desp,
+					tip: "user-more-word",
+					placeholder: "请输入企业简介",
+					type: "text",
+					fontSize: "16px",
+					pColumn: 19,
+					pRow: 12,
+					params: {
+						label: "企业简介",
+						fieldName: "desp",
+					},
+				},
+			];
+		},
+
+		handleItemClick(e) {
+			let that = this;
+			uni.navigateTo({
+				url: e.item.path,
+			});
+			// console.log("点击了", item);
+			// if (item.path) {
+			//     let url = item.path;
+			//     if (item.params) {
+			//         let paramsStr = "";
+			//         for (let key in item.params) {
+			//             if (paramsStr) {
+			//                 paramsStr += "&";
+			//             }
+			//             paramsStr += `${key}=${encodeURIComponent(item.params[key])}`;
+			//         }
+			//         url += `?${paramsStr}`;
+			//     }
+			//     uni.navigateTo({
+			//         url: url,
+			//     });
+			// }
+		},
+
+		teamSet() {
+			this.teamSetShow = true;
+		},
+		getTeamList() {
+			let that = this;
+			this.G.Get(this.api.user_getTeamList, {}, (res) => {
+				console.log(res);
+				res.forEach((item) => {
+					if (item.id == that.userInfo.agencyId) {
+						item.checked = true;
+					}
+				});
+				that.teamList = res;
+			});
+		},
+		toogleTeam($item) {
+			let that = this;
+			if (that.userInfo.agencyId == $item.id) {
+				return false;
+			}
+			wx.showLoading({
+				title: "切换中...",
+			});
+			that.G.Get(that.api.user_toggleTeam + `/${$item.id}`, {}, (res) => {
+				uni.setStorageSync("apply-agencyId", $item.id);
+				console.log(res);
+				that.G.checkTokenNew().then(() => {
+					uni.showToast({
+						title: "切换成功",
+						icon: "success",
+						duration: 2000,
+					});
+					that.teamSetShow = false;
+					that.userInfo = uni.getStorageSync("apply-userinfo");
+					uni.$emit("isGlogin", {
+						uid: that.userInfo.user.id,
+					});
+					that.getAgencyInfo();
+					that.getTeamList();
+					that.isAdmin = uni.getStorageSync("apply-userinfo").admin;
+				});
+			});
+		},
+	},
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #ededed;
+}
+</style>
diff --git a/root/person/pwdForget copy.vue b/root/person/pwdForget copy.vue
new file mode 100644
index 0000000..88b5a05
--- /dev/null
+++ b/root/person/pwdForget copy.vue	
@@ -0,0 +1,154 @@
+<template>
+	<view class="p-root-person-pwdForget g_w_all g_h_all g_bg_f_5 g_kuaishou">
+		<view class="g_pt_16 g_mb_24">
+			<g-panel-form-slot :list='[
+					{
+						icon:"",
+						label:"手机号",
+						result:tel,
+						path:"",
+						tip:"mobile",
+						type:"slot",
+					},
+					{
+						icon:"",
+						label:"验证码",
+						result:"",
+						path:"",
+						tip:"slot-code",
+						value:code,
+						type:"slot",
+						placeholder:"输入验证码",
+						pColumn:12
+					},
+				]'
+				@changeCode="getCode"
+			>
+			</g-panel-form-slot>
+		</view>
+		<view class="">
+			<g-panel-form-slot :list='[
+					{
+						icon:"",
+						label:"新密码",
+						result:"",
+						path:"",
+						tip:"slot-new-pwd",
+						value:newPwd,
+						type:"slot",
+						placeholder:"请输入新密码",
+						pColumn:12
+					},
+					{
+						icon:"",
+						label:"确认密码",
+						result:"",
+						path:"",
+						tip:"slot-confirm-pwd",
+						value:confirmPwd,
+						type:"slot",
+						placeholder:"再次输入新密码",
+						pColumn:12
+					},
+				]'
+				@changeNewPwd="getNewPwd"
+				@changeConfirmPwd="getConfirmPwd"
+			>
+			</g-panel-form-slot>
+		</view>	
+		<view class="g_pt_90 g_flex_row_center">
+			<g-button btnText='修改密码' type='primary' @clickBtn='submitForm' />
+		</view>
+	</view>	
+</template>
+
+<script>
+	export default{
+		onReady() {
+			this.G.setNavStyle();
+		},
+		onShareAppMessage(){
+			return this.G.shareFun();
+		},
+		data(){
+			return{
+				tel:uni.getStorageSync("apply-tel"),
+				code:"",
+				newPwd:"",
+				confirmPwd:"",
+			}
+		},
+		methods:{
+			getCode(e){
+				this.code = e;
+			},
+			getNewPwd(e){
+				this.newPwd = e;
+			},
+			getConfirmPwd(e){
+				this.confirmPwd = e;
+			},
+			submitForm(){
+				let that = this;
+				if(that.code == ''){
+					uni.showToast({
+						title:'请输入验证码',
+						icon:'none'
+					})
+					return false;
+				};
+				if(that.newPwd == ''){
+					uni.showToast({
+						title:'请输入新密码',
+						icon:'none'
+					})
+					return false;
+				};
+				if(that.confirmPwd == ''){
+					uni.showToast({
+						title:'请再次输入新密码',
+						icon:'none'
+					})
+					return false;
+				};
+				if(that.confirmPwd != that.newPwd){
+					uni.showToast({
+						title:'前后密码不一致',
+						icon:'none'
+					})
+					return false;
+				};
+				that.G.Get(that.api.user_changeForgetPwd,{
+					tel: uni.getStorageSync("apply-tel"),
+					code: that.code,
+					password: that.newPwd
+				},()=>{
+					uni.showToast({
+						title:'修改成功',
+						icon:'success'
+					})
+					setTimeout(()=>{
+						that.G.Get(that.api.login_out,{},()=>{
+							that.G.clearLocalStorage();
+							let params = {
+								path:'',
+								level:"",
+							}
+							uni.reLaunch({
+								url: '/pages/login/index?' + that.G.objToStr(params)
+							});
+						})
+					},1500)
+				})
+			},
+			goPage(){
+				uni.navigateTo({
+					url:'/root/person/pwdForget'
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/root/person/pwdForget.vue b/root/person/pwdForget.vue
index 88b5a05..4c090b6 100644
--- a/root/person/pwdForget.vue
+++ b/root/person/pwdForget.vue
@@ -1,154 +1,178 @@
 <template>
-	<view class="p-root-person-pwdForget g_w_all g_h_all g_bg_f_5 g_kuaishou">
-		<view class="g_pt_16 g_mb_24">
-			<g-panel-form-slot :list='[
-					{
-						icon:"",
-						label:"手机号",
-						result:tel,
-						path:"",
-						tip:"mobile",
-						type:"slot",
-					},
-					{
-						icon:"",
-						label:"验证码",
-						result:"",
-						path:"",
-						tip:"slot-code",
-						value:code,
-						type:"slot",
-						placeholder:"输入验证码",
-						pColumn:12
-					},
-				]'
-				@changeCode="getCode"
-			>
-			</g-panel-form-slot>
-		</view>
-		<view class="">
-			<g-panel-form-slot :list='[
-					{
-						icon:"",
-						label:"新密码",
-						result:"",
-						path:"",
-						tip:"slot-new-pwd",
-						value:newPwd,
-						type:"slot",
-						placeholder:"请输入新密码",
-						pColumn:12
-					},
-					{
-						icon:"",
-						label:"确认密码",
-						result:"",
-						path:"",
-						tip:"slot-confirm-pwd",
-						value:confirmPwd,
-						type:"slot",
-						placeholder:"再次输入新密码",
-						pColumn:12
-					},
-				]'
-				@changeNewPwd="getNewPwd"
-				@changeConfirmPwd="getConfirmPwd"
-			>
-			</g-panel-form-slot>
-		</view>	
-		<view class="g_pt_90 g_flex_row_center">
-			<g-button btnText='修改密码' type='primary' @clickBtn='submitForm' />
-		</view>
-	</view>	
+	<div class="g_bg_page g_pl_10 g_pr_10">
+		<div class="g_h_20"></div>
+		<div class="g_mb_10 g_fs_18 g_pl_10">「{{ beFllowAgencyInfo.inviteUserName || "-" }}」邀请您加入他的团队：</div>
+		<div class="r_box g_pt_24 g_text_c g_pl_20 g_pr_20">
+			<div class="g_pb_16">
+				<img class="g_h_80 g_w_80 g_radius_50" :src="beFllowAgencyInfo.logo || 'https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/APP/default.svg'" alt="" />
+				<div class="g_fs_20 g_mt_12 g_mb_12 g_fw_600">
+					{{ beFllowAgencyInfo.agencyName || "-" }}
+				</div>
+				<div class="g_c_9 g_fs_14">
+					{{ beFllowAgencyInfo.desp || "-" }}
+				</div>
+			</div>
+			<div class="g_flex_row_between g_pb_12 g_pt_12" style="border-top: 1rpx dotted #eee">
+				<div v-for="item in numList" class="g_flex_row_center flex_end">
+					<div class="g_fs_20 g_fw_600">{{ item.num }}</div>
+					<div class="g_fs_14 g_c_9">{{ item.label }}</div>
+				</div>
+			</div>
+		</div>
+		<div class="g_mt_30">
+			<div class="g_fs_18 g_mb_8 g_pl_12">填写企业简称:</div>
+			<div class="r_box g_pl_10">
+				<u-input v-model="agencyInfo.fullName" height="88" placeholder="区域+名称，如:上海发财劳务"></u-input>
+			</div>
+			<div class="g_fs_12 g_c_9 g_mt_6 g_pl_12">设置后系统将自动创建团队并关注该发单号，您作为创建人可在我的页面管理团队。</div>
+		</div>
+
+		<div class="g_mt_84">
+			<quickLogin @successLogin="successLogin" v-if="!agencyInfo.id">
+				<g-button btnText="申请关注" type="primary" class=""></g-button>
+			</quickLogin>
+			<div v-else>
+				<g-button v-if="beFllowAgencyInfo.recordStatus == 1" btnText="已关注" type="disabled" class=""></g-button>
+				<g-button v-else-if="beFllowAgencyInfo.recordStatus == 2" btnText="互相关注" type="disabled" class=""></g-button>
+				<g-button v-else-if="(beFllowAgencyInfo.recordStatus == 3 || beFllowAgencyInfo.recordStatus == 4) && !isSelf" btnText="申请关注" type="primary" class="" @clickBtn="applyAdd"></g-button>
+				<g-button v-else-if="beFllowAgencyInfo.recordStatus == 5" btnText="等待通过" type="disabled" class=""></g-button>
+				<g-button v-else-if="beFllowAgencyInfo.recordStatus == 6 && !isSelf" btnText="申请关注" type="primary" class="" @clickBtn="applyAdd"></g-button>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script>
-	export default{
-		onReady() {
-			this.G.setNavStyle();
-		},
-		onShareAppMessage(){
-			return this.G.shareFun();
-		},
-		data(){
-			return{
-				tel:uni.getStorageSync("apply-tel"),
-				code:"",
-				newPwd:"",
-				confirmPwd:"",
-			}
-		},
-		methods:{
-			getCode(e){
-				this.code = e;
+import quickLogin from "../../components/quickLogin.vue";
+export default {
+	components: {
+		quickLogin,
+	},
+	data() {
+		return {
+			beFllowAgencyInfo: {
+				agencyName: "",
+				fullName: "",
 			},
-			getNewPwd(e){
-				this.newPwd = e;
+			info: {},
+			agencyInfo: {
+				fullName: "",
+			}, // 登陆者的代理信息
+			userInfo: {
+				userName: "",
+				userId: "",
 			},
-			getConfirmPwd(e){
-				this.confirmPwd = e;
-			},
-			submitForm(){
-				let that = this;
-				if(that.code == ''){
-					uni.showToast({
-						title:'请输入验证码',
-						icon:'none'
-					})
-					return false;
-				};
-				if(that.newPwd == ''){
-					uni.showToast({
-						title:'请输入新密码',
-						icon:'none'
-					})
-					return false;
-				};
-				if(that.confirmPwd == ''){
-					uni.showToast({
-						title:'请再次输入新密码',
-						icon:'none'
-					})
-					return false;
-				};
-				if(that.confirmPwd != that.newPwd){
-					uni.showToast({
-						title:'前后密码不一致',
-						icon:'none'
-					})
-					return false;
-				};
-				that.G.Get(that.api.user_changeForgetPwd,{
-					tel: uni.getStorageSync("apply-tel"),
-					code: that.code,
-					password: that.newPwd
-				},()=>{
-					uni.showToast({
-						title:'修改成功',
-						icon:'success'
-					})
-					setTimeout(()=>{
-						that.G.Get(that.api.login_out,{},()=>{
-							that.G.clearLocalStorage();
-							let params = {
-								path:'',
-								level:"",
-							}
-							uni.reLaunch({
-								url: '/pages/login/index?' + that.G.objToStr(params)
-							});
-						})
-					},1500)
-				})
-			},
-			goPage(){
-				uni.navigateTo({
-					url:'/root/person/pwdForget'
-				})
-			}
+			numList: [
+				{ label: "总职位", num: "-" },
+				{ label: "最近更新", num: "-" },
+				{ label: "粉丝", num: "-" },
+			],
+			inviteUserId: "",
+			uid: "",
+			ing: false,
+			scene: "",
+			isSelf: false,
+		};
+	},
+	onLoad(options) {
+		let that = this;
+		console.log(options);
+		options.scene = "id=3087_101125";
+		if (options.scene) {
+			console.log("XXXXXXXXXXXX");
+			//扫小程序码携带参数
+			this.scene = options.scene;
+			var sceneStr = decodeURIComponent(options.scene);
+			var sceneJson = this.G.sceneToJson(sceneStr);
+			console.log("sceneJson===", sceneJson);
+			this.inviteUserId = sceneJson.id.split("_")[1]; //被关注团队的邀请人id
+			this.uid = sceneJson.id.split("_")[0]; // 被关注团队的id
+			that.G.Get("/checkUserLogin", {}, (res) => {
+				console.log("checkUserLogin", res);
+				if (res) {
+					that.getAgencyInfo().then(() => {
+						that.getAgencyById();
+					});
+				} else {
+					that.getAgencyById();
+				}
+			});
 		}
-	}
+	},
+	created() {},
+
+	methods: {
+		applyAdd() {
+			let that = this;
+
+			if (!this.agencyInfo.fullName) {
+				uni.showToast({
+					title: "请输入企业简称",
+					icon: "none",
+				});
+				return;
+			}
+			if (this.ing) {
+				return;
+			}
+			that.ing = true;
+			let _code = 1; // 账号搜索
+			// if (this.from == "friend") {
+			// 	_code = 2; // 名片分享
+			// } else {
+			if (this.scene) {
+				_code = 3; // 扫一扫
+			} else {
+				_code = 1; // 账号搜索
+			}
+			// }
+			this.G.Get(this.api.bind_subscribeSubmit + "/" + that.uid, { agencyId: that.agencyInfo.id, agencyName: that.agencyInfo.fullName, source: _code, remark: " " }, (res) => {
+				uni.showToast({
+					title: "申请成功",
+					icon: "none",
+				});
+				uni.navigateTo({
+					url: "/root/person/inviteFollowSuccess",
+				});
+				// that.checkHasApply();
+				console.log(res);
+			});
+		},
+		getAgencyById() {
+			let that = this;
+			this.G.Get(this.api.order_getAgencyByIdForApply, { agencyId: that.uid, inviteUserId: this.inviteUserId }, (res) => {
+				console.log("resresresresresres", res);
+				that.beFllowAgencyInfo = res;
+				if (res.id == that.agencyInfo.id) {
+					that.isSelf = true;
+				}
+				that.numList = [
+					{ label: "总职位", num: res.jobNum },
+					{ label: "最近更新", num: res.recruitmentJobNum },
+					{ label: "粉丝", num: res.downNum },
+				];
+			});
+		},
+		successLogin(e) {
+			console.log("successLogin", e);
+			this.getAgencyInfo();
+			this.getAgencyById();
+			this.applyAdd();
+		},
+		getAgencyInfo() {
+			let that = this;
+			return new Promise((reso, reject) => {
+				that.G.Get(that.api.login_agencyInfo, {}, (aRes) => {
+					console.log("获取团队信息:", aRes);
+					that.agencyInfo = { ...aRes.agency, fullName: aRes.agency.fullName ? aRes.agency.fullName : that.agencyInfo.fullName };
+
+					uni.setStorageSync("agencyInfo", aRes.agency);
+					reso();
+				});
+			});
+		},
+	},
+};
 </script>
 
-<style>
-</style>
\ No newline at end of file
+<style></style>
diff --git a/static/css/base.scss b/static/css/base.scss
index f698f4e..c1312ca 100644
--- a/static/css/base.scss
+++ b/static/css/base.scss
@@ -353,6 +353,9 @@ scroll-view::-webkit-scrollbar {
 		&_main {
 			color: $main_color;
 		}
+		&_10a {
+			color: #10aeff;
+		}
 		&_sub {
 			color: #576b95;
 		}
@@ -598,6 +601,10 @@ $max-radius: 50;
 .flex_center {
 	align-items: center;
 }
+.flex_end {
+	align-items: end;
+	align-items: flex-end;
+}
 .flex_nw {
 	flex-wrap: nowrap;
 }
@@ -637,10 +644,10 @@ $max-radius: 50;
 	min-height: 100vh !important;
 	/* #endif */
 }
-.r_box{
-  border-radius: 8px;
-  background-color: #fff;
+.r_box {
+	border-radius: 8px;
+	background-color: #fff;
 }
 .pri {
 	white-space: pre-line;
-}
\ No newline at end of file
+}
diff --git a/utils/ajax.js b/utils/ajax.js
index fed98df..106435c 100644
--- a/utils/ajax.js
+++ b/utils/ajax.js
@@ -151,7 +151,7 @@ let data = {
           });
           setTimeout(() => {
             uni.reLaunch({
-              url: '/pages/login/index?path=/' + that.getPathCopy().path + '&level=' + that.getPathCopy().level
+              url: '/pages/login/index?path=/pages/home/index&level=' + that.getPathCopy().level
             });
           }, 1500);
         } else {// 其他异常