Merge branch 'cyl/master'

root/person/agencyAvatar.vue

@@ -119,6 +119,7 @@ export default {
 						icon: "success",
 					});
 					that.G.checkToken();
+					uni.$emit('getBossAvatar',that.avatar)
 					setTimeout(() => {
 						uni.navigateBack();
 					}, 1500);

root/person/avatar.vue

@@ -19,12 +19,8 @@
 			</view>
 			<view class="g_flex_row_center g_mt_30">
 				<view v-if="!isEdit" class="g_flex_row_center">
-					<!-- #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" 
-					<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>
+					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>
-					<!-- #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>
@@ -122,7 +118,9 @@ export default {
 				});
 				that.G.checkToken();
 				setTimeout(() => {
-					uni.navigateBack();
+					uni.redirectTo({
+						url:'/root/person/info'
+					})
 				}, 1500);
 			});
 		},

root/person/change.vue

@@ -147,6 +147,7 @@ export default {
 			this.info.value.address = e.address;
 			this.info.value.lat = e.lat;
 			this.info.value.lng = e.lng;
+			uni.$emit('getBossAddress',that.avatar)
 		},
 	},
 };

root/person/orderEdit.vue

@@ -140,13 +140,25 @@ export default {
 			console.log("changeCompanyDespchangeCompanyDespchangeCompanyDespchangeCompanyDesp");
 			that.getAgencyInfo();
 		});
+		uni.$on("getBossAvatar", function (data) {
+        console.log("接收到 getBossAvatar 事件", data);
+        // 可以在这里执行更新头像的逻辑，例如：
+        // that.info.logo = data.avatarUrl;
+        that.getAgencyInfo(); // 刷新数据
+    });
+		uni.$on("getBossAddress", function (data) {
+        console.log("接收到 getBossAddress 事件", data);
+        // 可以在这里执行更新头像的逻辑，例如：
+        // that.info.logo = data.avatarUrl;
+        that.getAgencyInfo(); // 刷新数据
+    });
+
 		that.resetInfo();
 		that.getTeamList();
 		// if (that.userInfo.agencyStatus == 1) {
 		that.getAgencyInfo();
 		// }
 	}, 
-
 	methods: {
 		save() {
 			let that = this;