Explorar el Código

批量创建合并代码

朱鑫波 hace 2 años
padre
commit
2cee1b93fa

+ 9 - 1
src/filters.js

@@ -476,7 +476,15 @@ const filters = {
             11: "苹果",
         }
         return data[str]
-    }
+    },
+    //已安装用户
+    disableInstalledAppSwitchLable(str) {
+        var data = {
+            0: "过滤",
+            1: "不限",
+        }
+        return data[str]
+    },
 
 }
 

+ 2 - 2
src/utils/request.js

@@ -21,9 +21,9 @@ 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://api.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'; // 测试环境
-	// axios.defaults.baseURL = 'http://192.168.0.195:9999/jeecg-boot'; // 测试环境
+	axios.defaults.baseURL = 'http://192.168.0.195:9999/jeecg-boot'; // 测试环境
 	// axios.defaults.baseURL = 'http://192.168.1.134:9999/jeecg-boot'; // 泽宇环境
 
 }

+ 17 - 0
src/views/modules/kuaishouapp/account/stepForm/stepModule/targetedPopulation.vue

@@ -559,6 +559,22 @@ li:hover {
       </a-radio-group>
     </a-form-item>
     <a-form-item
+      label="已安装用户"
+      :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
+      :wrapperCol="{ lg: { span: 15 }, sm: { span: 15 } }"
+    >
+      <!-- v-decorator="[
+          'isOpen',
+          {
+            initialValue: '0'
+          }
+        ]" -->
+      <a-radio-group buttonStyle="solid" v-decorator="['disableInstalledAppSwitch ', { initialValue: 0 }]">
+        <a-radio-button :value="0">过滤</a-radio-button>
+        <a-radio-button :value="1">不限</a-radio-button>
+      </a-radio-group>
+    </a-form-item>
+    <a-form-item
       label="智能扩量"
       :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
       :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }"
@@ -816,6 +832,7 @@ export default {
                 'devicePrice',
                 'businessInterest',
                 'filterConvertedLevel',
+                'disableInstalledAppSwitch'
               ])
             )
           })

+ 1 - 0
src/views/modules/kuaishouapp/crossAccount/templateModal.vue

@@ -147,6 +147,7 @@ export default {
           this.populationData.allForm.checkArr =
             this.populationData.allForm.appType == '2' ? JSON.parse(dataJson.appIds) : []
           this.populationData.checkApp = 'none'
+          this.populationData.disableInstalledAppSwitch = dataJson.disableInstalledAppSwitch 
           this.$nextTick(() => { 
             console.log(dataJson)
             this.form.setFieldsValue(pick(dataJson, ['templateName']))

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 436 - 189
src/views/modules/kuaishouapp/newBatch/index.vue