From cd4b0c7a9c4fc56ddbd525594b4769538a715efb Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Sat, 7 Jun 2025 18:02:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/quickLogin.vue         |  14 ---
 pages.json                        |  12 +-
 pages/person/index.vue            |   4 +-
 root/person/agencyAvatar.vue      | 248 +++++++++++++++++++-------------------
 root/person/inviteFollowMe.vue    | 151 +++++++++++++++--------
 root/person/memberApplyAdd.vue    |   4 +-
 root/person/memberApplyQRCode.vue |   4 +-
 root/person/orderEdit.vue         |   5 +-
 root/person/pwdForget.vue         | 100 +++++++++------
 root/person/set.vue               |   5 +-
 10 files changed, 309 insertions(+), 238 deletions(-)

diff --git a/components/quickLogin.vue b/components/quickLogin.vue
index 8a44c0d..f1ba52b 100644
--- a/components/quickLogin.vue
+++ b/components/quickLogin.vue
@@ -106,20 +106,6 @@ export default {
 			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);
 		},
diff --git a/pages.json b/pages.json
index 2260185..ac140ad 100644
--- a/pages.json
+++ b/pages.json
@@ -124,7 +124,8 @@
         {
           "path": "pwdForget",
           "style": {
-            "navigationBarTitleText": "找回密码"
+            "navigationBarTitleText": "邀请关注"
+            // "navigationBarTitleText": "找回密码"
           }
         },
         {
@@ -172,6 +173,15 @@
             "backgroundColorBottom": "#000000"
           }
         },
+        {
+          "path": "agencyAvatar",
+          "style": {
+            "navigationBarTitleText": " ",
+            "backgroundColor": "#000000",
+            "backgroundColorTop": "#000000",
+            "backgroundColorBottom": "#000000"
+          }
+        },
         {
           "path": "message",
           "style": {
diff --git a/pages/person/index.vue b/pages/person/index.vue
index dd1326b..becd0f7 100644
--- a/pages/person/index.vue
+++ b/pages/person/index.vue
@@ -93,9 +93,7 @@
 				@clickItem="handleClickItem"
 			/>
 		</view>
-		<view class="g_mt_10">
-			<g-panel-form-item :list="[{ icon: 'icon-fankuiyujianyi', label: '反馈与建议', result: '', path: '/root/person/feedback', tip: 'message', pRow: 12 }]" @clickItem="handleClickItem" />
-		</view>
+
 
 		<view class="g_mt_24">
 			<g-panel-form-item
diff --git a/root/person/agencyAvatar.vue b/root/person/agencyAvatar.vue
index 2642f63..1a0c510 100644
--- a/root/person/agencyAvatar.vue
+++ b/root/person/agencyAvatar.vue
@@ -1,132 +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>
+	<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);
-                }
-            );
-        },
-    },
+	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
+<style></style>
diff --git a/root/person/inviteFollowMe.vue b/root/person/inviteFollowMe.vue
index 9613c19..3534c67 100644
--- a/root/person/inviteFollowMe.vue
+++ b/root/person/inviteFollowMe.vue
@@ -1,15 +1,15 @@
 <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="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="agencyInfo.logo || 'https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/APP/default.svg'" alt="" />
+				<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">
-					{{ agencyInfo.agencyName || "-" }}
+					{{ beFllowAgencyInfo.agencyName || "-" }}
 				</div>
 				<div class="g_c_9 g_fs_14">
-					{{ agencyInfo.desp || "-" }}
+					{{ beFllowAgencyInfo.desp || "-" }}
 				</div>
 			</div>
 			<div class="g_flex_row_between g_pb_12 g_pt_12" style="border-top: 1rpx dotted #eee">
@@ -22,79 +22,96 @@
 		<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>
+				<u-input v-model="agencyInfo.fullName" :disabled="disabled" 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>
+			<quickLogin @successLogin="successLogin" v-if="!agencyInfo.id">
+				<g-button btnText="申请关注" type="primary" class=""></g-button>
+			</quickLogin>
+			<g-button v-else-if="isSelf" btnText="不能关注自己" type="disabled"></g-button>
+			<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>
+import quickLogin from "../../components/quickLogin.vue";
 export default {
+	components: {
+		quickLogin,
+	},
 	data() {
 		return {
-			agencyInfo: {
+			beFllowAgencyInfo: {
 				agencyName: "",
 				fullName: "",
 			},
+			info: {},
+			agencyInfo: {
+				fullName: "",
+			}, // 登陆者的代理信息
 			userInfo: {
 				userName: "",
 				userId: "",
 			},
 			numList: [
-				{ label: "总职位", num: 0 },
-				{ label: "最近更新", num: 0 },
-				{ label: "粉丝", num: 0 },
+				{ label: "总职位", num: "-" },
+				{ label: "最近更新", num: "-" },
+				{ label: "粉丝", num: "-" },
 			],
-			applying: false,
 			inviteUserId: "",
 			uid: "",
 			ing: false,
+			scene: "",
+			isSelf: false,
+			disabled: false,
 		};
 	},
 	onLoad(options) {
+		let that = this;
 		console.log(options);
 		// options.scene = "id=3087_101125";
-		if (uni.getStorageSync("scene") || options.scene) {
+		if (options.scene) {
 			console.log("XXXXXXXXXXXX");
 			//扫小程序码携带参数
-			var sceneStr = uni.getStorageSync("scene") ? decodeURIComponent(uni.getStorageSync("scene")) : decodeURIComponent(options.scene);
+			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];
-			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);
+			this.inviteUserId = sceneJson.id.split("_")[1]; //被关注团队的邀请人id
+			this.uid = sceneJson.id.split("_")[0]; // 被关注团队的id
 		}
 	},
+	onShow() {
+		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.userInfo.userName) {
+			if (!this.agencyInfo.fullName) {
 				uni.showToast({
-					title: "请输入你的姓名",
+					title: "请输入企业简称",
 					icon: "none",
 				});
 				return;
@@ -103,37 +120,67 @@ export default {
 				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",
+			let _code = 1; // 账号搜索
+			// if (this.from == "friend") {
+			// 	_code = 2; // 名片分享
+			// } else {
+			if (this.scene) {
+				_code = 3; // 扫一扫
+			} else {
+				_code = 1; // 账号搜索
+			}
+			// }
+			return new Promise((reso) => {
+				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",
+					});
+					reso();
+					// that.checkHasApply();
+					console.log(res);
 				});
-				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;
+				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.jobUpdateNum },
+					{ label: "最近更新", num: res.recruitmentJobNum },
 					{ label: "粉丝", num: res.downNum },
 				];
 			});
 		},
-		checkHasApply() {
+		successLogin(e) {
 			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);
+			console.log("successLogin", e);
+			this.getAgencyInfo().then(() => {
+				that.getAgencyById();
+				that.applyAdd();
+			});
+		},
+		getAgencyInfo() {
+			let that = this;
+			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 };
+
+					uni.setStorageSync("agencyInfo", aRes.agency);
+					setTimeout(() => {
+						reso();
+					}, 200);
+				});
 			});
 		},
 	},
diff --git a/root/person/memberApplyAdd.vue b/root/person/memberApplyAdd.vue
index edd4808..f89a37a 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.userName || "-" }}」邀请您加入他的团队：</div>
+		<div class="g_mb_10 g_fs_18 g_pl_10">「{{ agencyInfo.inviteUserName || "-" }}」邀请您加入他的团队：</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">
@@ -100,7 +100,7 @@ export default {
 		},
 		getAgencyById() {
 			let that = this;
-			this.G.Get(this.api.order_getAgencyById, { agencyId: that.uid, inviteUserId: this.inviteUserId }, (res) => {
+			this.G.Get(this.api.order_getAgencyByIdForApply, { 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 6941be0..d8000c7 100644
--- a/root/person/memberApplyQRCode.vue
+++ b/root/person/memberApplyQRCode.vue
@@ -198,7 +198,7 @@ export default {
 					// #ifdef MP-WEIXIN
 					console.log("canvasRes1");
 
-					that.getWXCanvas("https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/canvasBg.png").then((canvasRes) => {
+					that.getWXCanvas("https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/joinTeam.png").then((canvasRes) => {
 						console.log("canvasRes", canvasRes);
 						that.shareJobImg = canvasRes.tempFilePath;
 						that.allowClick = true;
@@ -227,7 +227,7 @@ export default {
 					// #ifdef APP-PLUS || MP-KUAISHOU
 					uni.hideLoading();
 					that.allowClick = true;
-					that.getAppCanvas("https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/canvasBg.png");
+					that.getAppCanvas("https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/joinTeam.png");
 					console.log("canvasRes12");
 					// #endif
 				}
diff --git a/root/person/orderEdit.vue b/root/person/orderEdit.vue
index 6aace54..2ef1654 100644
--- a/root/person/orderEdit.vue
+++ b/root/person/orderEdit.vue
@@ -70,7 +70,7 @@
 						label: '联系人二维码',
 						fontColor: !info.contactWechatQrcode ? 'g_c_9' : 'g_c_3',
 						value: info.contactWechatQrcode,
-						path: '/root/agency/agencyAvatar?label=联系人二维码&fieldName=contactWechatQrcode&value=' + info.contactWechatQrcode,
+						path: '/root/person/agencyAvatar?label=联系人二维码&fieldName=contactWechatQrcode&value=' + info.contactWechatQrcode,
 						tip: 'avatar',
 						radius: 2,
 						type: 'text',
@@ -200,7 +200,7 @@ export default {
 					icon: "",
 					label: "企业头像",
 					value: that.info.logo,
-					path: "/root/agency/agencyAvatar?label=企业头像&fieldName=logo&value=" + that.info.logo,
+					path: "/root/person/agencyAvatar?label=企业头像&fieldName=logo&value=" + that.info.logo,
 					tip: "avatar",
 					type: "text",
 					fontSize: "16px",
@@ -305,6 +305,7 @@ export default {
 
 		handleItemClick(e) {
 			let that = this;
+			console.log("e", e);
 			uni.navigateTo({
 				url: e.item.path,
 			});
diff --git a/root/person/pwdForget.vue b/root/person/pwdForget.vue
index 4c090b6..cb0dde9 100644
--- a/root/person/pwdForget.vue
+++ b/root/person/pwdForget.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">「{{ beFllowAgencyInfo.inviteUserName || "-" }}」邀请您加入他的团队：</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="" />
@@ -22,7 +22,7 @@
 		<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>
+				<u-input v-model="agencyInfo.fullName" :customStyle="{ color: disabled ? '#999' : '#333' }" :disabled="disabled" height="88" placeholder="区域+名称，如:上海发财劳务"></u-input>
 			</div>
 			<div class="g_fs_12 g_c_9 g_mt_6 g_pl_12">设置后系统将自动创建团队并关注该发单号，您作为创建人可在我的页面管理团队。</div>
 		</div>
@@ -31,6 +31,7 @@
 			<quickLogin @successLogin="successLogin" v-if="!agencyInfo.id">
 				<g-button btnText="申请关注" type="primary" class=""></g-button>
 			</quickLogin>
+			<g-button v-else-if="isSelf" btnText="不能关注自己" type="disabled"></g-button>
 			<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>
@@ -72,12 +73,13 @@ export default {
 			ing: false,
 			scene: "",
 			isSelf: false,
+			disabled: false,
 		};
 	},
 	onLoad(options) {
 		let that = this;
 		console.log(options);
-		options.scene = "id=3087_101125";
+		// options.scene = "id=3087_101125";
 		if (options.scene) {
 			console.log("XXXXXXXXXXXX");
 			//扫小程序码携带参数
@@ -87,18 +89,21 @@ export default {
 			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();
-				}
-			});
 		}
 	},
+	onShow() {
+		let that = this;
+		that.G.Get("/checkUserLogin", {}, (res) => {
+			console.log("checkUserLogin", res);
+			if (res) {
+				that.getAgencyInfo().then(() => {
+					that.getAgencyById();
+				});
+			} else {
+				that.getAgencyById();
+			}
+		});
+	},
 	created() {},
 
 	methods: {
@@ -126,48 +131,69 @@ export default {
 				_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",
+			return new Promise((reso) => {
+				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",
+					});
+					reso();
+					// that.checkHasApply();
+					console.log(res);
 				});
-				// 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 },
-				];
+			return new Promise((reso, reject) => {
+				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 },
+					];
+					reso();
+				});
 			});
 		},
 		successLogin(e) {
+			let that = this;
 			console.log("successLogin", e);
-			this.getAgencyInfo();
-			this.getAgencyById();
-			this.applyAdd();
+			this.getAgencyInfo().then(() => {
+				that.getAgencyById().then(() => {
+					if (that.beFllowAgencyInfo.recordStatus == 3 || that.beFllowAgencyInfo.recordStatus == 4 || that.beFllowAgencyInfo.recordStatus == 6) {
+						that.applyAdd();
+					} else {
+						if (that.beFllowAgencyInfo.recordStatus == 5) {
+							uni.showToast({
+								title: "已发起关注申请, 正在等待通过",
+								icon: "none",
+							});
+						}
+					}
+				});
+			});
 		},
 		getAgencyInfo() {
 			let that = this;
 			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 };
 
 					uni.setStorageSync("agencyInfo", aRes.agency);
-					reso();
+					setTimeout(() => {
+						reso();
+					}, 200);
 				});
 			});
 		},
diff --git a/root/person/set.vue b/root/person/set.vue
index 51f8b8c..c52c448 100644
--- a/root/person/set.vue
+++ b/root/person/set.vue
@@ -1,7 +1,10 @@
 <template>
 	<view class="p-root-person-userinfo g_w_all g_h_all g_bg_f_5 g_kuaishou">
 		<view class="g_h_16"></view>
-		<view class="g_pl_10 g_pr_10 g_pb_16" v-if="isCreator">
+		<view class="">
+			<g-panel-form-item :list="[{ icon: '', label: '反馈与建议', result: '', path: '/root/person/feedback', tip: 'message', pRow: 12 }]" @clickItem="handleClickItem" />
+		</view>
+		<view class="g_pl_10 g_pr_10 g_pb_16 g_mt_10" v-if="isCreator">
 			<view class="g_bg_f g_pl_16 g_pr_16 g_radius_8">
 				<view class="g_flex_row_between g_h_56">
 					<view class="g_flex_column_center g_fs_16 g_c_3">关注邀请</view>