diff --git a/.env.development b/.env.development
index 1d38a38..f10a58d 100644
--- a/.env.development
+++ b/.env.development
@@ -2,11 +2,11 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://192.168.1.3:8080'
+VUE_APP_BASE_API = 'http://192.168.1.24:8080'
 # VUE_APP_BASE_API = 'https://plus.hwms.shop'
 
 # socket 连接地址
-VUE_APP_WS_URL = 'ws://192.168.1.3:8080'
+VUE_APP_WS_URL = 'ws://192.168.1.24:8080'
 # VUE_APP_WS_URL = 'ws://plus.hwms.shop'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
diff --git a/src/views/systemForm/setSystem/modifyStoreInfo.vue b/src/views/systemForm/setSystem/modifyStoreInfo.vue
index 436998e..4efd1c3 100644
--- a/src/views/systemForm/setSystem/modifyStoreInfo.vue
+++ b/src/views/systemForm/setSystem/modifyStoreInfo.vue
@@ -410,6 +410,18 @@
               <Maps v-if="mapKey" ref="mapChild" class="map-sty" :map-key="mapKey" :lat="Number(merData.lat || 34.34127)" :lon="Number(merData.long || 108.93984)" :address="merData.mer_address" @getCoordinates="getCoordinates" />
             </div> -->
             <el-form-item />
+            <!-- 商品详情公告-->
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="商品详情公告：">
+                  <span style="color: red;">该位置信息将同步至所有上架产品详情页上方</span>
+                  <vue-ueditor-wrap
+                    v-model="merData.mer_notice"
+                    :config="myConfig"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-form>
         </div>
       </div>
@@ -557,7 +569,7 @@
 import { serviceCodeApi,goodsCodeApi,storeGetInfoApi, marginCode, marginMakeCode, marginRecordLst,offlineRecordLst, marginRefund, marginRefundApply,offlinePayApi,contactApi } from '@/api/setting'
 import { getBaseInfo, merchantUpdate } from '@/api/user.js'
 import Maps from '@/components/map/map.vue'
-
+import VueUeditorWrap from 'vue-ueditor-wrap'
 import { mapState } from 'vuex'
 import { getToken } from '@/utils/auth'
 import SettingMer from '@/libs/settingMer'
@@ -566,7 +578,7 @@ import { roterPre } from '@/settings'
 import VueQr from 'vue-qr'
 export default {
   name: 'Information',
-  components: { Maps, VueQr },
+  components: { Maps, VueQr,VueUeditorWrap },
   data() {
     var checkPhone = (rule, value, callback) => {
       console.log(value)
@@ -634,7 +646,24 @@ export default {
         callback()
       }
     }
+    const url =
+      SettingMer.https + '/upload/image/0/file?ueditor=1&token=' + getToken()
     return {
+      myConfig: {
+        autoHeightEnabled: false, // 编辑器不自动被内容撑高
+        initialFrameHeight: 500, // 初始容器高度
+        initialFrameWidth: '100%', // 初始容器
+        enableAutoSave: false,
+        UEDITOR_HOME_URL: '/UEditor/',
+        serverUrl: url,
+        imageUrl: url,
+        imageFieldName: 'file',
+        imageUrlPrefix: '',
+        imageActionName: 'upfile',
+        imageMaxSize: 2048000,
+        readonly:false,
+        imageAllowFiles: ['.png', '.jpg', '.jpeg', '.gif', '.bmp']
+      },
       merModel: false,
       modalMap: false,
       modalBank: false,
@@ -688,6 +717,7 @@ export default {
         mer_take_day: [],
         mer_take_location: '',
         id: 0,
+        mer_notice:'',
         service_phone:'',
         mer_take_status: 0 }, // 默认数据
       myHeaders: { 'X-Token': getToken() },
@@ -905,7 +935,7 @@ export default {
           if (valid) {
             const dataKey = Object.keys(this.rules)
             const reqData = {};
-            [...dataKey, 'mer_state', 'long', 'lat', 'mini_banner', 'services_type', 'service_phone'].map(item => {
+            [...dataKey, 'mer_state', 'long', 'lat', 'mini_banner', 'services_type', 'service_phone','mer_notice'].map(item => {
               reqData[item] = this.merData[item]
             })
             reqData.type = this.infoType