Преглед изворни кода

Merge branch 'develop_yh47' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh47

lilei пре 9 месеци
родитељ
комит
dd5d18cb26
2 измењених фајлова са 6 додато и 5 уклоњено
  1. 4 3
      src/config/router.config.js
  2. 2 2
      src/views/numsGoodsShelves/easyPassShopping/index.vue

+ 4 - 3
src/config/router.config.js

@@ -787,8 +787,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '商城产品',
-              icon: 'monitor'
-              // permission: 'M_easyPassShopping'
+              icon: 'monitor',
+              permission: 'M_easyPassShopping'
             },
             hideChildrenInMenu: true,
             children: [
@@ -799,7 +799,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '商城产品列表',
                   icon: 'monitor',
-                  hidden: true
+                  hidden: true,
+                  permission: 'M_easyPassShoppingList'
                 }
               }
             ]

+ 2 - 2
src/views/numsGoodsShelves/easyPassShopping/index.vue

@@ -6,7 +6,7 @@
         <a-button
           type="primary"
           class="button-info"
-          v-if="shoppingMallStatus=='0'"
+          v-if="shoppingMallStatus=='0'&&$hasPermissions('B_openShopProduct')"
           icon="unlock"
           id="easyPassShopping-open-btn"
           :loading="iconLoading"
@@ -15,7 +15,7 @@
         </a-button>
         <a-button
           type="primary"
-          v-else
+          v-if="shoppingMallStatus=='1'&&$hasPermissions('B_closeShopProduct')"
           icon="poweroff"
           id="easyPassShopping-close-btn"
           :loading="iconLoading"