会员登录区分BA会员与正式会员 展示不同menu

frontendApi/config/menu.php

@@ -15,6 +15,7 @@ return [
         'routePath'=>'dashboard/index',
         'show'=>1,
         'brandAmbassador' => 1,
+        'isTop' => 1,
         'child'=>[
             ['name'=>'月奖金量', 'class'=>'', 'icon'=>'', 'controller'=>'dashboard', 'action'=>'bonus-num', 'routePath'=>'dashboard/bonus-num', 'show'=>0,],
         ]
@@ -28,6 +29,7 @@ return [
         'routePath'=>'shop',
         'show'=>1,
         'brandAmbassador' => 1,
+        'isTop' => 1,
         'child'=>[
             ['name'=>'Products list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'index', 'routePath'=>'shop/index', 'show'=>1],//商品列表
             ['name'=>'Welcome Pack management', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'dec', 'routePath'=>'user/dec', 'show'=>1,'allow'=>'declarer',],
@@ -41,7 +43,7 @@ return [
         ]
     ],
     'user'=>[
-        'name'=>'Member management',//会员管理
+        'name'=>'Member Management',//会员管理
         'class' => '',
         'icon'=>'el-icon-user',
         'controller'=>'user',
@@ -49,6 +51,7 @@ return [
         'routePath'=>'user',
         'show'=>1,
         'brandAmbassador' => 1,
+        'isTop' => 1,
         'child'=>[
             ['name'=>'Personal info', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'index', 'routePath'=>'user/index', 'show'=>1,],//个人资料
             //['name'=>'上传身份证', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'id-card', 'routePath'=>'user/id-card', 'show'=>0,],
@@ -146,6 +149,8 @@ return [
         'action'=>'',
         'routePath'=>'config',
         'show'=>1,
+        'brandAmbassador' => 1,
+        'isTop' => 1,
         'child'=>[
 //            ['name'=>'个人设置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'base', 'routePath'=>'config/base', 'show'=>1,],
             ['name'=>'Shipping Address', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'receive-address-list', 'routePath'=>'config/receive-address-list', 'show'=>1,],//收货地址管理

frontendApi/modules/v1/controllers/SiteController.php

@@ -119,12 +119,15 @@ class SiteController extends BaseController
         $daysDiff = Yii::$app->params['daysDiff'];
         // 钱包
         $shopWalletType = Yii::$app->params['shopWalletType'];
+        // 会员类型
+        $whetherBA = $this->_whetherBA();
         return [
             'decLevels' => $decLevels,
             'empLevels' => $empLevels,
             'menu' => $menu,
             'daysDiff' => $daysDiff,
             'shopWalletType' => $shopWalletType,
+            'whetherBA' => $whetherBA,
         ];
     }
 
@@ -138,12 +141,13 @@ class SiteController extends BaseController
                 }
                 // 是否BA会员
                 if ($this->_whetherBA()) {
-                    if (isset($parentMenu['brandAmbassador']) && ($parentMenu['brandAmbassador'] !== 1)) {
+                    // BA会员展示BA菜单
+                    if (!isset($parentMenu['brandAmbassador']) || ($parentMenu['brandAmbassador'] !== 1)) {
                         continue;
                     }
                 } else {
                     // 正式会员不显示BA会员菜单
-                    if (isset($parentMenu['brandAmbassador']) && ($parentMenu['brandAmbassador'] === 1)) {
+                    if (!isset($parentMenu['isTop']) && (isset($parentMenu['brandAmbassador']) && ($parentMenu['brandAmbassador'] === 1))) {
                         continue;
                     }
                 }

frontendEle/src/router/index.js

@@ -122,7 +122,7 @@ export const constantRouterMap = [
                     title: 'Products list',//BA商品列表
                     breadcrumb: [
                         {title: 'Dashboard', path: '/dashboard/index'},//首页
-                        {title: 'Shopping Mall', path: '/shop/ba-order-list'},//商城管理
+                        {title: 'Shopping Mall', path: '/shop/ba-product-list'},//商城管理
                     ],
                 },
             },
@@ -134,7 +134,7 @@ export const constantRouterMap = [
                 title: 'Products settlement', // 购物车
                 breadcrumb: [
                   {title: 'Dashboard', path: '/dashboard/index'},//首页
-                  {title: 'Shopping Mall', path: '/shop/ba-shopping-cart'}//商城管理
+                  {title: 'Shopping Mall', path: '/shop/ba-product-list'}//商城管理
                 ],
               },
             },
@@ -146,7 +146,7 @@ export const constantRouterMap = [
                     title: 'Order List',  // BA订单列表
                     breadcrumb: [
                         {title: 'Dashboard', path: '/dashboard/index'},//首页
-                        {title: 'Shopping Mall', path: '/shop/ba-order-list'}//商城管理
+                        {title: 'Shopping Mall', path: '/shop/ba-product-list'}//商城管理
                     ],
                 },
             },
@@ -285,10 +285,10 @@ export const constantRouterMap = [
         component: _import('user/ba-info'),
         name: 'ba-info',
         meta: {
-          title: 'Personal info',//个人资料
+          title: 'Personal Info',//个人资料
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},//首页
-            {title: 'Member management', path: '/user/index'},//会员管理
+            {title: 'Member management', path: '/user/ba-info'},//会员管理
           ],
         },
       },
@@ -300,7 +300,7 @@ export const constantRouterMap = [
           title: 'Reset Password',//重置密码
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},//首页
-            {title: 'Member management', path: '/user/index'},//会员管理
+            {title: 'Member management', path: '/user/ba-info'},//会员管理
           ],
         },
       },
@@ -629,7 +629,7 @@ export const constantRouterMap = [
           title: 'Shipping Address',//收货地址管理
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},//首页
-            {title: 'Setting', path: '/config/base'},//设置
+            {title: 'Setting', path: '/config/ba-receive-address-list'},//设置
           ],
         },
       },
@@ -642,7 +642,7 @@ export const constantRouterMap = [
           highLight: '/config/ba-receive-address-list',
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},//首页
-            {title: 'Setting', path: '/config/base'},//设置
+            {title: 'Setting', path: '/config/ba-receive-address-list'},//设置
             {title: 'Shipping Address', path: '/config/ba-receive-address-list'},//收货地址管理
           ],
         },
@@ -656,7 +656,7 @@ export const constantRouterMap = [
           highLight: '/config/ba-receive-address-list',
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},//首页
-            {title: 'Setting', path: '/config/base'},//设置
+            {title: 'Setting', path: '/config/ba-receive-address-list'},//设置
             {title: 'Shipping Address', path: '/config/ba-receive-address-list'},//收货地址管理
           ],
         },

frontendEle/src/utils/baseInfo.js

@@ -54,7 +54,10 @@ const baseInfo = {
   },
   siteTitle(){
     return this.get('siteTitle')
-  }
+  },
+  whetherBA() {
+    return this.get('whetherBA');
+  },
 }
 
-export default baseInfo
+export default baseInfo

frontendEle/src/views/layout/layout.vue

@@ -175,6 +175,7 @@ export default {
       unreadMessage: null,
       tool: tool,
       siteTitle: '',
+      whetherBA: baseInfo.whetherBA(),
     }
   },
   computed: {
@@ -198,7 +199,7 @@ export default {
       } else {
         return false
       }
-    }
+    },
   },
   methods: {
     onMenu () {
@@ -235,7 +236,8 @@ export default {
       this.profileShow = !this.profileShow
     },
     onGo(url) {
-      this.$router.push(url)
+      let _url = !this.whetherBA ? url : '/user/ba-info';
+      this.$router.push(_url)
     },
     onLogout () {
       userInfo.clear()