소스 검색

'提交自能投放个盯盘'

魏志佳 4 년 전
부모
커밋
bc0f0c062e
3개의 변경된 파일12개의 추가작업 그리고 8개의 파일을 삭제
  1. 2 2
      src/utils/request.js
  2. 7 6
      src/views/modules/autoLaunch/configLaunchInfo.vue
  3. 3 0
      src/views/modules/stockWatch/accountPage.vue

+ 2 - 2
src/utils/request.js

@@ -16,8 +16,8 @@ else if (process.env.NODE_ENV == 'debug') {
 else if (process.env.NODE_ENV == 'production') { 
   
   // axios.defaults.baseURL = 'http://192.168.1.251/jeecg-boot';
-  axios.defaults.baseURL = 'http://139.186.165.84:8806/jeecg-boot';     
-  // axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot';
+  // axios.defaults.baseURL = 'http://139.186.165.84:8806/jeecg-boot';     
+  axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot';
 }
 const service = axios.create({
 //   baseURL: '/jeecg-boot', // api base_url

+ 7 - 6
src/views/modules/autoLaunch/configLaunchInfo.vue

@@ -2047,8 +2047,8 @@ export default {
                     let population=this.incluedSelectedKeys.map(item=>{
                         return item.id
                     })
-                    values.excludePopulation=excludePopulation.length>0?JSON.stringify(excludePopulation):undefined;
-                    values.population=population.length>0?JSON.stringify(population):undefined;
+                    values.excludePopulation=excludePopulation.length>0?JSON.stringify(excludePopulation):'[]';
+                    values.population=population.length>0?JSON.stringify(population):'[]';
                     
                     
                     values.useAppMarket=values.useAppMarket?'1':'0'
@@ -2401,16 +2401,17 @@ export default {
                         this.checkedList=sceneId
                     }
                     
-                    
-                    if(res.result.population&&res.result.excludePopulation){
+                    let population=res.result.population?JSON.parse(res.result.population):[]
+                    let excludePopulation=res.result.excludePopulation?JSON.parse(res.result.excludePopulation):[]
+                    if(population.length&&excludePopulation.length){
                         this.form.setFieldsValue({
                             customCrowd:'3'
                         })
-                    }else if(res.result.population&&!res.result.excludePopulation){
+                    }else if(population.length&&!excludePopulation.length){
                         this.form.setFieldsValue({
                             customCrowd:'1'
                         })
-                    }else if(!res.result.population&&!res.result.excludePopulation){
+                    }else if(!population.length&&!excludePopulation.length){
                         this.form.setFieldsValue({
                             customCrowd:'0'
                         })

+ 3 - 0
src/views/modules/stockWatch/accountPage.vue

@@ -315,6 +315,7 @@
                         <div class="titleContext">
                             <span class="spot"> </span>
                             分版位数据
+                            <span class="titleTip" style="font-size:12px;margin-left:10px">数据与消耗存在一定误差</span>
                         </div>
                     </div>
                     <div class="eachrt">
@@ -331,6 +332,7 @@
                         <div class="titleContext">
                             <span class="spot"> </span>
                             分年龄数据
+                            <!-- <span class="titleTip" style="font-size:12px;margin-left:10px">数据与消耗存在一定误差</span> -->
                         </div>
                     </div>
                     <div class="eachrt">
@@ -345,6 +347,7 @@
                         <div class="titleContext">
                             <span class="spot"> </span>
                             分性别数据
+                            <!-- <span class="titleTip" style="font-size:12px;margin-left:10px">数据与消耗存在一定误差</span> -->
                         </div>
                     </div>
                     <div class="eachrt">