公告

hdApp/src/admin/billing/affirmGhs.vue

@@ -11,7 +11,7 @@
 						{{ ghsInfo.fullAddress }}
 					</view>
 				</view>
-				<!-- 批发商通知公告轮播 -->
+				<!-- 公告轮播 -->
 				<view class="ghs-notice-wrap" v-if="ghsNoticeList.length">
 					<view class="ghs-notice-bar" @click.stop="openGhsNoticeDetail()">
 						<swiper

hdApp/src/admin/home/homeMenus.js

@@ -14,7 +14,8 @@ export const APPLY_MENU_GROUPS = [
       { name: '分类', icon: homeIcon('category-filled'), url: '/admin/goods/category', pf: 1 },
       { name: '排序', icon: homeIcon('sort-filled'), url: '/admin/goods/categorySort', pf: 1 },
       { name: '任务', icon: homeIcon('task-filled'), url: '/admin/work/list', pf: 1 },
-      { name: '涨价设置', icon: homeIcon('price-increase'), url: '/admin/goods/price-increase', pf: 1 }
+      { name: '涨价设置', icon: homeIcon('price-increase'), url: '/admin/goods/price-increase', pf: 1 },
+      { name: '公告', icon: homeIcon('notice'), url: '/admin/shopNotice/list', pf: 1 }
     ]
   },
   {
@@ -92,7 +93,7 @@ export const APPLY_MENU_GROUPS = [
       { name: '花材统计', icon: homeIcon('stats-bar-filled'), url: '/admin/stat/kind', pf: 1 },
       { name: '员工统计', icon: homeIcon('staff'), url: '/admin/stat/makeStat', pf: 1 },
       { name: '设置', icon: homeIcon('settings-filled'), url: '/admin/work/set', pf: 1 },
-      { name: '通知公告', icon: homeIcon('notice'), url: '/admin/shopNotice/list', pf: 1 }
+      { name: '公告', icon: homeIcon('notice'), url: '/admin/shopNotice/list', pf: 1 }
     ]
   }
 ]
@@ -127,6 +128,7 @@ export const HOME_MENU_ITEMS = {
   buyItem: { name: '买花', icon: homeIcon('buy-item'), url: '/pagesPurchase/order', pf: 1 },
   purchaseRecord: { name: '买花记录', icon: homeIcon('purchase-record'), url: '/pagesPurchase/shopping', pf: 1 },
   priceIncrease: { name: '涨价设置', icon: homeIcon('price-increase'), url: '/admin/goods/price-increase', pf: 1 },
+  shopNotice: { name: '公告', icon: homeIcon('notice'), url: '/admin/shopNotice/list', pf: 1 },
 }
 
 /**
@@ -135,7 +137,7 @@ export const HOME_MENU_ITEMS = {
  */
 export const HOME_MENU_DEFAULT_KEYS = {
   quickMenus: ['itemBill', 'itemQuickBill', 'flower', 'buyItem'],
-  flowerMenus: ['mall', 'task', 'flowerCategory', 'flowerSort', 'flower', 'addFlower', 'priceIncrease'],
+  flowerMenus: ['mall', 'task', 'flowerCategory', 'flowerSort', 'flower', 'addFlower', 'priceIncrease', 'shopNotice'],
   plantMenus: ['itemMall', 'plant', 'part', 'changePrice', 'breakage', 'plantCategory', 'buyItem', 'purchaseRecord'],
   moreMenus: ['calculator', 'staff', 'profit', 'picText', 'scanPay', 'payCode', 'redPacket', 'rechargeSetting']
 }
@@ -244,6 +246,11 @@ export const getStoredMenuKeys = type => {
   keys = keys.filter(key => key !== 'allApply')
   if (type === 'flowerMenus') {
     keys = keys.filter(key => !REMOVED_FLOWER_MENU_KEYS.includes(key))
+    // 花束栏新增「公告」时，已缓存菜单在「涨价设置」后自动补入
+    if (keys.includes('priceIncrease') && !keys.includes('shopNotice')) {
+      const priceIndex = keys.indexOf('priceIncrease')
+      keys.splice(priceIndex + 1, 0, 'shopNotice')
+    }
   }
   return keys
 }

hdApp/src/pages.json

@@ -624,7 +624,7 @@
 		{
 			"root": "admin/shopNotice",
 			"pages": [
-				{"path": "list", "style": {"navigationBarTitleText": "通知公告", "enablePullDownRefresh": true}},
+				{"path": "list", "style": {"navigationBarTitleText": "公告", "enablePullDownRefresh": true}},
 				{"path": "add", "style": {"navigationBarTitleText": "编辑公告"}},
 				{"path": "preview", "style": {"navigationBarTitleText": "公告详情"}}
 			]