diff --git a/pages.json b/pages.json
index 1ba5841..cd4bb06 100644
--- a/pages.json
+++ b/pages.json
@@ -660,6 +660,16 @@
             // "navigationStyle": "custom"
           }
         },
+        {
+          "path": "bell",
+          "style": {
+            "backgroundColor": "#ededed",
+            "backgroundColorTop": "#ededed",
+            "backgroundColorBottom": "#ededed",
+            "navigationBarTitleText": "温馨提示"
+            // "navigationStyle": "custom"
+          }
+        },
         {
           "path": "posterShare",
           "style": {
diff --git a/root/merchantManagement/bell.vue b/root/merchantManagement/bell.vue
new file mode 100644
index 0000000..c5dc30a
--- /dev/null
+++ b/root/merchantManagement/bell.vue
@@ -0,0 +1,47 @@
+<template>
+	<view class="p-root-merchantManagement-dynamicNotice g_bg_f_5 g_p_10 g_pb_120" style="min-height: 100vh;padding-top: 10px;">
+		<view class="">
+			<view class="g_bg_f g_pl_10 g_radius_8">
+				<u-input type="textarea" height="240" :customStyle="{ fontSize: '34rpx' }" :clearable="false" autoHeight v-model="notice" 
+                 @input="changeNotice"></u-input>
+			</view>
+			<view class="g_mt_32" hover-class="none" hover-stop-propagation="false" style="margin-top: 120px;">
+				<rh-button :primaryColor='primaryColor' type="primary" btnText="完成" @clickBtn="subNameInfo"
+					:loading="isSubmit" size='new'
+				/>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			primaryColor:getApp().globalData.themeColor,
+			notice: "",
+			isSubmit:false,
+		};
+	},
+	methods: {
+		changeNotice(e) {
+			console.log(e);
+			let that = this;
+			this.notice = e;
+		},
+		subNameInfo() {
+			
+		},
+	},
+};
+</script>
+
+<style lang="less">
+.p-root-merchantManagement-dynamicNotice{
+	.g-components-button .bocai_btn_size_new{
+		width: 240px !important;
+		height: 40px !important;
+		line-height: 38px !important;
+	}
+}
+</style>
\ No newline at end of file
diff --git a/root/merchantManagement/child/workbench.vue b/root/merchantManagement/child/workbench.vue
index 6a62525..cdac43d 100644
--- a/root/merchantManagement/child/workbench.vue
+++ b/root/merchantManagement/child/workbench.vue
@@ -341,12 +341,18 @@ export default {
 					iconType: 1,
 					path: "/root/merchantManagement/watchedMe",
 				},
-				// {
-				// 	name: "配置",
-				// 	icon: "setting",
-				// 	iconType: 1,
-				// 	path: "/root/merchantManagement/setting?type=配置",
-				// },
+				{
+					name: "温馨提示",
+					icon: "bell",
+					iconType: 1,
+					path: "/root/merchantManagement/bell?type=配置",
+				},
+				{
+					name: "通用设置",
+					icon: "setting",
+					iconType: 1,
+					path: "/root/merchantManagement/setting?type=配置",
+				},
 			];
 		},
 		getApplyNum() {
diff --git a/root/merchantManagement/dynamicNotice.vue b/root/merchantManagement/dynamicNotice.vue
index a2a2f94..5e88a3c 100644
--- a/root/merchantManagement/dynamicNotice.vue
+++ b/root/merchantManagement/dynamicNotice.vue
@@ -14,7 +14,7 @@
 			<view class="g_bg_f g_pl_10 g_radius_8">
 				<u-input type="textarea" height="240" :customStyle="{ fontSize: '34rpx' }" :clearable="false" autoHeight v-model="notice" @input="changeNotice"></u-input>
 			</view>
-			<view class="g_mt_32" hover-class="none" hover-stop-propagation="false" style="margin-top: 214px;">
+			<view class="g_mt_32" hover-class="none" hover-stop-propagation="false" style="margin-top: 120px;">
 				<rh-button :primaryColor='primaryColor' :type="isChange ? 'primary' : 'disabled'" btnText="完成" @clickBtn="subNameInfo"
 					:loading="isSubmit" size='new'
 				/>
diff --git a/root/merchantManagement/setting.vue b/root/merchantManagement/setting.vue
index c142444..c85cc7f 100644
--- a/root/merchantManagement/setting.vue
+++ b/root/merchantManagement/setting.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="p-root-merchantManagement-dynamicNotice g_bg_f_5 g_p_10 g_pb_120" style="min-height: 100vh;padding-top: 0;">
 		
-		<view class="m-card">
+		<!-- <view class="m-card">
 			<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"
@@ -20,6 +20,46 @@
 				</view>
 				<view class="g_mt_4 g_c_8 g_fs_14 g_pl_10" style="line-height: 1.5;" hover-class="none" hover-stop-propagation="false"> 打开开关后, 系统会实时同步一次，然后系统会每天在23:00自动同步平台上最近上新的职位。 </view>
 			</view>
+		</view> -->
+		
+		<view class="m-card">
+			<view class="g_h_10"></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" hover-class="none" hover-stop-propagation="false">
+						<u-switch @change="handleSwitch($event, 'defaultCity')" 
+											cusSize='24' 
+											cusTop='2' 
+											:cusLeft='defaultCitySwitch ? 3.5 : 2.2' 
+											v-model="defaultCitySwitch" 
+											activeColor="#027aff" 
+											inactiveColor="#e5e5e5"
+						></u-switch>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="m-card">
+			<view class="g_h_10"></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" hover-class="none" hover-stop-propagation="false">
+						<u-switch @change="handleSwitch($event, 'recommend')" 
+											cusSize='24' 
+											cusTop='2' 
+											:cusLeft='recommendSwitch ? 3.5 : 2.2' 
+											v-model="recommendSwitch" 
+											activeColor="#027aff" 
+											inactiveColor="#e5e5e5"
+						></u-switch>
+					</view>
+				</view>
+			</view>
 		</view>
 		
 	<!-- 	<view class="m-card">
@@ -58,12 +98,14 @@ export default {
 		this.getShareInfo();
 	},
 	data() {
-		return {
-			applySwitch: false,
-			jobSwitch: false,
-			appInfo: uni.getStorageSync("miniApp-info"),
-		};
-	},
+			return {
+				applySwitch: false,
+				jobSwitch: false,
+				defaultCitySwitch: false,
+				recommendSwitch: false,
+				appInfo: uni.getStorageSync("miniApp-info"),
+			};
+		},
 	methods: {
 		getShareInfo() {
 			this.G.Get(this.api.merchantManagement_getShareJobsBtn, {}, (res) => {
@@ -86,6 +128,8 @@ export default {
 							resolve();
 						});
 					}
+				} if (type == "defaultCity") {
+				}if (type == "recommend") {
 				} else {
 					this.G.Put(this.api.merchantManagement_updateField, { fieldName: "applyNumDisplay", fieldValue: e ? 1 : 0 }, (res) => {
 						console.log(res);
@@ -118,4 +162,4 @@ export default {
 		text-align: center;
 	}
 }
-</style>
+</style>
\ No newline at end of file