feat 调整菜单结构

src/common/sider.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-aside style="width: 200px;">
+  <el-aside>
     <div class="sidebar">
       <div class="side-logo">
         <img @click="$router.push({path:'/'})" src="../../static/image/logo.png" class="logo" />
@@ -47,7 +47,6 @@ export default {
       items: [
         {
           path: "/",
-          name: "home",
           title: "一键发单",
           icon: require("../../static/image/order-icon.png"),
           children: [
@@ -70,77 +69,73 @@ export default {
         },
         {
           path: "/shopInfo",
-          name: "shopInfo",
           title: "商户信息",
           icon: require("../../static/image/shop-icon.png"),
           children: [
             {
-              path: "/shopInfo/shopInfos",
-              name: "shopInfos",
+              path: "/shop/shopList",
+              name: "shopList",
               title: "我的店铺",
             },
             {
-              path: "/shopInfo/shopAccount",
-              name: "shopInfos",
+              path: "/platformAccount/index",
+              name: "platformAccount",
               title: "账号管理",
             },
           ],
         },
         {
-          path: "/shopInfo/shopAccount",
-          name: "shopInfos",
+          path: "/account",
           title: "我的账户",
           icon: require("../../static/image/shop-icon.png"),
           children: [
             {
-              path: "/shopInfo/shopInfos",
-              name: "shopInfos",
+              path: "/account/wallet",
+              name: "wallet",
               title: "我的钱包",
             },
             {
-              path: "/shopInfo/shopAccount",
-              name: "shopInfos",
-              title: "收支明细",
+              path: "/account/walletDetail",
+              name: "walletDetail",
+              title: "消费明细",
             },
             {
-              path: "/shopInfo/shopAccount",
-              name: "shopInfos",
+              path: "/account/coupon",
+              name: "coupon",
               title: "优惠券",
             },
           ],
         },
         {
-          path: "/shopInfo",
-          name: "shopInfo",
+          path: "/platform",
           title: "平台管理",
           icon: require("../../static/image/shop-icon.png"),
           children: [
             {
-              path: "/shopInfo/shopInfos",
-              name: "shopInfos",
+              path: "/platform/bindTakeOut",
+              name: "bindTakeOut",
               title: "邦定外卖平台",
             },
             {
-              path: "/shopInfo/shopAccount",
-              name: "shopInfos",
+              path: "/platform/bindDelivery",
+              name: "bindDelivery",
               title: "绑定配送平台",
             },
           ],
         },
         {
-          path: "/setUp",
-          name: "setUp",
+          path: "/set",
           title: "设置中心",
           icon: require("../../static/image/setting-icon.png"),
           children: [
             {
-              path: "/setUp/set",
-              name: "set",
+              path: "/set/waimai",
+              name: "waimai",
               title: "外卖设置",
             },
             {
-              path: "/setUp/set",
-              name: "set",
+              path: "/set/system",
+              name: "system",
               title: "系统设置",
             },
             // {
@@ -157,32 +152,31 @@ export default {
         },
         {
           path: "/help",
-          name: "help",
           title: "帮助中心",
           icon: require("../../static/image/help-icon.png"),
           children: [
             {
-              path: "/setUp/set",
-              name: "set",
+              path: "/help/commonProblem",
+              name: "commonProblem",
               title: "常见问题",
             },
             {
-              path: "/download",
-              name: "download",
+              path: "/help/customerService",
+              name: "customerService",
               title: "客服中心",
             },
             {
-              path: "/download",
+              path: "/help/download",
               name: "download",
               title: "下载中心",
             },
             {
-              path: "/download",
-              name: "download",
+              path: "/help/feedback",
+              name: "feedback",
               title: "意见反馈",
             },
             {
-              path: "/about",
+              path: "/help/about",
               name: "about",
               title: "关于我们",
             },
@@ -222,30 +216,12 @@ export default {
 </script>
 
 <style lang='scss' scoped='scoped'>
-/deep/ .el-submenu .el-submenu__title {
-  font-size: 18px;
-  height: 50px;
-  line-height: 50px;
-  padding: 0 29px !important;
-}
-/deep/ .el-submenu .el-submenu__icon-arrow {
-  right: 37px !important;
-  font-size: 14px !important;
-  font-weight: bolder;
-}
 /deep/ .el-submenu .el-menu-item {
   padding-left: 76px !important;
-  height: 40px;
-  line-height: 40px;
-  font-size: 16px;
-  opacity: 0.8;
-  margin-top: 9px;
 }
 /deep/ .el-menu-item.is-active {
-  color: #fc7200 !important;
-  background-color: rgba(12, 43, 71, 0.39) !important;
+  background-color: #0c2b47 !important;
   border-right: 4px solid #fc7200;
-  opacity: 1;
 }
 .sidebar {
   display: block;
@@ -275,10 +251,10 @@ export default {
   height: 44px;
 }
 .side-bar-icon {
-  width: 30px;
-  height: 30px;
-  margin-right: 10px;
-  // margin-left: 14px;
+  width: 21px;
+  height: 21px;
+  margin-right: 18px;
+  margin-left: 14px;
 }
 .aliFamily {
   font-size: 24px;
@@ -290,7 +266,7 @@ export default {
 }
 
 .sidebar-el-menu:not(.el-menu--collapse) {
-  width: 220px;
+  width: 254px;
   box-sizing: border-box;
 }
 

src/components/accountCompoents/consumption.vue

@@ -64,20 +64,25 @@
 import { getAccountFlow } from "../../api/amount.js";
 import { getShopList } from "../../api/shop.js";
 export default {
-  data () {
+  name: "coupon",
+  data() {
     return {
       flowList: [],
       shopList: [],
-      consumptionList: [{
-        consumptionId: '0',
-        name: '全部'
-      }, {
-        consumptionId: '1',
-        name: '收入'
-      }, {
-        consumptionId: '2',
-        name: '支出'
-      }],
+      consumptionList: [
+        {
+          consumptionId: "0",
+          name: "全部",
+        },
+        {
+          consumptionId: "1",
+          name: "收入",
+        },
+        {
+          consumptionId: "2",
+          name: "支出",
+        },
+      ],
       params: {
         source: 2,
         pageNum: 1,
@@ -93,7 +98,7 @@ export default {
         shortcuts: [
           {
             text: "最近一周",
-            onClick (picker) {
+            onClick(picker) {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
@@ -102,7 +107,7 @@ export default {
           },
           {
             text: "最近一个月",
-            onClick (picker) {
+            onClick(picker) {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
@@ -111,7 +116,7 @@ export default {
           },
           {
             text: "最近三个月",
-            onClick (picker) {
+            onClick(picker) {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
@@ -124,13 +129,13 @@ export default {
   },
   watch: {
     "$store.state.userInfo": {
-      handler (newVal, oldVal) {
+      handler(newVal, oldVal) {
         this.memberType = newVal.memberType;
       },
       deep: true,
     },
   },
-  created () {
+  created() {
     this.init();
     this.search();
     if (this.memberType !== 1) {
@@ -138,13 +143,13 @@ export default {
     }
   },
   methods: {
-    init () {
+    init() {
       const start = new Date().getTime() - 3600 * 1000 * 24 * 7;
       this.params.startTime = start;
       this.params.endTime = new Date();
       this.value1 = [this.params.startTime, this.params.endTime];
     },
-    search () {
+    search() {
       if (this.value1 && this.value1.length) {
         this.params.startTime = this.$tool.getFormatDate(
           this.value1[0],
@@ -162,7 +167,7 @@ export default {
       this.flowList = [];
       this.getAccountFlow();
     },
-    getShopList () {
+    getShopList() {
       getShopList().then((res) => {
         if (res.code === 200) {
           this.shopList = res.data.map((v) => {
@@ -177,18 +182,18 @@ export default {
         }
       });
     },
-    handleSizeChange (val) {
+    handleSizeChange(val) {
       this.params.pageNum = 1;
       this.params.pageSize = val;
       this.flowList = [];
       this.getAccountFlow();
     },
-    handleCurrentChange (val) {
+    handleCurrentChange(val) {
       this.params.pageNum = val;
       this.flowList = [];
       this.getAccountFlow();
     },
-    getAccountFlow () {
+    getAccountFlow() {
       getAccountFlow(this.params).then((res) => {
         if (res.code == 200) {
           this.flowList = res.data.data || [];
@@ -201,45 +206,45 @@ export default {
         }
       });
     },
-    showType (type) {
+    showType(type) {
       let name;
       switch (type) {
         case 1:
-          name = "美团"
+          name = "美团";
           break;
         case 2:
-          name = "饿了么"
+          name = "饿了么";
           break;
         case 3:
-          name = "饿百"
+          name = "饿百";
           break;
         case 99:
-          name = "手动发单"
+          name = "手动发单";
           break;
 
         default:
-          name = '--'
+          name = "--";
           break;
       }
-      return name
+      return name;
     },
-    showPayMent (type) {
+    showPayMent(type) {
       let name;
       switch (type) {
         case 1:
-          name = '支付宝支付'
+          name = "支付宝支付";
           break;
         case 2:
-          name = '微信支付'
+          name = "微信支付";
           break;
         case 3:
-          name = '银联支付'
+          name = "银联支付";
           break;
         case 4:
-          name = '余额支付'
+          name = "余额支付";
           break;
         case 5:
-          name = '三方运力支付'
+          name = "三方运力支付";
           break;
 
         default:

src/components/accountCompoents/coupon.vue

@@ -39,6 +39,7 @@
 import { getCouponList, getCouponExplain } from "../../api/amount.js";
 import tool from "../../api/tool.js";
 export default {
+  name: 'coupon',
   data() {
     return {
       couponList: [],

src/components/accountCompoents/invalidCoupon.vue

@@ -40,6 +40,7 @@
 import { getCouponList, getCouponExplain } from "../../api/amount.js";
 import tool from "../../api/tool.js";
 export default {
+  name: "invalidCoupon",
   data() {
     return {
       couponList: [],
@@ -145,13 +146,13 @@ export default {
             font-weight: 400;
             line-height: 20px;
             margin-left: 2px;
-            color: #CCCCCC;
+            color: #cccccc;
           }
           .num {
             font-size: 26px;
             font-family: PingFang SC;
             font-weight: bold;
-            color: #CCCCCC;
+            color: #cccccc;
           }
         }
 
@@ -160,7 +161,7 @@ export default {
           font-family: PingFang SC;
           font-weight: 400;
           line-height: 20px;
-          color: #CCCCCC;
+          color: #cccccc;
         }
       }
       .recharge_coupon_bottom_middle {
@@ -170,7 +171,7 @@ export default {
           height: 100%;
           padding: 10px 0;
           height: 55px;
-          border-right: 1px dashed #CCCCCC;
+          border-right: 1px dashed #cccccc;
           box-sizing: border-box;
         }
       }
@@ -189,14 +190,14 @@ export default {
           font-family: PingFang SC;
           font-weight: bold;
           line-height: 25px;
-          color: #CCCCCC;
+          color: #cccccc;
           div:last-child {
             height: 20px;
             font-size: 12px;
             font-family: PingFang SC;
             font-weight: 400;
             line-height: 20px;
-            color: #CCCCCC;
+            color: #cccccc;
           }
         }
         .recharge_coupon_bottom_number {
@@ -206,16 +207,16 @@ export default {
             width: 63px;
             height: 22px;
             line-height: 22px;
-            border: 1px solid #CCCCCC;
+            border: 1px solid #cccccc;
             border-radius: 18px;
             text-align: center;
             font-size: 12px;
             font-family: PingFang SC;
             font-weight: 500;
-            color: #CCCCCC;
+            color: #cccccc;
             cursor: pointer;
             &:hover {
-              background-color: #CCCCCC;
+              background-color: #cccccc;
               color: #ffffff;
             }
           }

src/components/accountCompoents/recharge.vue

@@ -30,6 +30,7 @@
 <script>
 import { balanceLogs } from "../../api/amount.js";
 export default {
+  name: 'recharge',
   data() {
     return {
       rechargeList: [],

src/components/accountCompoents/wallet.vue

@@ -81,6 +81,7 @@ import {
 } from "../../api/amount.js";
 import qrCode from "../../common/qrCode.vue";
 export default {
+  name: 'wallet',
   props: {
     products: {
       type: Array,

src/components/customerService.vue

@@ -0,0 +1,39 @@
+<template>
+  <div>这是客服中心</div>
+</template>
+
+<script>
+export default {
+  name: "customerService",
+  data() {
+    return {};
+  },
+  // 监听属性 类似于data概念
+  computed: {},
+  // 监控data中的数据变化
+  watch: {},
+  // 方法集合
+  methods: {},
+  // 生命周期 - 创建完成（可以访问当前this实例）
+  created() {},
+  // 生命周期 - 挂载完成（可以访问DOM元素）
+  mounted() {},
+  // 生命周期 - 创建之前
+  beforeCreate() {},
+  // 生命周期 - 挂载之前
+  beforeMount() {},
+  // 生命周期 - 更新之前
+  beforeUpdate() {},
+  // 生命周期 - 更新之后
+  updated() {},
+  // 生命周期 - 销毁之前
+  beforeDestroy() {},
+  // 生命周期 - 销毁完成
+  destroyed() {},
+  // 如果页面有keep-alive缓存功能，这个函数会触发
+  activated() {},
+};
+</script>
+
+<style lang="scss" scoped  type="text/css">
+</style>

src/components/feedback.vue

@@ -0,0 +1,39 @@
+<template>
+  <div>这是意见反馈</div>
+</template>
+
+<script>
+export default {
+  name: "feedback",
+  data() {
+    return {};
+  },
+  // 监听属性 类似于data概念
+  computed: {},
+  // 监控data中的数据变化
+  watch: {},
+  // 方法集合
+  methods: {},
+  // 生命周期 - 创建完成（可以访问当前this实例）
+  created() {},
+  // 生命周期 - 挂载完成（可以访问DOM元素）
+  mounted() {},
+  // 生命周期 - 创建之前
+  beforeCreate() {},
+  // 生命周期 - 挂载之前
+  beforeMount() {},
+  // 生命周期 - 更新之前
+  beforeUpdate() {},
+  // 生命周期 - 更新之后
+  updated() {},
+  // 生命周期 - 销毁之前
+  beforeDestroy() {},
+  // 生命周期 - 销毁完成
+  destroyed() {},
+  // 如果页面有keep-alive缓存功能，这个函数会触发
+  activated() {},
+};
+</script>
+
+<style lang="scss" scoped  type="text/css">
+</style>

src/components/help.vue

@@ -28,7 +28,7 @@
 <script>
 import { helpList, helpDetail } from "../api/help.js";
 export default {
-  name: "help",
+  name: "commonProblem",
   data() {
     return {
       helpList: [],

src/components/platformAccount/index.vue

@@ -0,0 +1,39 @@
+<template>
+  <div>这是账号管理</div>
+</template>
+
+<script>
+export default {
+  name: "platformAccount",
+  data() {
+    return {};
+  },
+  // 监听属性 类似于data概念
+  computed: {},
+  // 监控data中的数据变化
+  watch: {},
+  // 方法集合
+  methods: {},
+  // 生命周期 - 创建完成（可以访问当前this实例）
+  created() {},
+  // 生命周期 - 挂载完成（可以访问DOM元素）
+  mounted() {},
+  // 生命周期 - 创建之前
+  beforeCreate() {},
+  // 生命周期 - 挂载之前
+  beforeMount() {},
+  // 生命周期 - 更新之前
+  beforeUpdate() {},
+  // 生命周期 - 更新之后
+  updated() {},
+  // 生命周期 - 销毁之前
+  beforeDestroy() {},
+  // 生命周期 - 销毁完成
+  destroyed() {},
+  // 如果页面有keep-alive缓存功能，这个函数会触发
+  activated() {},
+};
+</script>
+
+<style lang="scss" scoped  type="text/css">
+</style>

src/components/shopAccount.vue

@@ -25,38 +25,20 @@
 </template>
 
 <script>
-import merchantAdd from "./merchantAdd.vue";
-import wallet from "./accountCompoents/wallet.vue";
-import coupon from "./accountCompoents/coupon.vue";
-import invalidCoupon from "./accountCompoents/invalidCoupon.vue";
 import recharge from "./accountCompoents/recharge.vue";
 import consumption from "./accountCompoents/consumption.vue";
 export default {
-  name: "HelloWorld",
+  name: "walletDetail",
   components: {
-    wallet,
-    coupon,
-    invalidCoupon,
     recharge,
     consumption,
   },
-
   data() {
     return {
-      activeName: "wallet",
+      activeName: "recharge",
       tabList: [
-        { name: "我的钱包", index: 0, activeName: "wallet" },
-        {
-          name: "优惠券",
-          index: 1,
-          activeName: "coupon",
-          children: [
-            { name: "优惠券", command: "coupon" },
-            { name: "已失效优惠券", command: "invalidCoupon" },
-          ],
-        },
-        { name: "充值明细", index: 2, activeName: "recharge" },
-        { name: "消费明细", index: 3, activeName: "consumption" },
+        { name: "充值明细", index: 0, activeName: "recharge" },
+        { name: "消费明细", index: 1, activeName: "consumption" },
       ],
       tabNum: 0,
       renderComponent: true,

src/components/shopCompoents/bindDelivery.vue

@@ -128,6 +128,7 @@ import {
   unBindAptNew,
 } from "../../api/shop";
 export default {
+  name: 'bindDelivery',
   data() {
     return {
       deliveryList: [],

src/components/shopCompoents/bindTakeOut.vue

@@ -105,6 +105,7 @@ import {
   bindChangeShop,
 } from "../../api/shop";
 export default {
+  name: "bindTakeOut",
   data() {
     return {
       curIndex: 0,

src/components/shopCompoents/shopList.vue

@@ -41,6 +41,7 @@
 import shopAdd from "./shopAdd";
 import { getShopList, getProductList, shopDelete } from "../../api/shop";
 export default {
+  name: 'shopList',
   components: {
     shopAdd,
   },

src/components/system.vue

@@ -0,0 +1,39 @@
+<template>
+  <div>这是系统设置</div>
+</template>
+
+<script>
+export default {
+  name: "system",
+  data() {
+    return {};
+  },
+  // 监听属性 类似于data概念
+  computed: {},
+  // 监控data中的数据变化
+  watch: {},
+  // 方法集合
+  methods: {},
+  // 生命周期 - 创建完成（可以访问当前this实例）
+  created() {},
+  // 生命周期 - 挂载完成（可以访问DOM元素）
+  mounted() {},
+  // 生命周期 - 创建之前
+  beforeCreate() {},
+  // 生命周期 - 挂载之前
+  beforeMount() {},
+  // 生命周期 - 更新之前
+  beforeUpdate() {},
+  // 生命周期 - 更新之后
+  updated() {},
+  // 生命周期 - 销毁之前
+  beforeDestroy() {},
+  // 生命周期 - 销毁完成
+  destroyed() {},
+  // 如果页面有keep-alive缓存功能，这个函数会触发
+  activated() {},
+};
+</script>
+
+<style lang="scss" scoped  type="text/css">
+</style>

src/components/waimai.vue

@@ -0,0 +1,39 @@
+<template>
+  <div>这是外卖设置</div>
+</template>
+
+<script>
+export default {
+  name: "waimai",
+  data() {
+    return {};
+  },
+  // 监听属性 类似于data概念
+  computed: {},
+  // 监控data中的数据变化
+  watch: {},
+  // 方法集合
+  methods: {},
+  // 生命周期 - 创建完成（可以访问当前this实例）
+  created() {},
+  // 生命周期 - 挂载完成（可以访问DOM元素）
+  mounted() {},
+  // 生命周期 - 创建之前
+  beforeCreate() {},
+  // 生命周期 - 挂载之前
+  beforeMount() {},
+  // 生命周期 - 更新之前
+  beforeUpdate() {},
+  // 生命周期 - 更新之后
+  updated() {},
+  // 生命周期 - 销毁之前
+  beforeDestroy() {},
+  // 生命周期 - 销毁完成
+  destroyed() {},
+  // 如果页面有keep-alive缓存功能，这个函数会触发
+  activated() {},
+};
+</script>
+
+<style lang="scss" scoped  type="text/css">
+</style>

src/router/index.js

@@ -32,60 +32,114 @@ const router = new Router({
           component: () => import('../components/orderSearch.vue')
         },
         {
-          path: '/setUp/set',
-          name: 'set',
-          title: '外卖设置',
-          component: () => import('../components/set.vue')
+          path: '/manualCreate',
+          name: 'manualCreate',
+          title: '手动发单',
+          component: () => import('../components/manualCreate.vue')
         },
+        // {
+        //   path: '/setUp/set',
+        //   name: 'set',
+        //   title: '外卖设置',
+        //   component: () => import('../components/set.vue')
+        // },
+        // {
+        //   path: '/setUp/addressManagement',
+        //   name: 'addressManagement',
+        //   title: '常用地址',
+        //   component: () => import('../components/addressManagement.vue')
+        // },
+        // {
+        //   path: '/setUp/pictureManagement',
+        //   name: 'pictureManagement',
+        //   title: '图片管理',
+        //   component: () => import('../components/pictureManagement.vue')
+        // },
         {
-          path: '/setUp/addressManagement',
-          name: 'addressManagement',
-          title: '常用地址',
-          component: () => import('../components/addressManagement.vue')
+          path: '/shop/shopList',
+          name: 'shopList',
+          title: '我的店铺',
+          component: () => import('../components/shopCompoents/shopList.vue')
         },
         {
-          path: '/setUp/pictureManagement',
-          name: 'pictureManagement',
-          title: '图片管理',
-          component: () => import('../components/pictureManagement.vue')
+          path: '/platformAccount/index',
+          name: 'platformAccount',
+          title: '账号管理',
+          component: () => import('../components/platformAccount/index')
         },
         {
-          path: '/shopInfo/shopInfos',
-          name: 'shopInfos',
-          title: '门店管理',
-          component: () => import('../components/shopInfo.vue')
+          path: '/account/wallet',
+          name: 'wallet',
+          title: '我的钱包',
+          component: () => import('../components/accountCompoents/wallet.vue')
         },
         {
-          path: '/shopInfo/shopAccount',
-          name: 'shopAccount',
-          title: '我的账户',
+          path: '/account/walletDetail',
+          name: 'walletDetail',
+          title: '消费明细',
           component: () => import('../components/shopAccount.vue')
         },
         {
-          path: '/manualCreate',
-          name: 'manualCreate',
-          title: '手动发单',
-          component: () => import('../components/manualCreate.vue')
+          path: '/account/coupon',
+          name: 'coupon',
+          title: '优惠券',
+          component: () => import('../components/accountCompoents/coupon.vue')
+        },
+
+        {
+          path: '/platform/bindTakeOut',
+          name: 'bindTakeOut',
+          title: '绑定外卖平台',
+          component: () => import('../components/shopCompoents/bindTakeOut.vue')
         },
         {
-          path: '/help',
-          name: 'help',
-          title: '帮助中心',
+          path: '/platform/bindDelivery',
+          name: 'bindDelivery',
+          title: '绑定配送平台',
+          component: () => import('../components/shopCompoents/bindDelivery.vue')
+        },
+        {
+          path: '/set/waimai',
+          name: 'waimai',
+          title: '外卖设置',
+          component: () => import('../components/waimai.vue')
+        },
+        {
+          path: '/set/system',
+          name: 'system',
+          title: '系统设置',
+          component: () => import('../components/system.vue')
+        },
+        {
+          path: '/help/commonProblem',
+          name: 'commonProblem',
+          title: '常见问题',
           component: () => import('../components/help.vue')
         },
         {
-          path: '/download',
+          path: '/help/customerService',
+          name: 'customerService',
+          title: '常见问题',
+          component: () => import('../components/customerService.vue')
+        },
+        {
+          path: '/help/download',
           name: 'download',
           title: '下载中心',
           component: () => import('../components/downloadCenter.vue')
         },
         {
-          path: '/about',
+          path: '/help/feedback',
+          name: 'feedback',
+          title: '意见反馈',
+          component: () => import('../components/feedback.vue')
+        },
+        {
+          path: '/help/about',
           name: 'about',
           title: '关于我们',
           component: () => import('../components/about.vue')
         },
-
       ]
     },
     {

src/views/home.vue

@@ -118,7 +118,7 @@ export default {
 
 .el-main {
   position: absolute;
-  left: 220px;
+  left: 254px;
   right: 0;
   top: 80px;
   bottom: 0;