调整BA会员菜单

frontendApi/config/menu.php

@@ -14,8 +14,6 @@ return [
         'action'=>'index',
         'routePath'=>'dashboard/index',
         'show'=>1,
-        'brandAmbassador' => 1,
-        'isTop' => 1,
         'child'=>[
             ['name'=>'月奖金量', 'class'=>'', 'icon'=>'', 'controller'=>'dashboard', 'action'=>'bonus-num', 'routePath'=>'dashboard/bonus-num', 'show'=>0,],
         ]
@@ -38,8 +36,6 @@ return [
 //            ['name'=>'Repeat sales products', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'reconsume', 'routePath'=>'shop/reconsume', 'show'=>1,'allow'=>'studio'],//复消商品
 //            ['name'=>'申请退货', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-backing-out', 'routePath'=>'shop/order-backing-out', 'show'=>1,],//申请退货
             ['name'=>'Order List', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],//订单列表
-            ['name'=>'Products list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'/ba-product-list', 'routePath'=>'shop/ba-product-list', 'show'=>1, 'brandAmbassador' => 1],//BA商品列表
-            ['name'=>'Order List', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'ba-order-list', 'routePath'=>'shop/ba-order-list', 'show'=>1, 'brandAmbassador' => 1],//BA订单列表
             ['name'=>'Welcome Brand Ambassador', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'ba-dec', 'routePath'=>'user/ba-dec', 'show'=>1,'allow'=>'declarer',],
             ['name'=>'Welcome BA List', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'ba-dec-order-list', 'routePath'=>'shop/ba-dec-order-list', 'show'=>1,'allow'=>'declarer',],
         ]
@@ -52,8 +48,6 @@ return [
         'action'=>'',
         '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,],
@@ -61,9 +55,6 @@ return [
 //            ['name'=>'点位绑定列表', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'bind', 'routePath'=>'user/bind', 'show'=>1,],
 //            ['name'=>'点位绑定编辑', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'bind-edit', 'routePath'=>'user/bind-edit', 'show'=>0,],
             ['name'=>'Reset Password', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'password', 'routePath'=>'user/password', 'show'=>1],
-
-            ['name'=>'Personal info', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'ba-info', 'routePath'=>'user/ba-info', 'show'=>1, 'brandAmbassador' => 1],//个人资料
-            ['name'=>'Reset Password', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'ba-password', 'routePath'=>'user/ba-password', 'show'=>1, 'brandAmbassador' => 1],
         ]
     ],
     'atlas'=>[
@@ -152,12 +143,9 @@ 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,],//收货地址管理
-            ['name'=>'Shipping Address', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'ba-receive-address-list', 'routePath'=>'config/ba-receive-address-list', 'show'=>1, 'brandAmbassador' => 1],//BA收货地址管理
         ]
     ],
 ];

frontendApi/config/menuBA.php

@@ -0,0 +1,63 @@
+<?php
+
+return [
+    'dashboard'=>[
+        'name'=>'Dashboard',//控制台
+        'class' => '',
+        'icon'=>'el-icon-guide',
+        'controller'=>'dashboard',
+        'action'=>'index',
+        'routePath'=>'dashboard/ba-index',
+        'show'=>1,
+        'brandAmbassador' => 1,
+        'child'=>[]
+    ],
+    'shop'=>[
+        'name'=>'Shopping Mall',//商城管理
+        'class' => '',
+        'icon'=>'el-icon-goods',
+        'controller'=>'shop',
+        'action'=>'',
+        'routePath'=>'shop',
+        'show'=>1,
+        'child'=>[
+            ['name'=>'Products list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'/ba-product-list', 'routePath'=>'shop/ba-product-list', 'show'=>1], // 商品列表
+            ['name'=>'Order List', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'ba-order-list', 'routePath'=>'shop/ba-order-list', 'show'=>1], // 订单列表
+        ]
+    ],
+    'user'=>[
+        'name'=>'Member Management',//会员管理
+        'class' => '',
+        'icon'=>'el-icon-user',
+        'controller'=>'user',
+        'action'=>'',
+        'routePath'=>'user',
+        'show'=>1,
+        'child'=>[
+            ['name'=>'Personal info', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'ba-info', 'routePath'=>'user/ba-info', 'show'=>1], // 个人资料
+            ['name'=>'Reset Password', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'ba-password', 'routePath'=>'user/ba-password', 'show'=>1],// 修改密码
+        ]
+    ],
+    'article'=>[
+        'name'=>'Article Management',//文章管理
+        'class' => '',
+        'icon'=>'el-icon-document',
+        'controller'=>'article',
+        'action'=>'',
+        'routePath'=>'article',
+        'show'=>1,
+        'child'=>[]
+    ],
+    'config'=>[
+        'name'=>'Setting',//设置
+        'class' => '',
+        'icon'=>'el-icon-setting',
+        'controller'=>'config',
+        'action'=>'',
+        'routePath'=>'config',
+        'show'=>1,
+        'child'=>[
+            ['name'=>'Shipping Address', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'ba-receive-address-list', 'routePath'=>'config/ba-receive-address-list', 'show'=>1, 'brandAmbassador' => 1], // 收货地址管理
+        ]
+    ],
+];

frontendApi/config/urlManagerRules.php

@@ -19,6 +19,7 @@ return [
             'GET config' => 'config',
             'GET page-data' => 'page-data',
             'GET captcha' => 'captcha',
+            'GET ba-base-info' => 'ba-base-info',
         ],
     ],
     [

frontendApi/modules/v1/controllers/OauthController.php

@@ -76,6 +76,8 @@ class OauthController extends BaseController
             $result = BaUser::getEnCodeInfo(\Yii::$app->user->id);
         }
 
+        $result['identity'] = !$isGuest ? 'user' : 'brand';
+
         return static::notice($result);
     }
 

frontendApi/modules/v1/controllers/SiteController.php

@@ -127,7 +127,7 @@ class SiteController extends BaseController
             'menu' => $menu,
             'daysDiff' => $daysDiff,
             'shopWalletType' => $shopWalletType,
-            'whetherBA' => $this->_whetherBA(),
+            'whetherBA' => false,
         ];
     }
 
@@ -135,26 +135,10 @@ class SiteController extends BaseController
         $menuResult = [];
         foreach($parentArray as $key => $parentMenu){
             if($key !== 'article'){
-                if ($this->_whetherBA() && $parentMenu['name'] == 'Dashboard') {
-                    $parentMenu['routePath'] = 'dashboard/ba-index';
-                }
-
                 // 菜单是否显示
                 if(isset($parentMenu['show']) && !$parentMenu['show']){
                     continue;
                 }
-                // 是否BA会员
-                if ($this->_whetherBA()) {
-                    // BA会员展示BA菜单
-                    if (!isset($parentMenu['brandAmbassador']) || ($parentMenu['brandAmbassador'] !== 1)) {
-                        continue;
-                    }
-                } else {
-                    // 正式会员不显示BA会员菜单
-                    if (!isset($parentMenu['isTop']) && (isset($parentMenu['brandAmbassador']) && ($parentMenu['brandAmbassador'] === 1))) {
-                        continue;
-                    }
-                }
                 if($this->_teamworkChkMenu($parentMenu)){
                     continue;
                 }
@@ -191,22 +175,6 @@ class SiteController extends BaseController
         return false;
     }
 
-    /**
-     * 是否BA会员: 未转正 && 在BA用户表有存在
-     */
-    private function _whetherBA() {
-
-        // 是否正式会员
-        if (User::find()->where(['ID' => \Yii::$app->user->id])->exists()) {
-            return false;
-        }
-        // 是否BA会员
-        if (BaUser::find()->where(['ID' => \Yii::$app->user->id])->exists()) {
-            return true;
-        }
-        return false;
-    }
-
     /**
      * 报单中心显示菜单
      * @param $menu
@@ -297,4 +265,59 @@ class SiteController extends BaseController
         $siteTitle = $systemConfig['siteTitle']['VALUE'];
         return static::notice(['siteClose' => false, 'siteTitle' => $siteTitle]);
     }
+
+    /**
+     * 请求基础信息
+     * @return array
+     */
+    public function actionBaBaseInfo(){
+        // 菜单
+        $menu = require Yii::getAlias('@frontendApi/config/menuBA.php');
+        // 获取全部文章分类
+        $allArticleCategory = ArticleCategory::getAllCategory();
+        foreach($allArticleCategory as $category){
+            $menu['article']['child'][] = ['name'=>$category['CATE_NAME'], 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'list', 'routePath'=>'article/list/'.$category['ID'], 'show'=>1,];
+        }
+        $menu = $this->_childBaMenu($menu);
+        // 时间差
+        $daysDiff = Yii::$app->params['daysDiff'];
+        // 钱包
+        $shopWalletType = Yii::$app->params['shopWalletType'];
+
+        return [
+            'decLevels' => '',
+            'empLevels' => '',
+            'menu' => $menu,
+            'daysDiff' => $daysDiff,
+            'shopWalletType' => $shopWalletType,
+            'whetherBA' => true,
+        ];
+    }
+
+    private function _childBaMenu($parentArray) {
+        $menuResult = [];
+        foreach ($parentArray as $key => $parentMenu) {
+            if ($key !== 'article'){
+                // 菜单是否显示
+                if (isset($parentMenu['show']) && !$parentMenu['show']) {
+                    continue;
+                }
+                // 查看是否有该控制器的权限
+                if(isset($parentMenu['controller']) && $parentMenu['controller']){
+                    if(!Yii::$app->user->validateUserController($parentMenu['controller'])) continue;
+                }
+                // 查看是否有权限
+                if(isset($parentMenu['action']) && $parentMenu['action']){
+                    if(!Yii::$app->user->validateUserAction($parentMenu['controller'], $parentMenu['action'])) continue;
+                }
+                // 子菜单同样设置
+                if(isset($parentMenu['child']) && !empty($parentMenu['child'])){
+                    $parentMenu['child'] = $this->_childBaMenu($parentMenu['child']);
+                }
+            }
+
+            $menuResult[] = $parentMenu;
+        }
+        return $menuResult;
+    }
 }

frontendEle/src/utils/network.js

@@ -101,6 +101,7 @@ const network = {
           userInfo.userId(response.ID)
           userInfo.userName(response.USER_NAME)
           userInfo.userEmail(response.EMAIL)
+          userInfo.userIdentity(response.identity)
           userInfo.baseData({AVATAR: response.AVATAR,VERIFIED: response.VERIFIED,DEC_LV: response.DEC_LV,EMP_LV: response.EMP_LV,PROVINCE: response.PROVINCE,CITY: response.CITY,COUNTY: response.COUNTY})
           // 成功
           resolve(response)
@@ -115,8 +116,10 @@ const network = {
   },
   getBaseInfo () {
     let promise = new Promise((resolve, reject) => {
+      // 区分BA会员或者正式会员
+      let router = userInfo.userIdentity() === 'user' ? `site/base-info` : `site/ba-base-info`;
       updateToken(function (accessToken) {
-        axiosObj.get(`site/base-info`, {
+        axiosObj.get(router, {
           headers: {
             'Authorization': ACCESS_TOKEN_PREFIX + accessToken,
           }

frontendEle/src/utils/userInfo.js

@@ -68,6 +68,16 @@ const userInfo = {
     }
     localStorage.setItem('userEmail', arg[0])
   },
+  userIdentity (...arg) {
+    if (arg.length === 0) {
+      return localStorage.getItem('identity')
+    }
+    if (arg[0] === '') {
+      localStorage.removeItem('identity')
+      return
+    }
+    localStorage.setItem('identity', arg[0])
+  },
   accessToken (...arg) {
     if (arg.length === 0) {
       return localStorage.getItem('accessToken')

frontendEle/src/views/shop/ba-dec-order-list.vue

@@ -45,9 +45,7 @@ export default {
   data () {
     return {
       loading: false,
-      form: {
-
-      },
+      form: {},
       tableData: null,
       list: null,
       currentPage: 1,
@@ -62,21 +60,11 @@ export default {
     }
   },
   methods: {
-
     objectSpanMethod (obj) {
-      if (
-        obj.columnIndex === 7 ||
-        obj.columnIndex === 8 ||
-        obj.columnIndex === 9 ||
-        obj.columnIndex === 10 ||
-        obj.columnIndex === 11 ||
-        obj.columnIndex === 12 ||
-        obj.columnIndex === 13 ||
-        obj.columnIndex === 14
-      ) {
+      if (obj.columnIndex >= 7) {
       // ⼆维数组存储的数据取出
-        var _row = this.spanArr[obj.rowIndex]
-        var _col = _row > 0 ? 1 : 0
+        let _row = this.spanArr[obj.rowIndex]
+        let _col = _row > 0 ? 1 : 0
         return {
           rowspan: _row,
           colspan: _col
@@ -124,17 +112,13 @@ export default {
       this.pos = 0
       let _this = this
       network.getPageData(_this, 'shop/ba-dec-order-list', page, pageSize, {type: this.type}, function (response) {
-      // network.getData(`shop/dec-order-list`).then(response => {
         _this.loading = false
         _this.list = response.list
         let settingObj = _this.list
 
-        let settingArr = Object.keys(settingObj).map(key => {
-          // console.log(key); // 为每个键名
+        _this.tableData = Object.keys(settingObj).map(key => {
           return settingObj[key] // 把每个对象返回出去生成一个新的数组中相当于0:{id:1}
         })
-
-        _this.tableData = settingArr
         _this.getSpanArr(_this.tableData)
       })
     },

frontendEle/src/views/shop/ba-order-list.vue

@@ -15,8 +15,9 @@
                 <el-table-column width="130" label="Recipient name" prop="CONSIGNEE"></el-table-column><!--收货人-->
                 <el-table-column width="120" label="Phone Number" prop="MOBILE"></el-table-column><!--收货电话-->
                 <el-table-column width="150" label="Shipping Address" prop="FULL_ADDRESS"></el-table-column><!--收货地址-->
-                <el-table-column width="150" label="Payment" prop="PAY_TYPE"></el-table-column><!--支付方式-->
+                <el-table-column width="120" label="Created Name" prop="CREATE_USER"></el-table-column><!--创建人-->
                 <el-table-column width="120" label="Created time" prop="CREATED_AT"></el-table-column><!--下单时间-->
+                <el-table-column width="150" label="Payment" prop="PAY_TYPE"></el-table-column><!--支付方式-->
                 <el-table-column width="120" label="Pay time" prop="PAY_AT"></el-table-column><!--支付时间-->
                 <el-table-column width="120" label="Pay Status" prop="STATUS"></el-table-column><!--支付状态-->
             </el-table>

sql/upgrade/1962.sql

@@ -427,36 +427,3 @@ CREATE TABLE `AR_BA_DEC_ORDER`  (
     INDEX `IS_DEL`(`IS_DEL`) USING BTREE,
     INDEX `ORDER_SN`(`ORDER_SN`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '报单' ROW_FORMAT = Dynamic;
-
-CREATE TABLE `AR_BA_RETURN_ORDER` (
-    `ID` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL,
-    `SN` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '订单编号',
-    `DEC_SN` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '报单编号',
-    `CREATE_AT` int(11) NOT NULL DEFAULT 0 COMMENT '创建时间',
-    `ORDER_TYPE` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0' COMMENT '订单类型',
-    `ORDER_AMOUNT` decimal(16,3) NOT NULL DEFAULT 0.000 COMMENT '订单总金额',
-    `PV` decimal(16,3) NOT NULL DEFAULT 0.000 COMMENT '订单总PV',
-    `PAY_PV` decimal(16,3) NOT NULL DEFAULT 0.000 COMMENT '实际支付PV',
-    `PAY_AMOUNT` decimal(16,3) NOT NULL DEFAULT 0.000 COMMENT '实际支付金额',
-    `PAY_TYPE` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'cash' COMMENT '支付方式',
-    `USER_ID` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '用户ID 复消用户 或者有业绩的报单或升级用户ID',
-    `ORDER_PERIOD_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '订单的业绩期',
-    `PERIOD_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '操作时的业绩期',
-    `UPGRADE_TYPE` tinyint(1) NOT NULL DEFAULT 0 COMMENT '升级报单类型 1 补差额升级 2全额升级',
-    `USER_NAME` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '会员编号',
-    `PROVINCE` int(11) NOT NULL DEFAULT 0,
-    `CITY` int(11) NOT NULL DEFAULT 0,
-    `COUNTY` int(11) NOT NULL DEFAULT 0,
-    `ADDRESS` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-    `ADMIN_ID` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-    `ORI_CASH` decimal(16,3) NOT NULL DEFAULT 0.000 COMMENT '删除订单前用户余额user_wallet',
-    `ORI_BONUS` decimal(16,3) NOT NULL DEFAULT 0.000 COMMENT '删除订单前用户奖金user_bonus',
-    `ORI_EXCHANGE_POINTS` decimal(16,3) NOT NULL DEFAULT 0.000 COMMENT '删除订单前用户兑换积分user_bonus',
-    `ORI_RECONSUME_POINTS` decimal(16,3) NOT NULL DEFAULT 0.000 COMMENT '删除订单前用户复消费积分user_bonus',
-    `ORI_DEC_LV` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '删除前用户的级别',
-    `RETURN_DEC_LV` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '删除后用户的级别(退回到的级别)',
-    `IS_LOCKING` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否锁定会员,默认0不锁定. 1为删除会锁定会员',
-    `PAY_STATUS` int(3) NOT NULL DEFAULT 0 COMMENT '支付状态',
-    `PAY_NOTE` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '支付信息',
-    PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='删除订单记录表';