隐藏套餐列表、bugfix：管理员角色列表循环依赖引入导致分页错误

backendApi/config/menu.php

@@ -41,7 +41,7 @@ return [
             ['name'=>'删除商品', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'goods-delete', 'routePath'=>'shop/goods-delete', 'show'=>0,],
             // 新添加的商品操作 ---stop
             ['name'=>'商品列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'goods-list-export', 'routePath'=>'shop/goods-list-export', 'show'=>0,],
-            ['name'=>' Kitting products manage', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'package', 'routePath'=>'shop/package', 'show'=>1,],//套餐管理
+//            ['name'=>' Kitting products manage', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'package', 'routePath'=>'shop/package', 'show'=>1,],//套餐管理
 
             // ['name'=>'Welcome Pack Listing', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],//报单列表
             // ['name'=>'报单列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list-export', 'routePath'=>'shop/dec-order-list-export', 'show'=>0,],

backendApi/modules/v1/models/lists/shop/GoodsList.php

@@ -159,6 +159,20 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                         ];
                     },
                 ],
+                'TAX' => [
+                    'header' => 'Tax(₦)',//税额
+                    'headerOther' => [
+                        'width' => '150',
+                    ],
+                    'value' => function ($row) {
+                        return Tool::formatPrice($row['SELL_PRICE'] - $row['SELL_PRICE'] / (1 + $row['TAX_RATE'] / 100));
+                    },
+                    'valueOther' => function ($row) {
+                        return [
+                            'tag' => ['type' => 'danger', 'size' => 'small', 'class' => 'no-border']
+                        ];
+                    },
+                ],
                 'STORE_NUMS' => [
                     'header' => 'Inventory',//库存
                     'headerOther' => [

backendEle/src/router/index.js

@@ -105,32 +105,32 @@ export const constantRouterMap = [
         },
 
       },
-        {
-            path: '/shop/package',
-            component: _import('shop/package'),
-            name: 'shop_package',
-            meta: {
-                title: 'Kitting products list',//报单套餐列表
-                breadcrumb: [
-                    {title: 'Dashboard', path: '/dashboard/index'},//首页
-                    {title: 'Shopping Mall', path: '/shop/dec-order-list'},//商城管理
-                ],
-            },
-
-        },
-        {
-            path: '/shop/package-add',
-            component: _import('shop/package-add'),
-            name: 'shop_package-add',
-            meta: {
-                title: 'Add Kitting products',//报单套餐添加
-                breadcrumb: [
-                    {title: 'Dashboard', path: '/dashboard/index'},//首页
-                    {title: 'Shopping Mall', path: '/shop/dec-order-list'},//商城管理
-                ],
-            },
-
-        },
+        // {
+        //     path: '/shop/package',
+        //     component: _import('shop/package'),
+        //     name: 'shop_package',
+        //     meta: {
+        //         title: 'Kitting products list',//报单套餐列表
+        //         breadcrumb: [
+        //             {title: 'Dashboard', path: '/dashboard/index'},//首页
+        //             {title: 'Shopping Mall', path: '/shop/dec-order-list'},//商城管理
+        //         ],
+        //     },
+        //
+        // },
+        // {
+        //     path: '/shop/package-add',
+        //     component: _import('shop/package-add'),
+        //     name: 'shop_package-add',
+        //     meta: {
+        //         title: 'Add Kitting products',//报单套餐添加
+        //         breadcrumb: [
+        //             {title: 'Dashboard', path: '/dashboard/index'},//首页
+        //             {title: 'Shopping Mall', path: '/shop/dec-order-list'},//商城管理
+        //         ],
+        //     },
+        //
+        // },
         {
             path: '/shop/index',
             component: _import('shop/index'),

backendEle/src/views/admin/role.vue

@@ -111,10 +111,10 @@
         this.multipleSelection = val
       },
       handleCurrentChange (page) {
-        this.getData(this, page, this.pageSize)
+        this.getData(page, this.pageSize)
       },
       handleSizeChange (pageSize) {
-        this.getData(this, this.currentPage, pageSize)
+        this.getData(this.currentPage, pageSize)
       },
       handleRow (command) {
         let re = command.split('|')