zhuxinbo 5 년 전
부모
커밋
ec244f80e2

+ 1 - 0
debug.log

@@ -2,3 +2,4 @@
 [0529/110148.397:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
 [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

+ 7 - 2
src/views/modules/kuaishouapp/account/advertisingGroup.vue

@@ -220,14 +220,14 @@
           :wrapperCol="{ lg: { span: 18 }, sm: { span: 18 } }" v-if="getData('createCount')==1">
           <a-input v-decorator="[
           'unitName',
-           { rules: [{ required: true, message: '请输入广告组名称' }]} ]" />
+           { rules: [{ required: true, message: '请输入广告组名称' }],initialValue: unitNameInit} ]" />
         </a-form-item>
         <a-form-item label="广告组名称生成类型" :labelCol="{ lg: { span: 6 }, sm: { span: 6 } }"
           :wrapperCol="{ lg: { span: 18 }, sm: { span: 18 } }" v-if="getData('createCount')>1">
           <a-radio-group buttonStyle="solid" v-decorator="[
           'createType',
            {
-            initialValue:'1' } ]" @change="createUnitName">
+            initialValue:'1' } ]" @change="createUnitName">l
             <a-radio-button value="1">系统生成</a-radio-button>
             <a-radio-button value="2">自定义</a-radio-button>
           </a-radio-group>
@@ -522,6 +522,7 @@
     data: function () {
       return {
         unitName: '',
+        unitNameInit: '',
         unitId: '',
         editOk: '1',
         loadingList: false,
@@ -752,6 +753,10 @@
         this.campaignId = localStorage.getItem('advertisingGroupKey')
         this.form.resetFields()
         this.getCampaignList()
+        this.$nextTick(() => {
+          this.unitNameInit = item.unitName
+        })
+
         var params = {}
         params.accountId = item.accountId
         params.unitId = item.unitId

+ 16 - 8
src/views/modules/kuaishouapp/account/stepForm/Step3.vue

@@ -89,8 +89,11 @@
   <a-card :body-style="{ padding: '24px 32px' }" :bordered="false" class="only-step3">
     <a-tabs style="width:50%;margin:0 auto" type="editable-card" hideAdd @edit="remove">
       <a-tab-pane v-for="(pane, bestIndex) in pans" :tab="pane.tab" :key="pane.key" v-model="pansKey" disabled
-        :closable="pane.closable">
+        :closable="pane.closable" class="shishishis">
         <a-form @submit="handleSubmit" :form="form" style="margin-top:20px" :hideRequiredMark="true">
+          <a-form-item label="广告组名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-input v-model="pane.tab" readonly></a-input>
+          </a-form-item>
           <a-form-item label="素材类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-radio-group buttonStyle="solid" v-decorator="['creativeMaterialType', { initialValue: '1' }]">
               <a-radio-button value="1">竖版视频</a-radio-button>
@@ -144,10 +147,10 @@
                         </a-form-item>
                         <a-form-item label="广告语">
                           <a @click="showTitle(index,bestIndex)">推荐广告语</a>
-                          <a-textarea class="rending" placeholder="请输入广告语" v-model="item.description"
+                          <a-textarea class="rending" placeholder="请输入广告语" v-model.trim="item.description"
                             :autosize="{ minRows: 2, maxRows: 6 }"></a-textarea>
                           <a-tag v-for="(itemTag,indexTag) of tags" :key="indexTag"
-                            @click="getChange(item, itemTag, bestIndex)">{{itemTag.name}}</a-tag>
+                            @click="getChange(item, itemTag, index)">{{itemTag.name}}</a-tag>
                         </a-form-item>
                         <a-form-item label="创意标题">
                           <a-input v-model="item.name"></a-input>
@@ -507,6 +510,9 @@
       }
     },
     methods: {
+      a() {
+        alert(1)
+      },
       showTitle(index, bestIndex) {
         nowIndex = index
         bestIndex = bestIndex
@@ -721,7 +727,7 @@
         params.pageSize = this.ipagination.pageSize
         params.pageNo = page
         params.channelType = this.channelType
-        if (this.active == 0 && this.time.length > 0) {
+        if (this.time.length > 0) {
           params.startDate = moment(this.time[0]).format('YYYY-MM-DD')
           params.endDate = moment(this.time[1]).format('YYYY-MM-DD')
         }
@@ -933,7 +939,7 @@
         nowIndex = index
         bestIndex = bestIndex
         var params = {
-          videoSignature: this.pans[index].list[bestIndex].videoList.signature,
+          videoSignature: this.pans[bestIndex].list[index].videoList.signature,
           pageSize: 20,
           pageNo: 1
         }
@@ -1298,7 +1304,7 @@
         let d = date.getDate()
         d = d < 10 ? '0' + d : d
 
-        return 'image/Operate/' + y + '-' + MM + '-' + d + '/'
+        return 'image/' + y + '-' + MM + '-' + d + '/'
       },
       dirVideo() {
         let date = new Date()
@@ -1308,7 +1314,7 @@
         let d = date.getDate()
         d = d < 10 ? '0' + d : d
 
-        return 'video/Operate/' + y + '-' + MM + '-' + d + '/'
+        return 'video/' + y + '-' + MM + '-' + d + '/'
       },
       contentAll() {
         var count, arr = []
@@ -1377,7 +1383,9 @@
         })
 
         this.pansKey = this.pans[0].key
-        this.addCreative(0)
+        this.$nextTick(() => {
+          this.addCreative(0)
+        })
         getAction('/kuaishou/batch/checkCreativeCount', {
           unitId: this.pansKey,
           accountId: localStorage.getItem('accountId')

+ 3 - 0
src/views/modules/kuaishouapp/account/stepForm/stepModule/targetedPopulation.vue

@@ -405,8 +405,11 @@ li:hover {
     >
       <a-radio-group buttonStyle="solid" @change="businessInterest" v-model="allForm.businessInterestType">
         <a-radio-button :value="0">不限</a-radio-button>
+        <a-radio-button :value="1">智能推荐</a-radio-button>
         <a-radio-button :value="2">兴趣标签</a-radio-button>
       </a-radio-group>
+      <br>
+      <span v-if="allForm.businessInterestType==1">商业兴趣定向会根据您的投放计划,智能精选出最匹配人群,帮助您获取更满足投放意图的人群,以达到最好的投放效果。</span>
     </a-form-item>
     <a-form-item
       label=" "

+ 4 - 6
src/views/modules/material/scriptFile.vue

@@ -83,8 +83,8 @@
           <a @click="getViewUrlDbPath(record)">编辑</a>
           <a-divider type="vertical" />
           <a @click="bindProject(record)">项目绑定</a>
-          <!-- <a-divider type="vertical" />
-          <a @click="downLoad(record)">下载</a> -->
+          <a-divider type="vertical" />
+          <a @click="downLoad(record)">下载</a>
           <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
@@ -256,15 +256,13 @@
     },
     methods: {
       downLoad(item) {
-        let blob = new Blob([item.downloadUrl])
         let downloadElement = document.createElement('a')
-        let href = window.URL.createObjectURL(blob) //创建下载的链接
-        downloadElement.href = href
+        downloadElement.href = item.downloadUrl
         downloadElement.download = item.name //下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() //点击下载
         document.body.removeChild(downloadElement) //下载完成移除元素
-        window.URL.revokeObjectURL(href) //释放掉blob对象
+
       },
       filterOption(input, option) {
         return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0

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

@@ -13,6 +13,9 @@
             :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">
+          <a-input placeholder="请输入道具类型" v-decorator="['type']" />
+        </a-form-item>
         <!-- <a-form-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-date-picker
             style="width: 100%"

+ 2 - 10
src/views/modules/prop/modules/vm-image-list.vue

@@ -74,7 +74,7 @@
           :editable="true"
           :title="item.name"
           :img="item.coverUrl"
-          :desc="item.speciality"
+          :desc="item.desc"
           :detailUrl="item.videoUrl"
           :editUrl="item.editUrl"
           :id="item.id"
@@ -113,14 +113,6 @@ export default {
       type: Array,
       default: function() {
         return [
-          {
-            id: '19920805',
-            title: 'Title',
-            img: require('@/assets/img/img-1.jpg'),
-            desc:
-              "Lorem Ipsum is simply dummy text of the printing and typesetting industry,Lorem Ipsum has been the industry's standard dummy text ever since the 1500s ly dummy tly dummy tly dummy tly dummy tly dummy tly dummy t",
-            to: '#'
-          }
         ]
       }
     },
@@ -138,7 +130,7 @@ export default {
       showNum: 8, // number of item per page
       currentPage: 1,
       url: {
-        list: '/ctop/actor/list'
+        list: '/ctop/prop/list'
       },
       columns: [
         {