From ee135d61fc656a2092574369f8439ad8409a3368 Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Sat, 2 Jan 2021 16:23:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=92=AD=E6=94=BE=E8=A7=86=E9=A2=91=E6=97=B6?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ShowFile/ShowFile.vue          |  2 +-
 .../SimpleUploader/globalUploader.vue         |  1 +
 src/components/input/UploadImageInput.vue     |  2 +-
 src/components/preview/VideoPreview.vue       | 43 +++++++++----------
 src/utils/number.js                           | 16 +++----
 src/views/share/index.vue                     |  2 +-
 6 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue
index 674dcbd..718c033 100644
--- a/src/components/ShowFile/ShowFile.vue
+++ b/src/components/ShowFile/ShowFile.vue
@@ -2656,7 +2656,7 @@ export default {
         isFolder: row.isFolder
       }).then(res => {
         if (res.data) {
-          this.shareLink = 'http://' + window.location.host + '/s?s=' + res.data
+          this.shareLink = window.location.origin + '/s?s=' + res.data
           this.generateShareLinkLoading = false
         }
       })
diff --git a/src/components/SimpleUploader/globalUploader.vue b/src/components/SimpleUploader/globalUploader.vue
index 92f3eb5..a3375ae 100755
--- a/src/components/SimpleUploader/globalUploader.vue
+++ b/src/components/SimpleUploader/globalUploader.vue
@@ -671,6 +671,7 @@
         .files-title {
           margin-left: 3%;
           font-size: 20px;
+          line-height: 3.5rem;
         }
         .operate {
           flex: 1;
diff --git a/src/components/input/UploadImageInput.vue b/src/components/input/UploadImageInput.vue
index de6d01f..7e468fc 100644
--- a/src/components/input/UploadImageInput.vue
+++ b/src/components/input/UploadImageInput.vue
@@ -24,7 +24,7 @@
         <div class="url-desc" v-if="uploadState > 0" slot="tip">
           <span v-show="uploadState === 1">图片上传中{{uploadPercentage}}%</span>
           <span v-show="uploadState === 2">图片上传成功</span>
-          <span v-show="uploadState === 3">该图片不支持自动上传，请下载后手动上传</span>
+          <span v-show="uploadState === 3">该图片不支持自动上传</span>
           <span v-show="uploadState === 4">图片加载中</span>
           <i :class="{
             'el-icon-loading': uploadState === 1 ||  uploadState === 4,
diff --git a/src/components/preview/VideoPreview.vue b/src/components/preview/VideoPreview.vue
index 4809b14..b42af2d 100644
--- a/src/components/preview/VideoPreview.vue
+++ b/src/components/preview/VideoPreview.vue
@@ -2,9 +2,15 @@
 <div class="preview" v-if="show">
 <van-overlay :show="show">
   <div class="wrapper">
-    <div class="block" @mousemove="onmousemove" @mouseout="onmouseout" @mouseenter="onmouseenter" @mouseleave="onmouseleave">
-<!--      <div role="button" @click="close" class="viewer-button viewer-close" data-viewer-action="mix"></div>-->
-      <div v-show="pc?closeBarShow:true" class="close-bar" @click="close">
+    <div class="block"
+         @mousemove="onmousemove"
+         @mouseout="onmouseout"
+         @mouseenter="onmouseenter"
+         @mouseleave="onmouseleave"
+         @touchstart="onmouseenter"
+         @touchend="onmousemove"
+    >
+      <div v-show="closeBarShow" class="close-bar" @click="close">
         <svg-icon class="audio-player-close" icon-class="close"/>
       </div>
       <video-player class="video-player vjs-custom-skin"
@@ -150,7 +156,9 @@ export default {
         if(this.playing){
           if(!this.$pc){
             const closeBar = document.querySelector('.block .close-bar')
-            closeBar.style.display = "none"
+            if(closeBar){
+              closeBar.style.display = "none"
+            }
           }
           this.closeBarShow = false
         }
@@ -158,25 +166,16 @@ export default {
       },
       onmouseenter() {
         this.closeBarShow = true
-        let player = document.querySelector('.video-player.video-player.vjs-custom-skin')
-        // console.log('player',player)
-        // if(!player) return;
-        // this.onhover(function() {
-        //     console.log('124')
-        //   }, player, 2000);
       },
-      // onhover(fun, obj, time) {
-      //   var s;
-      //   obj.onmouseover = function() {
-      //       console.log('onmouseover')
-      //       s = setTimeout(fun, 1000);
-      //     };
-      //   obj.onmouseout = function() {
-      //     console.log('onmouseout')
-      //       if(!s) return;
-      //       clearTimeout(s);
-      //     };
-      // },
+      ontouchstart() {
+        console.log('ontouchstart', this.closeBarShow)
+        this.closeBarShow = true
+      },
+      ontouchsend() {
+        console.log('ontouchsend', this.closeBarShow)
+        this.closeBarShow = false
+        this.clearTimeout()
+      }
     }
 }
 </script>
diff --git a/src/utils/number.js b/src/utils/number.js
index 4a7a4f9..0ab74ec 100644
--- a/src/utils/number.js
+++ b/src/utils/number.js
@@ -132,11 +132,11 @@ export function formatSize(size) {
   } else if (size < 1024) {
     return size + 'B'
   } else if (size < 1024 * 1024) {
-    return (size/1024).toFixed(2) + 'k'
+    return (size/1024).toFixed(1) + 'k'
   } else if (size < 1024 * 1024 * 1024) {
-    return (size/(1024 * 1024)).toFixed(2) + 'M'
+    return (size/(1024 * 1024)).toFixed(1) + 'M'
   } else {
-    return (size/(1024 * 1024 * 1024)).toFixed(2) + 'G'
+    return (size/(1024 * 1024 * 1024)).toFixed(1) + 'G'
   }
 }
 
@@ -146,14 +146,14 @@ export function formatSize(size) {
  */
 export function formatNetSpeed(size) {
   if (size === 0) {
-    return '0 B/s'
+    return '0B/s'
   } else if (size < 1024) {
-    return size + ' B/s'
+    return size + 'B/s'
   } else if (size < 1024 * 1024) {
-    return (size/1024).toFixed(2) + ' KB/s'
+    return (size/1024).toFixed(2) + 'KB/s'
   } else if (size < 1024 * 1024 * 1024) {
-    return (size/(1024 * 1024)).toFixed(2) + ' MB/s'
+    return (size/(1024 * 1024)).toFixed(2) + 'MB/s'
   } else {
-    return (size/(1024 * 1024 * 1024)).toFixed(2) + ' GB/s'
+    return (size/(1024 * 1024 * 1024)).toFixed(2) + 'GB/s'
   }
 }
diff --git a/src/views/share/index.vue b/src/views/share/index.vue
index cdbf381..a6818a7 100644
--- a/src/views/share/index.vue
+++ b/src/views/share/index.vue
@@ -474,7 +474,7 @@
       fileClick(row) {
         this.shareDialog = true
         this.shareFileName = row.fileName
-        this.shareLink = 'http://'+window.location.host+'/s?s='+row.id
+        this.shareLink = window.location.origin+'/s?s='+row.id
         this.generateShareLinkLoading = false
       },
       // 复制分享链接