lushixing před 5 dny
rodič
revize
960d60414e

+ 1 - 1
src/router/modules/catwalkVideo.js

@@ -25,7 +25,7 @@ const catwalkVideoRouter = {
       path: "brandVideoEditor",
       component: () => import("@/views/catwalk-video/brandVideoEditor"),
       name: "brandVideoEditor",
-      meta: { title: "品牌视频剪辑" }
+      meta: { title: "走秀视频剪辑" }
     },
   ]
 };

+ 1 - 1
src/router/modules/musicLibraryManager.js

@@ -7,7 +7,7 @@ const musicLibraryManagerRouter = {
   component: Layout,
   redirect: "/musicLibraryManager/musicLibraryIndex",
   name: "音乐库管理",
-  meta: { title: "音乐库管理", icon: "el-icon-camera-solid" },
+  meta: { title: "音乐库管理", icon: "el-icon-s-claim" },
   children: [
     {
       path: "musicCategoryIndex",

+ 1 - 1
src/router/modules/videoCoverManager.js

@@ -7,7 +7,7 @@ const videoCoverManagerRouter = {
   component: Layout,
   redirect: "/videoCoverManager/videoCoverIndex",
   name: "店铺信息管理",
-  meta: { title: "店铺信息管理", icon: "el-icon-camera-solid" },
+  meta: { title: "店铺信息管理", icon: "el-icon-s-shop" },
   children: [
     {
       path: "videoCoverIndex",

+ 2 - 2
src/views/catwalk-video/brandVideoEditor.vue

@@ -261,7 +261,7 @@ export default {
         this.videoFlag = true;
         this.videoUploadPercent = 0;
         this.progressTimer = setInterval(() => {
-          if (this.videoUploadPercent < 97) {
+          if (this.videoUploadPercent < 93) {
             this.videoUploadPercent += 3;
           } else {
             clearInterval(this.progressTimer);
@@ -417,7 +417,7 @@ export default {
             top: -20px;
             right: -20px;
             cursor: pointer;
-            z-index: 999999;
+            z-index: 9;
             color: red;
             background-color: #fff;
             font-size: 30px;

+ 5 - 1
src/views/music-library-manager/musicLibrary.vue

@@ -32,7 +32,11 @@
             {{  scope.row.type == 0 ? '类目' : '音乐' }}
           </template>
         </el-table-column>
-        <el-table-column label="音乐时长" min-width="100" align="center" prop="musicDuration" />
+        <el-table-column label="音乐时长" min-width="130" align="center">
+          <template slot-scope="scope">
+            {{  scope.row.musicDuration + '秒' }}
+          </template>
+        </el-table-column>
         <el-table-column label="音乐地址" min-width="100" align="center" prop="musicUrl" />
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">

+ 4 - 4
src/views/music-library-manager/musicLibraryUpdater.vue

@@ -9,7 +9,7 @@
                 <li>
                   <el-form-item prop="parentId" label="选择现有音乐类型:">
                     <div class="type-black__select">
-                      <el-select v-model="form.parentId" placeholder="请选择音乐类型">
+                      <el-select clearable v-model="form.parentId" placeholder="现有音乐类型">
                         <el-option
                           v-for="item in musicTypes"
                           :key="item.id"
@@ -23,7 +23,7 @@
                 <li>
                   <el-form-item prop="musicName" label="音乐库名称:">
                     <div class="type-black__input">
-                      <el-input v-model="form.musicName" placeholder="音乐库名称"></el-input>
+                      <el-input v-model="form.musicName" clearable placeholder="音乐库名称"></el-input>
                     </div>
                   </el-form-item>
                 </li>
@@ -227,7 +227,7 @@ export default {
         return false;
       }
       this.progressTimer = setInterval(() => {
-        if (this.videoUploadPercent < 98) {
+        if (this.videoUploadPercent < 93) {
           this.videoUploadPercent += 5;
         } else {
           clearInterval(this.progressTimer);
@@ -346,7 +346,7 @@ export default {
             top: -20px;
             right: -20px;
             cursor: pointer;
-            z-index: 999999;
+            z-index: 9;
             color: red;
             background-color: #fff;
             font-size: 30px;

+ 2 - 4
src/views/video-cover-manager/components/VideoCoverFormModal.vue

@@ -31,7 +31,7 @@
           </div>
         </el-upload>
       </el-form-item>
-      <el-form-item prop="coverText" label="封面文字:">
+      <el-form-item label="封面文字:">
         <el-input placeholder="请输入封面文字" v-model="form.coverText"></el-input>
       </el-form-item>
       <el-form-item label="平台类型:" required>
@@ -83,9 +83,6 @@ export default {
         shopName: [
           { required: true, message: "请输入店铺名称", trigger: "blur" }
         ],
-        coverText: [
-          { required: true, message: "请输入封面文字", trigger: "blur" }
-        ],
         coverPicture: [
           { validator: checkCoverPicture, trigger: "change" }
         ]
@@ -262,6 +259,7 @@ export default {
     }
     img {
       max-height: 100%;
+      max-width: 100%;
       vertical-align: middle;
     }
   }