Просмотр исходного кода

Merge remote-tracking branch 'origin/master'

xuzuoyun 5 лет назад
Родитель
Сommit
324b2ba28d

+ 1 - 1
src/utils/request.js

@@ -8,7 +8,7 @@ import {ACCESS_TOKEN} from "@/store/mutation-types"
 // 创建 axios 实例
 const service = axios.create({
   baseURL: '/jeecg-boot', // api base_url
-  timeout: 60000 // 请求超时时间
+  timeout: 600000 // 请求超时时间
 })
 
 const err = (error) => {

+ 40 - 58
src/views/modules/kuaishouapp/KuaiShouCampaignTemplateList.vue

@@ -7,40 +7,26 @@
         <a-row :gutter="24">
 
           <a-col :md="6" :sm="8">
-            <a-form-item label="2:提升应用安装 3:获取电商下单 4:推广品牌活动 5:收集销售线索">
-              <a-input placeholder="请输入2:提升应用安装 3:获取电商下单 4:推广品牌活动 5:收集销售线索" v-model="queryParam.type"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="应用创建主键id">
-              <a-input placeholder="请输入应用创建主键id" v-model="queryParam.appId"></a-input>
-            </a-form-item>
-          </a-col>
-        <template v-if="toggleSearchStatus">
-        <a-col :md="6" :sm="8">
-            <a-form-item label="url类型 当计划类型为 3(获取电商下单)时必填:1 - 淘宝商品短链2 - 淘宝商品 itemID">
-              <a-input placeholder="请输入url类型 当计划类型为 3(获取电商下单)时必填:1 - 淘宝商品短链2 - 淘宝商品 itemID" v-model="queryParam.urlType"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="广告计划名称">
-              <a-input placeholder="请输入广告计划名称" v-model="queryParam.campaignName"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="当前登录人id">
-              <a-input placeholder="请输入当前登录人id" v-model="queryParam.loginId"></a-input>
+            <a-form-item label="类型">
+              <a-input placeholder="计划类型" v-model="queryParam.type"></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.campaignName"></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">
+             <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              </a>-->
             </span>
           </a-col>
 
@@ -131,42 +117,38 @@
             customRender:function (t,r,index) {
               return parseInt(index)+1;
             }
-           },
-		   {
-            title: '2:提升应用安装 3:获取电商下单 4:推广品牌活动 5:收集销售线索',
+          },
+          {
+            title: '计划类型',
             align:"center",
             dataIndex: 'type'
-           },
-		   {
-            title: '应用创建主键id',
+          },
+          {
+            title: '应用创建id',
             align:"center",
             dataIndex: 'appId'
-           },
-		   {
-            title: 'url类型 当计划类型为 3(获取电商下单)时必填:1 - 淘宝商品短链2 - 淘宝商品 itemID',
+          },
+          {
+            title: 'url类型 ',
             align:"center",
             dataIndex: 'urlType'
-           },
-		   {
+          },
+          {
             title: '广告计划名称',
             align:"center",
             dataIndex: 'campaignName'
-           },
-		   {
-            title: '当前登录人id',
-            align:"center",
-            dataIndex: 'loginId'
-           },
-		   {
-            title: '当计划类型是 3/4/5 时必填',
+          },
+
+          {
+            title: '推广url',
             align:"center",
             dataIndex: 'url'
-           },
-		   {
-            title: '计划单日预算金额 单位:厘 0表示预算不限,不小于500元,不超过100000000',
+          },
+          {
+            title: '计划单日预算金额',
             align:"center",
             dataIndex: 'dayBudget'
-           },
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -174,22 +156,22 @@
             scopedSlots: { customRender: 'action' },
           }
         ],
-		url: {
+        url: {
           list: "/kuaishou/kuaiShouCampaignTemplate/list",
           delete: "/kuaishou/kuaiShouCampaignTemplate/delete",
           deleteBatch: "/kuaishou/kuaiShouCampaignTemplate/deleteBatch",
           exportXlsUrl: "kuaishou/kuaiShouCampaignTemplate/exportXls",
           importExcelUrl: "kuaishou/kuaiShouCampaignTemplate/importExcel",
-       },
-    }
-  },
-  computed: {
-    importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
+        },
+      }
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      }
+    },
     methods: {
-     
+
     }
   }
 </script>

+ 9 - 13
src/views/modules/kuaishouapp/KuaiShouCreateAppTemplateList.vue

@@ -7,13 +7,13 @@
         <a-row :gutter="24">
 
           <a-col :md="6" :sm="8">
-            <a-form-item label="app类型 安卓 ios">
+            <a-form-item label="app类型">
               <a-input placeholder="请输入app类型 安卓 ios" v-model="queryParam.appType"></a-input>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8">
-            <a-form-item label="应用类型   : 1 Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏">
-              <a-input placeholder="请输入应用类型   : 1 Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏" v-model="queryParam.platform"></a-input>
+            <a-form-item label="应用类型">
+              <a-input placeholder="请输入应用类型" v-model="queryParam.platform"></a-input>
             </a-form-item>
           </a-col>
         <template v-if="toggleSearchStatus">
@@ -133,12 +133,12 @@
             }
            },
 		   {
-            title: 'app类型 安卓 ios',
+            title: 'app类型',
             align:"center",
             dataIndex: 'appType'
            },
 		   {
-            title: '应用类型   : 1 Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏',
+            title: '应用类型',
             align:"center",
             dataIndex: 'platform'
            },
@@ -158,25 +158,21 @@
             dataIndex: 'packageName'
            },
 		   {
-            title: '上传文件到服务器返回地址',
+            title: 'app地址',
             align:"center",
             dataIndex: 'file'
            },
 		   {
-            title: '上传图片到服务器返回地址',
+            title: '图片地址',
             align:"center",
             dataIndex: 'imageUrl'
            },
 		   {
-            title: '输入应用下载地址',
+            title: '应用下载地址',
             align:"center",
             dataIndex: 'url'
            },
-		   {
-            title: '登录人id',
-            align:"center",
-            dataIndex: 'loginId'
-           },
+
           {
             title: '操作',
             dataIndex: 'action',

+ 8 - 21
src/views/modules/kuaishouapp/KuaiShouGroupCreateLogList.vue

@@ -6,11 +6,7 @@
       <a-form layout="inline">
         <a-row :gutter="24">
 
-          <a-col :md="6" :sm="8">
-            <a-form-item label="广告计划模板ID">
-              <a-input placeholder="请输入广告计划模板ID" v-model="queryParam.campaignTemplateId"></a-input>
-            </a-form-item>
-          </a-col>
+
           <a-col :md="6" :sm="8">
             <a-form-item label="账户ID">
               <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
@@ -133,12 +129,12 @@
             }
            },
 		   {
-            title: '广告计划模板ID',
+            title: '广告计划ID',
             align:"center",
             dataIndex: 'campaignTemplateId'
            },
 		   {
-            title: '账户ID',
+            title: '账户',
             align:"center",
             dataIndex: 'accountId'
            },
@@ -173,7 +169,7 @@
             dataIndex: 'ocpxActionType'
            },
 		   {
-            title: '深度转化目标 null',
+            title: '深度转化目标',
             align:"center",
             dataIndex: 'deepConversionType'
            },
@@ -203,7 +199,7 @@
             dataIndex: 'dayBudget'
            },
 		   {
-            title: 'url类型 1:淘宝商品短链 2:淘宝商品 itemID',
+            title: 'url类型',
             align:"center",
             dataIndex: 'urlType'
            },
@@ -212,18 +208,14 @@
             align:"center",
             dataIndex: 'url'
            },
+
 		   {
-            title: 'APP ID',
-            align:"center",
-            dataIndex: 'appId'
-           },
-		   {
-            title: '创意展现方式  1:轮播 2:优选',
+            title: '创意展现方式',
             align:"center",
             dataIndex: 'showModel'
            },
 		   {
-            title: '投放方式 1:快速投放 2:平滑投放',
+            title: '投放方式',
             align:"center",
             dataIndex: 'speed'
            },
@@ -232,11 +224,6 @@
             align:"center",
             dataIndex: 'unitId'
            },
-		   {
-            title: '当前登录人id',
-            align:"center",
-            dataIndex: 'loginId'
-           },
           {
             title: '操作',
             dataIndex: 'action',

+ 10 - 23
src/views/modules/kuaishouapp/KuaiShouImageList.vue

@@ -6,14 +6,10 @@
       <a-form layout="inline">
         <a-row :gutter="24">
 
+
           <a-col :md="6" :sm="8">
-            <a-form-item label="图片保存本地地址">
-              <a-input placeholder="请输入图片保存本地地址" v-model="queryParam.localUrl"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="videoName">
-              <a-input placeholder="请输入videoName" v-model="queryParam.videoName"></a-input>
+            <a-form-item label="">
+              <a-input  v-model="queryParam.imageName"></a-input>
             </a-form-item>
           </a-col>
         <template v-if="toggleSearchStatus">
@@ -23,13 +19,8 @@
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8">
-            <a-form-item label="登录人id">
-              <a-input placeholder="请输入登录人id" v-model="queryParam.loginId"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="图片类型 1-竖版图片 2-横版图片">
-              <a-input placeholder="请输入图片类型 1-竖版图片 2-横版图片" v-model="queryParam.materialType"></a-input>
+            <a-form-item label="图片类型">
+              <a-input placeholder="请输入图片类型" v-model="queryParam.materialType"></a-input>
             </a-form-item>
           </a-col>
           </template>
@@ -133,27 +124,23 @@
             }
            },
 		   {
-            title: '图片保存本地地址',
+            title: '图片保存地址',
             align:"center",
             dataIndex: 'localUrl'
            },
 		   {
-            title: 'imageName',
+            title: '图片名称',
             align:"center",
             dataIndex: 'imageName'
            },
 		   {
-            title: '视频类别',
+            title: '图片类别',
             align:"center",
             dataIndex: 'imageType'
            },
+
 		   {
-            title: '登录人id',
-            align:"center",
-            dataIndex: 'loginId'
-           },
-		   {
-            title: '图片类型 1-竖版图片 2-横版图片',
+            title: '图片类型',
             align:"center",
             dataIndex: 'materialType'
            },

+ 62 - 75
src/views/modules/kuaishouapp/KuaiShouVideoList.vue

@@ -6,34 +6,20 @@
       <a-form layout="inline">
         <a-row :gutter="24">
 
-          <a-col :md="6" :sm="8">
-            <a-form-item label="视频保存本地地址">
-              <a-input placeholder="请输入视频保存本地地址" v-model="queryParam.localUrl"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="视频描述">
-              <a-input placeholder="请输入视频描述" v-model="queryParam.videoDesc"></a-input>
-            </a-form-item>
-          </a-col>
-        <template v-if="toggleSearchStatus">
-        <a-col :md="6" :sm="8">
-            <a-form-item label="videoName">
-              <a-input placeholder="请输入videoName" v-model="queryParam.videoName"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="视频类别">
-              <a-input placeholder="请输入视频类别" v-model="queryParam.videoType"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="登录人id">
-              <a-input placeholder="请输入登录人id" v-model="queryParam.loginId"></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.videoName"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-item label="视频类别">
+                <a-input placeholder="请输入视频类别" v-model="queryParam.videoType"></a-input>
+              </a-form-item>
+            </a-col>
           </template>
-          <a-col :md="6" :sm="8" >
+          <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>
@@ -52,21 +38,28 @@
     <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-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-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-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>项
+        <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>
 
@@ -85,9 +78,9 @@
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
           <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -109,15 +102,15 @@
 
 <script>
   import KuaiShouVideoModal from './modules/KuaiShouVideoModal'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 
   export default {
     name: "KuaiShouVideoList",
-    mixins:[JeecgListMixin],
+    mixins: [JeecgListMixin],
     components: {
       KuaiShouVideoModal
     },
-    data () {
+    data() {
       return {
         description: '快手-上传视频管理页面',
         // 表头
@@ -125,62 +118,56 @@
           {
             title: '#',
             dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
+            key: 'rowIndex',
+            width: 60,
+            align: "center",
+            customRender: function (t, r, index) {
+              return parseInt(index) + 1;
             }
-           },
-		   {
-            title: '视频保存本地地址',
-            align:"center",
+          },
+          {
+            title: '视频本地地址',
+            align: "center",
             dataIndex: 'localUrl'
-           },
-		   {
+          },
+          {
             title: '视频描述',
-            align:"center",
+            align: "center",
             dataIndex: 'videoDesc'
-           },
-		   {
-            title: 'videoName',
-            align:"center",
+          },
+          {
+            title: '视频名称',
+            align: "center",
             dataIndex: 'videoName'
-           },
-		   {
+          },
+          {
             title: '视频类别',
-            align:"center",
+            align: "center",
             dataIndex: 'videoType'
-           },
-		   {
-            title: '登录人id',
-            align:"center",
-            dataIndex: 'loginId'
-           },
+          },
+
           {
             title: '操作',
             dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
+            align: "center",
+            scopedSlots: {customRender: 'action'},
           }
         ],
-		url: {
+        url: {
           list: "/kuaishou/kuaiShouVideo/list",
           delete: "/kuaishou/kuaiShouVideo/delete",
           deleteBatch: "/kuaishou/kuaiShouVideo/deleteBatch",
           exportXlsUrl: "kuaishou/kuaiShouVideo/exportXls",
           importExcelUrl: "kuaishou/kuaiShouVideo/importExcel",
-       },
-    }
-  },
-  computed: {
-    importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-    methods: {
-     
-    }
+        },
+      }
+    },
+    computed: {
+      importExcelUrl: function () {
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      }
+    },
+    methods: {}
   }
 </script>
 <style scoped>

+ 15 - 7
src/views/modules/kuaishouapp/groupCreate.vue

@@ -192,7 +192,8 @@
         :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
         <a-radio-group v-model="ocpxActionType" @change="showBidType">
           <a-radio-button value="2">行为数</a-radio-button>
-          <a-radio-button value="180" :disabled="isDisabled">激活数</a-radio-button>
+          <a-radio-button value="180" :disabled="activationDisabled">激活</a-radio-button>
+          <a-radio-button value="53" :disabled="isFormDisabled">表单转化</a-radio-button>
         </a-radio-group>
       </a-form-item>
 
@@ -279,7 +280,8 @@
         cpaBid: 0,// bid_type 是 OCPC 时该字段必填
         page: 2,// 资源位置
         unitName: "_" + moment().format('YYYY-MM-DD_HH:mm'),//广告组名称
-        isDisabled: true,
+        activationDisabled: true,
+        isFormDisabled: true,
 
 
         form: this.$form.createForm(this),
@@ -302,14 +304,20 @@
           params.accountId = this.accountId;
           getAction(this.url.getDeepConversionUrl, params).then((res) => {
             if (res.success) {
-
-              if (res.result) {
-                this.isDisabled = false;
+              if (res.result.isActivate == 1) {
+                this.activationDisabled = false;
               } else {
-                this.isDisabled = true;
+                this.activationDisabled = true;
+              }
+              if (res.result.isFormSubmit == 1) {
+                this.isFormDisabled = false;
+              } else {
+                this.isFormDisabled = true;
               }
-
               console.log(res.result)
+            } else {
+              this.activationDisabled = true;
+              this.isFormDisabled = true;
             }
           });