From 8d57e830b02ebcd05e8d7bb24b011988869fe24e Mon Sep 17 00:00:00 2001 From: jmal Date: Mon, 25 Jan 2021 17:57:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ShowFile/ShowFile.vue | 5 + src/components/select/icon.vue | 1 - src/permission.js | 6 +- src/router/index.js | 2 +- src/views/public/share/shareList.vue | 93 ++- src/views/public/share/shareList_m.vue | 939 ---------------------- src/views/setting/articles/tagManager.vue | 1 - 7 files changed, 63 insertions(+), 984 deletions(-) delete mode 100644 src/views/public/share/shareList_m.vue diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue index fa80f32..e734f65 100644 --- a/src/components/ShowFile/ShowFile.vue +++ b/src/components/ShowFile/ShowFile.vue @@ -2064,6 +2064,7 @@ export default { if (this.selectPin) { return } + this.rowContextData = rows[0] } this.$refs.fileListTable.tableSelectData = rows this.selectRowData = rows @@ -3179,5 +3180,9 @@ export default { background-size: cover; background-position: center; } +.vmode{ + padding: 5px 10px; + margin-left: -5px; +} diff --git a/src/components/select/icon.vue b/src/components/select/icon.vue index 585570a..35db771 100644 --- a/src/components/select/icon.vue +++ b/src/components/select/icon.vue @@ -82,7 +82,6 @@ export default { this.pickerOpen = false }, select(icon){ - console.log('6789') this.currentValue = icon this.$emit('input', icon) this.$refs.popover.doClose() diff --git a/src/permission.js b/src/permission.js index 8f0e6a0..2112611 100644 --- a/src/permission.js +++ b/src/permission.js @@ -66,7 +66,11 @@ function setMenuList(next, to){ if(findPath(res.data, to)){ next(window.location.pathname + window.location.search) } else { - next({path: store.getters.menuList[0].path}) + if(to.path !== '/s'){ + next(window.location.pathname + window.location.search) + } else { + next({path: store.getters.menuList[0].path}) + } } }) } else { diff --git a/src/router/index.js b/src/router/index.js index 6d787ea..371dad2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -297,7 +297,7 @@ export const dynamicRouters = [ { path: '', name: 's_m', - component: () => import('@/views/public/share/shareList_m'), + component: () => import('@/views/public/share/shareList'), } ] }, diff --git a/src/views/public/share/shareList.vue b/src/views/public/share/shareList.vue index 897be37..3bf95fd 100644 --- a/src/views/public/share/shareList.vue +++ b/src/views/public/share/shareList.vue @@ -20,19 +20,20 @@
-
- - 下载 +
+ + + + + - - + +
- -
@@ -55,14 +56,11 @@
- - - + - +