From eeeba55795a965d61440137656019097e990af9f Mon Sep 17 00:00:00 2001
From: jscyl13849007907 <13849007907@163.com>
Date: Thu, 28 May 2026 16:28:16 +0800
Subject: [PATCH] no message

---
 pages.json                                |  2 +-
 root/merchantManagement/dynamicNotice.vue | 51 +++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/pages.json b/pages.json
index cd4bb06..e2f4260 100644
--- a/pages.json
+++ b/pages.json
@@ -656,7 +656,7 @@
             "backgroundColor": "#ededed",
             "backgroundColorTop": "#ededed",
             "backgroundColorBottom": "#ededed",
-            "navigationBarTitleText": "职位配置"
+            "navigationBarTitleText": "通用设置"
             // "navigationStyle": "custom"
           }
         },
diff --git a/root/merchantManagement/dynamicNotice.vue b/root/merchantManagement/dynamicNotice.vue
index 5e88a3c..161538d 100644
--- a/root/merchantManagement/dynamicNotice.vue
+++ b/root/merchantManagement/dynamicNotice.vue
@@ -14,6 +14,24 @@
 			<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="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_row_between" style="flex-wrap: wrap;">
+							<div v-for="(item,index) in colorGroup" 
+									 :key="index" class="g_w_48 g_h_48 g_radius_8" 
+									 :style="{
+										backgroundColor:item.value
+									}"
+									style="margin-top: 10px;"
+							></div>
+						</view>
+					</view>
+				</view>
+			</view>
 			<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'
@@ -66,6 +84,29 @@ export default {
 			
 			isSubmit:false,
 			isChange:false,
+			colorGroup:[
+				{
+					value:'red'
+				},
+				{
+					value:'green'
+				},
+				{
+					value:'blue'
+				},
+				{
+					value:'yellow'
+				},
+				{
+					value:'orange'
+				},
+				{
+					value:'#1677ff'
+				},
+				{
+					value:'#000'
+				}
+			]
 		};
 	},
 	methods: {
@@ -123,5 +164,15 @@ export default {
 		height: 40px !important;
 		line-height: 38px !important;
 	}
+	.g_flex_row_between {
+		display: flex;
+		justify-content: space-between;
+		width: 100%;
+		div {
+			width: calc(100% / 6 - 8px);
+			height: 48px;
+			border-radius: 8px;
+		}
+	}
 }
 </style>