Ver código fonte

拉取文件

zhuxinbo 5 anos atrás
pai
commit
a36a87de4b

BIN
dist.zip


+ 2 - 2
src/components/page/GlobalLayout.vue

@@ -246,7 +246,7 @@
         position: fixed;
         top: 0;
         right: 0;
-        z-index: 9;
+        z-index: 1000;
         width: 100%;
         transition: width .2s;
 
@@ -278,7 +278,7 @@
         position: fixed;
         top: 0;
         right: 0;
-        z-index: 9;
+        z-index: 1000;
         width: 100%;
         transition: width .2s;
 

+ 1 - 2
src/utils/request.js

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

+ 26 - 23
src/views/modules/kuaishouapp/account/copyGroup.vue

@@ -28,9 +28,9 @@
   <a-form @submit="handleSubmit" :form="form">
     <a-form-item label="目标应用" :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
       :wrapperCol="{ lg: { span: 17 }, sm: { span: 17 } }" v-if="campaignType == '2'">
-      <a-select disabled v-decorator="['appId', { rules: [{ required: true, message: '请选择目标应用' }] }]" showSearch allowClear
-        placeholder="选择应用目标" optionFilterProp="children" style="width: 500px" @focus="handleFocus" @blur="handleBlur"
-        @change="handleChange" :filterOption="filterOption">
+      <a-select disabled v-decorator="['appId', { rules: [{ required: true, message: '请选择目标应用' }] }]" showSearch
+        allowClear placeholder="选择应用目标" optionFilterProp="children" style="width: 500px" @focus="handleFocus"
+        @blur="handleBlur" @change="handleChange" :filterOption="filterOption">
         <a-select-option value="0">请选择目标应用</a-select-option>
         <a-select-option v-for="appModel in appList" :key="appModel.appId" :value="appModel.appId">
           {{ appModel.appName }}&#12288;&nbsp;&#12288; {{ appModel.appVersion }}&#12288;&#12288;&#12288;{{
@@ -56,13 +56,14 @@
       <a-input placeholder="请填写链接"
         v-decorator="['url', { rules: [{ required: true, message: ' ' }, { validator: handleConfirmValue }] }]" />
     </a-form-item>
-      <a-form-item label=" " :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
-        :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }" class="else-label" v-if="campaignType == '2'&&(getPlatForm(getData('appId'))=='1'||getPlatForm(getData('appId'))=='2')">
+    <a-form-item label=" " :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
+      :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }" class="else-label"
+      v-if="campaignType == '2'&&(getPlatForm(getData('appId'))=='1'||getPlatForm(getData('appId'))=='2')">
 
-        <a-checkbox  @change="onChange" :checked="allForm.useAppMarket">
-          优先从系统应用商店下载
-        </a-checkbox>
-      </a-form-item>
+      <a-checkbox @change="onChange" :checked="allForm.useAppMarket">
+        优先从系统应用商店下载
+      </a-checkbox>
+    </a-form-item>
     <div style="text-align:center;font-size:16px;margin-bottom:10px">
       目标人群
     </div>
@@ -341,7 +342,7 @@
           fail: [],
           success: [],
           sceneId: [7],
-          useAppMarket:false
+          useAppMarket: false
         },
         dataList: [],
         unitId: '',
@@ -574,10 +575,11 @@
                 ...res.result.appInfo,
                 ...res.result.target
               }
-              dataJson.sceneId = JSON.parse( dataJson.sceneId )[0] == '1'? '1':'2'
+              dataJson.sceneId = JSON.parse(dataJson.sceneId)[0] == '1' ? '1' : '2'
               dataJson.dayBudget = dataJson.dayBudget / 1000
               this.allForm.dayBudget = dataJson.dayBudget == 0 ? '0' : '1'
-              this.allForm.useAppMarket= dataJson.useAppMarket?(dataJson.useAppMarket==0?false:true):false
+              this.allForm.useAppMarket = dataJson.useAppMarket ? (dataJson.useAppMarket == 0 ? false : true) :
+                false
               this.allForm.time = dataJson.endTime ? '2' : '1'
               this.timeRange = [moment(dataJson.beginTime), moment(dataJson.endTime)]
               this.allForm.scheduleTime = dataJson.scheduleTime.indexOf('1') != -1 ? '2' : '1'
@@ -615,14 +617,15 @@
               this.populationData.allForm = {}
               this.populationData.allForm.regionType =
                 dataJson.region && JSON.parse(dataJson.region).length > 0 ? 'limit' : 'noLimit'
-              postAction('/kuaishou/batch/getRegionDetail', {
-                regionArr: dataJson.region
-              }).then(res => {
-                console.log(res)
-                if (res.success) {
-                  this.populationData.allForm.region = res.result
-                }
-              })
+              this.populationData.allForm.region = dataJson.region
+              //   postAction('/kuaishou/batch/getRegionDetail', {
+              //     regionArr: dataJson.region
+              //   }).then(res => {
+              //     console.log(res)
+              //     if (res.success) {
+              //       this.populationData.allForm.region = res.result
+              //     }
+              //   })
 
               this.populationData.allForm.ageType =
                 dataJson.agesRange.length > 0 ? 'ageLimit' : dataJson.ageMin ? 'ageCustom' : 'noLimit'
@@ -641,7 +644,7 @@
               console.log(this.populationData.allForm, dataJson.agesRange)
               this.$nextTick(() => {
                 this.form.setFieldsValue(pick(dataJson, ['appId', 'urlType', 'url', 'dayBudget', 'speed',
-                  'showMode','sceneId'
+                  'showMode', 'sceneId'
                 ]))
               })
             }
@@ -671,7 +674,7 @@
             })
             var json = {
               ...values,
-            //   sceneId: [values.sceneId],
+              //   sceneId: [values.sceneId],
               sceneId: values.sceneId == 1 ? [values.sceneId] : this.allForm.sceneId,
               dayBudget: values.dayBudget * 1000
             }
@@ -715,7 +718,7 @@
         })
       },
       onChange(value) {
-        this.allForm.useAppMarket =e.target.checked
+        this.allForm.useAppMarket = e.target.checked
       },
       handleChange(value) {
         //   this.$refs.population.getAppList(value)

Diferenças do arquivo suprimidas por serem muito extensas
+ 629 - 723
src/views/modules/kuaishouapp/account/editGroup.vue


+ 23 - 13
src/views/modules/kuaishouapp/account/stepForm/stepModule/selectRegion.vue

@@ -137,7 +137,8 @@
     JeecgListMixin
   } from '@/mixins/JeecgListMixin'
   import {
-    getProvince
+    getProvince,
+    postAction
   } from '@/api/manage'
   import $ from 'jquery'
   export default {
@@ -174,28 +175,37 @@
     mounted() {
       this.$nextTick(() => {
         this.getData().then(() => {
-            console.log(2)
-        //   if (this.dataValue.length > 0) {
-            this.checkData = this.dataValue
-            this.checkMatched = this.dataValue.map(item => {
-              return item.value
-            })
-            this.checkMatchedCity = this.dataValue.map(item => {
-              return item.value
-            })
-            this.$emit('update:checkData', this.checkData)
-        //   }
+          postAction('/kuaishou/batch/getRegionDetail', {
+            regionArr: this.dataValue
+          }).then(res => {
+            if (res.success) {
+              //   this.populationData.allForm.region = res.result
+              this.checkData = res.result
+              this.checkMatched = res.result.map(item => {
+                return item.value
+              })
+              this.checkMatchedCity = res.result.map(item => {
+                return item.value
+              })
+              this.$emit('update:checkData', this.checkData)
+            }
+          })
+          //   if (this.dataValue.length > 0) {
+
+          //   }
         })
 
       })
     },
     watch: {
       dataValue: {
+        deep: true,
         immediate: true, // immediate选项可以开启首次赋值监听
         handler(n, o) {
+          console.log(n)
           if (n.length > 0) {
             // this.getData().then(() => {
-              console.log(1)
+            console.log(1)
             //   if (n.length > 0) {
             this.$nextTick(() => {
               this.checkData = n

+ 2 - 2
vue.config.js

@@ -73,11 +73,11 @@ module.exports = {
         // target: 'http://192.168.1.54:8080', //请求本地 需要jeecg-boot后台项目  孙震
         // target: 'http://192.168.1.165:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.165:8848', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        target: 'http://api.tjyourong.com.cn/jeecg-boot', //请求本地 需要jeecg-boot后台项目 
+        // target: 'http://api.tjyourong.com.cn/jeecg-boot', //请求本地 需要jeecg-boot后台项目 
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
 
         // target: 'http://192.168.0.53:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        // target: 'http://192.168.1.251:8088', //请求本地 需要jeecg-boot后台项目 
+        target: 'http://192.168.1.251:8080', //请求本地 需要jeecg-boot后台项目 
 
         // target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目