Prechádzať zdrojové kódy

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-vue

魏志佳 5 rokov pred
rodič
commit
12f8e42caa
33 zmenil súbory, kde vykonal 2633 pridanie a 1989 odobranie
  1. 4 0
      debug.log
  2. 58 80
      src/components/ctop/ActorModal.vue
  3. 9 5
      src/components/ctop/vm-card.vue
  4. 3 0
      src/components/layouts/TabLayout.vue
  5. 78 8
      src/components/uploadFile.vue
  6. 1 1
      src/views/modules/Statistics/materialRank.vue
  7. 1 1
      src/views/modules/Statistics/performanceRelated/performanceRelated.vue
  8. 1 1
      src/views/modules/Statistics/videoStatics/vDay.vue
  9. 1 1
      src/views/modules/Statistics/videoStatics/vMonth.vue
  10. 1 1
      src/views/modules/Statistics/videoStatics/vSummary.vue
  11. 1 1
      src/views/modules/Statistics/videoStatics/vWeek.vue
  12. 10 5
      src/views/modules/actor/modules/ActorModal.vue
  13. 0 1
      src/views/modules/advertiser/ProjectList.vue
  14. 0 10
      src/views/modules/advertiser/ProjectMemberList.vue
  15. 0 5
      src/views/modules/advertiser/UserAllocationList.vue
  16. 2 2
      src/views/modules/kuaishouapp/account/editGroup.vue
  17. 1 1
      src/views/modules/kuaishouapp/account/editGroupNew.vue
  18. 1 0
      src/views/modules/kuaishouapp/account/originality.vue
  19. 1 1
      src/views/modules/kuaishouapp/account/stepForm/Step2.vue
  20. 184 277
      src/views/modules/kuaishouapp/account/stepForm/Step3.vue
  21. 26 2
      src/views/modules/kuaishouapp/account/stepForm/stepModule/targetedPopulation.vue
  22. 170 0
      src/views/modules/material/BytedanceEffectVideoInfoList.vue
  23. 1 1
      src/views/modules/material/excellentMaterial.vue
  24. 7 4
      src/views/modules/material/fragmentMatemal.vue
  25. 17 20
      src/views/modules/material/materialList.vue
  26. 184 0
      src/views/modules/material/modules/BytedanceEffectVideoInfoModal.vue
  27. 1828 1539
      src/views/modules/material/videoMaterial.vue
  28. 6 2
      src/views/modules/onlineTraining/onlineTrainingList.vue
  29. 7 3
      src/views/modules/prop/modules/ActorModal.vue
  30. 9 5
      src/views/modules/yard/YardList.vue
  31. 10 5
      src/views/modules/yard/modules/YardModal.vue
  32. 9 5
      src/views/modules/yard/modules/yardDetail.vue
  33. 2 2
      vue.config.js

+ 4 - 0
debug.log

@@ -3,5 +3,9 @@
 [0529/112937.608:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
 [0619/110835.729:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
 [0701/153438.192:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
+<<<<<<< HEAD
 [0708/055752.148:ERROR:process_info.cc(375)] NtQuerySystemInformation SystemExtendedHandleInformation: {没有足够配额} 没有足够的虚拟内存或分页文件配额以完成指定的操作。 (0xc0000017)
 [0708/055807.088:ERROR:process_info.cc(359)] UncheckedAllocate
+[0713/163350.208:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
+=======
+>>>>>>> test-2

+ 58 - 80
src/components/ctop/ActorModal.vue

@@ -1,27 +1,15 @@
 <template>
-  <a-modal
-    :title="title"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
+  <a-modal :title="title" :width="800" :visible="visible" :confirmLoading="confirmLoading" @ok="handleOk"
+    @cancel="handleCancel" cancelText="关闭">
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
 
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="演员姓名">
-          <a-input placeholder="请输入演员姓名" v-decorator="['name', validatorRules.name ]"/>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="演员姓名">
+          <a-input placeholder="请输入演员姓名" v-decorator="['name', validatorRules.name ]" />
         </a-form-item>
-        <a-form-item
-          label="封面"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-        >
-          <upload-to-ali
+        <a-form-item label="封面" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          {{coverUrl}}
+          <!-- <upload-to-ali
             v-model="coverUrl"
             :customDomain="customDomain"
             preview
@@ -32,53 +20,25 @@
             :size="1024000"
             :accessKeyId="accessKeyId"
             :accessKeySecret="accessKeySecret"
-          ></upload-to-ali>
+          ></upload-to-ali> -->
+
+          <uploadFile :value.sync="coverUrl" :fileCount="1" uploadType="image" :multiple="false" />
         </a-form-item>
-        <a-form-item
-          label="照片"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          v-if="!model.name"
-        >
-          <upload-to-ali
-            v-model="imageUrl"
-            :customDomain="customDomain"
-            multiple
-            preview
-            :region="region"
-            :bucket="bucket"
-            :accept="acceptImage"
-            :max="10"
-            :size="1024000"
-            :accessKeyId="accessKeyId"
-            :accessKeySecret="accessKeySecret"
-          ></upload-to-ali>
+        <a-form-item label="照片" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="!model.name">
+          <uploadFile :value.sync="imageUrl" :fileCount="1" uploadType="image" :multiple="false" />
+          <!-- <upload-to-ali v-model="imageUrl" :customDomain="customDomain" multiple preview :region="region"
+            :bucket="bucket" :accept="acceptImage" :max="10" :size="1024000" :accessKeyId="accessKeyId"
+            :accessKeySecret="accessKeySecret"></upload-to-ali> -->
         </a-form-item>
-        <a-form-item
-          label="视频作品"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          v-if="!model.name"
-        >
-          <upload-to-ali
-            v-model="videoUrl"
-            :customDomain="customDomain"
-            multiple
-            preview
-            :region="region"
-            :bucket="bucket"
-            :accept="acceptVideo"
-            :max="10"
-            :size="1024000"
-            :accessKeyId="accessKeyId"
-            :accessKeySecret="accessKeySecret"
-          ></upload-to-ali>
+        <a-form-item label="视频作品" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="!model.name">
+          <uploadFile :value.sync="videoUrl" :fileCount="1" uploadType="video" :multiple="false" />
+          <!-- <upload-to-ali v-model="videoUrl" :customDomain="customDomain" multiple preview :region="region"
+            :bucket="bucket" :accept="acceptVideo" :max="10" :size="1024000" :accessKeyId="accessKeyId"
+            :accessKeySecret="accessKeySecret"></upload-to-ali> -->
         </a-form-item>
         <a-form-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-date-picker
-            style="width: 100%"
-            placeholder="请选择生日"
-            v-decorator="['birthday', {initialValue:!model.birthday?null:moment(model.birthday,dateFormat)}]"/>
+          <a-date-picker style="width: 100%" placeholder="请选择生日"
+            v-decorator="['birthday', {initialValue:!model.birthday?null:moment(model.birthday,dateFormat)}]" />
         </a-form-item>
 
         <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -87,11 +47,8 @@
             <a-select-option :value="2">女</a-select-option>
           </a-select>
         </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="特长">
-          <a-input placeholder="请输入特长" v-decorator="['speciality']"/>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="特长">
+          <a-input placeholder="请输入特长" v-decorator="['speciality']" />
         </a-form-item>
 
 
@@ -101,7 +58,10 @@
 </template>
 
 <script>
-  import {httpAction} from '@/api/manage'
+  import uploadFile from '@/components/uploadFile.vue'
+  import {
+    httpAction
+  } from '@/api/manage'
   import pick from 'lodash.pick'
   import JTreeSelect from '@/components/jeecg/JTreeSelect'
   import moment from 'moment'
@@ -110,7 +70,8 @@
     name: "ActorModal",
     components: {
       UploadToAli,
-      JTreeSelect
+      JTreeSelect,
+      uploadFile
     },
     data() {
       return {
@@ -119,7 +80,7 @@
         model: {},
         videoUrl: [],
         imageUrl: [],
-        coverUrl:"",
+        coverUrl: "",
         customDomain: '',
         region: 'oss-cn-beijing',
         bucket: 'ctop-media',
@@ -129,18 +90,31 @@
         accessKeySecret: '1rkPz7JNoXk8sJevPaeYHWqfkQXBGh',
         dateFormat: "YYYY-MM-DD",
         labelCol: {
-          xs: {span: 24},
-          sm: {span: 5},
+          xs: {
+            span: 24
+          },
+          sm: {
+            span: 5
+          },
         },
         wrapperCol: {
-          xs: {span: 24},
-          sm: {span: 16},
+          xs: {
+            span: 24
+          },
+          sm: {
+            span: 16
+          },
         },
 
         confirmLoading: false,
         form: this.$form.createForm(this),
         validatorRules: {
-          name: {rules: [{required: true, message: '请输入演员姓名!'}]},
+          name: {
+            rules: [{
+              required: true,
+              message: '请输入演员姓名!'
+            }]
+          },
           // sex:{initialValue:((!this.model.sex)?"": (this.model.sex+""))},
         },
         url: {
@@ -149,9 +123,13 @@
         },
       }
     },
-    created() {
-    },
+    created() {},
     methods: {
+      fileWater() {
+        return new Promise(function (resolve, reject) {
+
+        })
+      },
       add() {
         this.edit({});
       },
@@ -161,9 +139,9 @@
         that.form.resetFields();
         that.model = Object.assign({}, record);
         that.visible = true;
-        that.coverUrl = record.coverUrl
-        that.imageUrl = record.imageUrl
-        that.videoUrl = record.videoUrl
+        // that.coverUrl = ""
+        // that.imageUrl = ""
+        // that.videoUrl = ""
         that.$nextTick(() => {
           that.form.setFieldsValue(pick(this.model, 'name', 'sex', 'speciality'))
           //时间格式化

+ 9 - 5
src/components/ctop/vm-card.vue

@@ -201,7 +201,8 @@ li {
       @ok="handleOk('photo')"
       @cancel="handleCancel('photo')"
     >
-      <upload-to-ali
+    <uploadFile :value.sync="imageUrl" :fileCount="1" uploadType="image" :multiple="false" />
+      <!-- <upload-to-ali
         style="margin:10px"
         v-model="imageUrl"
         :customDomain="customDomain"
@@ -213,7 +214,7 @@ li {
         :size="1024000"
         :accessKeyId="accessKeyId"
         :accessKeySecret="accessKeySecret"
-      ></upload-to-ali>
+      ></upload-to-ali> -->
     </a-modal>
     <!-- 新增作品 -->
     <a-modal
@@ -222,7 +223,8 @@ li {
       @ok="handleOk('video')"
       @cancel="handleCancel('video')"
     >
-      <upload-to-ali
+    <uploadFile :value.sync="videoUrl" :fileCount="1" uploadType="video" :multiple="false" />
+      <!-- <upload-to-ali
         style="margin:10px"
         v-model="videoUrl"
         :customDomain="customDomain"
@@ -234,7 +236,7 @@ li {
         :size="1024000"
         :accessKeyId="accessKeyId"
         :accessKeySecret="accessKeySecret"
-      ></upload-to-ali>
+      ></upload-to-ali> -->
     </a-modal>
     <actor-modal ref="modalForm" @ok="modalFormOk" @updateList="updateList" @close="closeVideo"></actor-modal>
   </div>
@@ -255,6 +257,7 @@ import {
 } from '@/api/actor'
 import actorModal from './ActorModal'
 import UploadToAli from '@femessage/upload-to-ali'
+  import uploadFile from '@/components/uploadFile.vue'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { closeAllVideoFun } from '@/utils/videoControl'
 export default {
@@ -262,7 +265,8 @@ export default {
   mixins: [JeecgListMixin],
   components: {
     actorModal,
-    UploadToAli
+    UploadToAli,
+    uploadFile
   },
   props: {
     type: {

+ 3 - 0
src/components/layouts/TabLayout.vue

@@ -85,6 +85,7 @@
           localStorage.removeItem("step")
           localStorage.removeItem("campaignId")
           localStorage.removeItem("pans")
+          localStorage.removeItem("pansKey")
           localStorage.removeItem("appId")
       }
       if(!this.linkList.includes("/account/advertisingGroup")){
@@ -110,6 +111,7 @@
           localStorage.removeItem("step")
           localStorage.removeItem("campaignId")
           localStorage.removeItem("pans")
+          localStorage.removeItem("pansKey")
           localStorage.removeItem("appId")
         }
         if(!this.linkList.includes("/account/advertisingGroup")){
@@ -156,6 +158,7 @@
         if(key == "/account/stepForm"){
             localStorage.removeItem("step")
             localStorage.removeItem("pans")
+            localStorage.removeItem("pansKey")
         }
         if(key == "/account/originality"){
             localStorage.removeItem("originality")

+ 78 - 8
src/components/uploadFile.vue

@@ -7,11 +7,11 @@
     <a-upload name="file" :multiple="multiple" list-type="picture-card" class="avatar-uploader"
       action="https://media-1301855440.cos.ap-chongqing.myqcloud.com/" :before-upload="beforeUpload"
       @change="handleChange" :accept="uploadType+'/*'" :file-list="fileList" :remove="removeFile"
-      @preview="handlePreview" :disabled="loadingElse">
+      @preview="handlePreview" :disabled="loadingElse||disabled">
       <div v-if="uploadType=='image'?fileList.length < fileCount:fileList.length<1">
         <a-progress v-if='loadingElse' :percent="percent" :show-info="false" />
         <div class="ant-upload-text">
-          Upload
+          点击上传
         </div>
       </div>
     </a-upload>
@@ -76,11 +76,21 @@
         default (file) {
           return Promise.resolve()
         }
+      },
+      disabled: {
+        type: Boolean,
+        default () {
+          return false
+        }
+      },
+      value: {
+        type: [String, Array],
+        required: true
       }
     },
     data() {
       return {
-        fileList: [], //链接集合
+        fileList: [],
         loadingElse: false,
         imageUrl: '',
         percent: 0,
@@ -90,8 +100,48 @@
     },
     filters: {},
     computed: {},
-    created() {},
-    watch: {},
+    mounted() {
+
+    },
+    watch: {
+      //    fileListAll
+      value: {
+        immediate: true,
+        handler(n, o) {
+          if (this.fileList.length == 0) {
+            if (typeof n == 'object') {
+              this.fileList = n.map((item, index) => {
+                return {
+                  uid: index + 1,
+                  name: index + 1,
+                  status: 'done',
+                  url: item,
+                }
+              })
+            } else {
+              if (n == '') {
+                this.fileList = []
+              } else {
+                this.fileList = [{
+                  uid: 1,
+                  name: 1,
+                  status: 'done',
+                  url: n,
+                }]
+
+              }
+
+            }
+          } else {
+            if (n.length == 0 || n == '') {
+              this.clearAll()
+            }
+          }
+
+        },
+        deep: true
+      }
+    },
     methods: {
       handleCancel() {
         closeAllVideoFun()
@@ -129,12 +179,17 @@
         this.checkFile(file).then(res => {
           this.cosUpload(file)
 
+        }).catch(() => {
+          this.loadingElse = false
         })
         return new Promise(function (resolve, reject) {
           reject()
         })
 
       },
+      clearAll() {
+        this.fileList = []
+      },
       cosUpload(file) {
         var that = this
         let date = new Date()
@@ -172,16 +227,31 @@
           that.loadingElse = false
           if (that.fileList.length < that.fileCount) {
             that.fileList.push({
-              uid: i++,
+              uid: file.name,
               name: file.name,
               status: 'done',
-              url: 'http://' + data.Location,
+              url: '//' + data.Location,
             })
+
+            // that.$emit('overUpload', that.fileList.map(item => {
+            //                 return item.url
+            //               }))
             that.$emit('overUpload', that.fileList)
+
+            if (that.multiple) {
+              that.$emit('update:value', that.fileList.map(item => {
+                return item.url
+              }))
+            } else {
+              that.$emit('update:value', that.fileList.map(item => {
+                return item.url
+              })[0])
+            }
+
+
           } else {
             that.$message.error('上传已达上限' + that.fileCount + '张')
           }
-
         });
       }
     }

+ 1 - 1
src/views/modules/Statistics/materialRank.vue

@@ -28,7 +28,7 @@
     </div>
     <a-table :columns="columns" :data-source="dataSource" tableLayout='auto' bordered :pagination='false' :loading='loading'>
       <div slot="videoU" slot-scope="test,records">
-        <img :src="records.url+'?x-oss-process=video/snapshot,t_0,m_fast'" alt="" style="width:140px"
+        <img :src="records.coverUrl" alt="" style="width:140px"
           @click="openVideo(records.url)">
       </div>
       <span slot="convertRate" slot-scope="convertRate">{{ convertRate | toPercentage }}</span>

+ 1 - 1
src/views/modules/Statistics/performanceRelated/performanceRelated.vue

@@ -143,7 +143,7 @@
                         
                         <div slot="urls" slot-scope="test,records">
                             <img
-                            :src="records.url+'?x-oss-process=video/snapshot,t_0,m_fast'"
+                            :src="records.coverUrl"
                             alt
                             style="width:100px"
                             @click="openVideo(records.url)"                           

+ 1 - 1
src/views/modules/Statistics/videoStatics/vDay.vue

@@ -84,7 +84,7 @@
       @change="sort"
     >
       <div slot="videoU" slot-scope="test,records">
-        <img  :src="records.url+'?x-oss-process=video/snapshot,t_0,m_fast'"  alt=""  style="width:140px"  @click="openVideo(records.url)" @load="loadShow">
+        <img  :src="records.coverUrl"  alt=""  style="width:140px"  @click="openVideo(records.url)" @load="loadShow">
 
       </div>
       <span slot="ctr" slot-scope="ctr">{{ ctr | toPercentage }}</span>

+ 1 - 1
src/views/modules/Statistics/videoStatics/vMonth.vue

@@ -93,7 +93,7 @@
       </span>
 
       <div slot="videoU" slot-scope="test,records">
-        <img  :src="records.url+'?x-oss-process=video/snapshot,t_0,m_fast'"  alt="" style="width:140px" @click="openVideo(records.url)" @load="loadShow">
+        <img  :src="records.coverUrl"  alt="" style="width:140px" @click="openVideo(records.url)" @load="loadShow">
       </div>
       <span slot="ctr" slot-scope="ctr">{{ ctr | toPercentage }}</span>
       <span

+ 1 - 1
src/views/modules/Statistics/videoStatics/vSummary.vue

@@ -93,7 +93,7 @@
     >
       <div slot="videoU" slot-scope="test,records">
         <img
-          :src="records.url+'?x-oss-process=video/snapshot,t_0,m_fast'"
+          :src="records.coverUrl"
           alt
           style="width:140px"
           @click="openVideo(records.url)"

+ 1 - 1
src/views/modules/Statistics/videoStatics/vWeek.vue

@@ -93,7 +93,7 @@
       </span>
 
       <div slot="videoU" slot-scope="test,records">
-       <img  :src="records.url+'?x-oss-process=video/snapshot,t_0,m_fast'"  alt="" style="width:140px" @click="openVideo(records.url)"  @load="loadShow">
+       <img  :src="records.coverUrl"  alt="" style="width:140px" @click="openVideo(records.url)"  @load="loadShow">
       </div>
       <span slot="ctr" slot-scope="ctr">{{ ctr | toPercentage }}</span>
       <span

+ 10 - 5
src/views/modules/actor/modules/ActorModal.vue

@@ -22,7 +22,9 @@
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
         >
-          <upload-to-ali
+
+        <uploadFile :value.sync="imageUrl" :fileCount="1" uploadType="image" :multiple="false" />
+          <!-- <upload-to-ali
             v-model="imageUrl"
             :customDomain="customDomain"
             multiple
@@ -34,14 +36,15 @@
             :size="1024000"
             :accessKeyId="accessKeyId"
             :accessKeySecret="accessKeySecret"
-          ></upload-to-ali>
+          ></upload-to-ali> -->
         </a-form-item>
         <a-form-item
           label="视频作品"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
         >
-          <upload-to-ali
+        <uploadFile :value.sync="videoUrl" :fileCount="1" uploadType="video" :multiple="false" />
+          <!-- <upload-to-ali
             v-model="videoUrl"
             :customDomain="customDomain"
             multiple
@@ -53,7 +56,7 @@
             :size="1024000"
             :accessKeyId="accessKeyId"
             :accessKeySecret="accessKeySecret"
-          ></upload-to-ali>
+          ></upload-to-ali> -->
         </a-form-item>
         <a-form-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-date-picker
@@ -87,11 +90,13 @@
   import JTreeSelect from '@/components/jeecg/JTreeSelect'
   import moment from 'moment'
   import UploadToAli from '@femessage/upload-to-ali'
+    import uploadFile from '@/components/uploadFile.vue'
   export default {
     name: "ActorModal",
     components: {
       UploadToAli,
-      JTreeSelect
+      JTreeSelect,
+      uploadFile
     },
     data() {
       return {

+ 0 - 1
src/views/modules/advertiser/ProjectList.vue

@@ -192,7 +192,6 @@
     },
     mounted() {
       getAction('/sys/user/getAllUserList', '').then(res => {
-        console.log(res)
         if (res.success) {
           this.options = res.result
         }

+ 0 - 10
src/views/modules/advertiser/ProjectMemberList.vue

@@ -422,7 +422,6 @@
         params.projectId = item.id
         params.status = 0
         getAction('/ctop/transferAccount/list', params).then(res => {
-          console.log(res)
           if (res.success) {
             this.projectVisible = true
             this.dataProject = res.result.map((item, index) => {
@@ -441,7 +440,6 @@
         params.status = status
         params.auditor = this.userInfo().id
         putAction('/ctop/transferAccount/edit', params).then(res => {
-          console.log(res)
           if (res.success) {
             this.projectVisible = false
             this.getResponsibleList()
@@ -475,7 +473,6 @@
         })
       },
       onTabChange(key, type) {
-        console.log(key, type)
         this[type] = key
         this.keyWord = ''
         if (key == 'myProject') {
@@ -551,7 +548,6 @@
         if (this.noTitleKey == 'myProject') {
           this.visibleAdd = true
           this.itemJson = item
-          console.log(this.itemJson)
           getAction('/sys/user/getAllUserList', '').then(res => {
             if (res.success) {
               this.list = res.result
@@ -577,7 +573,6 @@
       handleAdd() {},
       handleEdit(item) {
         if (this.noTitleKey == 'myProject') {
-          console.log(item)
           this.title = item.projectName
           this.projectId = item.id
           this.getMemberList(item.id)
@@ -590,7 +585,6 @@
       },
       handleDelete(id) {},
       onChageLogin(e) {
-        console.log(this.mode)
         if (this.mode == 'login') {
           this.loginType = 'pangolin'
         } else {
@@ -661,17 +655,14 @@
         })
       },
       handleChange(value, options) {
-        console.log(value, options)
         //   this.appId = value
       },
       getElseData(value) {
         this.getStatistics()
       },
       handleBlur() {
-        console.log('blur')
       },
       handleFocus() {
-        console.log('focus')
         if (this.appId.length > 0) {
           this.options = []
           for (let i = 0; i < this.list.length; i++) {
@@ -693,7 +684,6 @@
             return data.toLowerCase().indexOf(value.toLowerCase()) > -1
           })
           this.options = [...this.options]
-          console.log(this.options)
         } else {
           if (this.appId.length > 0) {
             this.options = []

+ 0 - 5
src/views/modules/advertiser/UserAllocationList.vue

@@ -261,7 +261,6 @@
     mounted() {
       this.getParticipateList()
       getAction('/sys/user/getAllUserList', '').then(res => {
-        console.log(res)
         if (res.success) {
           this.optionsAll = res.result
         }
@@ -270,7 +269,6 @@
     methods: {
       moment,
       onChangeSwitch(item) {
-        console.log(item)
         var params = {}
         params.id = item.id
         params.accountStatus = item.accountStatus == 0 ? 1 : 0
@@ -304,7 +302,6 @@
         })
       },
       project(item) {
-        console.log(item)
         this.visibleAdd = true
         this.accountId = item.accountId
         this.projectId = item.projectId
@@ -333,9 +330,7 @@
             params.projectId = this.projectId
             params.accountId = this.accountId
             params.status = 0
-            console.log(params)
             postAction('/ctop/transferAccount/add', params).then(res => {
-              console.log(res)
               if (res.success) {
                 this.confirmLoading = false
                 this.visibleAdd = false

+ 2 - 2
src/views/modules/kuaishouapp/account/editGroup.vue

@@ -64,7 +64,7 @@
       </a-form-item>
       <a-form-item :label="campaignType == '3' ? ' ' : '链接'" :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
         :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }" v-if="campaignType != '2'"
-        :class="{ elseLabel: campaignType == '3' }">
+        :class="{ 'else-label': campaignType == '3' }">
         <!-- 请填写以http://或者https://开头的落地页地址,长度不超过1000个字符 -->
         <a-input placeholder="请填写链接"
           v-decorator="['url', { rules: [{ required: true, message: ' ' }, { validator: handleConfirmValue }] }]" />
@@ -249,7 +249,7 @@
                           ? '不得低于1元,不得高于项目最高出价' + maxBid + '元'
                           : '不得低于1元,不得高于项目最高出价' + maxBid + '元'
                       }}</span>
-                       <span style="color:red;font-weight:700" v-else-if="item.bidType!=180&&item.cpaBid&&item.cpaBid>1">
+                       <span style="color:red;font-weight:700" v-else-if="item.bidType==2&&item.cpaBid&&item.cpaBid>1">
                           行为出价大于1元,请注意!!!
                       </span>
                     </a-form-item>

+ 1 - 1
src/views/modules/kuaishouapp/account/editGroupNew.vue

@@ -249,7 +249,7 @@
                           ? '不得低于1元,不得高于项目最高出价' + maxBid + '元'
                           : '不得低于1元,不得高于项目最高出价' + maxBid + '元'
                       }}</span>
-                      <span style="color:red;font-weight:700" v-else-if="item.bidType!=180&&item.cpaBid&&item.cpaBid>1">
+                      <span style="color:red;font-weight:700" v-else-if="item.bidType==2&&item.cpaBid&&item.cpaBid>1">
                         行为出价大于1元,请注意!!!
                       </span>
                     </a-form-item>

+ 1 - 0
src/views/modules/kuaishouapp/account/originality.vue

@@ -504,6 +504,7 @@
           var dataJson = JSON.stringify(this.title)
           console.log(this.title, this.titleKey)
           localStorage.setItem('pans', dataJson)
+          localStorage.setItem('pansKey', this.titleKey)
           this.$router.replace({
             path: '/account/stepForm'
           })

+ 1 - 1
src/views/modules/kuaishouapp/account/stepForm/Step2.vue

@@ -278,7 +278,7 @@
                           ? '不得低于1元,不得高于项目最高出价' + maxBid + '元'
                           : '不得低于1元,不得高于项目最高出价' + maxBid + '元'
                       }}</span>
-                      <span style="color:red;font-weight:700" v-else-if="item.bidType!=180&&item.cpaBid&&item.cpaBid>1">
+                      <span style="color:red;font-weight:700" v-else-if="item.bidType==2&&item.cpaBid&&item.cpaBid>1">
                           行为出价大于1元,请注意!!!     
                       </span>
                     </a-form-item>

+ 184 - 277
src/views/modules/kuaishouapp/account/stepForm/Step3.vue

@@ -1,4 +1,4 @@
-<style>
+<style lang="scss">
   .chouzhen span {
     display: inline-block;
   }
@@ -7,6 +7,28 @@
     text-align: center;
     font-size: 20px;
   }
+
+  .step3-image {
+    span {
+      padding: 0
+    }
+
+    .ant-checkbox {
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 100;
+    }
+  }
+
+  .step3-modal {
+    .ant-checkbox {
+      position: absolute;
+      top: 0;
+      right: 0;
+      z-index: 100;
+    }
+  }
 </style>
 <style scoped lang="scss">
   .actor-photo-list {
@@ -20,7 +42,6 @@
       height: 380px;
       border: 1px solid #f2f2f2;
       list-style: none;
-      padding: 10px;
 
       img,
       video {
@@ -58,6 +79,7 @@
     text-align: center;
     background: rgba(0, 0, 0, 0.5);
     border-radius: 2px;
+    z-index: 1000;
   }
 
   .actor-photo-list {
@@ -119,14 +141,15 @@
                             v-if="item.videoList"></video>
                         </a-form-item>
                         <div class="downLoad" style="overflow:auto">
-                          <ul class="actor-photo-list"
+                          <ul class="actor-photo-list step3-image"
                             :style="{ width: item.imageUrlList.length>4?25 * item.imageUrlList.length + '%':'100%' }"
                             v-if="item.imageUrlList.length > 0">
                             <a-checkbox-group v-model="item.checkArrImage"
                               style="width:100%;  display: flex;padding-left: 0;" @change="onChangeCheckImage">
                               <li v-for="(item, index) of item.imageUrlList" :key="index">
-                                <a-checkbox :value="item.code" style="position:absolute;z-index: 100"></a-checkbox><img
-                                  class="video" :src="item.url" />
+                                <a-checkbox :value="item.code" style="height:100%;width:100%">
+                                  <img class="video" :src="item.url" />
+                                </a-checkbox>
                               </li>
                             </a-checkbox-group>
                           </ul>
@@ -243,10 +266,13 @@
         </a-button>
       </template>
       <a-form-item label="" class="add-image-material">
+        <uploadFile v-if="addImageVisible" :value.sync="urlListImage.url" :checkFile="fileWater"
+          @overUpload="overUploadImage" @removeUpload="deleteImage" :fileCount="15" uploadType="image" />
+        <!-- 
         <upload-to-ali style="width:100%" v-model="urlListImage.url" :customDomain="customDomain" :multiple="true"
           preview :region="region" :bucket="bucket" :accept="acceptImage" :max="15" :size="2048"
           :accessKeyId="accessKeyId" :accessKeySecret="accessKeySecret" :before-upload="fileWater" :dir="dirImg"
-          @delete='deleteImage' @loaded="overUploadImage"></upload-to-ali>
+          @delete='deleteImage' @loaded="overUploadImage"></upload-to-ali> -->
         <span v-if="material.filter(item => item == false).length > 0 && urlListImage.url.length > 0"
           style="color:red">上传素材的尺寸不符,请修改(<span v-for="(item, index) of material" :key="index"
             v-show="!item">第{{ index + 1 }}张</span>出错)</span>
@@ -263,10 +289,13 @@
         </a-button>
       </template>
       <a-form-item label="" class="add-image-material">
-        <upload-to-ali v-model="urlList.url" :customDomain="customDomain" preview :region="region" :bucket="bucket"
+        <uploadFile v-if="addVideoVisible" :checkFile="file" :value.sync="urlList.url" @overUpload="overUpload" :fileCount="10"
+          uploadType="video" :multiple="false" />
+
+        <!-- <upload-to-ali v-model="urlList.url" :customDomain="customDomain" preview :region="region" :bucket="bucket"
           :accept="acceptVideo" :max="10" :size="1024000" :accessKeyId="accessKeyId" :accessKeySecret="accessKeySecret"
           :before-upload="file" :dir="dirVideo" @loaded="overUpload">
-        </upload-to-ali>
+        </upload-to-ali> -->
         <span v-if="messageTip" style="color:red">{{messageTip}}</span>
       </a-form-item>
     </a-modal>
@@ -281,13 +310,18 @@
         全选
       </a-button>
       <!-- </a-checkbox> -->
-      <ul v-if="chouzhenList.length>0" style="height:600px;overflow:auto;padding-left:0">
+      <ul v-if="chouzhenList.length>0" style="height:600px;overflow:auto;padding-left:0" class="step3-modal">
+
+        <a-checkbox-group v-model="checkList" @change="onChange" style="width:100%;">
+          <li v-for="(item,index) of chouzhenList" :key="index" class="chouzhen" style="height:355px"
+            :class="{'first':index == 0}">
+
 
-        <a-checkbox-group v-model="checkList" @change="onChange">
-          <li v-for="(item,index) of chouzhenList" :key="index" class="chouzhen" :class="{'first':index == 0}">
+            <a-checkbox :value="item.signature"
+              style="position:absolute;z-index: 100;width:100%;height:100%;right:0;top:0;float:right">
+              <img :src="item.url" alt="" style="width:100%">
 
-            <img :src="item.url" alt="" style="width:100%">
-            <a-checkbox :value="item.signature" style="position:absolute;z-index: 100;right:0;top:0;"></a-checkbox>
+            </a-checkbox>
 
           </li>
         </a-checkbox-group>
@@ -301,14 +335,17 @@
         <a-tab-pane :tab="item.label" v-for="item of tab" :key="item.value">
           <a-range-picker name="buildTime" style="width: 400px;margin:10px 0" v-model="time" />
           <ul v-if="dataSource.length>0" style="overflow:auto;padding-left:0">
-            <a-checkbox-group v-model="checkVideo" @change="onChangeVideo">
-              <li v-for="(item,index) of dataSource" :key="index" class="chouzhen">
-                <img :src="item.coverUrl" alt="" style="width:100%" @click="matemalVideo(item,index)">
+            <a-checkbox-group v-model="checkVideo" @change="onChangeVideo" style="width:100%">
+              <li v-for="(item,index) of dataSource" :key="index" class="chouzhen" style="height:350px;">
+
                 <!-- <video class="video" :src="item.url" controls="controls" style="width:100%">
                   您的浏览器不支持 video 标签。
                 </video> -->
-                <a-checkbox :value="item" style="position:absolute;z-index: 100;right:0;top:0;"></a-checkbox>
-
+                <a-checkbox :value="item" style="width:100%;position:absolute;z-index: 100;right:0;top:0;">
+                  <img :src="item.coverUrl" alt="" style="width:100%;margin-bottom:10px">
+                </a-checkbox>
+                <a @click="matemalVideo(item,index)"
+                  style="position:absolute;z-index: 100;right:56px;bottom: 5px;">查看视频</a>
               </li>
             </a-checkbox-group>
           </ul>
@@ -387,7 +424,7 @@
   } from '@/utils/videoControl' // 停止除当前外的其他视频播放,及停止所有视频播放的方法
   import checkMatemal from './stepModule/checkMatemal'
   import BMF from 'browser-md5-file'
-
+  import uploadFile from '@/components/uploadFile.vue'
 
   let nowIndex = 0
   let bestIndex = 0
@@ -397,7 +434,8 @@
     components: {
       UploadToAli,
       VuePreview,
-      checkMatemal
+      checkMatemal,
+      uploadFile
     },
     data() {
       return {
@@ -800,6 +838,13 @@
           this.$bus.$emit('remove', '/account/stepForm')
         } else {
           this.addCreative(0)
+          getAction('/kuaishou/batch/checkCreativeCount', {
+            unitId: this.pansKey,
+            accountId: localStorage.getItem('accountId')
+          }).then(res => {
+            console.log(res)
+            this.content = res.result
+          })
         }
       },
       handleOk() {
@@ -824,6 +869,7 @@
         this.visible = false
         this.remove(this.pansKey)
       },
+
       handleSubmit(e) {
         e.preventDefault()
         var index = this.pans.findIndex(item => item.key === this.pansKey)
@@ -872,7 +918,7 @@
               ...values,
               unitId: this.pansKey,
               accountId: localStorage.getItem('accountId'),
-              content: this.content 
+              content: this.content
             }
             postAction('/kuaishou/batch/createCreative', params).then(res => {
               if (res.success) {
@@ -1029,76 +1075,76 @@
         that.imageArrList = []
         var img
         if (urlAll.length > 0) {
-          for (var i = 0; i < this.urlListImage.url.length; i++) {
+          for (var i = 0; i < urlAll.length; i++) {
             that.imageArrList.push({
               signature: this.urlListImage.md5[i],
-              url: this.urlListImage.url[i],
+              url: urlAll[i].url,
             })
 
             img = new Image()
-            img.src = this.urlListImage.url[i]
-            if (img.complete) {
-              // 打印
-              if (img.width == 720) {
-                if (img.height == 1280) {
-                  that.material.push(true)
-                } else {
-                  that.material.push(false)
-                }
-              } else if (img.width == 1080) {
-                if (img.height == 1920) {
-                  that.material.push(true)
-                } else {
-                  that.material.push(false)
-                }
-              } else if (img.width == 1280) {
-                if (img.height == 720) {
-                  that.material.push(true)
-                } else {
-                  that.material.push(false)
-                }
-              } else if (img.width == 1920) {
-                if (img.height == 1080) {
-                  that.material.push(true)
-                } else {
-                  that.material.push(false)
-                }
-              } else {
-                that.material.push(false)
-              }
-            } else {
-
-              img.onload = () => {
-                if (img.width == 720) {
-                  if (img.height == 1280) {
-                    that.material.push(true)
-                  } else {
-                    that.material.push(false)
-                  }
-                } else if (img.width == 1080) {
-                  if (img.height == 1920) {
-                    that.material.push(true)
-                  } else {
-                    that.material.push(false)
-                  }
-                } else if (img.width == 1280) {
-                  if (img.height == 720) {
-                    that.material.push(true)
-                  } else {
-                    that.material.push(false)
-                  }
-                } else if (img.width == 1920) {
-                  if (img.height == 1080) {
-                    that.material.push(true)
-                  } else {
-                    that.material.push(false)
-                  }
-                } else {
-                  that.material.push(false)
-                }
-
-              }
-            }
+            img.src = urlAll[i].url
+            // if (img.complete) {
+            //   // 打印
+            //   if (img.width == 720) {
+            //     if (img.height == 1280) {
+            //       that.material.push(true)
+            //     } else {
+            //       that.material.push(false)
+            //     }
+            //   } else if (img.width == 1080) {
+            //     if (img.height == 1920) {
+            //       that.material.push(true)
+            //     } else {
+            //       that.material.push(false)
+            //     }
+            //   } else if (img.width == 1280) {
+            //     if (img.height == 720) {
+            //       that.material.push(true)
+            //     } else {
+            //       that.material.push(false)
+            //     }
+            //   } else if (img.width == 1920) {
+            //     if (img.height == 1080) {
+            //       that.material.push(true)
+            //     } else {
+            //       that.material.push(false)
+            //     }
+            //   } else {
+            //     that.material.push(false)
+            //   }
+            // } else {
+
+            //   img.onload = () => {
+            //     if (img.width == 720) {
+            //       if (img.height == 1280) {
+            //         that.material.push(true)
+            //       } else {
+            //         that.material.push(false)
+            //       }
+            //     } else if (img.width == 1080) {
+            //       if (img.height == 1920) {
+            //         that.material.push(true)
+            //       } else {
+            //         that.material.push(false)
+            //       }
+            //     } else if (img.width == 1280) {
+            //       if (img.height == 720) {
+            //         that.material.push(true)
+            //       } else {
+            //         that.material.push(false)
+            //       }
+            //     } else if (img.width == 1920) {
+            //       if (img.height == 1080) {
+            //         that.material.push(true)
+            //       } else {
+            //         that.material.push(false)
+            //       }
+            //     } else {
+            //       that.material.push(false)
+            //     }
+
+            //   }
+            // }
           }
         }
 
@@ -1111,14 +1157,10 @@
         //   md5: []
         // }
         return new Promise(function (resolve, reject) {
-          for (let i = 0; i < file.length; i++) {
-            bmf.md5(file[i], (err, md5) => {
-              // that.urlListImage.name.push(file[i].name)
-              that.urlListImage.md5.push(md5)
-              resolve()
-
-            })
-          }
+          bmf.md5(file, (err, md5) => {
+            that.urlListImage.md5.push(md5)
+            resolve()
+          })
         })
       },
       overUpload(urlAll) {
@@ -1128,7 +1170,7 @@
         var bmf = new BMF()
         var that = this
         return new Promise(function (resolve, reject) {
-          bmf.md5(file[0], (err, md5) => {
+          bmf.md5(file, (err, md5) => {
 
 
             getAction('/kusiShouUpload/checkVideo', {
@@ -1403,204 +1445,69 @@
       }
     },
     mounted: function () {
-      if (localStorage.getItem('pans')) {
-        this.pans = JSON.parse(localStorage.getItem('pans')).map(item => {
-          return {
-            ...item,
-            list: []
-          }
-        })
-
-        this.pansKey = this.pans[0].key
-        this.$nextTick(() => {
-          this.addCreative(0)
-        })
-        getAction('/kuaishou/batch/checkCreativeCount', {
-          unitId: this.pansKey,
-          accountId: localStorage.getItem('accountId')
-        }).then(res => {
-          console.log(res)
-          this.content = res.result
-        })
-        getAction('/kuaishou/batch/getActionBarText', {
-          campaignId: localStorage.getItem('campaignId') ? localStorage.getItem('campaignId') : localStorage
-            .getItem('advertisingGroupKey')
-        }).then(res => {
-          if (res.success) {
-            this.appList = res.result
-          }
-        })
+      this.$nextTick(() => {
+        if (localStorage.getItem('pans')) {
+          this.pans = JSON.parse(localStorage.getItem('pans')).map(item => {
+            return {
+              ...item,
+              list: []
+            }
+          })
 
-        if (localStorage.getItem('appId')) {
-          this.showSite = true
-          this.getAppList(localStorage.getItem('appId'))
-        } else {
+          this.pansKey = this.pans[0].key
 
-          getAction('/kuaishou/batch/getAppId', {
-            accountId: localStorage.getItem('accountId'),
-            unitId: this.pansKey
+          this.addCreative(0)
+          getAction('/kuaishou/batch/checkCreativeCount', {
+            unitId: this.pansKey,
+            accountId: localStorage.getItem('accountId')
+          }).then(res => {
+            console.log(res)
+            this.content = res.result
+          })
+          getAction('/kuaishou/batch/getActionBarText', {
+            campaignId: localStorage.getItem('campaignId') ? localStorage.getItem('campaignId') : localStorage
+              .getItem('advertisingGroupKey')
           }).then(res => {
             if (res.success) {
-              if (res.result) {
-                this.showSite = true
-                this.getAppList(res.result)
-              } else {
-                this.showSite = false
-              }
-
+              this.appList = res.result
             }
           })
-        }
-
-
-      }
-      getAction('/kuaishou/batch/creativeWord', {
-        accountId: localStorage.getItem('accountId')
-      }).then(res => {
-        if (res.success) {
-          this.tags = res.result
-        }
-      })
-    }
-  }
-</script>
-<style lang="scss">
-  .select_all {
-    margin-bottom: 10px;
-  }
-
-  .ant_modal_body_container {
-    .ant-modal-body {
-      max-height: 650px;
-      overflow-y: scroll;
-
-      .image_item_container {
-        margin: 0 -10px;
-        width: 100%;
-
-        .image_item {
-          display: inline-block;
-          width: 20%;
-          padding: 0 10px;
-          box-sizing: border-box;
-          margin-bottom: 20px;
-
-          .label_item {
-            display: block;
-            cursor: pointer;
-          }
-
-          .item_img {
-            width: 100%;
-            margin-bottom: 10px;
-          }
 
-          .item_text {
-            height: 42px;
-            overflow: hidden;
-            margin-bottom: 0;
-          }
+          if (localStorage.getItem('appId')) {
+            this.showSite = true
+            this.getAppList(localStorage.getItem('appId'))
+          } else {
 
-          .item_checkbox {
-            margin-bottom: 0;
-          }
+            getAction('/kuaishou/batch/getAppId', {
+              accountId: localStorage.getItem('accountId'),
+              unitId: this.pansKey
+            }).then(res => {
+              if (res.success) {
+                if (res.result) {
+                  this.showSite = true
+                  this.getAppList(res.result)
+                } else {
+                  this.showSite = false
+                }
 
-          .video {
-            width: 100%;
+              }
+            })
           }
-        }
-      }
-    }
-
-    .video_item_container {
-      .video {
-        width: 100%;
-      }
-    }
-  }
-
-  //   多选框
-  .checkbox_item_container {
-    .item_ul {
-      margin: 0 -10px;
 
-      .item_li {
-        width: 20%;
-        float: left;
-        padding: 0 10px;
-        box-sizing: border-box;
 
-        .item:hover i {
-          display: block;
-          cursor: pointer;
         }
-
-        .item {
-          position: relative;
-
-          i {
-            display: none;
-          }
-
-          video {
-            width: 100%;
-            min-height: 255px;
-          }
-
-          .checkbox_item {
-            display: block;
-
-            .ant-checkbox {
-              display: inline-block;
-            }
-
-            span {
-              display: block;
-              padding: 0;
-
-              .item_txt {
-                text-align: left;
-                height: 42px;
-                overflow: hidden;
-              }
-            }
+        getAction('/kuaishou/batch/creativeWord', {
+          accountId: localStorage.getItem('accountId')
+        }).then(res => {
+          if (res.success) {
+            this.tags = res.result
           }
-        }
-      }
-    }
-  }
+        })
+      })
 
-  // @media (min-width: 1024px){
-  //     .checkbox_item_container {
-  //         width:70%
-  //     }
-  // } /*>=1024的设备*/
-
-  // @media (min-width: 1100px) {
-  //     .checkbox_item_container {
-  //         width:70%
-  //     }
-  // } /*>=1100的设备*/
-  @media (min-width: 1280px) {
-    .checkbox_item_container_size {
-      width: 70%;
     }
   }
+</script>
+<style lang="scss">
 
-  /*>=1280的设备*/
-
-  // @media (min-width: 1366px) {
-  // }
-
-  // @media (min-width: 1440px) {
-  // }
-
-  // @media (min-width: 1680px) {
-
-  // }
-  @media (min-width: 1920px) {
-    .checkbox_item_container_size {
-      width: 50%;
-    }
-  }
 </style>

+ 26 - 2
src/views/modules/kuaishouapp/account/stepForm/stepModule/targetedPopulation.vue

@@ -63,6 +63,7 @@ li:hover {
           border: targeted == '4' ? '1px solid #f2f2f2' : '0',
           padding: targeted == '4' ? '20px' : '0'
         }"
+        v-clickoutside="targetedShow"
       >
         <div style="display:flex;margin-top:15px" v-if="targeted == '4' || targeted == '2'">
           <span style="white-space:nowrap;width:10%" v-if="targeted == '4'">定向池:</span>
@@ -71,8 +72,10 @@ li:hover {
             @focus="
               topMiddle = true
               topMiddleNo = false
+              dataList = dataElse
             "
             v-model="keyValue"
+            @change="showOne"
           />
         </div>
 
@@ -109,8 +112,10 @@ li:hover {
             @focus="
               topMiddleNo = true
               topMiddle = false
+              dataList = dataElse
             "
             v-model="keyValueNo"
+            @change="showTwo"
           />
         </div>
 
@@ -878,7 +883,8 @@ export default {
       selectedRowKeysValue: [],
       selectedRowKeysNo: [],
       selectedRowKeysValueNo: [],
-      dataList: []
+      dataList: [],
+      dataElse:[]
     }
   },
   computed: {},
@@ -894,6 +900,7 @@ export default {
                   key: index
                 }
               })
+              this.dataElse = this.dataList
               resolve(res.result)
             }
           }
@@ -948,7 +955,20 @@ export default {
         this.keyValueNo += this.selectedRowKeysValueNo[i].orientationName + '   '
       }
     },
-
+    showOne(){
+    //    this.keyValueNo =orientationName
+        var data = this.keyValue.split('   ')
+        this.dataList = this.dataElse.filter(item => {
+          return item.orientationName.toLowerCase().indexOf(data[data.length-1].toLowerCase()) > -1
+        })
+    },
+    showTwo(){
+    //    this.keyValueNo =orientationName
+        var data = this.keyValueNo.split('   ')
+        this.dataList = this.dataElse.filter(item => {
+          return item.orientationName.toLowerCase().indexOf(data[data.length-1].toLowerCase()) > -1
+        })
+    },
     getAge(e) {
       this.allForm.noAgeBreak = e.target.checked
     },
@@ -989,6 +1009,10 @@ export default {
     handleClose(e) {
       this.closeDialog = false
     },
+    targetedShow(e){
+        this.topMiddle = false
+        this.topMiddleNo = false
+    },
     clearAll() {
       this.checkArr = []
       this.indeterminate = false

+ 170 - 0
src/views/modules/material/BytedanceEffectVideoInfoList.vue

@@ -0,0 +1,170 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+        <a-col :md="6" :sm="8">
+            <a-form-item label="初次产生消耗时间">
+              <a-input placeholder="请输入初次产生消耗时间" v-model="queryParam.initialCostDate"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="最后一次消耗时间">
+              <a-input placeholder="请输入最后一次消耗时间" v-model="queryParam.finalCostDate"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="所属平面">
+              <a-input placeholder="请输入所属平面" v-model="queryParam.plane"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8" >
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <bytedanceEffectVideoInfo-modal ref="modalForm" @ok="modalFormOk"></bytedanceEffectVideoInfo-modal>
+  </a-card>
+</template>
+
+<script>
+  import BytedanceEffectVideoInfoModal from './modules/BytedanceEffectVideoInfoModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: "BytedanceEffectVideoInfoList",
+    mixins:[JeecgListMixin],
+    components: {
+      BytedanceEffectVideoInfoModal
+    },
+    data () {
+      return {
+        description: '有效视频信息管理页面',
+        // 表头
+        columns: [
+		   {
+            title: '视频唯一标识',
+            align:"center",
+            dataIndex: 'code'
+           },
+		   {
+            title: '视频链接',
+            align:"center",
+            dataIndex: 'url'
+           },
+		   {
+            title: '初次产生消耗时间',
+            align:"center",
+            dataIndex: 'initialCostDate'
+           },
+		   {
+            title: '最后一次消耗时间',
+            align:"center",
+            dataIndex: 'finalCostDate'
+           },
+		   {
+            title: '编导',
+            align:"center",
+            dataIndex: 'plan_dictText'
+           },
+		   {
+            title: '拍摄',
+            align:"center",
+            dataIndex: 'shot_dictText'
+           },
+		   {
+            title: '剪辑',
+            align:"center",
+            dataIndex: 'clip_dictText'
+           },
+		   {
+            title: '负责人',
+            align:"center",
+            dataIndex: 'manager_dictText'
+           },
+		   {
+            title: '两周消耗',
+            align:"center",
+            dataIndex: 'twoWeekCost'
+           },
+		   {
+            title: '总消耗',
+            align:"center",
+            dataIndex: 'totalCost'
+           },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+		url: {
+          list: "/ctop/bytedanceEffectVideoInfo/list",
+          delete: "/ctop/bytedanceEffectVideoInfo/delete",
+          deleteBatch: "/ctop/bytedanceEffectVideoInfo/deleteBatch",
+          exportXlsUrl: "ctop/bytedanceEffectVideoInfo/exportXls",
+          importExcelUrl: "ctop/bytedanceEffectVideoInfo/importExcel",
+       },
+    }
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+    methods: {
+
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

+ 1 - 1
src/views/modules/material/excellentMaterial.vue

@@ -220,7 +220,7 @@
                     }"></div>
                   <img v-if="active == 'IMAGE'" :src="items.url"
                     style="height:200px;max-width:100%;position:absolute;z-index:10;" />
-                  <img v-else :src="items.url + '?x-oss-process=video/snapshot,t_00000,m_fast'" alt=""
+                  <img v-else :src="items.coverUrl" alt=""
                     style="height:200px;max-width:100%;position:absolute;z-index:10;" />
                 </div>
 

+ 7 - 4
src/views/modules/material/fragmentMatemal.vue

@@ -384,12 +384,13 @@
         </a-form-item>
 
         <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="视频素材上传">
-          <upload-to-ali :customDomain="customDomain" preview :region="region" :bucket="bucket" :accept="acceptVideo"
+          <uploadFile :value.sync="urlList.url" :fileCount="1" uploadType="video" :multiple="false" />
+          <!-- <upload-to-ali :customDomain="customDomain" preview :region="region" :bucket="bucket" :accept="acceptVideo"
             :max="10" :size="1024000" :accessKeyId="accessKeyId" :accessKeySecret="accessKeySecret"
             :before-upload="file" :dir="dirVideo" @loaded="overUpload" v-decorator="[
               'url', // 给表单赋值或拉取表单时,该input对应的key
               { rules: [{ required: true, message: '请上传图片!' }] }
-            ]"></upload-to-ali>
+            ]"></upload-to-ali> -->
         </a-form-item>
         <a-form-item :label-col="labelCol" :wrapper-col="{
             xs: { span: 24 },
@@ -480,6 +481,7 @@
   } from '@/mixins/JeecgListMixin'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import UploadToAli from '@femessage/upload-to-ali'
+  import uploadFile from '@/components/uploadFile.vue'
   import {
     fileCheck,
     fileInsert,
@@ -525,7 +527,8 @@
       JEllipsis,
       UploadToAli,
       accountCheck,
-      checkMatemal
+      checkMatemal,
+      uploadFile
     },
 
     data() {
@@ -1250,7 +1253,7 @@
             }
             params.id = this.add ? null : this.id
             params.code = this.urlList.md5
-            params.url = values.url
+            params.url = this.urlList.url
             params.materialName = this.urlList.name
             params.userId = this.userInfo().id
             params.projectId = values.projectId

+ 17 - 20
src/views/modules/material/materialList.vue

@@ -303,7 +303,9 @@ a {
       </template>
       <a-form :form="form">
         <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="图片素材上传" class="add-image-material">
-          <upload-to-ali
+        <uploadFile :value.sync="urlList.url" :multiple='false'
+          @overUpload="overUpload" :fileCount="1" uploadType="image" />
+          <!-- <upload-to-ali
             style="width:160%"
             v-model="urlList.url"
             :customDomain="customDomain"
@@ -318,7 +320,7 @@ a {
             :before-upload="file"
             :dir="activeKey == 'image' ? dirImg : dirVideo"
             @loaded="overUpload"
-          ></upload-to-ali>
+          ></upload-to-ali> -->
           <span v-if="material.filter(item => item == false).length > 0 && urlList.url != ''" style="color:red"
             >上传素材的尺寸不符,请修改</span
           >
@@ -386,22 +388,9 @@ a {
               {{ refuseReason ? refuseReason : '无原因' }}
             </a-form-item>
             <a-form-item label="截图" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }" v-if="active == '2'">
-              <upload-to-ali
-                v-if="refuseFile"
-                disabled
-                v-model="refuseFile"
-                :customDomain="customDomain"
-                multiple
-                preview
-                :region="region"
-                :bucket="bucket"
-                :accept="acceptImage"
-                :max="10"
-                :size="1024000"
-                :accessKeyId="accessKeyId"
-                :accessKeySecret="accessKeySecret"
-                :dir="dirImg"
-              ></upload-to-ali>
+              <div v-if="refuseFile" style="width:100%">
+                    <img style="width:100px;height:auto;margin:5px"  @click="showBoHui(item)" :src="item" v-for="(item,index) in refuseFile" :key="index" alt="">
+                </div>
               <div v-else>无截图</div>
             </a-form-item>
           </a-form>
@@ -417,6 +406,7 @@ a {
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import UploadToAli from '@femessage/upload-to-ali'
+import uploadFile from '@/components/uploadFile.vue'
 import { fileCheck, fileInsert, fileEdit } from '@/api/actor'
 import { getAction, postAction, postFile, downFile, downFilePost, deleteAction, putAction } from '@/api/manage'
 
@@ -435,7 +425,8 @@ export default {
     JEllipsis,
     UploadToAli,
     accountCheck,
-    selectTable
+    selectTable,
+    uploadFile
   },
 
   data() {
@@ -539,7 +530,9 @@ export default {
       noList: [],
       material: [],
       excellent: 0,
-      code: ''
+      code: '',
+      bohui:"",
+      bohuiShow:false
     }
   },
   filters: {
@@ -606,6 +599,10 @@ export default {
     }
   },
   methods: {
+    showBoHui(item){
+      this.bohui = item
+      this.bohuiShow = true
+    },
     setSuccess() {
       var params = {}
       params.id = this.code

+ 184 - 0
src/views/modules/material/modules/BytedanceEffectVideoInfoModal.vue

@@ -0,0 +1,184 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="视频MD5码">
+          <a-input placeholder="请输入视频MD5码" v-decorator="['code', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="视频链接">
+          <a-input placeholder="请输入视频链接" v-decorator="['url', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="初次产生消耗时间">
+          <a-input placeholder="请输入初次产生消耗时间" v-decorator="['initialCostDate', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="最后一次消耗时间">
+          <a-input placeholder="请输入最后一次消耗时间" v-decorator="['finalCostDate', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="所属平面">
+          <a-input placeholder="请输入所属平面" v-decorator="['plane', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="编导">
+          <a-input placeholder="请输入编导" v-decorator="['plan', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="拍摄">
+          <a-input placeholder="请输入拍摄" v-decorator="['shot', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="所属剪辑">
+          <a-input placeholder="请输入所属剪辑" v-decorator="['clip', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="负责人">
+          <a-input placeholder="请输入负责人" v-decorator="['manager', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="两周消耗">
+          <a-input-number v-decorator="[ 'twoWeekCost', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="视频总消耗">
+          <a-input-number v-decorator="[ 'totalCost', {}]" />
+        </a-form-item>
+
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "BytedanceEffectVideoInfoModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        },
+        url: {
+          add: "/ctop/bytedanceEffectVideoInfo/add",
+          edit: "/ctop/bytedanceEffectVideoInfo/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'code','url','initialCostDate','finalCostDate','plane','plan','shot','clip','manager','twoWeekCost','totalCost'))
+		  //时间格式化
+        });
+
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+
+</style>

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1828 - 1539
src/views/modules/material/videoMaterial.vue


+ 6 - 2
src/views/modules/onlineTraining/onlineTrainingList.vue

@@ -112,10 +112,12 @@
         </a-form-item>
         <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="文件上传"
           v-show="(getData('title') && getData('topic'))||(oneList.length>0 && getData('topicAll'))">
-          <upload-to-ali v-model="fileUrl" :customDomain="customDomain" preview :region="region" :bucket="bucket"
+          <uploadFile :value.sync="fileUrl" :multiple='false':checkFile="file" :fileCount="1"
+            uploadType="video" />
+          <!-- <upload-to-ali v-model="fileUrl" :customDomain="customDomain" preview :region="region" :bucket="bucket"
             :accept="acceptVideo" :max="10" :size="1024000" :accessKeyId="accessKeyId"
             :accessKeySecret="accessKeySecret" :before-upload="file" :dir="dirVideo" @loaded="overUpload">
-          </upload-to-ali>
+          </upload-to-ali> -->
         </a-form-item>
 
       </a-form>
@@ -136,6 +138,7 @@
   import $ from 'jquery'
   import qs from 'qs'
   import UploadToAli from '@femessage/upload-to-ali'
+  import uploadFile from '@/components/uploadFile.vue'
   // document.write(textDes('https://ctop-media.oss-cn-beijing.aliyuncs.com/video/2020-03-20/20网服-1584693978588.mp4'))
   // document.write('<br>' + desDecrypt('s4HMPbmUfZ0=', 'ckplayerDesKey'))
   function textDes(str) {
@@ -250,6 +253,7 @@
     },
     components: {
       UploadToAli,
+      uploadFile
     },
     methods: {
       clear() {

+ 7 - 3
src/views/modules/prop/modules/ActorModal.vue

@@ -9,9 +9,11 @@
           <a-input placeholder="请输入道具名称" v-decorator="['name', validatorRules.name ]" />
         </a-form-item>
         <a-form-item label="照片" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <upload-to-ali v-model="imageUrl" :customDomain="customDomain" multiple preview :region="region"
+          <uploadFile :value.sync="imageUrl" @overUpload="overUpload" :fileCount="10"
+            uploadType="image" />
+          <!-- <upload-to-ali v-model="imageUrl" :customDomain="customDomain" multiple preview :region="region"
             :bucket="bucket" :accept="acceptImage" :max="10" :size="1024000" :accessKeyId="accessKeyId"
-            :accessKeySecret="accessKeySecret"></upload-to-ali>
+            :accessKeySecret="accessKeySecret"></upload-to-ali> -->
         </a-form-item>
         <a-form-item label="道具类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入道具类型" v-decorator="['type']" />
@@ -47,11 +49,13 @@
   import JTreeSelect from '@/components/jeecg/JTreeSelect'
   import moment from 'moment'
   import UploadToAli from '@femessage/upload-to-ali'
+  import uploadFile from '@/components/uploadFile.vue'
   export default {
     name: "ActorModal",
     components: {
       UploadToAli,
-      JTreeSelect
+      JTreeSelect,
+      uploadFile
     },
     data() {
       return {

+ 9 - 5
src/views/modules/yard/YardList.vue

@@ -134,15 +134,17 @@
 
     <!-- 新增图集 -->
     <a-modal v-model="addPhoto" title="新增图集" @ok="handleOk('photo')" @cancel="handleCancel('photo')">
-      <upload-to-ali style="margin:10px" v-model="imageUrl" :customDomain="customDomain" preview :region="region"
+        <uploadFile :value.sync="imageUrl" :fileCount="1" uploadType="image" :multiple="false" />
+      <!-- <upload-to-ali style="margin:10px" v-model="imageUrl" :customDomain="customDomain" preview :region="region"
         :bucket="bucket" :accept="acceptImage" :max="1" :size="1024000" :accessKeyId="accessKeyId"
-        :accessKeySecret="accessKeySecret"></upload-to-ali>
+        :accessKeySecret="accessKeySecret"></upload-to-ali> -->
     </a-modal>
     <!-- 新增作品 -->
     <a-modal v-model="addVideo" title="新增作品" @ok="handleOk('video')" @cancel="handleCancel('video')">
-      <upload-to-ali style="margin:10px" v-model="videoUrl" :customDomain="customDomain" preview :region="region"
+        <uploadFile :value.sync="videoUrl" :fileCount="1" uploadType="video" :multiple="false" />
+      <!-- <upload-to-ali style="margin:10px" v-model="videoUrl" :customDomain="customDomain" preview :region="region"
         :bucket="bucket" :accept="acceptVideo" :max="1" :size="1024000" :accessKeyId="accessKeyId"
-        :accessKeySecret="accessKeySecret"></upload-to-ali>
+        :accessKeySecret="accessKeySecret"></upload-to-ali> -->
     </a-modal>
 
     <yard-modal ref="modalForm" @ok="modalFormOk"></yard-modal>
@@ -157,6 +159,7 @@
   } from '@/mixins/JeecgListMixin'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import UploadToAli from '@femessage/upload-to-ali'
+  import uploadFile from '@/components/uploadFile.vue'
   import {
     yardPhotoList,
     yardVideoList,
@@ -171,7 +174,8 @@
     components: {
       JEllipsis,
       YardModal,
-      UploadToAli
+      UploadToAli,
+      uploadFile
     },
     data() {
       return {

+ 10 - 5
src/views/modules/yard/modules/YardModal.vue

@@ -28,7 +28,8 @@
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
         >
-          <upload-to-ali
+        <uploadFile :value.sync="imageUrl" :fileCount="1" uploadType="image" :multiple="false" />
+          <!-- <upload-to-ali
             v-model="imageUrl"
             :customDomain="customDomain"
             multiple
@@ -40,14 +41,16 @@
             :size="1024000"
             :accessKeyId="accessKeyId"
             :accessKeySecret="accessKeySecret"
-          ></upload-to-ali>
+          ></upload-to-ali> -->
         </a-form-item>
         <a-form-item
           label="视频"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
         >
-          <upload-to-ali
+
+         <uploadFile :value.sync="videoUrl" :fileCount="1" uploadType="video" :multiple="false" />
+          <!-- <upload-to-ali
             v-model="videoUrl"
             :customDomain="customDomain"
             multiple
@@ -59,7 +62,7 @@
             :size="1024000"
             :accessKeyId="accessKeyId"
             :accessKeySecret="accessKeySecret"
-          ></upload-to-ali>
+          ></upload-to-ali> -->
         </a-form-item>
 
         <a-form-item
@@ -91,11 +94,13 @@
   import JTreeSelect from '@/components/jeecg/JTreeSelect'
   import moment from 'moment'
   import UploadToAli from '@femessage/upload-to-ali'
+  import uploadFile from '@/components/uploadFile.vue'
   export default {
     name: "YardModal",
     components: {
       UploadToAli,
-      JTreeSelect
+      JTreeSelect,
+      uploadFile
     },
     data() {
       return {

+ 9 - 5
src/views/modules/yard/modules/yardDetail.vue

@@ -106,7 +106,8 @@ li {
       @ok="handleOk('photo')"
       @cancel="handleCancel('photo')"
     >
-      <upload-to-ali
+     <uploadFile :value.sync="imageUrl" :fileCount="1" uploadType="image" :multiple="false" />
+      <!-- <upload-to-ali
         style="margin:10px"
         v-model="imageUrl"
         :customDomain="customDomain"
@@ -118,7 +119,7 @@ li {
         :size="1024000"
         :accessKeyId="accessKeyId"
         :accessKeySecret="accessKeySecret"
-      ></upload-to-ali>
+      ></upload-to-ali> -->
     </a-modal>
     <!-- 新增作品 -->
     <a-modal
@@ -127,7 +128,8 @@ li {
       @ok="handleOk('video')"
       @cancel="handleCancel('video')"
     >
-      <upload-to-ali
+    <uploadFile :value.sync="videoUrl" :fileCount="1" uploadType="video" :multiple="false" />
+      <!-- <upload-to-ali
         style="margin:10px"
         v-model="videoUrl"
         :customDomain="customDomain"
@@ -139,7 +141,7 @@ li {
         :size="1024000"
         :accessKeyId="accessKeyId"
         :accessKeySecret="accessKeySecret"
-      ></upload-to-ali>
+      ></upload-to-ali> -->
     </a-modal>
   </div>
 </template>
@@ -149,13 +151,15 @@ import {
 
 } from '@/api/actor'
 import UploadToAli from '@femessage/upload-to-ali'
+import uploadFile from '@/components/uploadFile.vue'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { closeAllVideoFun } from '@/utils/videoControl'
 export default {
   name: 'VmCard',
   mixins: [JeecgListMixin],
   components: {
-    UploadToAli
+    UploadToAli,
+    uploadFile
   },
   props: {},
   data: function() {

+ 2 - 2
vue.config.js

@@ -67,13 +67,13 @@ module.exports = {
        
         // target: 'http://192.168.1.90:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
        
-        target: 'http://192.168.1.72:8088', //请求本地 需要jeecg-boot后台项目  英豪
+        // target: 'http://192.168.1.72:8088', //请求本地 需要jeecg-boot后台项目  英豪
        
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.1.94:8804', //请求本地 需要jeecg-boot后台项目  孙震
         // target: 'http://192.168.1.51:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.165:8848', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        // target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
+        target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
         // target: 'http://192.168.1.251:8088', //请求本地 需要jeecg-boot后台项目 
         // target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目