朱鑫波 пре 3 година
родитељ
комит
125db56069

+ 2 - 0
src/views/modules/autoLaunch/channelManage/components/creatApplication.vue

@@ -477,6 +477,7 @@ export default {
                         this.url.insertTemplateUrl = '/kuaishouAppPackage/fillInLink'
                         params = { ...values }
                         params.appIconUrl = this.fileUrl
+                        this.confirmLoading = false
                         this.$emit('getDataList', params)
                         this.handleCancel()
                         // postAction(this.url.insertTemplateUrl, params).then(res => {
@@ -490,6 +491,7 @@ export default {
                         //     }
                         // })
                     } else {
+                        this.confirmLoading = false
                         this.$message.error('请填写必填项')
                     }
                 }

+ 1 - 0
src/views/modules/autoLaunch/channelManage/createChannel.vue

@@ -346,6 +346,7 @@ li.chouzhen.first:before {
                                                     }
                                                 ]"
                                                 @change="numberMaxCheck"
+                                                @blur="numberMaxCheck"
                                                 :precision="0"
                                                 :min="1"
                                                 :max="100"

+ 8 - 0
src/views/modules/autoLaunch/channelManage/index.vue

@@ -264,6 +264,14 @@
             >
             <a-form :form="formDownLoad">
                 <a-form-item
+                    label="操作系统"
+                    :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 19 } }"
+                    class="require-class"
+                >
+                   安卓
+                </a-form-item>
+                <a-form-item
                     label="上传图标"
                     :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
                     :wrapperCol="{ xs: { span: 24 }, sm: { span: 19 } }"

+ 30 - 27
src/views/modules/autoLaunch/configLaunchInfo.vue

@@ -1759,20 +1759,6 @@
                         </a-form-item>
                         </div>
                     </div> 
-                    <div class="row-item">
-                        <div class="hint-item"> </div>
-                        <div class="label-item">
-                        <div class="text-item">是否开启系统优选</div>
-                        </div>
-                        <div class="input-item">
-                        <a-form-item>  
-                            <a-radio-group v-decorator="['systemOptimization', { initialValue: 0 }]" :disabled="getProjectIdAccount !== 458">
-                                <a-radio-button :value="0">否</a-radio-button>
-                                <a-radio-button :value="1">是</a-radio-button>                            
-                            </a-radio-group>
-                        </a-form-item>
-                        </div>
-                    </div> 
                 </div>
              
         </div>
@@ -2281,15 +2267,31 @@ export default {
         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('该账户不能使用渠道号')
-                        }
-                    })
+                    if(!!this.getFormData('appId')){
+                        var params = {}
+                        params.appIdArray = this.getFormData('appId') instanceof Array?this.getFormData('appId').map(item=>{return item.key}):[this.getFormData('appId').key]
+                        params.accountId = this.accountId
+                        postAction('/channel/queryChannelLevel', params).then(res=>{
+                            console.log(res)
+                            if(res.code === 200) {
+                                if(res.result){
+                                    this.channelData = res.result
+                                }else{
+                                    this.useChannel = false
+                                    this.$message.error(res.message) 
+                                }
+                                
+                            }else{
+                                this.useChannel = false
+                                this.$message.error('该账户不能使用渠道号')
+                            }
+                        })
+                    }else{
+                        this.useChannel = false
+                        this.$message.error('未选择应用不可开启')
+                    }
+                    
+                  
                 }else{
                     this.useChannel = false
                     this.$message.error('未选择账户不可开启')
@@ -3561,11 +3563,7 @@ 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 {
@@ -3615,6 +3613,11 @@ export default {
                             siteId:res.result.siteId,
                         })
                         
+                        this.useChannel = res.result.useChannel?res.result.useChannel==1?true:false:false
+
+                        if(this.useChannel){
+                            this.changeChannel(this.useChannel)
+                        }
                     },100)
 
                     

+ 6 - 3
src/views/modules/autoLaunch/configLaunchList.vue

@@ -165,6 +165,7 @@ import { getAction, postAction, downFile, downFilePost,deleteAction } from '@/ap
 import Treeselect from '@/views/modules/Statistics/components/Treeselect.vue'
 import configLaunchExploreDrawer from './components/configLaunchExploreDrawer.vue'
 import qs from 'qs'
+import { mapActions, mapGetters } from 'vuex'
 let typeValue='预算'
 
 
@@ -332,6 +333,7 @@ export default {
         },
     },
     methods: {
+        ...mapGetters(['userInfo']),
         goExplore(item) {
             this.exploreVisible = true
             this.exploreKey = '1'
@@ -505,7 +507,8 @@ export default {
                 strategyId:this.strategyId==undefined?null:this.strategyId,
                 accountId:this.accountId,
                 pageNo:this.ipagination.current,
-                pageSize:this.ipagination.pageSize
+                pageSize:this.ipagination.pageSize,
+                userId:this.userInfo().id
             }).then((res)=>{
                 this.data=[]
                 console.log(res)
@@ -514,7 +517,7 @@ export default {
 
                     this.ipagination.total = res.result.total
                     
-                    res.result.records.forEach((item)=>{
+                    res.result.list.forEach((item)=>{
                         item.key=item.id;
                         item.show=false;
                         item.visible=false;
@@ -522,7 +525,7 @@ export default {
                         item.openProgramCreateSpin=false;
                     })
 
-                    this.data = res.result.records;
+                    this.data = res.result.list;
                     this.selectedRowKeys=[];
                 }
             })