From 5b1f165528c68f22d1dd19fa85d080896c985902 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 17 Nov 2020 16:04:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E5=88=9D=E5=A7=8B=E5=B0=B1?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                      | 1 +
 src/import-png.d.ts               | 8 ++++++++
 src/layout/Regime.vue             | 2 +-
 src/views/mine/Archives.vue       | 5 +++--
 src/views/mine/ReleaseVideo.vue   | 4 +++-
 src/views/mine/ReleaseWebcast.vue | 4 +++-
 yarn.lock                         | 5 +++++
 7 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2fee0c7..86a6df9 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "trtc-js-sdk": "^4.6.5",
     "vod-js-sdk-v6": "^1.4.10",
     "vue": "^3.0.0-0",
+    "vue-cropper": "^0.5.5",
     "vue-router": "^4.0.0-0",
     "vuex": "^4.0.0-0"
   },
diff --git a/src/import-png.d.ts b/src/import-png.d.ts
index 607160a..faab5e1 100644
--- a/src/import-png.d.ts
+++ b/src/import-png.d.ts
@@ -18,6 +18,14 @@ declare module 'tim-js-sdk'{
     export default value;
 }
 
+declare module 'vue-cropper'{
+    const VueCropper: any
+    export {
+        VueCropper
+    }
+}
+
+
 declare var FB: any;
 
 declare var TCPlayer: any;
\ No newline at end of file
diff --git a/src/layout/Regime.vue b/src/layout/Regime.vue
index 65cd1f2..abb0adb 100644
--- a/src/layout/Regime.vue
+++ b/src/layout/Regime.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="mine" :style="{height:height + 'px'}">
         <NavTop :type="1" style="flex-shrink:0"></NavTop>
-        <div class="body">
+        <div class="body" id="rbody">
             <router-view/>
         </div>
     </div>
diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index a86f9cb..e1533ef 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -930,11 +930,12 @@ export default defineComponent({
         const uploadprogress: Ref<number> = ref(0);
         async function uploads(file: AntUpload) {
 
-            uploadprogress.value = 0;
+            uploadprogress.value = 1;
             issum = false;
             const res = await uploadflie(file.file, (info: any) => {
                 console.log(info);
-                uploadprogress.value = info.percent.toFixed(2) * 100;
+                const jindu = info.percent.toFixed(2) * 100
+                uploadprogress.value =  jindu > 0 ? jindu : 1;
             });
             userinfo.value.video = res.video.url;
             userinfo.value.videoid = res.fileId;
diff --git a/src/views/mine/ReleaseVideo.vue b/src/views/mine/ReleaseVideo.vue
index a905f78..12d0d5d 100644
--- a/src/views/mine/ReleaseVideo.vue
+++ b/src/views/mine/ReleaseVideo.vue
@@ -258,13 +258,15 @@ export default defineComponent({
                 issum = false;
                 console.log(file);
                 videofile.value = file.file;
+                uploadprogress.value = 1;
                 videos.value[0].addEventListener("durationchange", () => {
                     console.log(videos.value[0].duration);
                     form.value.fileduration = videos.value[0].duration;
                 });
                 const res = await uploadflie(file.file, (info: any) => {
                     console.log(info);
-                    uploadprogress.value = info.percent.toFixed(2) * 100;
+                    const jindu = info.percent.toFixed(2) * 100
+                    uploadprogress.value = jindu > 0 ? jindu : 1;
                 });
                 console.log(res);
 
diff --git a/src/views/mine/ReleaseWebcast.vue b/src/views/mine/ReleaseWebcast.vue
index bbf090e..295aaaf 100644
--- a/src/views/mine/ReleaseWebcast.vue
+++ b/src/views/mine/ReleaseWebcast.vue
@@ -493,9 +493,11 @@ export default defineComponent({
                     console.log(videos.value[0].duration);
                     form.value.fileduration = videos.value[0].duration;
                 });
+                uploadprogress.value = 1;
                 const res = await uploadflie(file.file, (info: any) => {
                     console.log(info);
-                    uploadprogress.value = info.percent.toFixed(2) * 100;
+                    const jindu = info.percent.toFixed(2) * 100
+                    uploadprogress.value = jindu > 0 ? jindu : 1;
                 });
                 console.log(res);
 
diff --git a/yarn.lock b/yarn.lock
index 27c8437..3a94896 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9245,6 +9245,11 @@ vod-js-sdk-v6@^1.4.10:
     js-sha1 "^0.6.0"
     uuid "^3.3.2"
 
+vue-cropper@^0.5.5:
+  version "0.5.5"
+  resolved "https://registry.npmjs.org/vue-cropper/-/vue-cropper-0.5.5.tgz#9bd1ba563c7faa268abd52fb2af4c6c28d33c962"
+  integrity sha512-5mGaBlS1EwLxUFwHHX2Q8zOZSiVfBUjOfolR+ZNKwu7Rh3u+GhwHYOyFkgZHhhoQBBNdyVB28O6W+MpMimhCbA==
+
 vue-eslint-parser@^7.0.0, vue-eslint-parser@^7.1.1:
   version "7.1.1"
   resolved "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.1.1.tgz#c43c1c715ff50778b9a7e9a4e16921185f3425d3"