朱鑫波 4 年之前
父节点
当前提交
88bf81dbf0

+ 5 - 2
src/components/ctop/ActorModal.vue

@@ -30,7 +30,7 @@
             :accessKeySecret="accessKeySecret"></upload-to-ali> -->
         </a-form-item>
         <a-form-item label="视频作品" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="!model.name">
-          <uploadFile :value.sync="videoUrl" :fileCount="1" uploadType="video" />
+          <uploadFile :value.sync="videoUrl" :fileCount="10" uploadType="video" />
           <!-- <upload-to-ali v-model="videoUrl" :customDomain="customDomain" multiple preview :region="region"
             :bucket="bucket" :accept="acceptVideo" :max="10" :size="1024000" :accessKeyId="accessKeyId"
             :accessKeySecret="accessKeySecret"></upload-to-ali> -->
@@ -130,6 +130,9 @@
         })
       },
       add() {
+        this.imageUrl = []
+        this.videoUrl = []
+        this.coverUrl = ""
         this.edit({});
       },
       edit(record) {
@@ -138,7 +141,7 @@
         that.form.resetFields();
         that.model = Object.assign({}, record);
         that.visible = true;
-        // that.coverUrl = ""
+        that.coverUrl = record.coverUrl?record.coverUrl:''
         // that.imageUrl = ""
         // that.videoUrl = ""
         that.$nextTick(() => {

+ 2 - 1
src/components/ctop/propModal.vue

@@ -112,11 +112,12 @@
         this.edit({});
       },
       edit(record) {
-
+        console.log(record)
         let that = this;
         that.form.resetFields();
         that.model = Object.assign({}, record);
         that.visible = true;
+        that.imageUrl = record.coverUrl?[record.coverUrl]:[]
         that.$nextTick(() => {
           that.form.setFieldsValue(pick(this.model, 'name', 'desc'))
           //时间格式化

+ 4 - 4
src/components/ctop/vm-card.vue

@@ -222,7 +222,7 @@ li {
       @ok="handleOk('photo')"
       @cancel="handleCancel('photo')"
     >
-    <uploadFile :value.sync="imageUrl" :fileCount="1" uploadType="image" :multiple="false" />
+    <uploadFile :value.sync="imageUrl" :fileCount="10" uploadType="image" />
       <!-- <upload-to-ali
         style="margin:10px"
         v-model="imageUrl"
@@ -244,7 +244,7 @@ li {
       @ok="handleOk('video')"
       @cancel="handleCancel('video')"
     >
-    <uploadFile :value.sync="videoUrl" :fileCount="1" uploadType="video" :multiple="false" />
+    <uploadFile :value.sync="videoUrl" :fileCount="10" uploadType="video" />
       <!-- <upload-to-ali
         style="margin:10px"
         v-model="videoUrl"
@@ -377,8 +377,8 @@ export default {
       noImgUrl: require('@/assets/img/noImg.png'),
       loginInfo: JSON.parse(localStorage.getItem('pro__Login_Userinfo')),
       photoList: [],
-      imageUrl: '',
-      videoUrl: '',
+      imageUrl: [],
+      videoUrl: [],
       total: 1,
       videoTotal: 1,
       pageSize: 4,

+ 17 - 12
src/views/modules/advertiser/modules/projectListModal.vue

@@ -81,16 +81,17 @@
         </a-form-item>
         <div v-if="showDian">
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优化目标">
-            <a-radio-group buttonStyle="solid" v-decorator="['bidType', { initialValue: 2 }]">
-              <a-radio-button :value="2">点击数</a-radio-button>
-              <a-radio-button :value="10">转化数</a-radio-button>
-            </a-radio-group>
+            <a-select v-decorator="['bidType', { initialValue: 2 }]" mode="multiple">
+              <a-select-option :value="2">点击数</a-select-option>
+              <a-select-option :value="10">OCPM</a-select-option>
+              <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') == 10"
+            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>
@@ -243,10 +244,8 @@ export default {
         }
       })
     },
-    handleBlur() {
-    },
-    handleFocus() {
-    },
+    handleBlur() {},
+    handleFocus() {},
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },
@@ -310,7 +309,12 @@ export default {
       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 : this.model.bidType
+        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)
       }
       this.visible = true
@@ -363,7 +367,6 @@ export default {
         // this.resId = record.responsibleId
         // this.shejiId = record.designResponsibleId
         getAction('/sys/user/getAllUserListV1', '').then((res) => {
-
           if (res.success) {
             this.options = res.result
           }
@@ -407,7 +410,9 @@ export default {
           formData.designResponsibleId = values.designResponsibleId
           formData.userId = formData.userId ? formData.userId : that.userInfo().id
           if (this.showDian) {
-            formData.ocpxActionType = formData.bidType == 2 ? JSON.stringify([0]) : JSON.stringify(formData.ocpxActionType)
+            formData.ocpxActionType =
+              formData.bidType == 2 ? JSON.stringify([0]) : JSON.stringify(formData.ocpxActionType)
+            formData.bidType = JSON.stringify(formData.bidType)
           }
           httpAction(httpurl, formData, method)
             .then((res) => {

+ 1 - 1
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后台项目  祚云