From 4b3ce450f9ab8c2bdb68c067d60111381e4f54e8 Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Wed, 17 Mar 2021 17:57:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E6=89=93=E5=BC=80=E6=96=87=E4=BB=B6=E7=9A=84=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.js               |  2 --
 src/views/home/mobile/index.vue | 22 ++++++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index e5394f1..e7facb4 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -10,7 +10,6 @@ NProgress.configure({ showSpinner: false }) // NProgress配置
 const whiteList = ['/login','/s','/s/','/s_m','/s_m/'] // 白名单
 
 router.beforeEach(async(to, from, next) => {
-  console.log(to)
   // 开始进度条
   NProgress.start()
   // 设置页面标题
@@ -80,7 +79,6 @@ function setMenuList(next, to){
       }
     })
   } else {
-    console.log('next(to)', to)
     next(to)
   }
 }
diff --git a/src/views/home/mobile/index.vue b/src/views/home/mobile/index.vue
index 25e86b0..8a173aa 100644
--- a/src/views/home/mobile/index.vue
+++ b/src/views/home/mobile/index.vue
@@ -230,7 +230,8 @@
         <van-checkbox v-if="selectStatus" v-model="isShowCheckContext" slot="right-icon" :name="rowContextData"></van-checkbox>
       </van-cell>
     </van-overlay>
-
+    <!--为了不受右键区域的影响, 把弹窗之类的提取出来-->
+    <image-viewer :fileList="fileList" :file="imagePreviewRow" :status.sync="imagePreviewVisible"></image-viewer>
   </div>
 </template>
 <script>
@@ -242,10 +243,11 @@
   import Bus from '@/assets/js/bus'
   import {getPath, getPathList, removePath, setPath} from '@/utils/path'
   import fileConfig from "@/utils/file-config";
+  import ImageViewer from "@/components/preview/ImageViewer";
   let pinyin = require("pinyin");
 
   export default {
-    components: {IconFile},
+    components: {ImageViewer, IconFile},
     computed: {
       ...mapGetters([
         'name',
@@ -323,7 +325,9 @@
         sortableProp: null,
         order: null,
         grid: false,
-        vmode: 'list'
+        vmode: 'list',
+        imagePreviewRow: {},
+        imagePreviewVisible: false,
       };
     },
     mounted(){
@@ -957,12 +961,14 @@
             setPath(this.path, this.pathList)
             this.getFileList()
           } else {
-            if(row.contentType.includes('text')){
-              this.$router.push(`/public/articles/article?mark=${row.id}`)
-            }else{
-              // 打开文件
-              fileConfig.preview(this.$store.state.user.token, row, this.$store.getters.token)
+            if (row.contentType.startsWith('image')) {
+              // 图片
+              this.imagePreviewVisible = true
+              this.imagePreviewRow = row
+              return
             }
+            // 通用打开文件的方法
+            fileConfig.preview(this.$store.state.user.name, row, this.$store.getters.token)
           }
         }
       },