Prechádzať zdrojové kódy

Merge branch 'test' of https://gitee.com/hcst/adsp-vue into test

zhuxinbo 5 rokov pred
rodič
commit
383c34fde4

+ 78 - 71
src/views/modules/bytedance/model/InternalModel.vue

@@ -12,7 +12,7 @@
             optionFilterProp="children"
             style="width: 200px"
           >
-            <a-select-option v-for="user in userList" :key="user.id" :value="user.id">{{user.accountName}}</a-select-option>
+            <a-select-option v-for="user in userList" :key="user.accountId" :value="user.accountId">{{user.accountName}}</a-select-option>
           </a-select>
       </a-form-item>
 
@@ -57,19 +57,6 @@
         </a-select>
       </a-form-item>
 
-
-      <!--<a-form-item
-        label="广告类别"
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol">
-        <a-radio-group v-model="adCategory">
-          <a-radio-button value="1">售卖</a-radio-button>
-          <a-radio-button value="2">换量</a-radio-button>
-          <a-radio-button value="4">配送</a-radio-button>
-          <a-radio-button value="5">内广</a-radio-button>
-          <a-radio-button value="7">补量</a-radio-button>
-        </a-radio-group>
-      </a-form-item>-->
       <a-form-item
         label="投放目标"
         :labelCol="labelCol"
@@ -144,8 +131,8 @@
           optionFilterProp="children"
           style="width: 200px"
         >
-          <a-select-option value="AD_CONVERT_TYPE_INSTALL_FINISH">安装完成</a-select-option>
-          <a-select-option value="AD_CONVERT_TYPE_DOWNLOAD_FINiSH">下载完成</a-select-option>
+          <a-select-option value="15">安装完成</a-select-option>
+          <a-select-option value="4">下载完成</a-select-option>
         </a-select>
       </a-form-item>
 
@@ -165,39 +152,12 @@
         </a-select>
       </a-form-item>
 
-      <!--<a-form-item
-        label="直达链接"
-        v-if="showOpenUrlStatus"
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol">
-        <a-radio-group>
-          <a-radio-button value="disabled">不启用</a-radio-button>
-          <a-radio-button value="enabled">启用</a-radio-button>
-        </a-radio-group>
-      </a-form-item>-->
-
-<!--      <a-form-item-->
-<!--        label="直达链接生成方式"-->
-<!--        :labelCol="labelCol"-->
-<!--        :wrapperCol="wrapperCol">-->
-<!--        <a-radio-group>-->
-<!--          <a-radio-button value="auto_create" disabled>自动生成</a-radio-button>-->
-<!--          <a-radio-button value="hand_create">手动生成</a-radio-button>-->
-<!--        </a-radio-group>-->
-<!--      </a-form-item>-->
-<!--      <a-form-item-->
-<!--        label="跳转app链接"-->
-<!--        :labelCol="labelCol"-->
-<!--        :wrapperCol="wrapperCol">-->
-<!--        <a-input v-model="redirectUrl"></a-input>-->
-<!--      </a-form-item>-->
       <a-form-item
         label="出价方式"
         :labelCol="labelCol"
         :wrapperCol="wrapperCol">
         <a-radio-group v-model="bidType">
           <a-radio-button value="0">手动</a-radio-button>
-<!--          <a-radio-button value="1">保守</a-radio-button>-->
           <a-radio-button value="2" v-if="deliveryTarget==='11'">自动</a-radio-button>
         </a-radio-group>
 
@@ -290,6 +250,38 @@
       </a-form-item>
 
       <a-form-item
+        label="创意模板"
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol">
+        <a-select
+          v-model="creativeTemplateId"
+          style="width: 300px">
+          <a-select-option v-for="template in creativeTemplateList" :key="template.id" :value="template.id">{{template.name}}</a-select-option>
+        </a-select>
+      </a-form-item>
+
+      <a-form-item label="创意方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-radio-group v-model="creativeType">
+          <a-radio-button value="customize">自定义创意</a-radio-button>
+          <a-radio-button value="program">程序化创意</a-radio-button>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="素材添加方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-radio-group v-model="materialAddType">
+          <a-radio-button value="customize">自定义上传</a-radio-button>
+          <!--<a-radio-button value="program">程序化创意</a-radio-button>-->
+        </a-radio-group>
+      </a-form-item>
+      <material :creativeType.sync="creativeType" :accountId.sync="accountId" ref="material"></material>
+
+      <a-form-item label="应用下载详情页" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-input v-model="webUrl"></a-input>
+      </a-form-item>
+      <a-form-item label="应用名" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-input v-model="appName"></a-input>
+      </a-form-item>
+
+      <a-form-item
         label="迭代数量"
         :labelCol="labelCol"
         :wrapperCol="wrapperCol">
@@ -310,10 +302,12 @@
 
 <script>
   import {deleteAction, postAction, getAction} from '@/api/manage'
+  import UploadToAli from '@femessage/upload-to-ali'
   import pick from 'lodash.pick'
   import jq from 'jquery'
   import moment from 'moment';
   import AFormItem from "ant-design-vue/es/form/FormItem";
+  import material from '../../../template/creative/modules/material'
 
   let dateQuantumRangeConst = '';
   export default {
@@ -321,6 +315,10 @@
     components: {AFormItem},
     data() {
       return {
+        webUrl:'',
+        appName:'',
+        creativeType:'customize',
+        materialAddType:'customize',
         userOrientationId:null,
         userOrientationList:[],
         loading:false,
@@ -351,6 +349,8 @@
         simpleDeliverytarget:'',
         activeConvertList:[],
         deliverytargetId:null,
+        creativeTemplateList:[],
+        creativeTemplateId:null,
         templateName: '', //模板名称
         deliveryRange: '1',//投放范围
         deliveryForm: '1',//投放形式
@@ -394,15 +394,21 @@
           userAllocationList:'/template/bind/login/list',
           dictListUrl: 'toutiao/dictitem/list',
           insertUrl: 'test/create',
-          convertList:'template/convert/list/url/ng',
-          userOrentationList:'ctop/byteDanceUserOrientationTemplate/list'
+          convertList:'template/convert/list/url',
+          userOrentationList:'ctop/byteDanceUserOrientationTemplate/list',
+          creativeTemplateList:'/ctop/bytedanceCreativeLaunchTemplate/list'
         }
       }
     },
+    components: {
+      AFormItem,
+      UploadToAli,
+      material
+    },
     methods: {
       refreshConvertApiId(){
         let params = {};
-        getAction(this.url.convertList+'?bindAccountId='+this.accountId+'&urlId='+this.urlId ,params).then((res)=>{
+        getAction(this.url.convertList+'?accountId='+this.accountId+'&urlId='+this.urlId ,params).then((res)=>{
           console.log(res);
           if(res.code == 0){
             this.activeConvertList = res.data.active_convert_list;
@@ -455,10 +461,6 @@
         });
       },
       edit(record) {
-        // this.form.resetFields();
-
-        // this.time[0] = record.startDate
-        // this.time[1] = record.endDate
         this.model = Object.assign({}, record);
         this.visible = true;
         this.id = record.id
@@ -493,10 +495,6 @@
             load_time_table('table_time_selected1', dateQuantumRangeConst);
           });
         }
-        // this.$nextTick(() => {
-        //   this.form.setFieldsValue(pick(this.model, 'name', 'convertPrice', 'priceType', 'dateQuantum', 'flowDateType', 'budgetPriceMode', 'flowControlMode', 'bidType','budgetPrice','startDate','endDate'))
-        //   //时间格式化
-        // });
       },
       close() {
         this.$emit('close');
@@ -596,32 +594,34 @@
         params.itratorNum = this.itratorNum;
         params.templateName = this.templateName;
         params.convertId = this.convertId;
+        params.simpleDeliverytarget = this.simpleDeliverytarget;
+        params.convertType = this.convertType;
         if (this.time != [] && this.time.length == 2) {
           params.startDate = moment(this.time[0]).format('YYYY-MM-DD HH:mm')
           params.endDate = moment(this.time[1]).format('YYYY-MM-DD HH:mm')
         }
-
+        params.creativeTemplateId = this.creativeTemplateId;
+        params.creativeType = this.creativeType;
+        params.materialAddType = this.materialAddType;
+        var dataCreatives = this.$refs.material.HorizontalLargeImageListBig.concat(
+          this.$refs.material.HorizontalLargeImageListHeng,
+          this.$refs.material.HorizontalLargeImageListShu,
+          this.$refs.material.HorizontalLargeImageListZu,
+          this.$refs.material.HorizontalLargeImageListSmall,
+          this.$refs.material.HorizontalLargeImageListBigShu
+        )
+        console.log(dataCreatives)
+        params.creatives = dataCreatives
+        if (this.creativeType == 'program') {
+          params.titles = this.$refs.material.titleData
+        }
+        params.webUrl = this.webUrl;
+        params.appName = this.appName;
         params.dateQuantumRange = this.dateQuantumRange;
         params.urlId = this.urlId;
         e.preventDefault()
         this.form.validateFields((err, values) => {
           if (!err) {
-          /*  console.log('Received values of form: ', values);
-
-            this.dateQuantumRange = jq("#table_time_selected1_time_num").val();
-            params.id = this.id;
-            params.name = this.name;
-            params.bidType = this.bidType;
-            params.flowControlMode = this.flowControlMode;
-            params.budgetPrice = this.budgetPrice;
-            params.budgetPriceMode = this.budgetPriceMode;
-            params.flowDateType = this.flowDateType;
-
-            params.dateQuantum = this.dateQuantum;
-            params.priceType = this.priceType;
-            params.convertPrice = this.convertPrice;
-            params.filterType = this.filterType;
-            params.dateQuantumRange = this.dateQuantumRange;*/
             this.loading = true;
             console.log(params)
              postAction(this.url.insertUrl, params).then((res) => {
@@ -684,6 +684,13 @@
           this.userOrientationList = res.result.records
         }
       });
+      params = {};
+      params.pageSize = '1000';
+      getAction(this.url.creativeTemplateList, params).then((res) => {
+        if (res.success) {
+          this.creativeTemplateList = res.result.records
+        }
+      });
     }
   }
 

+ 164 - 0
src/views/template/appdownloadpage/list.vue

@@ -0,0 +1,164 @@
+<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.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="应用下载链接">
+              <a-input placeholder="请输入应用下载链接" v-model="queryParam.downloadUrl"></a-input>
+            </a-form-item>
+          </a-col>
+        <template v-if="toggleSearchStatus">
+        <a-col :md="6" :sm="8">
+            <a-form-item label="应用名">
+              <a-input placeholder="请输入应用名" v-model="queryParam.appName"></a-input>
+            </a-form-item>
+          </a-col>
+          </template>
+          <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>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </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 -->
+
+    <!-- 表单区域 -->
+    <bytedanceAppDownloadDetailPage-modal ref="modalForm" @ok="modalFormOk"></bytedanceAppDownloadDetailPage-modal>
+  </a-card>
+</template>
+
+<script>
+  import BytedanceAppDownloadDetailPageModal from './modules/BytedanceAppDownloadDetailPageModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: "BytedanceAppDownloadDetailPageList",
+    mixins:[JeecgListMixin],
+    components: {
+      BytedanceAppDownloadDetailPageModal
+    },
+    data () {
+      return {
+        description: '应用下载详情页信息管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+           },
+		   {
+            title: '名称',
+            align:"center",
+            dataIndex: 'name'
+           },
+		   {
+            title: '应用下载链接',
+            align:"center",
+            dataIndex: 'downloadUrl'
+           },
+		   {
+            title: '应用名',
+            align:"center",
+            dataIndex: 'appName'
+           },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+		url: {
+          list: "/ctop/bytedanceAppDownloadDetailPage/list",
+          delete: "/ctop/bytedanceAppDownloadDetailPage/delete",
+          deleteBatch: "/ctop/bytedanceAppDownloadDetailPage/deleteBatch",
+          exportXlsUrl: "ctop/bytedanceAppDownloadDetailPage/exportXls",
+          importExcelUrl: "ctop/bytedanceAppDownloadDetailPage/importExcel",
+       },
+    }
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+    methods: {
+
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

+ 136 - 0
src/views/template/appdownloadpage/modules/BytedanceAppDownloadDetailPageModal.vue

@@ -0,0 +1,136 @@
+<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="名称">
+          <a-input placeholder="请输入名称" v-decorator="['name', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="应用下载链接">
+          <a-input placeholder="请输入应用下载链接" v-decorator="['downloadUrl', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="应用名">
+          <a-input placeholder="请输入应用名" v-decorator="['appName', {}]" />
+        </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: "BytedanceAppDownloadDetailPageModal",
+    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/bytedanceAppDownloadDetailPage/add",
+          edit: "/ctop/bytedanceAppDownloadDetailPage/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,'name','downloadUrl','appName'))
+		  //时间格式化
+        });
+
+      },
+      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>

+ 41 - 201
src/views/template/creative/create.vue

@@ -185,163 +185,9 @@
       <a-form-item label="素材添加方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
         <a-radio-group v-model="materialAddType">
           <a-radio-button value="customize">自定义上传</a-radio-button>
-          <!--<a-radio-button value="program">程序化创意</a-radio-button>-->
-        </a-radio-group>
-      </a-form-item>
-      <!-- <a-form-item label="选择素材类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-        <a-radio-group v-model="materialType" @change="materialTypeChange">
-          <a-badge
-            :count="HorizontalLargeImageListBig.length"
-            :numberStyle="{backgroundColor: '#52c41a'} "
-          >
-            <a-radio-button value="CREATIVE_IMAGE_MODE_LARGE">大图横图</a-radio-button>
-          </a-badge>
-          <a-badge
-            :count="HorizontalLargeImageListShu.length"
-            :numberStyle="{backgroundColor: '#52c41a'} "
-          >
-            <a-radio-button value="CREATIVE_IMAGE_MODE_VIDEO">横版视频</a-radio-button>
-          </a-badge>
-          <a-badge
-            :count="HorizontalLargeImageListHeng.length"
-            :numberStyle="{backgroundColor: '#52c41a'} "
-          >
-            <a-radio-button value="CREATIVE_IMAGE_MODE_VIDEO_VERTICAL">竖版视频</a-radio-button>
-          </a-badge>
-          <a-badge
-            :count="HorizontalLargeImageListZu.length"
-            :numberStyle="{backgroundColor: '#52c41a'} "
-          >
-            <a-radio-button value="CREATIVE_IMAGE_MODE_GROUP">组图</a-radio-button>
-          </a-badge>
-          <a-badge
-            :count="HorizontalLargeImageListSmall.length"
-            :numberStyle="{backgroundColor: '#52c41a'} "
-          >
-            <a-radio-button value="CREATIVE_IMAGE_MODE_SMALL">小图</a-radio-button>
-          </a-badge>
-          <a-badge
-            :count="HorizontalLargeImageListBigShu.length"
-            :numberStyle="{backgroundColor: '#52c41a'} "
-          >
-            <a-radio-button value="CREATIVE_IMAGE_MODE_LARGE_VERTICAL">大图竖图</a-radio-button>
-          </a-badge>
+          <a-radio-button value="program">程序化创意</a-radio-button>
         </a-radio-group>
-      </a-form-item>-->
-      <!-- 创建大图横图创意 -->
-      <!-- <a-form-item
-        label="创建创意"
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-        v-if="createLargeImageCreativeCon"
-      >
-        <a-layout>
-          <a-layout-content style="padding:10px;">
-            <div :style="{ marginBottom: '16px' }">
-              <a-button @click="addCreative()" :disabled="count">添加创意</a-button>
-              <span
-                style="color:black;margin-left:10px"
-                v-if="creativeType == 'customize'"
-              >{{countMany}}/10</span>
-              <span
-                style="color:black;margin-left:10px"
-                v-else-if="creativeType == 'program'"
-              >视频数量:{{vadioMany}}/12 图片数量:{{imgMany}}/10</span>
-            </div>
-            <a-row>
-              <a-col :span="8" v-for="(item,index) of HorizontalLargeImageList" :key="index">
-                <a-card title :ref="item">
-                  <a-icon
-                    type="close"
-                    style="float:right;cursor: pointer;"
-                    @click="deleteCreative(index)"
-                  />
-                  <div style="clear:both"></div>
-                  <div class="dynamically_add_form_item">
-                    <a-form-item class label="素材上传" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                      <upload-to-ali
-                        v-model="item.vadioUrl"
-                        :customDomain="customDomain"
-                        preview
-                        :region="region"
-                        :bucket="bucket"
-                        :accept="acceptImage"
-                        :size="102400"
-                        :accessKeyId="accessKeyId"
-                        :accessKeySecret="accessKeySecret"
-                      ></upload-to-ali>
-                    </a-form-item>
-                    <a-form-item
-                      label="创意标题"
-                      :labelCol="labelCol"
-                      :wrapperCol="wrapperCol"
-                      v-if="creativeType == 'customize'"
-                    >
-                      <a-input v-model="item.text" class="rending" @change="judge(item)"></a-input>
-                    </a-form-item>
-                    <a-form-item
-                      label="动态词包"
-                      :labelCol="labelCol"
-                      :wrapperCol="wrapperCol"
-                      v-if="creativeType == 'customize'"
-                    >
-                      <a-tag
-                        v-for="(itemTag,indexTag) of tags"
-                        :key="indexTag"
-                        v-show="indexTag<item.many"
-                        @click="getChange(item,itemTag,index)"
-                      >{{itemTag.name}}</a-tag>
-                      <span @click="showElseClick(item)">{{item.showElse?"更多":"收起"}}</span>
-                    </a-form-item>
-                    <a-form-item
-                      label="封面上传"
-                      :labelCol="labelCol"
-                      :wrapperCol="wrapperCol"
-                      v-if="creativeType == 'program'&&(materialType=='CREATIVE_IMAGE_MODE_VIDEO_VERTICAL'||materialType=='CREATIVE_IMAGE_MODE_VIDEO')"
-                    >
-                      <upload-to-ali
-                        v-model="item.imageUrl"
-                        :customDomain="customDomain"
-                        preview
-                        :region="region"
-                        :bucket="bucket"
-                        :accept="acceptImage"
-                        :size="102400"
-                        :accessKeyId="accessKeyId"
-                        :accessKeySecret="accessKeySecret"
-                      ></upload-to-ali>
-                    </a-form-item>
-                  </div>
-                </a-card>
-              </a-col>
-            </a-row>
-          </a-layout-content>
-        </a-layout>
       </a-form-item>
-      <a-form-item
-        v-if="creativeType == 'program'"
-        label="程序化创意标题"
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-      >
-        <a-button @click="addTitle">添加创意标题</a-button>
-        <br />
-        <div v-for="(item,index) of titleData" :key="index">
-          <a-input style="width:55%" v-model="item.text" class="rending-all"></a-input>
-          <a-icon
-            type="delete"
-            style="margin-left:20px;cursor: pointer;"
-            v-show="titleData.length>1"
-            @click="tetleDetele(index)"
-          />
-          <br />
-          <a-tag
-            v-for="(itemTag,indexTag) of tags"
-            :key="indexTag"
-            @click="getChangeAllTitle(item,itemTag,index)"
-          >{{itemTag.name}}</a-tag>
-        </div>
-      </a-form-item>-->
       <material :creativeType.sync="creativeType" :accountId.sync="accountId" ref="material"></material>
       <a-form-item label="应用下载详情页" :labelCol="labelCol" :wrapperCol="wrapperCol">
         <a-input v-model="webUrl"></a-input>
@@ -766,54 +612,48 @@ export default {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },
     handleSubmit(e) {
-      e.preventDefault()
+      e.preventDefault();
       this.form.validateFields((err, values) => {
         if (!err) {
-          console.log('Received values of form: ', values)
-          let params = {}
-          params.campaignId = this.campaignId
-          params.deliveryRange = this.deliveryRange
-          params.userorentationId = this.userorentationId
-          params.budgetId = this.budgetId
-          params.deliverytargetId = this.deliverytargetId
-          params.horizonImageUrl = this.horizonImageUrl
-          params.horizonImageCreativeText = this.horizonImageCreativeText
-          params.horizonVideoUrl = this.horizonVideoUrl
-          params.horizonVideoCoverImageUrl = this.horizonVideoCoverImageUrl
-          params.horizonVideoCreativeText = this.horizonVideoCreativeText
-          params.verticalVideoUrl = this.verticalVideoUrl
-          params.verticalVideoCoverImageUrl = this.verticalVideoCoverImageUrl
-          params.verticalVideoCreativeText = this.verticalVideoCreativeText
-          params.groupImageUrl = this.groupImageUrl
-          params.groupImageCreativeText = this.groupImageCreativeText
-          params.smallImageUrl = this.smallImageUrl
-          params.smallImageCreativeText = this.smallImageCreativeText
-          params.verticalImageUrl = this.verticalImageUrl
-          params.verticalImageCreativeText = this.verticalImageCreativeText
-          params.planId = this.planId
-          params.accountId = this.accountId
-          params.advertiseLocation = this.advertiseLocation
-          params.inventoryType = this.inventoryType
-          params.sceneInventory = this.sceneInventory
-          params.creativeType = this.creativeType
-          params.customize = this.customize
-          params.webUrl = this.webUrl
-          params.appName = this.appName
-          params.isCommentDisable = this.isCommentDisable
-          params.creativeDisplayMode = this.creativeDisplayMode
-          params.adCategory = this.adCategory
-          params.adKeywords = this.adKeywords
-          params.name = this.name
-          params.convertId = this.convertId
-          params.iteratorNum = this.iteratorNum
-
-          //   var dataCreatives = this.HorizontalLargeImageListBig.concat(
-          //     this.HorizontalLargeImageListHeng,
-          //     this.HorizontalLargeImageListShu,
-          //     this.HorizontalLargeImageListZu,
-          //     this.HorizontalLargeImageListSmall,
-          //     this.HorizontalLargeImageListBigShu
-          //   )
+          console.log('Received values of form: ', values);
+          let params = {};
+          params.campaignId = this.campaignId;
+          params.deliveryRange = this.deliveryRange;
+          params.userorentationId = this.userorentationId;
+          params.budgetId = this.budgetId;
+          params.deliverytargetId = this.deliverytargetId;
+          params.horizonImageUrl = this.horizonImageUrl;
+          params.horizonImageCreativeText = this.horizonImageCreativeText;
+          params.horizonVideoUrl = this.horizonVideoUrl;
+          params.horizonVideoCoverImageUrl = this.horizonVideoCoverImageUrl;
+          params.horizonVideoCreativeText = this.horizonVideoCreativeText;
+          params.verticalVideoUrl = this.verticalVideoUrl;
+          params.verticalVideoCoverImageUrl = this.verticalVideoCoverImageUrl;
+          params.verticalVideoCreativeText = this.verticalVideoCreativeText;
+          params.groupImageUrl = this.groupImageUrl;
+          params.groupImageCreativeText = this.groupImageCreativeText;
+          params.smallImageUrl = this.smallImageUrl;
+          params.smallImageCreativeText = this.smallImageCreativeText;
+          params.verticalImageUrl = this.verticalImageUrl;
+          params.verticalImageCreativeText = this.verticalImageCreativeText;
+          params.planId = this.planId;
+          params.accountId = this.accountId;
+          params.advertiseLocation = this.advertiseLocation;
+          params.inventoryType = this.inventoryType;
+          params.sceneInventory = this.sceneInventory;
+          params.creativeType = this.creativeType;
+          params.customize = this.customize;
+          params.webUrl = this.webUrl;
+          params.appName = this.appName;
+          params.isCommentDisable = this.isCommentDisable;
+          params.creativeDisplayMode = this.creativeDisplayMode;
+          params.adCategory = this.adCategory;
+          params.adKeywords = this.adKeywords;
+          params.name = this.name;
+          params.convertId = this.convertId;
+          params.iteratorNum = this.iteratorNum;
+          params.simpleDeliverytarget = this.simpleDeliverytarget;
+          params.convertType = this.convertType;
           var dataCreatives = this.$refs.material.HorizontalLargeImageListBig.concat(
             this.$refs.material.HorizontalLargeImageListHeng,
             this.$refs.material.HorizontalLargeImageListShu,

+ 208 - 0
src/views/template/launch/list.vue

@@ -0,0 +1,208 @@
+<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.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="是否关闭评论">
+              <a-input placeholder="请输入是否关闭评论" v-model="queryParam.commentDisable"></a-input>
+            </a-form-item>
+          </a-col>
+        <template v-if="toggleSearchStatus">
+        <a-col :md="6" :sm="8">
+            <a-form-item label="是否关闭视频详情页落地页">
+              <a-input placeholder="请输入是否关闭视频详情页落地页" v-model="queryParam.closeVideoDetail"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="创意展现方式">
+              <a-input placeholder="请输入创意展现方式" v-model="queryParam.creativeDisplayMode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="是否使用优选广告位">
+              <a-input placeholder="请输入是否使用优选广告位" v-model="queryParam.smartInventory"></a-input>
+            </a-form-item>
+          </a-col>
+          </template>
+          <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>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('创意模板')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </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 -->
+
+    <!-- 表单区域 -->
+    <bytedanceCreativeLaunchTemplate-modal ref="modalForm" @ok="modalFormOk"></bytedanceCreativeLaunchTemplate-modal>
+  </a-card>
+</template>
+
+<script>
+  import BytedanceCreativeLaunchTemplateModal from './modules/BytedanceCreativeLaunchTemplateModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: "BytedanceCreativeLaunchTemplateList",
+    mixins:[JeecgListMixin],
+    components: {
+      BytedanceCreativeLaunchTemplateModal
+    },
+    data () {
+      return {
+        description: '创意模板管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+           },
+		   {
+            title: '模板名称',
+            align:"center",
+            dataIndex: 'name'
+           },
+		   {
+            title: '是否关闭评论',
+            align:"center",
+            dataIndex: 'commentDisable'
+           },
+		   {
+            title: '是否关闭视频详情页落地页',
+            align:"center",
+            dataIndex: 'closeVideoDetail'
+           },
+		   {
+            title: '创意展现方式',
+            align:"center",
+            dataIndex: 'creativeDisplayMode'
+           },
+		   {
+            title: '是否使用优选广告位',
+            align:"center",
+            dataIndex: 'smartInventory'
+           },
+		   {
+            title: '场景广告位',
+            align:"center",
+            dataIndex: 'sceneInventory'
+           },
+		   {
+            title: '是否开启衍生计划',
+            align:"center",
+            dataIndex: 'generateDerivedAd'
+           },
+		   {
+            title: '创意投放位置',
+            align:"center",
+            dataIndex: 'inventoryType'
+           },
+		   {
+            title: '创意分类',
+            align:"center",
+            dataIndex: 'thirdIndustryId'
+           },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+		url: {
+          list: "/ctop/bytedanceCreativeLaunchTemplate/list",
+          delete: "/ctop/bytedanceCreativeLaunchTemplate/delete",
+          deleteBatch: "/ctop/bytedanceCreativeLaunchTemplate/deleteBatch",
+          exportXlsUrl: "ctop/bytedanceCreativeLaunchTemplate/exportXls",
+          importExcelUrl: "ctop/bytedanceCreativeLaunchTemplate/importExcel",
+       },
+    }
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+    methods: {
+     
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

+ 222 - 0
src/views/template/launch/modules/BytedanceCreativeLaunchTemplateModal.vue

@@ -0,0 +1,222 @@
+<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="模板名称">
+          <a-input placeholder="请输入模板名称" v-model="name" />
+        </a-form-item>
+       <a-form-item label="广告位置" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-radio-group v-model="advertiseLocation">
+            <a-radio-button value="great">优选广告位</a-radio-button>
+            <a-radio-button value="media">按媒体指定位置</a-radio-button>
+            <a-radio-button value="sence">按场景指定位置</a-radio-button>
+          </a-radio-group>
+        </a-form-item>
+
+        <a-form-item label="媒体指定" v-if="advertiseLocation=='media'" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-checkbox-group v-model="inventoryType">
+            <a-checkbox value="INVENTORY_FEED">今日头条</a-checkbox>
+            <a-checkbox value="INVENTORY_VIDEO_FEED">西瓜视频</a-checkbox>
+            <a-checkbox value="INVENTORY_HOTSOON_FEED">火山小视频</a-checkbox>
+            <a-checkbox value="INVENTORY_AWEME_FEED">抖音</a-checkbox>
+            <a-checkbox value="INVENTORY_UNION_SLOT">穿山甲</a-checkbox>
+          </a-checkbox-group>
+        </a-form-item>
+
+        <a-form-item label="场景选择" v-if="advertiseLocation=='sence'" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-radio-group v-model="sceneInventory">
+            <a-radio-button value="VIDEO_SCENE">沉浸式竖版视频场景</a-radio-button>
+            <a-radio-button value="FEED_SCENE">信息流场景</a-radio-button>
+            <a-radio-button value="TAIL_SCENE">视频后贴和尾帧场景</a-radio-button>
+          </a-radio-group>
+        </a-form-item>
+
+        <a-form-item label="广告评论" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-radio-group v-model="isCommentDisable ">
+            <a-radio-button value="0">关闭</a-radio-button>
+            <a-radio-button value="1">开启</a-radio-button>
+          </a-radio-group>
+        </a-form-item>
+        <a-form-item label="创意展现方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-radio-group v-model="creativeDisplayMode">
+            <a-radio-button value="CREATIVE_DISPLAY_MODE_CTR">优选模式</a-radio-button>
+            <a-radio-button value="CREATIVE_DISPLAY_MODE_RANDOM">轮播模式</a-radio-button>
+          </a-radio-group>
+        </a-form-item>
+
+        <a-form-item label="创意分类" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-cascader
+            :options="options"
+            width="200px"
+            v-model="adCategory"
+            placeholder="请选择分类"
+          />
+        </a-form-item>
+
+        <a-form-item label="创意标签" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-select mode="tags" style="width: 100%" :tokenSeparators="[' ']" v-model="adKeywords"></a-select>
+        </a-form-item>
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="视频详情页落地页">
+          <a-radio-group v-model="videoDetailPage">
+            <a-radio-button value="1">开启</a-radio-button>
+            <a-radio-button value="0">关闭</a-radio-button>
+          </a-radio-group>
+        </a-form-item>
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="优选广告位">
+          <a-radio-group v-model="smartInventory">
+            <a-radio-button value="1">启用</a-radio-button>
+            <a-radio-button value="0">关闭</a-radio-button>
+          </a-radio-group>
+        </a-form-item>
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="衍生计划">
+          <a-radio-group v-model="ysplanOpen">
+            <a-radio-button value="1">开启</a-radio-button>
+            <a-radio-button value="0">关闭</a-radio-button>
+          </a-radio-group>
+        </a-form-item>
+
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import {deleteAction, postAction, getAction} from '@/api/manage';
+  import pick from 'lodash.pick'
+
+  export default {
+    name: "BytedanceCreativeLaunchTemplateModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        name:'',
+        isCommentDisable:'0',
+        creativeDisplayMode:'CREATIVE_DISPLAY_MODE_CTR',
+        adCategory: null,
+        adKeywords: [],
+        options:[],
+        ysplanOpen:'0',
+        videoDetailPage:'0',
+        smartInventory:'0',
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        advertiseLocation:'great',
+        inventoryType:[],
+        sceneInventory:'',
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        },
+        url: {
+          add: "/ctop/bytedanceCreativeLaunchTemplate/add",
+          edit: "/ctop/bytedanceCreativeLaunchTemplate/edit",
+          industryListUrl: '/template/bytedance/industry/list',
+        },
+      }
+    },
+    created: function () {
+      let params = {}
+      getAction(this.url.industryListUrl, params).then(res => {
+        this.options = res
+      })
+    },
+    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,'name','commentDisable','closeVideoDetail','creativeDisplayMode','smartInventory','sceneInventory','generateDerivedAd','inventoryType','thirdIndustryId'))
+		  //时间格式化
+        });
+
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let param = {};
+            param.name = this.name;
+            param.advertiseLocation = this.advertiseLocation;
+            param.inventoryType = JSON.stringify(this.inventoryType);
+            param.sceneInventory = this.sceneInventory;
+            param.commentDisable = this.isCommentDisable;
+            param.creativeDisplayMode = this.creativeDisplayMode;
+            param.thirdIndustryId = JSON.stringify(this.adCategory);
+            param.adKeywords = JSON.stringify(this.adKeywords);
+            param.closeVideoDetail = this.videoDetailPage;
+            param.smartInventory = this.smartInventory;
+            param.generateDerivedAd = this.ysplanOpen;
+            console.log(param)
+            postAction(this.url.add,param).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>

+ 1 - 1
src/views/template/userorientation/modules/ByteDanceUserOrientationTemplateModal.vue

@@ -121,7 +121,7 @@
         <a-form-item label="手机品牌" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-radio-group @change="changeMobileBrandType" v-model="isMobileBrand">
             <a-radio-button value="NONE">不限</a-radio-button>
-            <a-radio-button value="BRAND">按品牌</a-radio-button>
+            <a-radio-button v-if="platformType != 'IOS'" value="BRAND">按品牌</a-radio-button>
           </a-radio-group>
           <br />
           <a-select