朱鑫波 před 4 roky
rodič
revize
9895c7407c

+ 2 - 2
src/components/lyric/lyric.vue

@@ -10,14 +10,14 @@
         <dd>歌手名:{{ currentMusic.singer }}</dd>
         <dd>专辑名:{{ currentMusic.album }}</dd>
       </template>
-      <template v-else>
+      <!-- <template v-else>
         <dd>mmPlayer在线音乐播放器</dd>
         <dd>
           <a class="hover" target="_blank" href="https://github.com/maomao1996">
             <mm-icon type="github" :size="14" />&nbsp;茂茂
           </a>
         </dd>
-      </template>
+      </template> -->
     </dl>
     <!--歌词-->
     <div ref="musicLyric" class="music-lyric">

+ 5 - 4
src/utils/request.js

@@ -32,7 +32,7 @@ const err = (error) => {
     // console.log("------异常响应------", error.response.status)
     switch (error.response.status) {
       case 403:
-        notification.error({message: '系统提示', description: '拒绝访问', duration: 4})
+        notification.error({key:'0',message: '系统提示', description: '拒绝访问', duration: 4})
         break
       case 500:
         //notification.error({ message: '系统提示', description:'Token失效,请重新登录!',duration: 4})
@@ -57,13 +57,13 @@ const err = (error) => {
         }
         break
       case 404:
-        notification.error({message: '系统提示', description: '很抱歉,资源未找到!', duration: 4})
+        notification.error({key:'1',message: '系统提示', description: '很抱歉,资源未找到!', duration: 4})
         break
       case 504:
-        notification.error({message: '系统提示', description: '网络超时'})
+        notification.error({key:'2',message: '系统提示', description: '网络超时'})
         break
       case 401:
-        notification.error({message: '系统提示', description: '未授权,请重新登录', duration: 4})
+        notification.error({key:'3',message: '系统提示', description: '未授权,请重新登录', duration: 4})
         if (token) {
           store.dispatch('Logout').then(() => {
             setTimeout(() => {
@@ -74,6 +74,7 @@ const err = (error) => {
         break
       default:
         notification.error({
+          key:'4',
           message: '系统提示',
           description: data.message,
           duration: 4

+ 12 - 12
src/views/modules/kuaishouapp/account/accountIndex.vue

@@ -534,7 +534,7 @@ let realTimeColumn=[
           pageSizeOptions: ['10', '30', '50'],
           total: 0,
           onChange: (current, pageSize) => {
-            console.log(current, pageSize)
+
             // 切换分页时的回调,
             // 当在页面定义change事件时,切记要把此处的事件清除,因为这两个事件重叠了,可能到时候会导致一些莫名的bug
             this.ipagination.current = current
@@ -696,7 +696,7 @@ let realTimeColumn=[
         },
       // 查看实时数据
       realTimedata(records){
-        console.log(records);
+
         this.realTimeRecords=records
         this.realTimeVisiable=true;
         this.realTimeHttp()
@@ -713,7 +713,7 @@ let realTimeColumn=[
           startDate:this.dateValue[0].format('YYYY-MM-DD'),
           endDate:this.dateValue[1].format('YYYY-MM-DD')
         }).then(res=>{
-          console.log(res)
+
           this.realTimeData=[];
           this.realTimeLoading=false;
           if(res.success){
@@ -763,7 +763,7 @@ let realTimeColumn=[
         return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       },
       getUnitData(e) {
-        console.log(this.unitId)
+
         var params = {
           accountId: this.appId,
           unitId: this.unitId,
@@ -790,7 +790,7 @@ let realTimeColumn=[
           localStorage.setItem('campaignId', record.campaignId)
           if (localStorage.getItem('advertisingGroup')) {
             var dataElse = JSON.parse(localStorage.getItem('advertisingGroup'))
-            console.log(dataElse)
+
             for (let i = 0; i < dataElse.length; i++) {
               if (dataElse[i].key == record.key) {
                 this.$router.replace({
@@ -849,7 +849,7 @@ let realTimeColumn=[
         }
       },
       onChangeSwitch(item) {
-        console.log(item)
+
         var params = {}
         params.accountId = this.appId + ''
         params.putStatus = item.showSwich ? 1 : 2
@@ -907,7 +907,7 @@ let realTimeColumn=[
         params.userId = this.userInfo().id
         params.campaignIds = this.selectedRowKeysValue
         postAction('/kuaishou/batch/batchUpdateStatus', params).then(res => {
-          console.log(res)
+
           if (res.success) {
             this.addUser()
             this.selectedRowKeysValue = []
@@ -927,7 +927,7 @@ let realTimeColumn=[
           params.userId = this.userInfo().id
           params.campaignIds = this.selectedRowKeysValue
           postAction('/kuaishou/batch/batchUpdateDayBudgetByProportion', params).then(res => {
-            console.log(res)
+
             if (res.success) {
               if (res.result.failCount > 0) {
                 this.visible = true
@@ -952,7 +952,7 @@ let realTimeColumn=[
           params.userId = this.userInfo().id
           params.campaignIds = this.selectedRowKeysValue
           postAction('/kuaishou/batch/batchUpdateDayBudget', params).then(res => {
-            console.log(res)
+
             if (res.success) {
               if (res.result.failCount > 0) {
                 this.visible = true
@@ -998,7 +998,7 @@ let realTimeColumn=[
           accountId: item.accountId
         }).then(res => {
           if (res.success) {
-            console.log(res)
+
             this.many = res.result.budget
             this.manyTwo = res.result.budget
             this.cost = res.result.cost
@@ -1028,7 +1028,7 @@ let realTimeColumn=[
             params.userId = this.userInfo().id
             params.campaignIds = [item.campaignId]
             postAction('/kuaishou/batch/batchUpdateDayBudget', params).then(res => {
-              console.log(res)
+
               if (res.result.failCount > 0) {
                 this.$message.error(
                   '广告计划:' +
@@ -1043,7 +1043,7 @@ let realTimeColumn=[
         } else {
           item.elseMoney = item.dayBudget / 1000
         }
-        console.log(item)
+
       },
       campaignEdit(e) {
         this.loadingCampaign = true

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1718 - 1579
src/views/modules/kuaishouapp/account/stepForm/Step3.vue


+ 239 - 133
src/views/modules/kuaishouapp/account/stepForm/Step4.vue

@@ -57,6 +57,9 @@
   outline: 0;
   box-shadow: none;
 }
+.sticker-styles .ant-checkbox-wrapper + .ant-checkbox-wrapper {
+  margin-left: 0;
+}
 </style>
 <style scoped lang="scss">
 .actor-photo-list {
@@ -164,40 +167,76 @@ li.chouzhen.first:before {
               <a-radio-button value="1">竖版视频</a-radio-button>
               <a-radio-button value="2">横版视频</a-radio-button>
             </a-radio-group>
-            ({{ videoCount + '/8' }})
+            ({{ (horizontalPhoto[0].videoList.length+verticalPhoto[0].videoList.length) + '/5' }})
             <!-- {{verticalPhoto}}/{{horizontalPhoto}} -->
           </a-form-item>
           <!-- <a-form-item label="素材同步" :labelCol="labelCol" :wrapperCol="wrapperCol">
            
           </a-form-item>-->
-          <a-form-item label="创意内容" :labelCol="labelCol">
+
+          <a-form-item label="创意内容" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-layout>
               <a-layout-content style="padding: 10px">
-                <div :style="{ marginBottom: '16px' }" style="float: right">
+                <!-- <div :style="{ marginBottom: '16px' }" style="float: right">
                   <a-button @click="addCreative(bestIndex)" :disabled="videoCount >= 5 || listCheck">添加创意</a-button>
-                </div>
-                <a-row style="margin-top: 50px">
+                </div> -->
+                <a-row>
                   <a-col :span="24" v-for="(item, index) of pane.list" :key="index">
                     <a-card title :ref="item">
-                      <a-icon
+                      <!-- <a-icon
                         type="close"
                         style="float: right; cursor: pointer"
                         @click="deleteCreative(bestIndex, index)"
-                      />
+                      /> -->
                       <div style="clear: both"></div>
                       <div class="dynamically_add_form_item">
                         <a-form-item label>
                           <a @click="getVideoList('video', index, item, bestIndex)">选择视频</a>
                           <a @click="uploadVideo(index, bestIndex)" style="margin-left: 10px">上传视频</a>
-
                           <br />
-                          <video
+                          <!-- <video
                             :src="item.videoList.url"
                             controls="controls"
                             style="width: 25%"
                             v-if="item.videoList"
-                          ></video>
+                          ></video> -->
+                          <span
+                            v-for="(item, deleteIndex) of item.videoList"
+                            style="position: relative"
+                            :key="deleteIndex"
+                          >
+                            <!-- <video :src="item.url" controls="controls" style="width: 18%; margin: 1%"></video> -->
+                            <img :src="item.coverUrl" style="width: 18%; margin: 1%" :key="item.url" />
+                            <a-icon
+                              type="close-circle"
+                              @click="deleteVideo(index, bestIndex, deleteIndex)"
+                              style="position: absolute; right: 0px"
+                            />
+                          </span>
                         </a-form-item>
+                      </div>
+                    </a-card>
+                  </a-col>
+                </a-row>
+              </a-layout-content>
+            </a-layout>
+          </a-form-item>
+          
+          <a-form-item label="封面" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-layout>
+              <a-layout-content style="padding: 10px">
+                <!-- <div :style="{ marginBottom: '16px' }" style="float: right">
+                  <a-button @click="addCreative(bestIndex)" :disabled="videoCount >= 5 || listCheck">添加创意</a-button>
+                </div> -->
+                <a-row>
+                  <a-col :span="24" v-for="(item, index) of pane.imageList" :key="index">
+                    <a-card title :ref="item">
+                      <!-- <a-icon
+                        type="close"
+                        style="float: right; cursor: pointer"
+                        @click="deleteCreative(bestIndex, index)"
+                      /> -->
+                      <div style="clear: both"></div>
                         <a-form-item label>
                           <a
                             @click="getVideoList('image', index, item, bestIndex)"
@@ -235,8 +274,8 @@ li.chouzhen.first:before {
             </a-layout>
           </a-form-item>
           <a-form-item label="广告语" :labelCol="labelCol" :wrapperCol="wrapperCol" class="step4-else">
-            <a @click="addCaptions()" :disabled="captionsList.length >= 6">添加广告语</a>
-            ({{ captionsCount + '/6' }})
+            <a @click="addCaptions('captionsList')" :disabled="captionsList.length >= 3">添加广告语</a>
+            ({{ captionsCount + '/3' }})
             <div
               v-for="(item, index) in captionsList"
               style="
@@ -244,7 +283,7 @@ li.chouzhen.first:before {
                 position: relative;
                 border-radius: 4px;
                 border: 1px solid #d9d9d9;
-                width: 100%;
+                width: 95%;
               "
               :style="{ marginBottom: index == captionsList.length - 1 ? '0px' : '20px' }"
             >
@@ -273,8 +312,8 @@ li.chouzhen.first:before {
               </p>
               <a-icon
                 type="delete"
-                @click="deleteCaptions(index)"
-                style="position: absolute; bottom: 0; right: -50px"
+                @click="deleteCaptions(index,'captionsList')"
+                style="position: absolute; bottom: 0; right: -30px"
                 :style="{ display: captionsList.length == 1 ? 'none' : 'block' }"
               />
             </div>
@@ -290,7 +329,61 @@ li.chouzhen.first:before {
               @click="getChange(item, itemTag, index)"
             >{{itemTag.name}}</a-tag>-->
           </a-form-item>
+<!-- stickerStyles -->
+<!-- coverSlogansList -->
+<!-- {{stickerStyles}} -->
+          <a-form-item label="封面贴纸" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="stickerStyles.length>0" class="sticker-styles">
+            <a-checkbox-group v-model="stickerStylesValue">
+              <a-checkbox v-for="(item,index) in stickerStyles" :key="index" :value="item.id" :disabled="stickerStylesValue.filter(i=>i==item.id).length==0&&stickerStylesValue.length>=6">
+                <img :src="item.url.overlay_preview_url" alt="" style="width:100px;margin:10px;opacity: 0.5;">
+              </a-checkbox>
 
+            </a-checkbox-group>
+          </a-form-item>
+          <a-form-item label="封面广告语" :labelCol="labelCol" :wrapperCol="wrapperCol" class="step4-else" v-if="stickerStyles.length>0">
+            <a @click="addCaptions('coverSlogansList')" :disabled="coverCount >= 6">添加封面广告语</a>
+            ({{ coverCount + '/6' }})
+            <div
+              v-for="(item, index) in coverSlogansList"
+              style="
+                display: inline-block;
+                position: relative;
+                border-radius: 4px;
+                border: 1px solid #d9d9d9;
+                width:  95%;
+              "
+              :style="{ marginBottom: index == coverSlogansList.length - 1 ? '0px' : '20px' }"
+            >
+              <a-textarea
+                placeholder="请输入封面广告语"
+                v-model.trim="item.coverSlogans"
+                :autosize="{ minRows: 2, maxRows: 2 }"
+                :max-length="14"
+              ></a-textarea>
+              <p
+                style="
+                  font-size: 12px;
+                  color: #b6bbc7;
+                  letter-spacing: 0.3px;
+                  text-align: right;
+                  line-height: 20px;
+                  position: absolute;
+                  bottom: 0;
+                  right: 6px;
+                  width: 100%;
+                  margin-bottom: 0;
+                "
+              >
+                {{ item.coverSlogans.length + '/14' }}
+              </p>
+              <a-icon
+                type="delete"
+                @click="deleteCaptions(index,'coverSlogansList')"
+                style="position: absolute; bottom: 0; right: -30px"
+                :style="{ display: coverSlogansList.length == 1 ? 'none' : 'block' }"
+              />
+            </div>
+          </a-form-item>
           <a-form-item label="行动号召" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-select
               v-decorator="['actionBarText', { rules: [{ required: true, message: '行动号召按钮文案' }] }]"
@@ -347,7 +440,7 @@ li.chouzhen.first:before {
     </a-form-item>
     <checkMatemal ref="check" @showVideo="showData"></checkMatemal>
     <a-modal :maskClosable="false" v-model="visible" title="广告创意创建情况">
-      <div style="font-size:24px">
+      <div style="font-size: 24px">
         {{ allForm.success }}
         <!-- 创建成功:{{ allForm.success.length }}条
         <div style="margin-top: 20px">
@@ -677,9 +770,14 @@ export default {
   },
   data() {
     return {
+      stickerStylesValue: [],
+      coverSlogansList: [{ coverSlogans: '' }],
+      stickerStyles: [],
       captionsList: [{ captions: '' }],
-      horizontalPhoto: [], //横板
-      verticalPhoto: [], //竖版
+      horizontalPhoto: [
+        { videoList: [], imageList: [], creativeMaterialType: '2', imageUrlList: [], checkArrImage: [] },
+      ], //横板
+      verticalPhoto: [{ videoList: [], imageList: [], creativeMaterialType: '1', imageUrlList: [], checkArrImage: [] }], //竖版
       trackName: '',
       showImageChouzhen: false,
       showImageStr: null,
@@ -773,16 +871,16 @@ export default {
       },
       wrapperCol: {
         lg: {
-          span: 18,
+          span: 20,
         },
         sm: {
           span: 18,
         },
         xs: {
-          span: 14,
+          span: 20,
         },
         md: {
-          span: 14,
+          span: 20,
         },
       },
       visible: false,
@@ -814,11 +912,19 @@ export default {
     }
   },
   methods: {
-    addCaptions() {
-      this.captionsList.push({ captions: '' })
+    addCaptions(type) { 
+      if (type == 'captionsList') {
+        this.captionsList.push({ captions: '' })
+      } else {
+        this.coverSlogansList.push({ coverSlogans: '' })
+      }
     },
-    deleteCaptions(index) {
-      this.captionsList.splice(index, 1)
+    deleteCaptions(index, type) {
+      if (type == 'captionsList') {
+        this.captionsList.splice(index, 1)
+      } else {
+        this.coverSlogansList.splice(index, 1)
+      }
     },
     changeType(index) {
       this.$forceUpdate()
@@ -1140,17 +1246,17 @@ export default {
       } else {
         //   this.pans[index].list[item.key].imageList.push(...item.image)
 
-        if (item.image.length + this.pans[index].list[item.key].imageList > 4) {
+        if (item.image.length + this.pans[index].imageList[item.key].imageList > 4) {
           this.$message.error(
             '当前选择封面' +
               item.image.length +
               '张,最多可选择' +
-              (4 - this.pans[index].list[item.key].imageList.length) +
+              (4 - this.pans[index].imageList[item.key].imageList.length) +
               '张'
           )
           return
         } else {
-          this.pans[index].list[item.key].imageList.push(...item.image)
+          this.pans[index].imageList[item.key].imageList.push(...item.image)
           this.chouzhen = false
           this.chouzhenList = []
           this.checkList = []
@@ -1162,9 +1268,9 @@ export default {
       return this.form.getFieldValue(className)
     },
     onChangeVideo() {
-      if (this.checkVideo.length > 1) {
-        this.checkVideo.shift()
-      }
+      // if (this.checkVideo.length > 1) {
+      //   this.checkVideo.shift()
+      // }
     },
     callback(key) {
       this.channelType = key
@@ -1287,10 +1393,10 @@ export default {
 
     handleSubmit(e) {
       e.preventDefault()
-      var index = this.pans.findIndex((item) => item.key === this.pansKey)
-      var data = this.pans[index].list.map((item) => {
-        return item.imageList.length + item.imageUrlList.length
-      })
+      // var index = this.pans.findIndex((item) => item.key === this.pansKey)
+      // var data = this.pans[index].list.map((item) => {
+      //   return item.imageList.length + item.imageUrlList.length
+      // })
       // if (this.contentAll > 15) {
       //   this.$message.error('封面最多15张')
       //   return
@@ -1299,63 +1405,27 @@ export default {
       this.form.validateFields((err, values) => {
         if (!err) {
           this.loading = true
-          // var dataJson = this.pans[index].list.map((item) => {
-          //   return {
-          //     description: item.description,
-          //     imageArr: item.imageList.map((ele, index) => {
-          //       return {
-          //         signature: ele.signature,
-          //         name: item.name,
-          //       }
-          //     }),
-          //     imageArrTwo: item.checkArrImage.map((ele, index) => {
-          //       return {
-          //         signature: ele,
-          //         name: item.name,
-          //       }
-          //     }),
-          //     photoId: item.videoList.photoId,
-          //     name: item.name,
+          var index = this.pans.findIndex((item) => item.key === this.pansKey)
+          // var data = this.verticalPhoto.map((item) => {
+          //   if (item.imageList.length > 0) {
+          //     return item.imageList.map((i) => {
+          //       return i.signature
+          //     })
+          //   } else {
+          //     return []
           //   }
           // })
-          // var allJson = dataJson.map((item) => {
-          //   return {
-          //     description: item.description,
-          //     imageArr:
-          //       item.imageArr.concat(item.imageArrTwo).length > 0
-          //         ? item.imageArr.concat(item.imageArrTwo)
-          //         : [
-          //             {
-          //               name: item.name,
-          //             },
-          //           ],
-          //     photoId: item.photoId,
+          // var dataTwo = this.horizontalPhoto.map((item) => {
+          //   if (item.imageList.length > 0) {
+          //     return item.imageList.map((i) => {
+          //       return i.signature
+          //     })
+          //   } else {
+          //     return []
           //   }
           // })
-          //       horizontalPhoto: [], //横板
-          //  verticalPhoto: [], //竖版
-          //  videoList: '',
-          //     imageList: [],
-          var data = this.verticalPhoto.map((item) => {
-            if (item.imageList.length > 0) {
-              return item.imageList.map((i) => {
-                return i.signature
-              })
-            } else {
-              return []
-            }
-          })
-          var dataTwo = this.horizontalPhoto.map((item) => {
-            if (item.imageList.length > 0) {
-              return item.imageList.map((i) => {
-                return i.signature
-              })
-            } else {
-              return []
-            }
-          })
-          var dataElse = tqFun(data)
-          var dataTwoElse = tqFun(dataTwo)
+          // var dataElse = tqFun(data)
+          // var dataTwoElse = tqFun(dataTwo)
 
           var params = {
             // dataJson: allJson,
@@ -1366,16 +1436,21 @@ export default {
             captions: this.captionsList.map((item) => {
               return item.captions
             }),
-            horizontalPhotoIds: this.horizontalPhoto.map((item) => {
-              return item.videoList.photoId
+            stickerStyles: this.stickerStylesValue,
+            coverSlogans: this.coverSlogansList.map((item) => {
+              return item.coverSlogans
+            }),
+            horizontalPhotoIds: this.horizontalPhoto[0].videoList.map((item) => {
+              return item.photoId
             }),
-            verticalPhotoIds: this.verticalPhoto.map((item) => {
-              return item.videoList.photoId
+            verticalPhotoIds: this.verticalPhoto[0].videoList.map((item) => {
+              return item.photoId
+            }),
+            coverImageTokens: this.pans[index].imageList[0].imageList.map((i) => {
+              return i.signature
             }),
-            coverImageTokens: dataElse.concat(dataTwoElse),
           }
           console.log(params)
-          console.log(dataElse.concat(dataTwoElse))
           postAction('/ctop/kuaishouProgramCreative/createProgramCreative', params).then((res) => {
             if (res.success) {
               this.loading = false
@@ -1413,25 +1488,33 @@ export default {
     },
     addCreative(index) {
       if (this.getData('creativeMaterialType') == '1') {
-        this.verticalPhoto.push({
-          videoList: '',
-          imageList: [],
-          creativeMaterialType: '1',
-          imageUrlList: [],
-          checkArrImage: [],
-        })
+        // this.verticalPhoto.push({
+        //   videoList: [],
+        //   imageList: [],
+        //   creativeMaterialType: '1',
+        //   imageUrlList: [],
+        //   checkArrImage: [],
+        // })
         this.pans[index].list = this.verticalPhoto
       } else if (this.getData('creativeMaterialType') == '2') {
-        this.horizontalPhoto.push({
-          videoList: '',
-          imageList: [],
-          creativeMaterialType: '2',
-          imageUrlList: [],
-          checkArrImage: [],
-        })
+        // this.horizontalPhoto.push({
+        //   videoList: [],
+        //   imageList: [],
+        //   creativeMaterialType: '2',
+        //   imageUrlList: [],
+        //   checkArrImage: [],
+        // })
         this.pans[index].list = this.horizontalPhoto
       }
     },
+    addAdList(index) {
+      this.$nextTick(() => {
+        this.pans[index].imageList.push({
+          imageList: [],
+          creativeMaterialType: '1',
+        })
+      })
+    },
     deleteCreative(bestIndex, index) {
       this.pans[bestIndex].list.splice(index, 1)
     },
@@ -1757,30 +1840,34 @@ export default {
       }
     },
     deleteData(index, bestIndex, deleteIndex) {
-      this.pans[index].list[bestIndex].imageList.splice(deleteIndex, 1)
+      this.pans[index].imageList[bestIndex].imageList.splice(deleteIndex, 1)
+    },
+    deleteVideo(index, bestIndex, deleteIndex) {
+      this.pans[index].list[bestIndex].videoList.splice(deleteIndex, 1)
     },
     handleOkShow(e) {
       //
 
       this.pans[bestIndex].list[nowIndex].imageList = []
-      this.pans[bestIndex].list[nowIndex].videoList = this.checkVideo[0]
+      this.pans[bestIndex].list[nowIndex].videoList = this.checkVideo
       this.ipagination.current = 1
-      var params = {
-        videoSignature: this.checkVideo[0].signature,
-        pageSize: 20,
-        pageNo: 1,
-      }
-      getAction('/cutFrame/material/list', params).then((res) => {
-        console.log(res)
-        if (res.success) {
-          if (res.result.records.length > 0) {
-            this.pans[bestIndex].list[nowIndex].chouzhenShow = true
-          } else {
-            this.pans[bestIndex].list[nowIndex].chouzhenShow = false
-          }
-          this.visibleMatemal = false
-        }
-      })
+      this.visibleMatemal = false
+      // var params = {
+      //   videoSignature: this.checkVideo[0].signature,
+      //   pageSize: 20,
+      //   pageNo: 1,
+      // }
+      // getAction('/cutFrame/material/list', params).then((res) => {
+      //   console.log(res)
+      //   if (res.success) {
+      //     if (res.result.records.length > 0) {
+      //       this.pans[bestIndex].list[nowIndex].chouzhenShow = true
+      //     } else {
+      //       this.pans[bestIndex].list[nowIndex].chouzhenShow = false
+      //     }
+      //     this.visibleMatemal = false
+      //   }
+      // })
     },
     judge(item) {
       var re = /[(.*?)]/g
@@ -1846,14 +1933,17 @@ export default {
       })
       return data.length
     },
-    videoCount() {
-      var data = this.verticalPhoto.filter((item) => {
-        return item.videoList != ''
+    coverCount() {
+      var data = this.coverSlogansList.filter((item) => {
+        return item.coverSlogans != ''
       })
-      var dataElse = this.horizontalPhoto.filter((item) => {
-        return item.videoList != ''
-      })
-      return data.length + dataElse.length
+      return data.length
+    },
+
+    videoCount() {
+      // this.verticalPhoto.videoList
+      // return 0
+      // return this.horizontalPhoto[0].videoList.length+ this.verticalPhoto[0].videoList.length
     },
     dirImg() {
       let date = new Date()
@@ -1946,12 +2036,14 @@ export default {
           return {
             ...item,
             list: [],
+            imageList: [],
           }
         })
 
         this.pansKey = this.pans[0].key
         setTimeout(() => {
           this.addCreative(0)
+          this.addAdList(0)
         }, 0)
 
         getAction('/kuaishou/batch/checkCreativeCount', {
@@ -1997,6 +2089,20 @@ export default {
           this.tags = res.result
         }
       })
+      getAction('/kuaishou/batch/getCreativeWordStyles', {
+        accountId: localStorage.getItem('accountId'),
+      }).then((res) => {
+        if (res.success) {
+          this.stickerStyles = res.result.map((item) => {
+            return {
+              id: item.sticker_style_id,
+              url: item.sticker_styles[0],
+            }
+          })
+        } else {
+          this.stickerStyles = []
+        }
+      })
     })
   },
 }

+ 7 - 1
src/views/modules/kuaishouapp/account/stepForm/stepModule/checkMatemal.vue

@@ -23,10 +23,13 @@
   }
 }
 </style>
+<style>
+</style>
 <template>
   <div>
     <a-modal title="选择素材" v-model="visibleMatemal" @ok="handleOk" @cancel="close" :width="1000">
-      <div>
+      <div class="spinning-model" style="margin:auto">
+        <a-spin :spinning="spinning" style="margin:100px auto;position: relative;left: 50%;"/>
         <ul class="actor-photo-list">
           <a-checkbox-group
             v-model="checkArr"
@@ -80,6 +83,7 @@ export default {
       url: {
         list: '/kuaishou/batch/getVideoList'
       },
+      spinning:false,
       visibleMatemal: false,
       dataSource: [],
       columns: [],
@@ -133,10 +137,12 @@ export default {
     },
     getData(url, params) {
       this.dataSource = []
+      this.spinning = true
       getAction(url, params).then(res => {
         if (res.success) {
           this.dataSource = res.result.records
           this.ipagination.total = res.result.total
+          this.spinning = false
         }
       })
     },

+ 1 - 1
vue.config.js

@@ -77,7 +77,7 @@ module.exports = {
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.170:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
 
-        // target: 'http://192.168.1.94:8081', //请求本地 需要jeecg-boot后台项目  赵西安
+        // target: 'http://192.168.1.94:8080', //请求本地 需要jeecg-boot后台项目  赵西安
 
 
         //  target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目