chore[litemall-admin]: 团购活动菜单项调整至推广菜单中

doc/note.md

+# 项目笔记
+
+记录本项目开发中一些关键技术点。
+
+注意：
+> 这些技术并不是绝对正确或者唯一，而是目前项目所采用。
+
+## 1. 前后端交互技术
+
+## 2. 错误码
\ No newline at end of file

litemall-admin/src/router/index.js

@@ -105,22 +105,6 @@ export const asyncRouterMap = [
       { path: 'comment', component: _import('goods/comment'), name: 'goodsComment', meta: { title: '商品评论', noCache: true }}
     ]
   },
-
-  {
-    path: '/groupon',
-    component: Layout,
-    redirect: 'noredirect',
-    name: 'grouponManage',
-    meta: {
-      title: '团购管理',
-      icon: 'chart'
-    },
-    children: [
-      { path: 'list', component: _import('groupon/list'), name: 'list', meta: { title: '团购规则', noCache: true }},
-      { path: 'record', component: _import('groupon/record'), name: 'record', meta: { title: '团购活动', noCache: true }}
-    ]
-  },
-
   {
     path: '/promotion',
     component: Layout,
@@ -132,7 +116,9 @@ export const asyncRouterMap = [
     },
     children: [
       { path: 'ad', component: _import('promotion/ad'), name: 'ad', meta: { title: '广告列表', noCache: true }},
-      { path: 'topic', component: _import('promotion/topic'), name: 'topic', meta: { title: '专题管理', noCache: true }}
+      { path: 'topic', component: _import('promotion/topic'), name: 'topic', meta: { title: '专题管理', noCache: true }},
+      { path: 'groupon-rule', component: _import('promotion/grouponRule'), name: 'grouponRule', meta: { title: '团购规则', noCache: true }},
+      { path: 'groupon-activity', component: _import('promotion/grouponActivity'), name: 'grouponActivity', meta: { title: '团购活动', noCache: true }}
     ]
   },
 

litemall-admin/src/views/groupon/record.vue → litemall-admin/src/views/promotion/grouponActivity.vue

@@ -6,7 +6,6 @@
       <el-input clearable class="filter-item" style="width: 200px;" placeholder="请输入商品编号" v-model="listQuery.goodsId">
       </el-input>
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
-      <!--<el-button class="filter-item" type="primary" @click="handleCreate" icon="el-icon-edit">添加</el-button>-->
       <el-button class="filter-item" type="primary" :loading="downloadLoading" icon="el-icon-download"
                  @click="handleDownload">导出
       </el-button>
@@ -97,7 +96,7 @@
   import BackToTop from '@/components/BackToTop'
 
   export default {
-    name: 'GoodsList',
+    name: 'GrouponActivity',
     components: { BackToTop },
     data() {
       return {

litemall-admin/src/views/groupon/list.vue → litemall-admin/src/views/promotion/grouponRule.vue

@@ -94,7 +94,7 @@
   import BackToTop from '@/components/BackToTop'
 
   export default {
-    name: 'GrouponList',
+    name: 'GrouponRule',
     components: { BackToTop },
     data() {
       return {