Bladeren bron

拉取代码

朱鑫波 4 jaren geleden
bovenliggende
commit
2c442d4bb3

+ 1 - 1
src/components/uploadFile.vue

@@ -8,7 +8,7 @@
       action="https://media-1301855440.cos.ap-chongqing.myqcloud.com/" :before-upload="beforeUpload"
       @change="handleChange" :accept="uploadType+'/'+(uploadType=='image'?'jpeg,image/jpg':'mp4')" :file-list="fileList"
       :remove="removeFile" @preview="handlePreview" :disabled="loadingElse||disabled">
-      <div v-if="uploadType=='image'?fileList.length < fileCount:fileList.length<1">
+      <div v-if="fileList.length < fileCount||fileList.length<1">
         <a-progress v-if='loadingElse' :percent="percent" :show-info="false" />
         <div class="ant-upload-text">
           点击上传

+ 11 - 7
src/views/modules/advertiser/ProjectList.vue

@@ -133,7 +133,12 @@
           <!-- {{ text | ocpxActionType }} -->
         </span>
         <span slot="bidType" slot-scope="text">
-          {{ text | bidType }}
+          <div v-if="text">
+            <span v-for="(item, index) of JSON.parse(text)" :key="index"
+              >{{ item | bidType }}{{ index == JSON.parse(text).length - 1 ? '' : ',' }}</span
+            >
+          </div>
+          <div v-else>-</div>
         </span>
         <span slot="mediaId" slot-scope="text">
           {{ text == '1' || text == '3' ? '头条' : '快手' }}
@@ -287,12 +292,11 @@ export default {
         53: '提交线索',
         180: '激活',
         190: '付费',
-        191:'首日ROI',
-        348:'有效线索',
-        383:'授信',
-        384:'完件',
-        394:'订单提交',
-
+        191: '首日ROI',
+        348: '有效线索',
+        383: '授信',
+        384: '完件',
+        394: '订单提交',
       }
       return data[sta]
     },

+ 33 - 45
src/views/modules/advertiser/modules/projectListModal.vue

@@ -18,14 +18,11 @@
             <a-radio-button value="4">快手内广</a-radio-button>
           </a-radio-group>
         </a-form-item> -->
+
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="项目名称">
           <a-input placeholder="请输入项目名称" v-decorator="['projectName', validatorRules.projectName]" disabled />
         </a-form-item>
-        <!-- <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="行业">
-          <j-tree-select ref="treeSelect" placeholder="请选择行业" v-decorator="['industryId']"
-            dict="sys_category,name,id" pidField="pid" pidValue="f5cb2d2d28417b3b65a6dd744bcb9a76">
-          </j-tree-select>
-        </a-form-item>-->
+
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
@@ -87,26 +84,28 @@
               <a-select-option :value="6">OCPC</a-select-option>
             </a-select>
           </a-form-item>
-          <a-form-item
-            label="转化目标"
-            :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-            v-show="getFormFieldValue('bidType').indexOf(10) > -1 || getFormFieldValue('bidType').indexOf(6) > -1"
-          >
-            <a-select v-decorator="['ocpxActionType', { initialValue: 2 }]" mode="multiple">
-              <a-select-option :value="2">行为数</a-select-option>
-              <a-select-option :value="180">激活</a-select-option>
-              <a-select-option :value="53">表单提交</a-select-option>
+          <div v-if="Array.isArray(getFormFieldValue('bidType'))">
+            <a-form-item
+              label="转化目标"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              v-show="getFormFieldValue('bidType').findIndex((item) => item == 10)>-1 || getFormFieldValue('bidType').findIndex((item) => item == 6)>-1"
+            >
+              <a-select v-model="model.ocpxActionType" mode="multiple">
+                <a-select-option :value="2">行为数</a-select-option>
+                <a-select-option :value="180">激活</a-select-option>
+                <a-select-option :value="53">表单提交</a-select-option>
 
-              <a-select-option :value="394">订单提交</a-select-option>
-              <a-select-option :value="348">使用有效线索</a-select-option>
-              <a-select-option :value="383">授信出价</a-select-option>
-              <a-select-option :value="384">完件出价</a-select-option>
-              <a-select-option :value="190">付费出价</a-select-option>
-              <a-select-option :value="191">首日ROI</a-select-option>
-              <a-select-option :value="396">注册优化目标</a-select-option>
-            </a-select>
-          </a-form-item>
+                <a-select-option :value="394">订单提交</a-select-option>
+                <a-select-option :value="348">使用有效线索</a-select-option>
+                <a-select-option :value="383">授信出价</a-select-option>
+                <a-select-option :value="384">完件出价</a-select-option>
+                <a-select-option :value="190">付费出价</a-select-option>
+                <a-select-option :value="191">首日ROI</a-select-option>
+                <a-select-option :value="396">注册优化目标</a-select-option>
+              </a-select>
+            </a-form-item>
+          </div>
         </div>
 
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售">
@@ -219,7 +218,7 @@ export default {
       optionsElse: [],
       supplierList: [],
       editAll: false,
-      showDian: true,
+      showDian: false,
     }
   },
   created() {
@@ -298,47 +297,40 @@ export default {
       //       }
       if (record.mediaId == '2' || record.mediaId == '4') {
         var params = { ...record }
+        params.bidType = record.bidType == null ? [2] : JSON.parse(record.bidType)
+        params.ocpxActionType = record.ocpxActionType == null ? [2] : JSON.parse(record.ocpxActionType)
         this.showDian = true
       } else {
         var { ocpxActionType, bidType, ...params } = record
         this.showDian = false
       }
-
       this.form.resetFields()
       this.model = Object.assign({}, params)
       this.model.maxBid = this.model.maxBid ? this.model.maxBid / 1000 : 0
       this.model.maxDeepCpaBid = this.model.maxDeepCpaBid ? this.model.maxDeepCpaBid / 1000 : 0
-      if (record.mediaId == '2' || record.mediaId == '4') {
-        this.model.bidType =
-          this.model.bidType == null
-            ? [2]
-            : typeof JSON.parse(this.model.bidType) == Array
-            ? JSON.parse(this.model.bidType)
-            : [this.model.bidType]
-        this.model.ocpxActionType = this.model.ocpxActionType == null ? [2] : JSON.parse(this.model.ocpxActionType)
-      }
+      // if (record.mediaId == '2' || record.mediaId == '4') {
+      //   this.model.bidType = this.model.bidType == null ? [2] : JSON.parse(this.model.bidType)
+      //   this.model.ocpxActionType = this.model.ocpxActionType == null ? [2] : JSON.parse(this.model.ocpxActionType)
+      // }
       this.visible = true
+      console.log(this.model)
       this.$nextTick(() => {
         if (record.advertiserId) {
           this.form.setFieldsValue(
             pick(
               this.model,
               'projectName',
-              'industryId',
               'advertiserId',
               'productId',
-              'responsibleName',
               'maxBid',
               'maxDeepCpaBid',
-              'userId',
               'designResponsibleId',
               'responsibleId',
-              'industryCode',
+
               'supplierCode',
               // 'advertiserType',
               'saleId',
               'bidType',
-              'ocpxActionType'
             )
           )
         } else {
@@ -346,15 +338,11 @@ export default {
             pick(
               this.model,
               'projectName',
-              'industryId',
               'advertiserId',
-              'responsibleName',
               'maxBid',
               'maxDeepCpaBid',
-              'userId',
               'designResponsibleId',
               'responsibleId',
-              'industryCode',
               'supplierCode',
               // 'advertiserType',
               'saleId',
@@ -388,7 +376,7 @@ export default {
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
-          // that.confirmLoading = true
+          that.confirmLoading = true
           let httpurl = ''
           let method = ''
           if (!this.model.id) {

+ 2 - 2
src/views/modules/autoRules/newBlankRule.vue

@@ -20,8 +20,8 @@
                              <a-form-model-item ref="eventRuleLevel"  prop="eventRuleLevel">
                                 <a-radio-group v-model="form.eventRuleLevel" @change="applyObjChange">
                                     <a-radio-button value="ACCOUNT">账户</a-radio-button>
-                                    <!-- <a-radio-button value="CAMPAIGN">计划</a-radio-button>
-                                    <a-radio-button value="UNIT">组</a-radio-button> -->
+                                    <a-radio-button value="CAMPAIGN">计划</a-radio-button>
+                                    <a-radio-button value="UNIT">组</a-radio-button>
                                     <!-- <a-radio-button value="CREATE">创意</a-radio-button> -->
                                 </a-radio-group>
                             </a-form-model-item>

+ 2 - 2
vue.config.js

@@ -68,7 +68,7 @@ module.exports = {
     open : true,
     proxy: {
       '/jeecg-boot': {
-        //  target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+         target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.1.188:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
@@ -82,7 +82,7 @@ module.exports = {
         // target: 'http://192.168.1.219:8080', //请求本地 需要jeecg-boot后台项目  赵西安
 
 
-         target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
+        //  target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目
         //  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目