From 845fba3777072b44046db7b833185e139c6883e0 Mon Sep 17 00:00:00 2001
From: jscyl13849007907 <13849007907@163.com>
Date: Sat, 30 May 2026 11:24:55 +0800
Subject: [PATCH] no message

---
 root/merchantManagement/child/workbench.vue | 12 +++----
 root/merchantManagement/setting.vue         | 50 ++++++++++++++---------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/root/merchantManagement/child/workbench.vue b/root/merchantManagement/child/workbench.vue
index 14bf8df..86e99f0 100644
--- a/root/merchantManagement/child/workbench.vue
+++ b/root/merchantManagement/child/workbench.vue
@@ -347,12 +347,12 @@ export default {
 				// 	iconType: 1,
 				// 	path: "/root/merchantManagement/bell?type=配置",
 				// },
-				// {
-				// 	name: "通用设置",
-				// 	icon: "setting",
-				// 	iconType: 1,
-				// 	path: "/root/merchantManagement/setting?type=配置",
-				// },
+				{
+					name: "通用设置",
+					icon: "setting",
+					iconType: 1,
+					path: "/root/merchantManagement/setting?type=配置",
+				},
 			];
 		},
 		getApplyNum() {
diff --git a/root/merchantManagement/setting.vue b/root/merchantManagement/setting.vue
index a60cd86..bc78c18 100644
--- a/root/merchantManagement/setting.vue
+++ b/root/merchantManagement/setting.vue
@@ -23,40 +23,40 @@
 		</view> -->
 		
 		<view class="m-card">
-			<view class="g_h_10"></view>
+			<view class="g_h_24"></view>
 			<view class="" hover-class="none" hover-stop-propagation="false">
 				<view class="g_p_10 g_flex_row_between flex_center g_bg_f g_radius_8 g_fs_16" hover-class="none"
 					hover-stop-propagation="false" style="padding: 16px 10px;">
-					<view class="g_flex_column_center g_fw_500 g_c_0 g_fs_17" hover-class="none" hover-stop-propagation="false"> 默认城市 </view>
+					<view class="g_flex_column_center g_fw_500 g_c_0 g_fs_17" hover-class="none" hover-stop-propagation="false"> 职位默认位置 </view>
 					<view class="g_flex_column_center" hover-class="none" hover-stop-propagation="false">
-						<u-switch @change="handleSwitch($event, 'defaultCity')" 
-											cusSize='24' 
-											cusTop='2' 
-											:cusLeft='fdb_Homecity ? 3.5 : 2.2' 
-											v-model="fdb_Homecity" 
-											activeColor="#027aff" 
-											inactiveColor="#e5e5e5"
-						></u-switch>
+						<div class="g_flex_row_end">
+							<div class="g_flex_1 g_flex_column_center" style="font-size: 17px;color: #666;">
+								{{ fdbHomeCity == 1 ? "全国" : "当前城市" }}
+							</div>
+							<div class="g_flex_none g_flex_column_center">
+								<i class="iconfont iconfont icon-gengduo11 g_c_c"></i>
+							</div>
+						</div>
 					</view>
 				</view>
 			</view>
 		</view>
 		
 		<view class="m-card">
-			<view class="g_h_10"></view>
+			<view class="g_h_24"></view>
 			<view class="" hover-class="none" hover-stop-propagation="false">
 				<view class="g_p_10 g_flex_row_between flex_center g_bg_f g_radius_8 g_fs_16" hover-class="none"
 					hover-stop-propagation="false" style="padding: 16px 10px;">
-					<view class="g_flex_column_center g_fw_500 g_c_0 g_fs_17" hover-class="none" hover-stop-propagation="false"> 默认显示推荐 </view>
+					<view class="g_flex_column_center g_fw_500 g_c_0 g_fs_17" hover-class="none" hover-stop-propagation="false"> 职位默认tab </view>
 					<view class="g_flex_column_center" hover-class="none" hover-stop-propagation="false">
-						<u-switch @change="handleSwitch($event, 'recommend')" 
-											cusSize='24' 
-											cusTop='2' 
-											:cusLeft='fdb_HomeTab ? 3.5 : 2.2' 
-											v-model="fdb_HomeTab" 
-											activeColor="#027aff" 
-											inactiveColor="#e5e5e5"
-						></u-switch>
+						<div class="g_flex_row_end">
+							<div class="g_flex_1 g_flex_column_center" style="font-size: 17px;color: #666;">
+								{{ fdbHomeTab == 1 ? "全部" : "推荐" }}
+							</div>
+							<div class="g_flex_none g_flex_column_center">
+								<i class="iconfont iconfont icon-gengduo11 g_c_c"></i>
+							</div>
+						</div>
 					</view>
 				</view>
 			</view>
@@ -103,17 +103,17 @@ export default {
 		that.G.Get(that.api.login_agencyInfo, {}, (aRes) => {
 			uni.setStorageSync("agencyInfo", aRes.agency);
 			let _data = aRes.agency;
-			that.fdb_Homecity = _data.fdbHomeCity == 1 ? true : false;// 0当前城市 1全国
-			that.fdb_HomeTab = _data.fdbHomeTab == 1 ? true : false;//0推荐 1全部
-			console.log("获取团队信息:", aRes, that.fdb_Homecity, that.fdb_HomeTab);
+			that.fdbHomeCity = _data.fdbHomeCity;// 0当前城市 1全国
+			that.fdbHomeTab = _data.fdbHomeTab;//0推荐 1全部
+			console.log("获取团队信息:", aRes, that.fdbHomeCity, that.fdbHomeTab);
 		});
 	},
 	data() {
 			return {
 				applySwitch: false,
 				jobSwitch: false,
-				fdb_Homecity: false,
-				fdb_HomeTab: false,
+				fdbHomeCity: false,
+				fdbHomeTab: false,
 				appInfo: uni.getStorageSync("miniApp-info"),
 			};
 		},