From b0a6592373eaf98013cc66c166feb4b47588fa4e Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 10 Nov 2020 14:56:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=92=8C=E7=9B=B4=E6=92=AD=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?item=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LiveItem.vue     |  2 +-
 src/components/VideoItem.vue    |  2 +-
 src/i18n/en.ts                  |  2 +-
 src/i18n/zh.ts                  |  2 +-
 src/utils/common.ts             | 34 +++++++++++++++++++++++++++++++++
 src/views/mine/Archives.vue     | 16 ++++++++++++++--
 src/views/mine/ReleaseVideo.vue |  6 +++++-
 7 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/src/components/LiveItem.vue b/src/components/LiveItem.vue
index b63d46b..53babdf 100644
--- a/src/components/LiveItem.vue
+++ b/src/components/LiveItem.vue
@@ -36,7 +36,7 @@
 <style lang="scss" scoped>
 .videoitem{
     width: 226px;
-    height: 198px;
+    // height: 198px;
     background-color: #fff;
     border-radius: 17px;
     overflow: hidden;
diff --git a/src/components/VideoItem.vue b/src/components/VideoItem.vue
index dcf1a07..cdb5eec 100644
--- a/src/components/VideoItem.vue
+++ b/src/components/VideoItem.vue
@@ -37,7 +37,7 @@
 <style lang="scss" scoped>
 .videoitem{
     width: 226px;
-    height: 198px;
+    // height: 198px;
     background-color: #fff;
     border-radius: 17px;
     overflow: hidden;
diff --git a/src/i18n/en.ts b/src/i18n/en.ts
index 384ed2f..60d152e 100644
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@@ -83,7 +83,7 @@ export default {
     xiugai: "modify",
     shuruxinnicheng: "Please enter a new nickname",
     jibenxinxi: "Basic information",
-    laiziguojia: "From the country",
+    laiziguojia: "From a country or region",
     juzhudi: "Place of residence",
     shurujuzhudi: "Enter residence",
     wohaihuishuo: "I would also say",
diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts
index 7b8c2f4..19fed55 100644
--- a/src/i18n/zh.ts
+++ b/src/i18n/zh.ts
@@ -83,7 +83,7 @@ export default {
     xiugai:"修改",
     shuruxinnicheng:"请输入新的昵称",
     jibenxinxi:"基本信息",
-    laiziguojia:"来自国家",
+    laiziguojia:"来自国家或地区",
     juzhudi:"居住地",
     shurujuzhudi:"输入居住地",
     wohaihuishuo:"我还会说",
diff --git a/src/utils/common.ts b/src/utils/common.ts
index 1fdbf71..d6ad46d 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -52,4 +52,38 @@ export function getValue(key: string): any{
         }
     }
     return value;
+}
+
+/**
+ * 验证图片是否为对应类型
+ * @param name 图片名字
+ */
+
+export function provenimg(name: string): boolean{
+    const type = ['png', 'jpg'];
+    const ntypearr = name.split('.');
+    const ntype = ntypearr[ntypearr.length - 1];
+    for(const i in type){
+        if(type[i] == ntype){
+            return true;
+        }
+    }
+    return false;
+}
+
+/**
+ * 验证视频是否为对应类型
+ * @param name 图片名字
+ */
+
+export function provenvideo(name: string): boolean{
+    const type = ['flv', 'mp4'];
+    const ntypearr = name.split('.');
+    const ntype = ntypearr[ntypearr.length - 1];
+    for(const i in type){
+        if(type[i] == ntype){
+            return true;
+        }
+    }
+    return false;
 }
\ No newline at end of file
diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index 90868d9..ad15de1 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -523,6 +523,7 @@ import {
 } from "@/api/index";
 import { message } from "ant-design-vue";
 import { useI18n } from "@/utils/i18n";
+import { provenvideo } from '@/utils/common';
 
 export default defineComponent({
     name: "Archives",
@@ -909,6 +910,7 @@ export default defineComponent({
         }
         const uploadprogress: Ref<number> = ref(0);
         async function uploads(file: AntUpload) {
+
             uploadprogress.value = 0;
 
             const res = await uploadflie(file.file, (info: any) => {
@@ -960,6 +962,15 @@ export default defineComponent({
             //  picinfo.url=res.video.url
             formData.value.img = res.video.url;
         }
+
+        function beforeVideoUpload(file: any){
+            console.log(file)
+            const type = provenvideo(file.name);
+            if(!type){
+                message.error("文件类型错误,请重新选择")
+            }
+            return false;
+        }
         // function selguojia(e: any){
         //     userinfo.value.countryValue = e;
         //     console.log(e)
@@ -1007,7 +1018,8 @@ export default defineComponent({
             uploadspic,
             lan,
             interestslist,
-            isdisabled
+            isdisabled,
+            beforeVideoUpload
         };
     },
 });
@@ -1068,7 +1080,7 @@ export default defineComponent({
                     align-items: center;
                     margin-bottom: 28px;
                     .label {
-                        width: 60px;
+                        width: 90px;
                         font-size: 11px;
                         font-weight: 500;
                         color: #808080;
diff --git a/src/views/mine/ReleaseVideo.vue b/src/views/mine/ReleaseVideo.vue
index 8b0bcb2..8900020 100644
--- a/src/views/mine/ReleaseVideo.vue
+++ b/src/views/mine/ReleaseVideo.vue
@@ -131,7 +131,7 @@
 import { defineComponent, onMounted, reactive, Ref, ref, toRaw } from "vue";
 import { PlaySquareOutlined, PlusOutlined } from "@ant-design/icons-vue";
 import NavBottom from "@/components/NavBottom.vue";
-import { previewCover } from "@/utils/common";
+import { previewCover, provenimg } from "@/utils/common";
 import { FromSend, ImgInfo, VideoInfo } from "@/types";
 import { uploadflie } from "@/utils/vod";
 import { setvideo, videoadd, videodetail } from "@/api";
@@ -191,6 +191,10 @@ export default defineComponent({
          */
         const beforeCoverUpload = (file: File): boolean => {
             console.log(file);
+            const type = provenimg(file.name);
+            if(!type){
+                message.error("请重新选择")
+            }
             return false;
         };