From 39fa3b08016ca90e2fa6c965f60ce0a4b6520678 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 2 Nov 2020 09:58:49 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=9B=BD=E5=AE=B6=E4=B8=8D=E8=83=BD=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/i18n.ts           |  2 +-
 src/views/mine/Archives.vue | 52 +++++++++++++++++++++++++------------
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/utils/i18n.ts b/src/utils/i18n.ts
index c03d8b7..a2e7ad4 100644
--- a/src/utils/i18n.ts
+++ b/src/utils/i18n.ts
@@ -13,7 +13,7 @@ const createI18n = (config: Config) => ({
     locale: ref(config.locale),
     messages: config.messages,
     $t(key: string) {
-        console.log(key)
+        // console.log(key)
         return this.messages[this.locale.value][key];
     },
     $s(){
diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index 28d4bf4..e84ca54 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -50,6 +50,8 @@
                             style="width: 171px"
                             size="small"
                             ref="select"
+                            show-search
+                            @change="selguojia"
                             :getPopupContainer="
                                 (triggerNode) => triggerNode.parentNode
                             "
@@ -57,7 +59,7 @@
                             <a-select-option
                                 v-for="(item, index) in chiveslist[0]"
                                 :key="index"
-                                :value="item.name"
+                                :value="item.id"
                             >
                                 {{ item.name }}
                             </a-select-option>
@@ -77,6 +79,7 @@
                             v-model:value="userinfo.tlanguageValue"
                             style="width: 171px"
                             size="small"
+                            show-search
                             ref="select"
                             :getPopupContainer="
                                 (triggerNode) => triggerNode.parentNode
@@ -105,6 +108,7 @@
                                         style="width: 171px"
                                         size="small"
                                         ref="select"
+                                        show-search
                                         @change="choosewillsay"
                                         :getPopupContainer="
                                             (triggerNode) =>
@@ -253,6 +257,7 @@
                             style="width: 171px"
                             size="small"
                             ref="select"
+                            show-search
                             :getPopupContainer="
                                 (triggerNode) => triggerNode.parentNode
                             "
@@ -548,7 +553,6 @@ export default defineComponent({
             formData.value = toRaw(userinfo.value);
             console.log(userinfo.value.currencyValue, "listsssss");
             currencyindex.value = userinfo.value.currency;
-
             console.log(currencyindex.value, "listsssss");
         });
         const modalNode = () =>
@@ -803,22 +807,30 @@ export default defineComponent({
             console.log(uesrinfo);
 
             // console.log(toRaw(formData.value));
-            if (userinfo.value.currency == "") {
-                if (userinfo.value.currencyValue != "") {
-                    for (let i = 0; i < currencylist.value.length; i++) {
-                        if (
-                            userinfo.value.currencyValue ==
-                            currencylist.value[i].name
-                        ) {
-                            userinfo.value.currency = (i + 1).toString();
-                        }
-                    }
-                }
-            }
-
-            const reg = /^\w+((.\w+)|(-\w+))@[A-Za-z0-9]+((.|-)[A-Za-z0-9]+).[A-Za-z0-9]+$/;
+            // if (uesrinfo.currency == "") {
+            //     if (uesrinfo.currencyValue != "") {
+            //         for (let i = 0; i < currencylist.value.length; i++) {
+            //             if (
+            //                 uesrinfo.currencyValue ==
+            //                 currencylist.value[i].name
+            //             ) {
+            //                 uesrinfo.currency = currencylist.value[i].value;
+            //             }
+            //         }
+            //     }
+            // }
+            // eslint-disable-next-line
+            const reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
             console.log(userinfo.value.email);
-            console.log();
+            // console.log();
+            // for (let i = 0; i < currencylist.value.length; i++) {
+            //     if (
+            //         uesrinfo.currencyValue ==
+            //         currencylist.value[i].name
+            //     ) {
+            //         uesrinfo.currency = currencylist.value[i].value;
+            //     }
+            // }
             if (reg.test(userinfo.value.email)) {
                 putmember(uesrinfo);
             } else {
@@ -858,6 +870,7 @@ export default defineComponent({
             if (formData.value.video != "" && uploadprogress.value == 0) {
                 uploadprogress.value = 100;
             }
+            console.log(formData.value.country)
         });
 
         function choosewillsay(e?: any) {
@@ -881,6 +894,10 @@ export default defineComponent({
             //  picinfo.url=res.video.url
             formData.value.img = res.video.url;
         }
+        function selguojia(e: any){
+            userinfo.value.countryValue = e;
+            console.log(e)
+        }
 
         return {
             modalNode,
@@ -923,6 +940,7 @@ export default defineComponent({
             showname,
             uploadspic,
             lan,
+            selguojia
         };
     },
 });
-- 
2.47.2


From 05e2e2df346863493dd1bc5e765548218e673365 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 2 Nov 2020 10:10:25 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E6=97=B6=E5=8C=BA=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mine/Archives.vue | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index e84ca54..288e8d6 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -51,7 +51,6 @@
                             size="small"
                             ref="select"
                             show-search
-                            @change="selguojia"
                             :getPopupContainer="
                                 (triggerNode) => triggerNode.parentNode
                             "
@@ -59,7 +58,7 @@
                             <a-select-option
                                 v-for="(item, index) in chiveslist[0]"
                                 :key="index"
-                                :value="item.id"
+                                :value="item.name"
                             >
                                 {{ item.name }}
                             </a-select-option>
@@ -253,7 +252,7 @@
                     <div class="input-box time-zone-box">
                         <div class="label">{{ lan.$t("shiqu") }}</div>
                         <a-select
-                            v-model:value="userinfo.zoneid"
+                            v-model:value="userinfo.zoneStr"
                             style="width: 171px"
                             size="small"
                             ref="select"
@@ -265,7 +264,7 @@
                             <a-select-option
                                 v-for="(item, index) in zonelist"
                                 :key="index"
-                                :value="item.zoneid"
+                                :value="item.city + item.gmt"
                             >
                                 {{ item.city }}{{ item.gmt }}
                             </a-select-option>
@@ -831,6 +830,17 @@ export default defineComponent({
             //         uesrinfo.currency = currencylist.value[i].value;
             //     }
             // }
+            for(const i in chiveslist.value[0]){
+                if(chiveslist.value[0][i].name == uesrinfo.country){
+                    uesrinfo.countryValue = chiveslist.value[0][i].id
+                }
+            }
+            for(const i in zonelist.value){
+                if((zonelist.value[i].city + zonelist.value[i].gmt) == uesrinfo.zoneStr){
+                    uesrinfo.zoneid = zonelist.value[i].zoneid
+                }
+                console.log(zonelist.value[i].city + zonelist.value[i].gmt, uesrinfo.zoneStr)
+            }
             if (reg.test(userinfo.value.email)) {
                 putmember(uesrinfo);
             } else {
@@ -894,10 +904,10 @@ export default defineComponent({
             //  picinfo.url=res.video.url
             formData.value.img = res.video.url;
         }
-        function selguojia(e: any){
-            userinfo.value.countryValue = e;
-            console.log(e)
-        }
+        // function selguojia(e: any){
+        //     userinfo.value.countryValue = e;
+        //     console.log(e)
+        // }
 
         return {
             modalNode,
@@ -940,7 +950,6 @@ export default defineComponent({
             showname,
             uploadspic,
             lan,
-            selguojia
         };
     },
 });
-- 
2.47.2


From 683b173a047e8e9823b2c2965223f555119016fa Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 2 Nov 2020 10:36:21 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=88=91?=
 =?UTF-8?q?=E8=BF=98=E4=BC=9A=E8=AF=B4=E6=8F=90=E4=BA=A4=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts            |  2 +-
 src/views/mine/Archives.vue | 58 +++++++++++++++++++++++--------------
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index 02251d1..1d327b1 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -746,7 +746,7 @@ export async function putmember(data: any): Promise<any>{
         mtongue: data.mtongue,
         email: data.email,
         interest: JSON.stringify(data.interest),
-        willsay: JSON.stringify(data.willsayValue),
+        willsay: JSON.stringify(data.willsay),
         birthday: data.birthday,
         zoneid: data.zoneid,
         currency: data.currencyValue,
diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index 288e8d6..6414209 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -118,10 +118,9 @@
                                             v-for="(item,
                                             index) in chiveslist[1]"
                                             :key="index"
-                                            :value="item.languageid"
+                                            :value="item.name"
                                         >
                                             {{ item.name }}
-                                            {{ item.languageid }}
                                         </a-select-option>
                                     </a-select>
                                     <div class="proficiency">
@@ -781,28 +780,45 @@ export default defineComponent({
             //     console.log(toRaw(formData.value).willsay[i])
             // }
             const uesrinfo = toRaw(formData.value);
-            for (let m = 0; m < toRaw(chiveslist.value).length; m++) {
-                for (const i in uesrinfo.willsayValue) {
-                    // console.log(toRaw(formData.value).willsayValue[i])
+            // for (let m = 0; m < toRaw(chiveslist.value).length; m++) {
+            //     for (const i in uesrinfo.willsayValue) {
+            //         // console.log(toRaw(formData.value).willsayValue[i])
 
-                    if (typeof uesrinfo.willsay[i].name == "string") {
-                        // console.log(toRaw(chiveslist.value))
-                        if (
-                            uesrinfo.willsay[i].name ==
-                            toRaw(chiveslist.value)[m].name
-                        ) {
-                            uesrinfo.willsayValue[i].name = toRaw(
-                                chiveslist.value
-                            )[m].languageid;
-                        }
-                    } else {
-                        uesrinfo.willsayValue[i].name =
-                            uesrinfo.willsay[i].name;
+            //         if (typeof uesrinfo.willsay[i].name == "string") {
+            //             // console.log(toRaw(chiveslist.value))
+            //             if (
+            //                 uesrinfo.willsay[i].name ==
+            //                 toRaw(chiveslist.value)[m].name
+            //             ) {
+            //                 uesrinfo.willsayValue[i].name = toRaw(
+            //                     chiveslist.value
+            //                 )[m].languageid;
+            //             }
+            //         } else {
+            //             uesrinfo.willsayValue[i].name =
+            //                 uesrinfo.willsay[i].name;
+            //         }
+
+            //         uesrinfo.willsayValue[i].level = uesrinfo.willsay[i].level;
+            //     }
+            // }
+
+            for(const i in uesrinfo.willsay){
+                for(const j in chiveslist.value[1]){
+                    if(uesrinfo.willsay[i].name == chiveslist.value[1][j].name){
+                        uesrinfo.willsay[i].name = chiveslist.value[1][j].languageid
                     }
-
-                    uesrinfo.willsayValue[i].level = uesrinfo.willsay[i].level;
+                    console.log(uesrinfo.willsay[i].name, chiveslist.value[1][j].name)
                 }
             }
+            const arr: any = {};
+            for(const i in uesrinfo.willsay){
+                // const a: any = {};
+                arr[uesrinfo.willsay[i].name] = uesrinfo.willsay[i].level
+                // arr.push(a);
+                // arr.push({uesrinfo.willsay[i].name})
+            }
+            uesrinfo.willsay = arr;
             console.log(uesrinfo);
 
             // console.log(toRaw(formData.value));
@@ -839,7 +855,7 @@ export default defineComponent({
                 if((zonelist.value[i].city + zonelist.value[i].gmt) == uesrinfo.zoneStr){
                     uesrinfo.zoneid = zonelist.value[i].zoneid
                 }
-                console.log(zonelist.value[i].city + zonelist.value[i].gmt, uesrinfo.zoneStr)
+                // console.log(zonelist.value[i].city + zonelist.value[i].gmt, uesrinfo.zoneStr)
             }
             if (reg.test(userinfo.value.email)) {
                 putmember(uesrinfo);
-- 
2.47.2


From 5fceedfd1d64149de8605abe32231c4cc4298d37 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 2 Nov 2020 10:44:20 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E7=A7=92?=
 =?UTF-8?q?=E7=9A=84=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mine/ReleaseWebcast.vue | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/views/mine/ReleaseWebcast.vue b/src/views/mine/ReleaseWebcast.vue
index cdabbf2..2f57c0d 100644
--- a/src/views/mine/ReleaseWebcast.vue
+++ b/src/views/mine/ReleaseWebcast.vue
@@ -101,10 +101,15 @@
           placeholder="请设置您的开始时间"
         /> -->
                 <a-date-picker
+                    class="datesel"
                     show-time
+                    format="YYYY-MM-DD HH:mm"
                     :value="form.dateline"
                     @change="startchange"
                     :placeholder="lan.$t('shezhikaishishijian')"
+                    :getCalendarContainer="
+                        (triggerNode) => triggerNode.parentNode
+                    "
                 />
             </a-form-item>
             <a-form-item
@@ -710,5 +715,13 @@ export default defineComponent({
             }
         }
     }
+    .datesel{
+        &::v-deep(.ant-calendar-time-picker-select){
+            width: 50% !important;
+            &:last-child{
+                display: none;
+            }
+        }
+    }
 }
 </style>
\ No newline at end of file
-- 
2.47.2


From 6dddc2cd7aac3d6b1acf7c6f9fc52ef94522a723 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 2 Nov 2020 14:22:57 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/en.ts                    |   5 +-
 src/i18n/zh.ts                    |   5 +-
 src/views/mine/Archives.vue       |   8 +
 src/views/mine/ReleaseVideo.vue   | 914 +++++++++++++++---------------
 src/views/mine/ReleaseWebcast.vue |  38 +-
 5 files changed, 514 insertions(+), 456 deletions(-)

diff --git a/src/i18n/en.ts b/src/i18n/en.ts
index cb9ad18..030f2c7 100644
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@@ -289,5 +289,8 @@ export default {
     chushihuashibai: "Failed to initialize local stream",
     buzhichifenxiang: "Your browser does not support screen sharing. Please download the new version of chrome",
     xuanzefenxiangneirong: "Please choose what to share",
-    guanbishibai: "Closing failed"
+    guanbishibai: "Closing failed",
+    fengmianyaoqiu:"Cover requirements:",
+    fengmianyaoqiu1:"File extension: JPG, png",
+    fengmianyaoqiu2:"File size limit: 2m",
 }
\ No newline at end of file
diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts
index 9701418..ebafbc4 100644
--- a/src/i18n/zh.ts
+++ b/src/i18n/zh.ts
@@ -94,7 +94,10 @@ export default {
     shipinyaoqiu:"视频要求：",
     shipinyaoqiu1:"上传视频时间要求为30s之内",
     shipinyaoqiu2:"支持文件大小100M",
-    shipinyaoqiu3:"文件扩展名：fiv、mp4…",
+    shipinyaoqiu3:"文件扩展名：fiv、mp4",
+    fengmianyaoqiu:"封面要求：",
+    fengmianyaoqiu1:"文件扩展名：jpg，png",
+    fengmianyaoqiu2:"文件大小限制：2M",
     ziwojieshao:"自我介绍",
     lianxifangshi:"联系方式",
     genghuanshoujihao:"更换手机号",
diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index 6414209..cccdc32 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -804,6 +804,10 @@ export default defineComponent({
             // }
 
             for(const i in uesrinfo.willsay){
+                if(uesrinfo.willsay[i].name == '请选择'){
+                    console.log(111)
+                    break;
+                }
                 for(const j in chiveslist.value[1]){
                     if(uesrinfo.willsay[i].name == chiveslist.value[1][j].name){
                         uesrinfo.willsay[i].name = chiveslist.value[1][j].languageid
@@ -814,6 +818,10 @@ export default defineComponent({
             const arr: any = {};
             for(const i in uesrinfo.willsay){
                 // const a: any = {};
+                if(uesrinfo.willsay[i].name == '请选择'){
+                    console.log(111)
+                    break;
+                }
                 arr[uesrinfo.willsay[i].name] = uesrinfo.willsay[i].level
                 // arr.push(a);
                 // arr.push({uesrinfo.willsay[i].name})
diff --git a/src/views/mine/ReleaseVideo.vue b/src/views/mine/ReleaseVideo.vue
index 37d3e51..6093041 100644
--- a/src/views/mine/ReleaseVideo.vue
+++ b/src/views/mine/ReleaseVideo.vue
@@ -1,106 +1,130 @@
 <template>
-  <div class="upload-video">
-    <a-form :label-col="labelCol" :wrapper-col="wrapperCol">
-      <div class="title">{{lan.$t("shangchuanshipin")}}</div>
-      <a-form-item :label="lan.$t('shipinbiaoti')">
-        <a-input
-          size="small"
-          v-model:value="form.title"
-          :placeholder="lan.$t('shurushipinbiaoti')"
-        />
-      </a-form-item>
-      <a-form-item :label="lan.$t('shipinfengmian')" class="video-cover">
-        <a-upload list-type="picture" :customRequest="uploadspic" :before-upload="beforeUpload">
-          <div class="upload-image" v-if="!viewCover && form.img.length == 0">
-            <PlusOutlined
-              style="fontsize: 22px"
-              v-if="uploadpicprogress == 0"
-            />
-            <a-progress
-              type="circle"
-              :percent="uploadpicprogress"
-              :width="80"
-              v-else
-            />
-          </div>
-          <div class="upload-image" v-else>
-            <img style="width: 100%; height: 100%" :src="form.img" />
-          </div>
-        </a-upload>
-      </a-form-item>
-      <a-form-item :label="lan.$t('xuanzeshipin')" class="video-introduction">
-        <div class="upload-container">
-          <a-upload list-type="picture" :customRequest="uploads"  :beforeUpload="beforeVideoUpload">
-            <div class="upload-image">
-              <PlaySquareOutlined
-                style="fontsize: 22px"
-                v-if="uploadprogress == 0"
-              />
-              <a-progress
-                type="circle"
-                :percent="uploadprogress"
-                :width="80"
-                v-else
-              />
-              <video style="display: none" :src="videofile"></video>
-            </div>
-            <div
-              class="upload-image upload"
-              style="position: relative"
-              v-show="false"
-            >
-              <video
-                :src="form.fileurl"
-                :ref="
-                  (el) => {
-                    videos[0] = el;
-                  }
-                "
-                class="upload"
-              ></video>
-              <!-- <a-progress type="circle" :percent="100" :width="80" style="position:absolute;right:35%"/> -->
-            </div>
-          </a-upload>
-          <!-- 文件列表 -->
-            <div v-if="form.video[0].length">
-                  <div
-                v-for="(item, index) in form.video"
-                :key="index"
-                class="video-list"
-              >
-                <img src="@/static/images/link.png" class="link" />
-                <span class="one-line-hide">{{ item.split('/')[item.split('/').length-1] }}</span>
-                <img
-                  src="@/static/images/delete.png"
-                  @click="removeFile(0)"
-                  class="del"
+    <div class="upload-video">
+        <a-form :label-col="labelCol" :wrapper-col="wrapperCol">
+            <div class="title">{{ lan.$t("shangchuanshipin") }}</div>
+            <a-form-item :label="lan.$t('shipinbiaoti')">
+                <a-input
+                    size="small"
+                    v-model:value="form.title"
+                    :placeholder="lan.$t('shurushipinbiaoti')"
                 />
-              </div>
-            </div>
-        </div>
-        <div class="demand">
-          <p class="one-line-hide">{{lan.$t('shipinyaoqiu')}}</p>
-          <p class="one-line-hide">
-            1. {{lan.$t('shipinyaoqiu3')}}
-          </p>
-        </div>
-      </a-form-item>
-      <a-form-item :label="lan.$t('shipinjianjie')" class="brief">
-        <a-textarea
-          v-model:value="form.desc"
-          :autoSize="true"
-          class="brief-textarea"
-          :maxlength="200"
-          :placeholder="lan.$t('shurushipinjianjie')"
-        />
-        <span class="words-number">{{ form.desc.length }}/200</span>
-      </a-form-item>
-      <a-form-item :wrapper-col="{ span: 4, offset: 0 }">
-        <a-button @click="onSubmit">{{lan.$t('shangchuanshipin')}}</a-button>
-      </a-form-item>
-    </a-form>
-    <nav-bottom></nav-bottom>
-  </div>
+            </a-form-item>
+            <a-form-item :label="lan.$t('shipinfengmian')" class="video-cover">
+                <div style="display: flex">
+                    <a-upload
+                        list-type="picture"
+                        :customRequest="uploadspic"
+                        :before-upload="beforeUploadpic"
+                    >
+                        <div
+                            class="upload-image"
+                            v-if="!viewCover && form.img.length == 0"
+                        >
+                            <PlusOutlined
+                                style="fontsize: 22px"
+                                v-if="uploadpicprogress == 0"
+                            />
+                            <a-progress
+                                type="circle"
+                                :percent="uploadpicprogress"
+                                :width="80"
+                                v-else
+                            />
+                        </div>
+                        <div class="upload-image" v-else>
+                            <img
+                                style="width: 100%; height: 100%"
+                                :src="form.img"
+                            />
+                        </div>
+                    </a-upload>
+                    <div class="demand">
+                        <p class="one-line-hide">
+                            {{ lan.$t("fengmianyaoqiu") }}
+                        </p>
+                        <p class="one-line-hide">
+                            1.{{ lan.$t("fengmianyaoqiu1") }}
+                        </p>
+                        <p class="one-line-hide">
+                            2.{{ lan.$t("fengmianyaoqiu2") }}
+                        </p>
+                    </div>
+                </div>
+            </a-form-item>
+            <a-form-item
+                :label="lan.$t('shipinjieshao')"
+                class="video-introduction"
+            >
+                <a-upload
+                    list-type="picture"
+                    :customRequest="uploads"
+                    :before-upload="beforeUpload"
+                >
+                    <div class="upload-image" v-if="form.fileurl.length == 0">
+                        <PlaySquareOutlined
+                            style="fontsize: 22px"
+                            v-if="uploadprogress == 0"
+                        />
+                        <a-progress
+                            type="circle"
+                            :percent="uploadprogress"
+                            :width="80"
+                            v-else
+                        />
+                        <!-- <video style="display: none" :src="videofile"></video> -->
+                    </div>
+                    <div
+                        class="upload-image upload"
+                        style="position: relative"
+                        v-show="form.fileurl.length != 0"
+                    >
+                        <video
+                            :src="form.fileurl"
+                            :ref="
+                                (el) => {
+                                    videos[0] = el;
+                                }
+                            "
+                            class="upload1"
+                        ></video>
+                        <!-- <a-progress type="circle" :percent="100" :width="80" style="position:absolute;right:35%"/> -->
+                    </div>
+                </a-upload>
+                <div class="demand">
+                    <p class="one-line-hide">
+                        {{ lan.$t("shipinyaoqiu") }}
+                    </p>
+                    <p class="one-line-hide">1.{{ lan.$t("shipinyaoqiu1") }}</p>
+                    <p class="one-line-hide">2.{{ lan.$t("shipinyaoqiu2") }}</p>
+                    <p class="one-line-hide">3.{{ lan.$t("shipinyaoqiu3") }}</p>
+                </div>
+                <!-- <div class="demand">
+                    <p class="one-line-hide">视频要求：</p>
+                    <p class="one-line-hide">1.上传视频时间要求为30s之内</p>
+                    <p class="one-line-hide">2.支持文件大小100M</p>
+                    <p class="one-line-hide">
+                        3.文件扩展名：fiv、mp4…文件扩展名：fiv、mp4…
+                    </p>
+                </div> -->
+            </a-form-item>
+            <a-form-item :label="lan.$t('shipinjianjie')" class="brief">
+                <a-textarea
+                    v-model:value="form.desc"
+                    :autoSize="true"
+                    class="brief-textarea"
+                    :maxlength="200"
+                    :placeholder="lan.$t('shurushipinjianjie')"
+                />
+                <span class="words-number">{{ form.desc.length }}/200</span>
+            </a-form-item>
+            <a-form-item :wrapper-col="{ span: 4, offset: 0 }">
+                <a-button @click="onSubmit">{{
+                    lan.$t("shangchuanshipin")
+                }}</a-button>
+            </a-form-item>
+        </a-form>
+        <nav-bottom></nav-bottom>
+    </div>
 </template>
 <script lang="ts">
 import { defineComponent, onMounted, reactive, Ref, ref, toRaw } from "vue";
@@ -110,314 +134,313 @@ import { previewCover } from "@/utils/common";
 import { FromSend, ImgInfo, VideoInfo } from "@/types";
 import { uploadflie } from "@/utils/vod";
 import { setvideo, videoadd, videodetail } from "@/api";
-import { useRoute } from 'vue-router';
-import { message } from 'ant-design-vue';
-import { useI18n } from '@/utils/i18n';
+import { useRoute } from "vue-router";
+import { message } from "ant-design-vue";
+import { useI18n } from "@/utils/i18n";
 
 export default defineComponent({
-  name: "ReleaseWebcast",
-  components: {
-    PlaySquareOutlined,
-    PlusOutlined,
-    NavBottom,
-  },
-  setup() {
-    const lan: any = useI18n();
-    interface FileItem {
-      video: Array<string>;
-    }
-    const fileList: Array<FileItem> = [];
-
-    // 表单数据
-    const form = ref<any>({
-      title: "",
-      img: "",
-      fileid: "",
-      fileurl: "",
-      fileduration: "",
-      desc: "",
-      video:[""],
-    });
-    onMounted(async () => {
-      if(useRoute().query.id){
-        console.log(useRoute().query.id,"knijkdbj")
-        form.value = await videodetail(useRoute().query.id,1)
-        console.log(form.value,"fornm")
-      }
-    })
-    
-    // 是否显示封面预览 封面的路径
-    const viewCover: Ref<boolean> = ref(false),
-      previewImage: Ref<string> = ref("");
-    /**
-     * 封面改变触发事件
-     */
-    function coverChange(info: ImgInfo): void {
-      // console.log(info);
-      // 获取预览图片
-      previewCover(info.file).then((url) => (previewImage.value = url));
-      viewCover.value = true;
-      // form.cover = fileList;
-    }
-
-    /**
-     * 上传封面之前的钩子
-     * @param file 上传的文件
-     */
-    const beforeCoverUpload = (file: File): boolean => {
-      console.log(file);
-      return false;
-    };
-
-
-    /**
-     * 删除封面
-     */
-    function cancelCover(file: number): void {
-      console.log(file);
-    }
-    /**
-     * 删除视频列表
-     * @param index 删除文件的索引
-     */
-    function removeFile(index: number): void {
-      const newFileList = form.value.video.slice();
-      newFileList.splice(index, 1);
-      form.value.video = newFileList;
-    }
-
-    /**
-     * 上传图片
-     */
-    const uploadpicprogress: Ref<number> = ref(0);
-    const videofile = ref<File>();
-    const videos = ref<Array<any>>([]);
-    const ifalowupload=ref<boolean>(false)
-    interface AntUpload {
-      action: string;
-      data: unknown;
-      file: File;
-    }
-    async function uploadspic(file: AntUpload) {
-      if(ifalowupload.value){
-        const res = await uploadflie(file.file, (info: any) => {
-          console.log(info);
-          uploadpicprogress.value = info.percent.toFixed(2) * 100;
-        });
-        console.log(res);
-        form.value.img = res.video.url;
-      }else{
-        return
-      }
-      
-    }
-
-    /**
-     * 上传视频
-     */
-	const uploadprogress: Ref<number> = ref(0);
-	const ifallowvideo=ref<boolean>(false)
-    async function uploads(file: AntUpload) {
-		if(ifallowvideo.value){
-			uploadprogress.value=0
-			form.value.video=[""]
-			console.log(file);
-			videofile.value = file.file;
-			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;
-			});
-			console.log(res);
-
-			form.value.fileid = res.fileId;
-			form.value.fileurl = res.video.url;
-			form.value.video[0]=res.video.url
-			uploadprogress.value=0
-		}
-    
-    }
-
-    function beforeVideoUpload(info?: any){
-		console.log(info)
-		if(info.type.split("/")[0]!="video"){
-			ifallowvideo.value
-			message.error(lan.$t('wenjiangeshi'))
-			
-		}else{
-			ifallowvideo.value=true
-		}
- 
-    }
-
-    /**
-     * 表单提交
-     */
-    const routes=useRoute()
-    const onSubmit = async (e: FromSend) => {
-      e.preventDefault();
-      console.log(toRaw(form.value), 111);
-      console.log(toRaw(form.value).video[0].length)
-      
-      console.log(routes.query,"adsadsa")
-      const subdata=toRaw(form.value)
-      if(subdata.title==""){
-        message.error(lan.$t('biaotiweikong'))
-        return
-      }else if(subdata.img==""){
-        message.error(lan.$t('fengmianweikong'))
-        return
-      }else if(subdata.fileurl==""){
-        message.error(lan.$t('wenjianweikong'))
-      }else if(subdata.desc==""){
-        message.error(lan.$t('jianjieweikong'))
-      }
-      else{
-        
-        if(routes.query.id){
-          form.value.id=routes.query.id
-          console.log('edi')
-          setvideo(form.value)
-        }else{
-          videoadd(form, toRaw(form.value));
+    name: "ReleaseWebcast",
+    components: {
+        PlaySquareOutlined,
+        PlusOutlined,
+        NavBottom,
+    },
+    setup() {
+        const lan: any = useI18n();
+        interface FileItem {
+            video: Array<string>;
         }
-        // videoadd(form, toRaw(form.value));
-      }
+        const fileList: Array<FileItem> = [];
 
-      // videoadd(form, toRaw(form.value));
-    };
+        // 表单数据
+        const form = ref<any>({
+            title: "",
+            img: "",
+            fileid: "",
+            fileurl: "",
+            fileduration: "",
+            desc: "",
+            video: [""],
+        });
+        onMounted(async () => {
+            if (useRoute().query.id) {
+                console.log(useRoute().query.id, "knijkdbj");
+                form.value = await videodetail(useRoute().query.id, 1);
+                console.log(form.value, "fornm");
+            }
+        });
 
-    function beforeUpload(info?: any){
-      console.log(info.type)
-      if(info.type.split('/')[0]!="image"){
-        message.error(lan.$t('fengmiangeshi'))
-        ifalowupload.value=false
-        return
-      }else{
-        ifalowupload.value=true
-      }
-    }
+        // 是否显示封面预览 封面的路径
+        const viewCover: Ref<boolean> = ref(false),
+            previewImage: Ref<string> = ref("");
+        /**
+         * 封面改变触发事件
+         */
+        function coverChange(info: ImgInfo): void {
+            // console.log(info);
+            // 获取预览图片
+            previewCover(info.file).then((url) => (previewImage.value = url));
+            viewCover.value = true;
+            // form.cover = fileList;
+        }
 
-    return {
-		labelCol: { span: 4 },
-		wrapperCol: { span: 14 },
-		form,
-		viewCover,
-		previewImage,
-		previewCover,
-		coverChange,
-		cancelCover,
-		beforeCoverUpload,
-		onSubmit,
-		uploadpicprogress,
-		uploadspic,
-		uploadprogress,
-		uploads,
-		videofile,
-		videos,
-		removeFile,
-		beforeUpload,
-		ifalowupload,
-    beforeVideoUpload,
-    lan
-    };
-  },
+        /**
+         * 上传封面之前的钩子
+         * @param file 上传的文件
+         */
+        const beforeCoverUpload = (file: File): boolean => {
+            console.log(file);
+            return false;
+        };
+
+        /**
+         * 删除封面
+         */
+        function cancelCover(file: number): void {
+            console.log(file);
+        }
+        /**
+         * 删除视频列表
+         * @param index 删除文件的索引
+         */
+        function removeFile(index: number): void {
+            const newFileList = form.value.video.slice();
+            newFileList.splice(index, 1);
+            form.value.video = newFileList;
+        }
+
+        /**
+         * 上传图片
+         */
+        const uploadpicprogress: Ref<number> = ref(0);
+        const videofile = ref<File>();
+        const videos = ref<Array<any>>([]);
+        const ifalowupload = ref<boolean>(false);
+        interface AntUpload {
+            action: string;
+            data: unknown;
+            file: File;
+        }
+        async function uploadspic(file: AntUpload) {
+            if (ifalowupload.value) {
+                const res = await uploadflie(file.file, (info: any) => {
+                    console.log(info);
+                    uploadpicprogress.value = info.percent.toFixed(2) * 100;
+                });
+                console.log(res);
+                form.value.img = res.video.url;
+            } else {
+                return;
+            }
+        }
+
+        function beforeUploadpic(info?: any) {
+            console.log(info);
+            if (info.type.split("/")[0] != "image") {
+                message.error(lan.$t("fengmiangeshi"));
+                ifalowupload.value = false;
+                return;
+            } else {
+                ifalowupload.value = true;
+            }
+        }
+
+        /**
+         * 上传视频
+         */
+        const uploadprogress: Ref<number> = ref(0);
+        const ifallowvideo = ref<boolean>(false);
+         async function uploads(file: AntUpload) {
+            if (ifallowvideo.value) {
+                console.log(file);
+                videofile.value = file.file;
+                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;
+                });
+                console.log(res);
+
+                form.value.fileid = res.fileId;
+                form.value.fileurl = res.video.url;
+            }
+        } 
+
+        function beforeVideoUpload(info?: any) {
+            console.log(info);
+            if (info.type.split("/")[0] != "video") {
+                ifallowvideo.value;
+                message.error(lan.$t("wenjiangeshi"));
+            } else {
+                ifallowvideo.value = true;
+            }
+        }
+
+        /**
+         * 表单提交
+         */
+        const routes = useRoute();
+        const onSubmit = async (e: FromSend) => {
+            e.preventDefault();
+            console.log(toRaw(form.value), 111);
+            console.log(toRaw(form.value).video[0].length);
+
+            console.log(routes.query, "adsadsa");
+            const subdata = toRaw(form.value);
+            if (subdata.title == "") {
+                message.error(lan.$t("biaotiweikong"));
+                return;
+            } else if (subdata.img == "") {
+                message.error(lan.$t("fengmianweikong"));
+                return;
+            } else if (subdata.fileurl == "") {
+                message.error(lan.$t("wenjianweikong"));
+            } else if (subdata.desc == "") {
+                message.error(lan.$t("jianjieweikong"));
+            } else {
+                if (routes.query.id) {
+                    form.value.id = routes.query.id;
+                    console.log("edi");
+                    setvideo(form.value);
+                } else {
+                    videoadd(form, toRaw(form.value));
+                }
+                // videoadd(form, toRaw(form.value));
+            }
+
+            // videoadd(form, toRaw(form.value));
+        };
+        function beforeUpload(info?: any) {
+            console.log(info);
+            if (info.type.split("/")[0] != "video") {
+                ifallowvideo.value = false;
+                message.error(lan.$t("shipinjieshaoccuowu"));
+                return;
+            } else {
+                ifallowvideo.value = true;
+            }
+        }
+
+        return {
+            labelCol: { span: 4 },
+            wrapperCol: { span: 14 },
+            form,
+            viewCover,
+            previewImage,
+            previewCover,
+            coverChange,
+            cancelCover,
+            beforeCoverUpload,
+            onSubmit,
+            uploadpicprogress,
+            uploadspic,
+            uploadprogress,
+            uploads,
+            videofile,
+            videos,
+            removeFile,
+            beforeUpload,
+            ifalowupload,
+            beforeVideoUpload,
+            lan,
+            beforeUploadpic
+        };
+    },
 });
 </script>
 <style lang="scss" scoped>
-.upload {
+.upload1{
   width: 171px;
   height: 96px;
-  display:none
+}
+.upload {
+    width: 171px;
+    height: 96px;
+    display: none;
 }
 .upload-video {
-  width: 100%;
-  min-width: 700px;
-  background-color: #ffffff;
-  padding: 46px;
-  border-radius: 17px;
-  position: relative;
-  ::v-deep(.ant-form) {
-    .title {
-      font-size: 12px;
-      font-weight: bold;
-      color: #111111;
-      margin-bottom: 28px;
-    }
-    .ant-row {
-      .ant-form-item-label {
-        width: 60px;
-        margin: 0 30px 0 17px;
-        > label {
-          font-size: 12px;
-          font-weight: 500;
-          color: #808080;
-          &::after {
-            content: "";
-          }
+    width: 100%;
+    min-width: 700px;
+    background-color: #ffffff;
+    padding: 46px;
+    border-radius: 17px;
+    position: relative;
+    ::v-deep(.ant-form) {
+        .title {
+            font-size: 12px;
+            font-weight: bold;
+            color: #111111;
+            margin-bottom: 28px;
         }
-      }
-      .upload-image {
-        width: 171px;
-        height: 96px;
-        border: 1px solid #dcdfe0;
-        border-radius: 3px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-right: 17px;
-      }
-      .ant-input {
-        width: 171px;
-        padding: 6px 11px;
-        border-radius: 3px;
-        border: 1px solid #dcdfe0;
-        font-size: 11px;
-        color: #3f3f3f;
-        &::-webkit-input-placeholder {
-          font-size: 12px;
-          color: #808080;
+        .ant-row {
+            .ant-form-item-label {
+                width: 60px;
+                margin: 0 30px 0 17px;
+                > label {
+                    font-size: 12px;
+                    font-weight: 500;
+                    color: #808080;
+                    &::after {
+                        content: "";
+                    }
+                }
+            }
+            .upload-image {
+                width: 171px;
+                height: 96px;
+                border: 1px solid #dcdfe0;
+                border-radius: 3px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                margin-right: 17px;
+            }
+            .ant-input {
+                width: 171px;
+                padding: 6px 11px;
+                border-radius: 3px;
+                border: 1px solid #dcdfe0;
+                font-size: 11px;
+                color: #3f3f3f;
+                &::-webkit-input-placeholder {
+                    font-size: 12px;
+                    color: #808080;
+                }
+            }
+            .ant-select {
+                font-size: 12px;
+                color: #3f3f3f;
+            }
+            .ant-select-dropdown {
+                font-size: 12px;
+            }
+            .ant-upload-list {
+                display: none;
+            }
+            .ant-btn {
+                padding: 0;
+                width: 63px;
+                height: 23px;
+                background: #ccc;
+                border-radius: 3px;
+                font-size: 10px;
+                font-weight: 500;
+                color: #ffffff;
+                &:hover {
+                    background: #08ae98;
+                }
+            }
         }
-      }
-      .ant-select {
-        font-size: 12px;
-        color: #3f3f3f;
-      }
-      .ant-select-dropdown {
-        font-size: 12px;
-      }
-      .ant-upload-list {
-        display: none;
-      }
-      .ant-btn {
-        padding: 0;
-        width: 63px;
-        height: 23px;
-        background: #ccc;
-        border-radius: 3px;
-        font-size: 10px;
-        font-weight: 500;
-        color: #ffffff;
-        &:hover{
-          background: #08ae98;
+        .video-cover {
+            .preview-image {
+                width: 171px;
+                height: 96px;
+            }
         }
-      }
-    }
-    .video-cover {
-      .preview-image {
-        width: 171px;
-        height: 96px;
-      }
-    }
-    .video-introduction {
-      .ant-form-item-control-wrapper {
-        .ant-form-item-children {
-          display: flex;
-          // align-items: center;
-          .demand {
+        .demand {
             height: 94px;
             font-size: 10px;
             font-weight: 500;
@@ -427,61 +450,66 @@ export default defineComponent({
             flex-direction: column;
             justify-content: center;
             > p {
-              line-height: 17px;
-              margin: 0;
+                line-height: 17px;
+                margin: 0;
             }
-          }
         }
-      }
-      .video-list {
-        display: flex;
-        align-items: center;
-        .link {
-          width: 11px;
-          height: 11px;
-          margin-right: 4px;
+        .video-introduction {
+            .ant-form-item-control-wrapper {
+                .ant-form-item-children {
+                    display: flex;
+                    // align-items: center;
+                }
+            }
+            .video-list {
+                display: flex;
+                align-items: center;
+                .link {
+                    width: 11px;
+                    height: 11px;
+                    margin-right: 4px;
+                }
+                > span {
+                    font-size: 9px;
+                    font-weight: 500;
+                    color: #07ad97;
+                    max-width: 150px;
+                }
+                .del {
+                    width: 11px;
+                    height: 11px;
+                    margin-left: auto;
+                    cursor: pointer;
+                }
+            }
         }
-        > span {
-          font-size: 9px;
-          font-weight: 500;
-          color: #07ad97;
-          max-width: 150px;
+        .duration {
+            .unit {
+                margin-left: 18px;
+                font-size: 12px;
+                font-weight: 500;
+                color: #808080;
+            }
         }
-        .del {
-          width: 11px;
-          height: 11px;
-          margin-left: auto;
-          cursor: pointer;
+        .brief {
+            position: relative;
+            .ant-input {
+                width: 359px;
+            }
+            .brief-textarea {
+                min-height: 85px;
+                padding-bottom: 30px;
+            }
+            .words-number {
+                position: absolute;
+                right: 11px;
+                bottom: -11px;
+                font-size: 11px;
+                font-weight: 500;
+                color: #7f7f7f;
+                user-select: none;
+            }
         }
-      }
     }
-    .duration {
-      .unit {
-        margin-left: 18px;
-        font-size: 12px;
-        font-weight: 500;
-        color: #808080;
-      }
-    }
-    .brief {
-      position: relative;
-      .ant-input {
-        width: 359px;
-      }
-      .brief-textarea {
-        min-height: 85px;
-        padding-bottom: 30px;
-      }
-      .words-number {
-        position: absolute;
-        right: 11px;
-        bottom: -11px;
-        font-size: 11px;
-        font-weight: 500;
-        color: #7f7f7f;
-        user-select: none;
-      }
-    }
-  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/mine/ReleaseWebcast.vue b/src/views/mine/ReleaseWebcast.vue
index 2f57c0d..3e31e48 100644
--- a/src/views/mine/ReleaseWebcast.vue
+++ b/src/views/mine/ReleaseWebcast.vue
@@ -10,7 +10,8 @@
                 />
             </a-form-item>
             <a-form-item :label="lan.$t('zhibofengmian')" class="item-cover">
-                <a-upload
+                <div style="display:flex">
+                    <a-upload
                     list-type="picture"
                     :customRequest="uploadspic"
                     :before-upload="beforeUploadpic"
@@ -36,7 +37,21 @@
                             :src="form.img"
                         />
                     </div>
+                    
                 </a-upload>
+                <div class="demand">
+                        <p class="one-line-hide">
+                            {{ lan.$t("fengmianyaoqiu") }}
+                        </p>
+                        <p class="one-line-hide">
+                            1.{{ lan.$t("fengmianyaoqiu1") }}
+                        </p>
+                        <p class="one-line-hide">
+                            2.{{ lan.$t("fengmianyaoqiu2") }}
+                        </p>
+                    </div>
+                </div>
+                
             </a-form-item>
             <a-form-item
                 :label="lan.$t('shipinjieshao')"
@@ -618,21 +633,22 @@ export default defineComponent({
                 height: 96px;
             }
         }
+         .demand {
+                line-height: 17px;
+                font-size: 10px;
+                font-weight: 500;
+                color: #808080;
+                width: 134px;
+                > p {
+                    margin: 0;
+                }
+            }
         .video-introduction {
             .ant-form-item-control-wrapper {
                 .ant-form-item-children {
                     display: flex;
                     align-items: center;
-                    .demand {
-                        line-height: 17px;
-                        font-size: 10px;
-                        font-weight: 500;
-                        color: #808080;
-                        width: 134px;
-                        > p {
-                            margin: 0;
-                        }
-                    }
+                   
                 }
             }
         }
-- 
2.47.2


From d305d45cfd753933128d04df4cbe7cd7748eeb3f Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 2 Nov 2020 14:33:19 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=92=B1?=
 =?UTF-8?q?=E5=8C=85=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mine/Transactiondetail.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/mine/Transactiondetail.vue b/src/views/mine/Transactiondetail.vue
index fe09e41..43abd82 100644
--- a/src/views/mine/Transactiondetail.vue
+++ b/src/views/mine/Transactiondetail.vue
@@ -31,7 +31,7 @@
 
           <div class="infoitem">
             <div class="left">{{lan.$t('laiyuan')}}</div>
-            <div class="right">{{accountinfo.remark}}</div>
+            <div class="right">{{accountinfo.typename}}</div>
           </div>
           <div class="back" @click="navto(1,2)">{{lan.$t('fanhui')}}</div>
          
@@ -77,13 +77,13 @@
             <div class="right">{{accountinfo.typename}}</div>
           </div>
           <div class="infoitem">
-            <div class="left">{{riqi}}</div>
+            <div class="left">{{lan.$t('riqi')}}</div>
             <div class="right">{{accountinfo.created_at}}</div>
           </div>
 
           <div class="infoitem">
             <div class="left">{{lan.$t('shoukuanzhanghu')}}</div>
-            <div class="right">{{accountinfo.account}}</div>
+            <div class="right">{{accountinfo.typename}}</div>
           </div>
         
           <div class="back" @click="navto(2)">{{lan.$t('fanhui')}}</div>
-- 
2.47.2


From f2a1b7f105e820c4cf4b72eebbc3f7287bef03d9 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 2 Nov 2020 14:35:22 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E6=94=BE=E5=A4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Menu.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index 1615967..84a6657 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -8,7 +8,7 @@
         </div>
         
         <div class="list" @mouseout="tuichu()">
-            <div v-for="(i,j) in list" :key="j" style="overflow: hidden;" @click="routeto(j)" @mouseenter="mouse(j)">
+            <div v-for="(i,j) in list" :key="j" style="overflow: hidden;" @click="routeto(j)">
                 <div class="item" :class="{'selitem': j == selnum, 'seltop': j == selnum - 1, 'selbottom': j == selnum + 1}">
                     <div class="route">
                         <img :src="j == selnum ? i.sleicon : i.icon" alt="" class="icon">
@@ -74,6 +74,14 @@
             padding: 0 18px;
             justify-content: space-between;
             cursor: pointer;
+            &:hover{
+                .route{
+                
+                    .title{
+                        font-weight: bold;
+                    }
+                } 
+            }
             .route{
                 display: flex;
                 .icon{
-- 
2.47.2


From 31e8e04017afd6d1f199dc40d957a9d252c58f2d Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 2 Nov 2020 14:38:14 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E7=9C=81?=
 =?UTF-8?q?=E7=95=A5=E5=A5=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mine/Archives.vue       |  2 +-
 src/views/mine/ReleaseVideo.vue   | 16 ++++++++--------
 src/views/mine/ReleaseWebcast.vue | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index cccdc32..0302c5f 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -1113,7 +1113,7 @@ export default defineComponent({
                         font-size: 10px;
                         font-weight: 500;
                         color: #808080;
-                        width: 134px;
+                        // width: 134px;
                         p {
                             margin: 0;
                         }
diff --git a/src/views/mine/ReleaseVideo.vue b/src/views/mine/ReleaseVideo.vue
index 6093041..0b544ca 100644
--- a/src/views/mine/ReleaseVideo.vue
+++ b/src/views/mine/ReleaseVideo.vue
@@ -39,13 +39,13 @@
                         </div>
                     </a-upload>
                     <div class="demand">
-                        <p class="one-line-hide">
+                        <p>
                             {{ lan.$t("fengmianyaoqiu") }}
                         </p>
-                        <p class="one-line-hide">
+                        <p>
                             1.{{ lan.$t("fengmianyaoqiu1") }}
                         </p>
-                        <p class="one-line-hide">
+                        <p>
                             2.{{ lan.$t("fengmianyaoqiu2") }}
                         </p>
                     </div>
@@ -91,12 +91,12 @@
                     </div>
                 </a-upload>
                 <div class="demand">
-                    <p class="one-line-hide">
+                    <p>
                         {{ lan.$t("shipinyaoqiu") }}
                     </p>
-                    <p class="one-line-hide">1.{{ lan.$t("shipinyaoqiu1") }}</p>
-                    <p class="one-line-hide">2.{{ lan.$t("shipinyaoqiu2") }}</p>
-                    <p class="one-line-hide">3.{{ lan.$t("shipinyaoqiu3") }}</p>
+                    <p>1.{{ lan.$t("shipinyaoqiu1") }}</p>
+                    <p>2.{{ lan.$t("shipinyaoqiu2") }}</p>
+                    <p>3.{{ lan.$t("shipinyaoqiu3") }}</p>
                 </div>
                 <!-- <div class="demand">
                     <p class="one-line-hide">视频要求：</p>
@@ -445,7 +445,7 @@ export default defineComponent({
             font-size: 10px;
             font-weight: 500;
             color: #808080;
-            width: 134px;
+            // width: 134px;
             display: flex;
             flex-direction: column;
             justify-content: center;
diff --git a/src/views/mine/ReleaseWebcast.vue b/src/views/mine/ReleaseWebcast.vue
index 3e31e48..4e6e003 100644
--- a/src/views/mine/ReleaseWebcast.vue
+++ b/src/views/mine/ReleaseWebcast.vue
@@ -40,13 +40,13 @@
                     
                 </a-upload>
                 <div class="demand">
-                        <p class="one-line-hide">
+                        <p>
                             {{ lan.$t("fengmianyaoqiu") }}
                         </p>
-                        <p class="one-line-hide">
+                        <p>
                             1.{{ lan.$t("fengmianyaoqiu1") }}
                         </p>
-                        <p class="one-line-hide">
+                        <p>
                             2.{{ lan.$t("fengmianyaoqiu2") }}
                         </p>
                     </div>
@@ -96,9 +96,9 @@
                     <p class="one-line-hide">
                         {{ lan.$t("shipinyaoqiu") }}
                     </p>
-                    <p class="one-line-hide">1.{{ lan.$t("shipinyaoqiu1") }}</p>
-                    <p class="one-line-hide">2.{{ lan.$t("shipinyaoqiu2") }}</p>
-                    <p class="one-line-hide">3.{{ lan.$t("shipinyaoqiu3") }}</p>
+                    <p>1.{{ lan.$t("shipinyaoqiu1") }}</p>
+                    <p>2.{{ lan.$t("shipinyaoqiu2") }}</p>
+                    <p>3.{{ lan.$t("shipinyaoqiu3") }}</p>
                 </div>
                 <!-- <div class="demand">
                     <p class="one-line-hide">视频要求：</p>
-- 
2.47.2


From 8656e75e16d2d391e84cb0e4898bc0014bb9da34 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 2 Nov 2020 15:24:08 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=98=9F?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mine/ReleaseWebcast.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/mine/ReleaseWebcast.vue b/src/views/mine/ReleaseWebcast.vue
index 4e6e003..c7b9bc0 100644
--- a/src/views/mine/ReleaseWebcast.vue
+++ b/src/views/mine/ReleaseWebcast.vue
@@ -2,14 +2,14 @@
     <div class="webcast">
         <a-form :label-col="labelCol" :wrapper-col="wrapperCol">
             <div class="title">{{ lan.$t("zhiboxinxi") }}</div>
-            <a-form-item :label="lan.$t('zhibobiaoti')">
+            <a-form-item :label="lan.$t('zhibobiaoti')" :rules="{ required: true, message: 'Please input Activity name', trigger: 'blur'}">
                 <a-input
                     size="small"
                     v-model:value="form.title"
                     :placeholder="lan.$t('shuruzhibobiaoti')"
                 />
             </a-form-item>
-            <a-form-item :label="lan.$t('zhibofengmian')" class="item-cover">
+            <a-form-item :label="lan.$t('zhibofengmian')" class="item-cover" :rules="{ required: true, message: 'Please input Activity name', trigger: 'blur'}">
                 <div style="display:flex">
                     <a-upload
                     list-type="picture"
@@ -56,6 +56,7 @@
             <a-form-item
                 :label="lan.$t('shipinjieshao')"
                 class="video-introduction"
+                 :rules="{ required: true, message: 'Please input Activity name', trigger: 'blur'}"
             >
                 <a-upload
                     list-type="picture"
@@ -109,7 +110,8 @@
                     </p>
                 </div> -->
             </a-form-item>
-            <a-form-item :label="lan.$t('kaishishijian')">
+            <a-form-item :label="lan.$t('kaishishijian')" :rules="{ required: true, message: 'Please input Activity name', trigger: 'blur'}">
+                
                 <!-- <a-input
           size="small"
           v-model:value="form.startTime"
@@ -131,6 +133,7 @@
                 :label="lan.$t('zhiboshichang')"
                 class="duration"
                 v-bind="validateInfos.livetime"
+                 :rules="{ required: true, message: 'Please input Activity name', trigger: 'blur'}"
             >
                 <a-input
                     size="small"
@@ -144,6 +147,7 @@
             <a-form-item
                 :label="lan.$t('zhiborenshu')"
                 v-bind="validateInfos.livenumber"
+                 :rules="{ required: true, message: 'Please input Activity name', trigger: 'blur'}"
             >
                 <a-input
                     size="small"
-- 
2.47.2


From 8177140705ce794ce6c5fd0e5a3fb0513b267aa0 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 2 Nov 2020 16:11:45 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E8=92=99?=
 =?UTF-8?q?=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html | 14 ++++++++++++++
 src/api/base.ts   |  4 ++++
 2 files changed, 18 insertions(+)

diff --git a/public/index.html b/public/index.html
index 30bfe4f..d0854bb 100644
--- a/public/index.html
+++ b/public/index.html
@@ -61,6 +61,19 @@
             }
         })(1366, 1024);
     </script>
+    <style>
+        #make{
+            background-color: #000;
+            opacity: 0.5;
+            width: 100%;
+            height: 100vh;
+            position: fixed;
+            top: 0;
+            left: 0;
+            z-index: 999;
+            display: none;
+        }
+    </style>
 </head>
 
 <body>
@@ -69,6 +82,7 @@
             Please enable it to continue.</strong>
     </noscript>
     <div id="app"></div>
+    <div id="make"></div>
     <!-- built files will be auto injected -->
     <script>
         window.fbAsyncInit = function () {
diff --git a/src/api/base.ts b/src/api/base.ts
index aa3c4fd..70ce126 100644
--- a/src/api/base.ts
+++ b/src/api/base.ts
@@ -13,9 +13,11 @@ export interface Get {
 }
 let login: MessageType;
 let count = 0;
+const div: any = document.getElementById("make");
 axios.interceptors.request.use((config)=>{
     if(count == 0){
         login = message.loading('加载中..', 0)
+        div.style.display = "block"
     }
     count++;
     return config;
@@ -28,6 +30,7 @@ axios.interceptors.response.use((response)=>{
             count--;
             if(count == 0){
                 login();
+                div.style.display = "none"
             }
             console.log(count)
         }, 1000)
@@ -44,6 +47,7 @@ axios.interceptors.response.use((response)=>{
             count--;
             if(count == 0){
                 login();
+                div.style.display = "none"
             }
             console.log(count)
         }, 1000)
-- 
2.47.2