朱鑫波 3 роки тому
батько
коміт
e847b8544e

+ 13 - 2
src/views/modules/autoLaunch/channelManage/channelAdmin/components/channelList.vue

@@ -156,8 +156,8 @@
                                     allow-clear
                                 >
                                     <a-select-option :value="''">不限</a-select-option>
-                                    <a-select-option :value="0">无效</a-select-option>
-                                    <a-select-option :value="1">有效</a-select-option>
+                                    <a-select-option :value="0"></a-select-option>
+                                    <a-select-option :value="1"></a-select-option>
                                 </a-select>
                             </a-form-item>
                         </a-col>
@@ -311,6 +311,17 @@
                         >+编号</a-tag
                     >
                 </a-form-item>
+                <a-form-item
+                    label="是否循环使用"
+                    :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 19 } }"
+                    class="require-class"
+                >
+                    <a-select v-decorator="['isCycle']" placeholder="请选择" allow-clear>
+                        <a-select-option :value="0">否</a-select-option>
+                        <a-select-option :value="1">是</a-select-option>
+                    </a-select>
+                </a-form-item>
             </a-form>
         </a-modal>
     </div>

+ 1 - 1
src/views/modules/autoLaunch/channelManage/channelAdmin/components/checkCreat.vue

@@ -312,7 +312,7 @@ export default {
             }
         },
         goBack() {
-            this.$router.replace('/autoLaunch/channelManage')
+            this.$router.replace('/autoLaunch/channelAdmin')
             
             this.$bus.$emit('remove', '/autoLaunch/createChannelIndex')
             this.$bus.$emit('remove', '/autoLaunch/createChannelIndex?accountId='+this.$route.query.accountId)

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

@@ -519,7 +519,7 @@ export default {
         onChange(value) {}
     },
     created: function() {
-        this.createTypeData = JSON.parse(localStorage.getItem('createTypeData'))
+        this.createTypeData = JSON.parse(localStorage.getItem('channelInfo'))
         let params = {}
         params.pageSize = '1000'
         params.mediaId = '2'

+ 28 - 8
src/views/modules/autoLaunch/channelManage/createChannel.vue

@@ -267,7 +267,17 @@ li.chouzhen.first:before {
                                             <a-input
                                                 v-decorator="[
                                                     'channelCode',
-                                                    { rules: [{ required: true, message: '请填写渠道号' }] }
+                                                    {
+                                                        rules: [
+                                                            { required: true, message: '请填写渠道号' },
+                                                            {
+                                                                min: 1,
+                                                                max: 20,
+                                                                message: '渠道号不能超过20个字符',
+                                                                trigger: 'blur'
+                                                            }
+                                                        ]
+                                                    }
                                                 ]"
                                                 allow-clear
                                                 id="channelCode"
@@ -291,7 +301,17 @@ li.chouzhen.first:before {
                                             <a-input
                                                 v-decorator="[
                                                     'channelName',
-                                                    { rules: [{ required: true, message: '请填写渠道号' }] }
+                                                    {
+                                                        rules: [
+                                                            { required: true, message: '请填写渠道号' },
+                                                            {
+                                                                min: 1,
+                                                                max: 50,
+                                                                message: '渠道号名称不能超过50个字符',
+                                                                trigger: 'blur'
+                                                            }
+                                                        ]
+                                                    }
                                                 ]"
                                                 allow-clear
                                                 id="channelName"
@@ -406,7 +426,7 @@ li.chouzhen.first:before {
                                                     'isHaveItem',
                                                     {
                                                         rules: [{ required: true, message: '是否关联单品必选' }],
-                                                        initialValue: 1
+                                                        initialValue: 0
                                                     }
                                                 ]"
                                             >
@@ -420,7 +440,7 @@ li.chouzhen.first:before {
                                     <a-col :span="16">
                                         <a-form-item label="使用层级">
                                             <a-radio-group
-                                                disabled
+                                                
                                                 button-style="solid"
                                                 v-decorator="[
                                                     'usageLevel',
@@ -441,7 +461,7 @@ li.chouzhen.first:before {
                                     <a-col :span="16">
                                         <a-form-item label="是否循环使用">
                                             <a-radio-group
-                                                disabled
+                                                
                                                 button-style="solid"
                                                 v-decorator="[
                                                     'isCycle',
@@ -632,13 +652,13 @@ export default {
             let z = /-/g
             let a = /\//g
             let d = /\./g
-            if (value === '' || value === undefined || value === 0  || value === '0') {
+            if (value === '' || value === undefined || value === 0 || value === '0') {
                 callback('编号必须填写')
             } else if (value.match(d)) {
                 callback('请填写正确编号')
             } else if (value.match(a)) {
                 callback('请填写正确编号')
-            } else if (value.match(z)&&value.match(z).length > 1) {
+            } else if (value.match(z) && value.match(z).length > 1) {
                 callback('请填写正确编号')
             } else if (value.startsWith('-') || value.endsWith('-')) {
                 callback('请填写正确编号')
@@ -752,7 +772,7 @@ export default {
         },
         goBack() {
             localStorage.removeItem('channelInfo')
-            this.$router.replace('/autoLaunch/channelManage')
+            this.$router.replace('/autoLaunch/channelAdmin')
             this.$bus.$emit('remove', '/autoLaunch/createChannelIndex')
 
             this.$bus.$emit('remove', '/autoLaunch/createChannelIndex?accountId=' + this.$route.query.accountId)

+ 2 - 2
vue.config.js

@@ -105,7 +105,7 @@ module.exports = {
         // target: 'http://192.168.1.43:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.43:8806', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        target: 'http://192.168.1.59:7701', //请求本地 需要jeecg-boot后台项目  赵西安
+        // target: 'http://192.168.1.59:7701', //请求本地 需要jeecg-boot后台项目  赵西安
         // target: 'http://192.168.1.193:8080', //请求本地 需要jeecg-boot后台项目  李煜一
         // target: 'http://192.168.1.193:31012', //请求本地 需要jeecg-boot后台项目  李煜一
         // target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
@@ -119,7 +119,7 @@ module.exports = {
         // target:'http://gateway.tjyourong.com.cn', //测试
         // target:'http://apipre.tjyourong.com.cn', //预生产
         // target: 'http://192.168.1.134:7001', //请求本地 需要jeecg-boot后台项目  周泽宇
-        // target:'http://192.168.0.195:9999/',
+        target:'http://192.168.0.195:9999/',
         // target:'http://gateway.tjyourong.com.cn/',//测试
 
         ws: false,