From 9bf76847ddce502b34a14e5d0c13a04997987d37 Mon Sep 17 00:00:00 2001 From: wangdong <1551135706@qq.com> Date: Thu, 6 Jun 2024 19:42:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=9C=B0=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/BasicLayout.vue | 2 +- src/permission.js | 2 +- src/store/modules/permission.js | 3 +-- src/views/goods/Index.vue | 4 ++-- src/views/goods/Update.vue | 4 ++-- src/views/manage/role/Index.vue | 4 ++-- src/views/manage/role/modules/EditForm.vue | 4 ++-- src/views/order/Index.vue | 4 ++-- 8 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index 273370b..ac5d16c 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -135,7 +135,7 @@ export default { Api.info().then(result => { const { data: { storeInfo } } = result this.storeInfo = storeInfo - window.storeInfo = storeInfo + window.localStorage.setItem('storeInfo', JSON.stringify(storeInfo)) }) }, diff --git a/src/permission.js b/src/permission.js index 89fb669..0dd727d 100644 --- a/src/permission.js +++ b/src/permission.js @@ -44,7 +44,7 @@ router.beforeEach((to, from, next) => { store .dispatch('GetInfo') .then(({ roles, modules }) => { - window.roles = roles + window.localStorage.setItem('roles', JSON.stringify(roles)); // 根据roles权限生成可访问的路由表 store.dispatch('GenerateRoutes', { roles, modules }) .then(routers => { diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index db27d32..34e628e 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -79,7 +79,6 @@ function filterModulesRouter (routerMap, modules) { if (route.children && route.children.length) { route.children = filterModulesRouter(route.children, modules) } - console.log(route, route.moduleKey || '', modules) return checkModuleKey(route, modules) && checkModules(route, modules) }) return moduleRouters @@ -152,7 +151,7 @@ function setPrimaryMenuRedirect (routerMap) { * 设置默认的首页 * @param {*} routerMap */ -function setIndexRedirect (routerMap) { +function setIndexRedirect(routerMap) { const root = routerMap[0] if (root.children && root.children.length) { const item = root.children[0] diff --git a/src/views/goods/Index.vue b/src/views/goods/Index.vue index 7354f5c..b85c554 100644 --- a/src/views/goods/Index.vue +++ b/src/views/goods/Index.vue @@ -364,10 +364,10 @@ export default { } }, isSuper() { - return window.roles ? window.roles.isSuper : 0 + return window.localStorage.getItem('roles') ? JSON.parse(window.localStorage.getItem('roles')).isSuper : 0 }, storeVersion() { - return window.storeInfo ? window.storeInfo.store_version : 0 + return window.localStorage.getItem('storeInfo') ? JSON.parse(window.localStorage.getItem('storeInfo')).store_version : 0 } }, methods: { diff --git a/src/views/goods/Update.vue b/src/views/goods/Update.vue index c00e4b5..49664a4 100644 --- a/src/views/goods/Update.vue +++ b/src/views/goods/Update.vue @@ -597,10 +597,10 @@ export default { }, computed: { isSuper() { - return window.roles ? window.roles.isSuper : 0 + return window.localStorage.getItem('roles') ? JSON.parse(window.localStorage.getItem('roles')).isSuper : 0 }, storeVersion() { - return window.storeInfo ? window.storeInfo.store_version : 0 + return window.localStorage.getItem('storeInfo') ? JSON.parse(window.localStorage.getItem('storeInfo')).store_version : 0 } }, watch: { diff --git a/src/views/manage/role/Index.vue b/src/views/manage/role/Index.vue index 5cd272c..33e13d1 100644 --- a/src/views/manage/role/Index.vue +++ b/src/views/manage/role/Index.vue @@ -84,10 +84,10 @@ export default { }, computed: { isSuper() { - return window.roles ? window.roles.isSuper : 0 + return window.localStorage.getItem('roles') ? JSON.parse(window.localStorage.getItem('roles')).isSuper : 0 }, storeVersion() { - return window.storeInfo ? window.storeInfo.store_version : 0 + return window.localStorage.getItem('storeInfo') ? JSON.parse(window.localStorage.getItem('storeInfo')).store_version : 0 } }, created () { diff --git a/src/views/manage/role/modules/EditForm.vue b/src/views/manage/role/modules/EditForm.vue index c59cadf..467a5c7 100644 --- a/src/views/manage/role/modules/EditForm.vue +++ b/src/views/manage/role/modules/EditForm.vue @@ -102,10 +102,10 @@ export default { }, computed: { isSuper() { - return window.roles ? window.roles.isSuper : 0 + return window.localStorage.getItem('roles') ? JSON.parse(window.localStorage.getItem('roles')).isSuper : 0 }, storeVersion() { - return window.storeInfo ? window.storeInfo.store_version : 0 + return window.localStorage.getItem('storeInfo') ? JSON.stringify(window.localStorage.getItem('storeInfo')).store_version : 0 } }, methods: { diff --git a/src/views/order/Index.vue b/src/views/order/Index.vue index 0d1a8cf..5a0abd3 100644 --- a/src/views/order/Index.vue +++ b/src/views/order/Index.vue @@ -360,10 +360,10 @@ export default { }, computed: { isSuper() { - return window.roles ? window.roles.isSuper : 0 + return window.localStorage.getItem('roles') ? JSON.parse(window.localStorage.getItem('roles')).isSuper : 0 }, storeVersion() { - return window.storeInfo ? window.storeInfo.store_version : 0 + return window.localStorage.getItem('storeInfo') ? JSON.parse(window.localStorage.getItem('storeInfo')).store_version : 0 } }, watch: { From 4bf5023453e203286438975953447a5e1eab8a1d Mon Sep 17 00:00:00 2001 From: wangdong <1551135706@qq.com> Date: Fri, 7 Jun 2024 09:44:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=BB=9A=E5=8A=A8?= =?UTF-8?q?=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/shop/Index.vue | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/src/views/shop/Index.vue b/src/views/shop/Index.vue index eef0887..101b75a 100644 --- a/src/views/shop/Index.vue +++ b/src/views/shop/Index.vue @@ -33,12 +33,22 @@ :columns="columns" :data="loadData" :pagination="pagination" + :scroll="{ x: 1450 }" > 商户logo + + {{ item.shop_name }} + + + {{ item.shop_label }} + + + {{ item.company_name }} + {{ item.is_select_mechant ? '是' : '否' }} @@ -90,11 +100,15 @@ export default { }, { title: '商户名称', - dataIndex: 'shop_name' + width: '150px', + dataIndex: 'shop_name', + scopedSlots: { customRender: 'shop_name' } }, { title: '商户标签', - dataIndex: 'shop_label' + width: '150px', + dataIndex: 'shop_label', + scopedSlots: { customRender: 'shop_label' } }, { title: '账号名称', @@ -111,7 +125,9 @@ export default { }, { title: '公司名称', - dataIndex: 'company_name' + width: '150px', + dataIndex: 'company_name', + scopedSlots: { customRender: 'company_name' } }, { title: '法人名字', @@ -119,7 +135,8 @@ export default { }, { title: '手机号', - dataIndex: 'phone' + dataIndex: 'phone', + width: '120px' }, { title: '是否展示营业执照', @@ -136,12 +153,13 @@ export default { }, { title: '添加时间', + width: '150px', dataIndex: 'create_time' }, { title: '操作', dataIndex: 'action', - width: '180px', + width: '120px', scopedSlots: { customRender: 'action' } } ]