no message

pages/home/index.vue

@@ -326,30 +326,16 @@ export default {
 		let locationUpdated = uni.getStorageSync("LOCATION_SETTING_UPDATED");
 		if (locationUpdated) {
 			uni.removeStorageSync("LOCATION_SETTING_UPDATED");
-			uni.showModal({
+			// 直接执行更新逻辑，去掉弹窗确认
-				title: "",
+			let agencyInfo = uni.getStorageSync("agencyInfo");
-				content: "您已更新默认位置",
+			that.cityLoading = true;
-				confirmText: "点击更新",
+			if (agencyInfo && agencyInfo.fdbHomeCity == 1) {
-				success: (res) => {
+				uni.removeStorageSync("selectedCity");
-					let agencyInfo = uni.getStorageSync("agencyInfo");
+			}
-					if (res.confirm) {
+			that.initSelectedCityByAgencyInfo().then(() => {
-						that.cityLoading = true;
+				that.loadSelectedCityFromCache().then(() => {
-						if (agencyInfo && agencyInfo.fdbHomeCity == 1) {
+					that.getList();
-							uni.removeStorageSync("selectedCity");
+				});
-						}
-						that.initSelectedCityByAgencyInfo().then(() => {
-							that.loadSelectedCityFromCache().then(() => {
-								that.getList();
-							});
-						});
-					} else {
-						that.initSelectedCityByAgencyInfo().then(() => {
-							that.loadSelectedCityFromCache().then(() => {
-								that.getList();
-							});
-						});
-					}
-				}
 			});
 		} else {
 			that.initSelectedCityByAgencyInfo().then(() => {
@@ -705,6 +691,10 @@ export default {
 				that.cityLoading = false;
 				resolve();
 			}
+			// 设置默认tab
+			if (agencyInfo && agencyInfo.fdbHomeTab !== undefined) {
+				that.tabInfo.active = agencyInfo.fdbHomeTab == 1 ? 0 : 1;
+			}
 		},
 		checkScroll() {
 			let that = this;
@@ -848,10 +838,14 @@ export default {
 				console.log("一才职位列表：", res);
 				let resData = {};
 				resData = res.pageBean;
-				if (resData.recordCount == 0) {
+				// 只有在没有配置时才根据职位数量设置tab，否则尊重配置
-					that.tabInfo.active = 0;
+				let agencyInfo = uni.getStorageSync("agencyInfo");
-				} else {
+				if (!agencyInfo || agencyInfo.fdbHomeTab === undefined) {
-					that.tabInfo.active = 1;
+					if (resData.recordCount == 0) {
+						that.tabInfo.active = 0;
+					} else {
+						that.tabInfo.active = 1;
+					}
 				}
 				console.log("that.tabInfo.active", that.tabInfo.active);
 				callback();