Forráskód Böngészése

添加封面清空,改为不清空

zhuxinbo 5 éve
szülő
commit
1797ef3857

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

@@ -205,7 +205,7 @@ let compareOption = {
 
 let columns = [
   {
-    title: '日期/时间',
+    title: '时间',
     dataIndex: 'statDate',
     scopedSlots: { customRender: 'statDate' },
     align: 'center',

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

@@ -312,7 +312,7 @@ let init={
 
 let columns = [
   {
-    title: '日期/时间',
+    title: '时间',
     dataIndex: 'statDate',
     scopedSlots: { customRender: 'statDate' },
     align: 'center',

+ 27 - 8
src/views/modules/kuaishouapp/account/copyGroup.vue

@@ -136,9 +136,9 @@
     <a-form-item label="创意展现方式" :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
       :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }">
       <!-- v-decorator="['speed', { initialValue: '1' }]" -->
-      <a-radio-group buttonStyle="solid" v-decorator="['showMode', { initialValue: '2' }]">
-        <a-radio-button value="2">智能优选</a-radio-button>
-        <a-radio-button value="1">随机轮播</a-radio-button>
+      <a-radio-group buttonStyle="solid" v-decorator="['showMode', { initialValue: 2 }]">
+        <a-radio-button :value="2">智能优选</a-radio-button>
+        <a-radio-button :value="1">随机轮播</a-radio-button>
       </a-radio-group>
       <br />
       <span>
@@ -149,13 +149,29 @@
         }}
       </span>
     </a-form-item>
+
+
     <a-form-item label="场景广告位" :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
-      :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }">
+      :wrapperCol="{ lg: { span: 17 }, sm: { span: 17 } }">
       <!-- v-decorator="['speed', { initialValue: '1' }]" -->
       <a-radio-group buttonStyle="solid" v-decorator="['sceneId', { initialValue: '1' }]">
         <a-radio-button value="1">优选广告位</a-radio-button>
+        <a-radio-button value="2">按场景选择广告位</a-radio-button>
       </a-radio-group>
+      <!-- getData('speed') == '2' -->
+      <br>
+
     </a-form-item>
+    <a-form-item label=" " :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
+      :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }" class="else-label" v-if="getData('sceneId') == '2'">
+      <a-checkbox-group :defaultValue="[7]" v-model="allForm.sceneId">
+        <a-checkbox :value="7">信息流广告</a-checkbox>
+        <a-checkbox :value="6">上下滑大屏广告</a-checkbox>
+        <a-checkbox :value="3">视频播放页广告</a-checkbox>
+      </a-checkbox-group>
+    </a-form-item>
+
+
     <div style="text-align:center;font-size:16px">优化目标和计费</div>
     <a-form-item label=" " :labelCol="{ lg: { span: 6 }, sm: { span: 6 } }"
       :wrapperCol="{ lg: { span: 18 }, sm: { span: 18 } }" class="else-label">
@@ -316,7 +332,8 @@
             isFormSubmit: '0'
           },
           fail: [],
-          success: []
+          success: [],
+          sceneId: [7]
         },
         dataList: [],
         unitId: '',
@@ -549,6 +566,7 @@
                 ...res.result.appInfo,
                 ...res.result.target
               }
+              dataJson.sceneId = JSON.parse( dataJson.sceneId )[0] == '1'? '1':'2'
               dataJson.dayBudget = dataJson.dayBudget / 1000
               this.allForm.dayBudget = dataJson.dayBudget == 0 ? '0' : '1'
               this.allForm.time = dataJson.endTime ? '2' : '1'
@@ -564,7 +582,7 @@
                 unitName: dataJson.unitName,
                 unitNameCheck: false,
                 deepConversionType: dataJson.deepConversionType,
-                deepConversionBid: dataJson.deepConversionBid/1000
+                deepConversionBid: dataJson.deepConversionBid / 1000
               }]
 
               this.populationData = dataJson
@@ -614,7 +632,7 @@
               console.log(this.populationData.allForm, dataJson.agesRange)
               this.$nextTick(() => {
                 this.form.setFieldsValue(pick(dataJson, ['appId', 'urlType', 'url', 'dayBudget', 'speed',
-                  'showMode'
+                  'showMode','sceneId'
                 ]))
               })
             }
@@ -644,7 +662,8 @@
             })
             var json = {
               ...values,
-              sceneId: [values.sceneId],
+            //   sceneId: [values.sceneId],
+              sceneId: values.sceneId == 1 ? [values.sceneId] : this.allForm.sceneId,
               dayBudget: values.dayBudget * 1000
             }
             var params = {

+ 44 - 17
src/views/modules/kuaishouapp/account/stepForm/Step3.vue

@@ -2,9 +2,10 @@
   .chouzhen span {
     display: inline-block;
   }
-  .check-video .ant-tabs-nav-container{
-      text-align: center;
-      font-size: 20px;
+
+  .check-video .ant-tabs-nav-container {
+    text-align: center;
+    font-size: 20px;
   }
 </style>
 <style scoped lang="scss">
@@ -271,8 +272,8 @@
     </a-modal>
 
 
-    <a-modal title="选择素材" v-model="visibleMatemal" @ok="handleOkShow" :width="1000" >
-      <a-tabs type="card" @change="callback" v-model="active"  class="check-video">
+    <a-modal title="选择素材" v-model="visibleMatemal" @ok="handleOkShow" :width="1000">
+      <a-tabs type="card" @change="callback" v-model="active" class="check-video">
         <a-tab-pane :tab="item.label" v-for="item of tab" :key="item.value">
           <ul v-if="dataSource.length>0" style="overflow:auto;padding-left:0">
             <a-checkbox-group v-model="checkVideo" @change="onChangeVideo">
@@ -473,7 +474,7 @@
         this.pans[index].list[item.key].checkAllImage = !this.pans[index].list[item.key].checkAllImage
       },
       onChangeCheckImage(checkedList) {
-       
+
       },
       handleConfirmValue(rule, value, callback) {
         if (/(http|https):\/\/([\w.]+\/?)\S*/.test(value) && value.length < 10000) {
@@ -484,7 +485,7 @@
       },
       showData(item, type) {
         var index = this.pans.findIndex(item => item.key === this.pansKey)
-        this.pans[index].list[item.key].imageList = []
+        // this.pans[index].list[item.key].imageList = []
         if (type == 'video') {
           this.pans[index].list[item.key].videoList = item.video
           getAction('/kuaishou/batch/getCreativeCopywriter', {
@@ -523,7 +524,18 @@
             }
           })
         } else {
-          this.pans[index].list[item.key].imageList.push(...item.image)
+          //   this.pans[index].list[item.key].imageList.push(...item.image)
+
+          if (item.image.length + this.contentAll > 15) {
+            this.$message.error('当前选择封面' + item.image.length + '张,最多可选择' + (15 - this.contentAll) + '张')
+            return
+          } else {
+            this.pans[index].list[item.key].imageList.push(...item.image)
+            this.chouzhen = false
+            this.chouzhenList = []
+            this.checkList = []
+            this.checkAll = false
+          }
         }
       },
       getData(className) {
@@ -738,11 +750,17 @@
           }
 
         }
-        this.pans[bestIndex].list[nowIndex].imageList = arr
-        this.chouzhen = false
-        this.chouzhenList = []
-        this.checkList = []
-        this.checkAll = false
+        if (arr.length + this.contentAll > 15) {
+          this.$message.error('当前选择封面' + arr.length + '张,最多可选择' + (15 - this.contentAll) + '张')
+          return
+        } else {
+          this.pans[bestIndex].list[nowIndex].imageList.push(...arr)
+          this.chouzhen = false
+          this.chouzhenList = []
+          this.checkList = []
+          this.checkAll = false
+        }
+
       },
       showImages(index, bestIndex) {
         this.chouzhen = true
@@ -796,9 +814,18 @@
         }
         postAction("/kusiShouUpload/image", params).then(res => {
           if (res.success) {
-            this.pans[bestIndex].list[nowIndex].imageList = res.result
-            this.closeImage()
-            this.loadingImage = false
+
+
+            if (res.result.length + this.contentAll > 15) {
+              this.$message.error('当前上传封面' + res.result.length + '张,最多可上传' + (15 - this.contentAll) + '张')
+              this.loadingImage = false
+              return
+            } else {
+              this.pans[bestIndex].list[nowIndex].imageList.push(...res.result)
+              this.closeImage()
+
+            }
+
           } else {
             this.$message.error('封面上传失败')
             this.loadingImage = false
@@ -890,7 +917,7 @@
               }
             }
           }
-        } 
+        }
 
       },
       fileWater(file) {