diff --git a/template/admin/src/api/product.js b/template/admin/src/api/product.js index bdfac1496..9cc416666 100644 --- a/template/admin/src/api/product.js +++ b/template/admin/src/api/product.js @@ -106,6 +106,16 @@ export function treeListApi(type) { }); } +/** + * @description 商品管理-- 分类 new + */ +export function cascaderListApi(type) { + return request({ + url: `product/category/cascader/${type}`, + method: 'get', + }); +} + /** * @description 商品管理-- 详情 */ diff --git a/template/admin/src/assets/images/sort03.jpg b/template/admin/src/assets/images/sort03.jpg new file mode 100644 index 000000000..bdc8b14e4 Binary files /dev/null and b/template/admin/src/assets/images/sort03.jpg differ diff --git a/template/admin/src/layout/routerView/parent.vue b/template/admin/src/layout/routerView/parent.vue index 9061e0e33..b3e86b5df 100644 --- a/template/admin/src/layout/routerView/parent.vue +++ b/template/admin/src/layout/routerView/parent.vue @@ -1,50 +1,48 @@ diff --git a/template/admin/src/pages/account/login/index.vue b/template/admin/src/pages/account/login/index.vue index 065d23538..1ff664dff 100644 --- a/template/admin/src/pages/account/login/index.vue +++ b/template/admin/src/pages/account/login/index.vue @@ -211,7 +211,8 @@ export default { this.$store.commit('menus/setopenMenus', []); this.$store.commit('menus/getmenusNav', data.menus); this.$store.dispatch('routesList/setRoutesList', data.menus); - + let arr = this.formatFlatteningRoutes(this.$router.options.routes); + this.formatTwoStageRoutes(arr); // 记录用户信息 this.$store.commit('userInfo/name', data.user_info.account); this.$store.commit('userInfo/avatar', data.user_info.head_pic); @@ -257,15 +258,17 @@ export default { }, formatTwoStageRoutes(arr) { if (arr.length <= 0) return false; + console.log(arr, 'arr'); const newArr = []; const cacheList = []; arr.forEach((v) => { - if (v?.meta?.keepAlive) { + if (v && v.meta && v.meta.keepAlive) { newArr.push({ ...v }); cacheList.push(v.name); this.$store.dispatch('keepAliveNames/setCacheKeepAlive', cacheList); } }); + console.log(newArr, 'newArr'); return newArr; }, // 多级嵌套数组处理成一维数组 diff --git a/template/admin/src/pages/cms/article/index.vue b/template/admin/src/pages/cms/article/index.vue index d9525eb2c..107f09536 100644 --- a/template/admin/src/pages/cms/article/index.vue +++ b/template/admin/src/pages/cms/article/index.vue @@ -101,7 +101,7 @@ import relationList from './relation'; import { formatDate } from '@/utils/validate'; import goodsList from '@/components/goodsList/index'; export default { - name: 'addArticle', + name: 'cms_article', data() { return { modalTitleSs: '', diff --git a/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue b/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue index e2c32b6c6..41210b3fa 100644 --- a/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue +++ b/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue @@ -174,7 +174,7 @@ import { import { scrollTop } from '@/libs/util'; export default { - name: 'index', + name: 'marketing_channel_code', filters: { typeFilter(status) { const statusMap = { diff --git a/template/admin/src/pages/marketing/storeBargain/index.vue b/template/admin/src/pages/marketing/storeBargain/index.vue index 4e16a1680..186e70874 100644 --- a/template/admin/src/pages/marketing/storeBargain/index.vue +++ b/template/admin/src/pages/marketing/storeBargain/index.vue @@ -112,7 +112,7 @@ import { bargainListApi, bargainSetStatusApi, stroeBargainApi } from '@/api/mark import { formatDate } from '@/utils/validate'; import { exportBargainList } from '@/api/export'; export default { - name: 'storeBargain', + name: 'marketing_storeBargain', filters: { formatDate(time) { if (time !== 0) { diff --git a/template/admin/src/pages/marketing/storeCombination/index.vue b/template/admin/src/pages/marketing/storeCombination/index.vue index ec5e3e3de..1eaf3e54c 100644 --- a/template/admin/src/pages/marketing/storeCombination/index.vue +++ b/template/admin/src/pages/marketing/storeCombination/index.vue @@ -114,7 +114,7 @@ import { formatDate } from '@/utils/validate'; import { exportCombinationList } from '@/api/export.js'; export default { - name: 'index', + name: 'marketing_combinalist', filters: { formatDate(time) { if (time !== 0) { diff --git a/template/admin/src/pages/marketing/storeCouponIssue/create.vue b/template/admin/src/pages/marketing/storeCouponIssue/create.vue index 8b7cb1669..3936397cf 100644 --- a/template/admin/src/pages/marketing/storeCouponIssue/create.vue +++ b/template/admin/src/pages/marketing/storeCouponIssue/create.vue @@ -28,7 +28,9 @@ 后台赠送 付费会员专享 -
手动领取:用户需要手动领取优惠券;新用户自动发放:新注册的用户自动发放;后台赠送:后台发放制定用户或者添加到商品里面用户购买该商品获得;付费会员专享:仅付费会员可以领取和使用
+
+ 手动领取:用户需要手动领取优惠券;新用户自动发放:新注册的用户自动发放;后台赠送:后台发放制定用户或者添加到商品里面用户购买该商品获得;付费会员专享:仅付费会员可以领取和使用 +
@@ -49,9 +51,17 @@
选择商品
-