Browse Source

提交到测试分支

朱鑫波 3 năm trước cách đây
mục cha
commit
78898997c4

+ 3 - 1
src/utils/request.js

@@ -20,8 +20,10 @@ else if (process.env.NODE_ENV === 'debug') {
 }
 else if (process.env.NODE_ENV === 'production') {
 	// axios.defaults.baseURL = 'http://apipre.tjyourong.com.cn/jeecg-boot'; // 预生产
-    axios.defaults.baseURL = 'http://gateway.tjyourong.com.cn/jeecg-boot';//测试
+	axios.defaults.baseURL = 'http://gateway.tjyourong.com.cn/jeecg-boot';//测试
 	// axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot'; // 生产环境
+	// axios.defaults.baseURL = 'http://gateway.tjyourong.com.cn/jeecg-boot'; // 生产环境
+
 }
 const service = axios.create({
 	// baseURL: '/jeecg-boot', // api base_url

+ 1 - 1
src/views/modules/autoLaunch/channelManage/index.vue

@@ -512,7 +512,7 @@ export default {
             if (!result) {
                 this.$message.error('不支持该文件类型')
                 this.loadDisabled = false
-                return false
+                return Promise.reject()
             }
         },
         ...mapGetters(['userInfo']),

+ 137 - 14
src/views/modules/autoLaunch/configLaunchInfo.vue

@@ -84,12 +84,12 @@
                    <a-tag color="#2db7f5" @click="getChangeAll('日期', 'form', 'campaignName')"
                 >+日期</a-tag
               >
-              <!-- <a-tag color="#2db7f5" @click="getChangeAll('应用包名', 'form', 'campaignName')"
-                >+应用包名</a-tag
+              <a-tag color="#2db7f5" @click="getChangeAll('渠道号', 'form', 'campaignName')"
+                >+渠道号</a-tag
+              >
+              <a-tag color="#2db7f5" @click="getChangeAll('渠道号名称', 'form', 'campaignName')"
+                >+渠道号名称</a-tag
               >
-              <a-tag color="#2db7f5" @click="getChangeAll('自定义', 'form', 'campaignName')"
-                >+自定义</a-tag
-              > -->
                 </a-form-item>
                 </div>
             </div>  
@@ -186,9 +186,12 @@
                <a-tag color="#2db7f5" @click="getChangeAll('广告位置', 'form', 'groupName')"
                 >+广告位置</a-tag
               >
-               <!-- <a-tag color="#2db7f5" @click="getChangeAll('自定义', 'form', 'groupName')"
-                >+自定义</a-tag
-              > -->
+              <a-tag color="#2db7f5" @click="getChangeAll('渠道号', 'form', 'groupName')"
+                >+渠道号</a-tag
+              >
+              <a-tag color="#2db7f5" @click="getChangeAll('渠道号名称', 'form', 'groupName')"
+                >+渠道号名称</a-tag
+              >
                 </a-form-item>
                 </div>
             </div>  
@@ -307,9 +310,9 @@
                         </div>
                     </div>
                     <div class="row-item">
-                    <div class="hint-item"></div>
-                    <div class="label-item">
-                        <div class="text-item">调起链接</div>
+                        <div class="hint-item"></div>
+                        <div class="label-item">
+                            <div class="text-item">调起链接</div>
                         </div>
                         <div class="input-item">
                             <a-form-item>
@@ -317,13 +320,100 @@
                                 <span style="color:red"> 需加白使用</span>
                                 <div v-if="uriCheck">
                                     <a-input placeholder="请填写链接" v-decorator="['schemaUri', { rules: [{ message:'链接不能为空'}] }]" />
-                                   
+                                
                                 </div>
                                 
                             </a-form-item>
                         </div>
                     </div>
 
+                    <div class="row-item">
+                        <div class="hint-item"></div>
+                        <div class="label-item">
+                            <div class="text-item">是否使用渠道号</div>
+                            <div class="required-item"></div>
+                        </div>
+                        
+                        <div class="input-item">
+                            <a-form-item>
+                                <a-switch default-checked v-model="useChannel" @change="changeChannel"/>
+                            </a-form-item>
+                        </div>
+                    </div>
+                    <div class="row-item" v-if="channelData&&channelData.channel.isHaveItem">
+                        <div class="hint-item"></div>
+                        <div class="label-item">
+                            <div class="text-item">是否使用单品</div>
+                            <div class="required-item"></div>
+                        </div>
+                        
+                        <div class="input-item">
+                            <a-form-item>
+                                <a-radio-group v-model="channelData.channel.isHaveItem" disabled>
+                                    <a-radio-button :value="1">是</a-radio-button>
+                                    <a-radio-button :value="0">否</a-radio-button>
+                                </a-radio-group>
+                            </a-form-item>
+                        </div>
+                    </div>
+                    <div class="row-item" v-if="channelData&&channelData.channel.usageLevel">
+                        <div class="hint-item"></div>
+                        <div class="label-item">
+                            <div class="text-item">渠道号作用维度</div>
+                            <div class="required-item"></div>
+                        </div>
+                        
+                        <div class="input-item">
+                            <a-form-item>
+                               <a-radio-group
+                                    button-style="solid"
+                                    v-model="channelData.channel.usageLevel"
+                                    disabled
+                                >
+                                    <a-radio-button value="account">账户</a-radio-button>
+                                    <a-radio-button value="plan">计划</a-radio-button>
+                                    <a-radio-button value="group">组</a-radio-button>
+                                </a-radio-group>
+                            </a-form-item>
+                        </div>
+                    </div>
+
+                    <div class="row-item" v-if="channelData&&channelData.channel.usageLevel&&channelData.list&&channelData.list.length>0&&channelData.channel.usageLevel=='plan'">
+                        <div class="hint-item"></div>
+                        <div class="label-item">
+                            <div class="text-item">渠道号选择</div>
+                            <div class="required-item"></div>
+                        </div>
+                        
+                        <div class="input-item">
+                            <a-form-item>
+                                <a-collapse accordion ref="collapse">
+                                    <template v-for="(item, index) in channelData.list">
+                                        <a-collapse-panel
+                                            :forceRender="true"
+                                            :header="item.appName+'(应用标记)'"
+                                            style="background: #f9f9fa;border-radius: 4px;margin-bottom:15px;overflow: hidden;border: 1px solid #d9d9d9;"
+                                        >
+                                            <a-form-item
+                                                label="渠道号"
+                                                v-bind="formItemLayout"
+                                            >
+                                                {{item.channelCode}}
+                                            </a-form-item>
+                                           <a-form-item
+                                                label="素材关键字"
+                                                v-bind="formItemLayout"
+                                            >
+                                                {{item.itemName}}
+                                            </a-form-item>
+                                        </a-collapse-panel>
+                                    </template>
+                                </a-collapse>
+                            </a-form-item>
+                        </div>
+                    </div>
+
+
                     <div class="row-item" v-if="getFormData('singleAppid')==0">
                     <div class="hint-item"></div>
                     <div class="label-item">
@@ -1911,10 +2001,15 @@ export default {
     },
     data() {
         return {
+            formItemLayout: {
+                labelCol: { span: 4 },
+                wrapperCol: { span: 20 }
+            },
             getProjectIdAccount: '',
             checkCpaBidBloon:false,
             appType: '0',
             uriCheck: false,
+            useChannel:false,
             programUnitCnt:300,
             customUnitCnt:400,
             customUnitCntMax:400,
@@ -2067,7 +2162,8 @@ export default {
             checkAllApp: false,
             optionsAll: [],
             multipleBidData:[],
-            descriptionList:[{value:""}]
+            descriptionList:[{value:""}],
+            channelData:null
            
             
         }
@@ -2182,6 +2278,25 @@ export default {
     },
     methods: {
         ...mapGetters(['userInfo']),
+        changeChannel(checked) {
+            if(checked){
+                if(!!this.accountId){
+                    getAction('/channel/queryChannelLevel', {accountId:this.accountId}).then(res=>{
+                        console.log(res)
+                        if(res.code === 200) {
+                            this.channelData = res.result
+                        }else{
+                            this.useChannel = false
+                            this.$message.error('该账户不能使用渠道号')
+                        }
+                    })
+                }else{
+                    this.useChannel = false
+                    this.$message.error('未选择账户不可开启')
+                }
+               
+            }
+        },
         handleGetAcoountId(list) {
             getAction('/estimatePeopleNumber/getProjectId', {accountId: list}).then(result => {
                 if (result.code === 0) {
@@ -3115,6 +3230,9 @@ export default {
 
                     values.campaignDayBudget = this.budgetType =='1'?0: values.campaignDayBudget*1000
                     values.unitDayBudget = this.dayBudgetType =='1'?0: values.unitDayBudget*1000
+
+                    values.usageLevel = this.channelData&&this.channelData.channel?this.channelData.channel.usageLevel:null
+                    values.useChannel = this.useChannel?1:0
                     let url=''
                     if(this.editRecordId){
                         url='/ctop/aiKuaishouAdvertiserStrategy/edit';
@@ -3443,7 +3561,11 @@ export default {
                         this.scheduleTimeType = ''
                         this.scheduleTimeData = str
                    }
-                   
+                   this.useChannel = res.result.useChannel?res.result.useChannel==1?true:false:false
+
+                    if(this.useChannel){
+                        this.changeChannel(this.useChannel)
+                    }
                     this.multipleBidData = res.result.appInfoList ? res.result.appInfoList.map(item=>{
                         
                         return {
@@ -3671,6 +3793,7 @@ export default {
         },
     },
     created() {
+
         if(this.$route){
             let editRecordId=this.$route.query.id;
             if(editRecordId){

+ 0 - 3
src/views/modules/earlyWarningRules/ruleModule.vue

@@ -1483,9 +1483,6 @@ export default {
       align-items: center;
       margin-bottom: 20px;
     }
-    .row-item:last-of-type {
-      margin-bottom: 0;
-    }
     .row-item .hint-item {
       width: 24px;
       min-width: 24px;