Jelajahi Sumber

对外商业化调整

yumeng 4 tahun lalu
induk
melakukan
689f7603b1
2 mengubah file dengan 35 tambahan dan 35 penghapusan
  1. 2 2
      src/components/uploadFile.vue
  2. 33 33
      src/views/modules/material/videoMaterial.vue

+ 2 - 2
src/components/uploadFile.vue

@@ -242,9 +242,9 @@
         }
         console.log(str + '-' + timeElse + '.' + arr[arr.length - 1])
         cos.putObject({
-          Bucket: 'media-1301855440',
+          Bucket: 'thirdpart-1301855440',
           /* 必须 */
-          Region: 'ap-thirdpart',
+          Region: 'ap-chongqing',
           /* 存储桶所在地域,必须字段 */
           Key: that.uploadType + '/' + y + '-' + MM + '-' + d + '/' + str + '-' + timeElse + '.' + arr[arr
             .length - 1],

+ 33 - 33
src/views/modules/material/videoMaterial.vue

@@ -20,7 +20,7 @@
     margin-bottom: 10px !important;
   }
 
-  .ant-carousel  .slick-slide {
+  .ant-carousel .slick-slide {
     text-align: center;
     //   height: 160px;
     //   line-height: 160px;
@@ -32,11 +32,11 @@
     padding: 0;
   }
 
-  .ant-carousel  .slick-slide h3 {
+  .ant-carousel .slick-slide h3 {
     color: #fff;
   }
 
-  .ant-carousel  .custom-slick-arrow {
+  .ant-carousel .custom-slick-arrow {
     width: 25px;
     height: 25px;
     font-size: 25px;
@@ -45,11 +45,11 @@
     opacity: 0.3;
   }
 
-  .ant-carousel  .custom-slick-arrow:before {
+  .ant-carousel .custom-slick-arrow:before {
     display: none;
   }
 
-  .ant-carousel  .custom-slick-arrow:hover {
+  .ant-carousel .custom-slick-arrow:hover {
     opacity: 0.5;
   }
 
@@ -1041,10 +1041,10 @@
               </a-form-item>
             </div>
             <div v-if="detail.ascription" style="display:flex;">
-              <a-form-item label="策划" style="flex:1">
+              <a-form-item label="策划" v-if="detail.ascription.planName" style="flex:1">
                 {{ detail.ascription.planName }}
               </a-form-item>
-              <a-form-item label="拍摄" style="flex:1">
+              <a-form-item label="拍摄" v-if="detail.ascription.shotName" style="flex:1">
                 {{ detail.ascription.shotName }}
               </a-form-item>
               <a-form-item label="剪辑" v-if="detail.ascription.clipName" style="flex:1">
@@ -1061,28 +1061,28 @@
                 <a-button type="primary" @click="downloadByBlobShowUrl">下载</a-button>
               </a-form-item>
             </div>
-            <div>
-              <a-form-item label="水印素材下载" v-if="name">
-                <a-button type="primary" @click="downloadByBlob" v-if="showUrlWater">下载</a-button>
-                <span v-else>水印素材生成中,请一分钟后刷新</span>
-              </a-form-item>
-            </div>
-            <div>
-              <a-form-item label="水印素材链接" v-if="showUrlWater">
-                <a-input v-model="showUrlWater" type="text" readOnly />
-              </a-form-item>
-            </div>
-            <div style="width:100%" class="downLoad">
-              <a-form-item label="生成水印素材" style="width:100%">
-                <a-select :defaultValue="4" v-model="size" style="width:80%">
-                  <a-select-option :value="item.id" :key="item.id" v-for="item of sizeType">{{
-                    item.name
-                    }}
-                  </a-select-option>
-                </a-select>
-                <a-button type="primary" @click="getWater" :loading="waterLoading">生成</a-button>
-              </a-form-item>
-            </div>
+            <!-- <div>
+               <a-form-item label="水印素材下载" v-if="name">
+                 <a-button type="primary" @click="downloadByBlob" v-if="showUrlWater">下载</a-button>
+                 <span v-else>水印素材生成中,请一分钟后刷新</span>
+               </a-form-item>
+             </div>
+             <div>
+               <a-form-item label="水印素材链接" v-if="showUrlWater">
+                 <a-input v-model="showUrlWater" type="text" readOnly />
+               </a-form-item>
+             </div>
+             <div style="width:100%" class="downLoad">
+               <a-form-item label="生成水印素材" style="width:100%">
+                 <a-select :defaultValue="4" v-model="size" style="width:80%">
+                   <a-select-option :value="item.id" :key="item.id" v-for="item of sizeType">{{
+                     item.name
+                     }}
+                   </a-select-option>
+                 </a-select>
+                 <a-button type="primary" @click="getWater" :loading="waterLoading">生成</a-button>
+               </a-form-item>
+             </div>-->
             <div>
               <a-form-item label="审核人" v-if="active == '2' && detail.auditorName">
                 {{ detail.auditorName }}
@@ -1295,7 +1295,7 @@
       </ul>
       <div style="clear:both"></div>
       <a-modal title="图片预览" v-model="showImageChouzhen" :footer="null">
-        <img :src="showImageStr"  style="width:100%"/>
+        <img :src="showImageStr" style="width:100%"/>
       </a-modal>
     </a-modal>
 
@@ -1333,8 +1333,8 @@
 
     data() {
       return {
-        showImageChouzhen:false,
-        showImageStr:null,
+        showImageChouzhen: false,
+        showImageStr: null,
         coverPreviewVisible: false,
         chouzhen: false,
         chouzhenList: [],
@@ -1481,7 +1481,7 @@
         douyinData: null,
         bohui: "",
         bohuiShow: false,
-        waterLoading:false
+        waterLoading: false
       }
     },
     filters: {