Prechádzať zdrojové kódy

账户配置功能迭代

jiayufei 4 rokov pred
rodič
commit
233a3fb1ce

+ 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://apipre.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';//生产环境
+  // 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

+ 18 - 17
src/views/modules/account-config/components/check-more-plat/check-more-plat.vue

@@ -125,28 +125,29 @@
 }
 </style>
 <template>
-  <div class="ul-radio-group">
-    <a-checkbox-group v-model="selectedVal" :disabled="disabled" style="width: 100%">
-      <a-checkbox
-        v-for="item of selectOption"
-        :label="item.label"
-        :key="item.value"
-        :value="item.value"
-        :class="{
-          item: true && userButton,
-          selection: selectedVal && selectedVal.indexOf(item.value) > -1 && userButton,
-          bgcolor: item.disabled,
-        }"
-        >{{ item.label }}</a-checkbox
-      >
-    </a-checkbox-group>
-  </div>
+    <div class="ul-radio-group">
+        <a-checkbox-group v-model="selectedVal" :disabled="disabled" style="width: 100%">
+            <a-checkbox
+                v-for="item of selectOption"
+                :label="item.label"
+                :key="item.value"
+                :value="item.value"
+                :class="{
+                    item: true && userButton,
+                    selection: selectedVal && selectedVal.indexOf(item.value) > -1 && userButton,
+                    bgcolor: item.disabled
+                }"
+            >
+                {{ item.label }}
+            </a-checkbox>
+        </a-checkbox-group>
+    </div>
 </template>
 <script>
 import {isArray} from '@/utils/Tools';
 import {getAction } from '@/api/manage';
 export default {
-    name: 'check-more-plat', // checkbox组件二次封装
+    name: 'check-more-plat',
     props: {
         userButton: {
             type: Boolean,

+ 23 - 5
src/views/modules/account-config/components/configuration-modal.vue

@@ -398,9 +398,9 @@
                         </a-form-model-item>
                         <a-form-model-item label="平台">
                             <!-- <check-more-plat
-                                v-model="configForm.adPlatform"
+                                v-model="configForm.updateAdPlatform"
                                 :options="adPlatformOption"
-                                @change="getAgeSelect"
+                                @change="handlePlateSelect"
                             >
                             </check-more-plat> -->
                             <a-radio-group v-model="configForm.adPlatform" button-style="solid">
@@ -449,7 +449,7 @@
                             </a-radio-group>
                         </a-form-model-item>
                         <a-form-model-item v-if="configForm.adConvertType" label="过滤已转化用户">
-                            <a-radio-group v-model="configForm.adHideIfConverted" button-style="solid">
+                            <a-radio-group v-model="configForm.adHideIfConverted" button-style="solid" @change="handleAdhideConver">
                                 <a-radio-button
                                     v-for="item in adHideIfConvertedDataOption"
                                     :key="item.id"
@@ -832,7 +832,7 @@
                     />
                 </a-form-model-item>
                 <div v-if="subTitleMsgStatus" style="width: 500px;color: #f00;margin-left: 140px">{{ subTitleMsg }}</div>
-                <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="自动生成素材视频">
+                <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="自动生成视频素材">
                     <a-radio-group v-model="configForm.creativeIsPresentedVideo" button-style="solid">
                         <a-radio-button :value="0">不启用</a-radio-button>
                         <a-radio-button :value="1">启用</a-radio-button>
@@ -1256,7 +1256,7 @@ export default {
                 creativeIsCommentDisable: 1,
                 creativeDownloadStatus: 1,
                 creativeSubTitle: '',
-                adConvertedTimeDuration: 'ONE_MONTH',
+                adConvertedTimeDuration: 'THREE_MONTH',
                 adDownloadMode: 'DEFAULT',
                 dpLinkIndexUsed: 0,
                 adRetargetingTagsType: '',
@@ -1304,6 +1304,7 @@ export default {
                 customPerson: 'NONE', // 定向-自定义
                 adSuperiorPopularityType: 'NONE', // 定向-媒体定向
                 adPlatform: 'NONE', // 定向-平台
+                updateAdPlatform: ['NONE'],
                 adDeviceSelectType: ['NONE'],
                 adSelectAc: ['NONE'],
                 adAc: '', // 定向-网络
@@ -1450,6 +1451,12 @@ export default {
     methods: {
         ...mapGetters(['nickname', 'avatar', 'userInfo']),
         moment,
+        handleAdhideConver(e) {
+            const defaultValue = e.target.value;
+            if (defaultValue === 'CUSTOMER' || defaultValue === 'APP') {
+                this.configForm.adConvertedTimeDuration = 'THREE_MONTH';
+            }
+        },
         handleAdAutoExtend(e) {
             const defaultValue = e.target.value;
             if (defaultValue === '0') {
@@ -1723,6 +1730,17 @@ export default {
                 this.configForm.adSelectCity = [];
             }
         },
+        handlePlateSelect(data) {
+            if (data.length > 1 && data.findIndex(item => item === 'NONE') === 0) {
+                data.splice(data.findIndex(item => item === 'NONE'), 1);
+            }
+            else if (data.length > 1 && data.findIndex(item => item === 'NONE') === data.length - 1) {
+                data.splice(0, data.length - 1);
+            }
+            else if (data.length === 0) {
+                data.push('NONE');
+            }
+        },
         getAgeSelect(data) {
             if (data.length > 1 && data.findIndex(item => item === 'NONE') === 0) {
                 data.splice(data.findIndex(item => item === 'NONE'), 1);

+ 18 - 5
src/views/modules/creative-copywrit/creative-copywrit.vue

@@ -1514,7 +1514,7 @@
                                             v-for="val in item.updateTagsList"
                                             :key="val.id"
                                             color="#1890ff"
-                                            @click="handleGetChangeAll(val.name, item.name)"
+                                            @click="handleGetChangeAll(val.name, item.name, val.maxWordLen, item.id)"
                                         >
                                             + {{ val.name }}
                                         </a-tag>
@@ -1524,7 +1524,7 @@
                                             v-for="val in item.defaultTagsList"
                                             :key="val.id"
                                             color="#1890ff"
-                                            @click="handleGetChangeAll(val.name, item.name)"
+                                            @click="handleGetChangeAll(val.name, item.name, val.maxWordLen, item.id)"
                                         >
                                             + {{ val.name }}
                                         </a-tag>
@@ -1597,7 +1597,7 @@
                                             v-for="val in item.updateTagsList"
                                             :key="val.id"
                                             color="#1890ff"
-                                            @click="handleGetChangeAll(val.name, item.name)"
+                                            @click="handleGetChangeAll(val.name, item.name, val.maxWordLen, item.id)"
                                         >
                                             + {{ val.name }}
                                         </a-tag>
@@ -1607,7 +1607,7 @@
                                             v-for="val in item.defaultTagsList"
                                             :key="val.id"
                                             color="#1890ff"
-                                            @click="handleGetChangeAll(val.name, item.name)"
+                                            @click="handleGetChangeAll(val.name, item.name, val.maxWordLen, item.id)"
                                         >
                                             + {{ val.name }}
                                         </a-tag>
@@ -2014,8 +2014,19 @@ export default {
                 console.log(error, 'eeee');
             });
         },
+        judge(item, lens, formId) {
+            console.log(item, this.defaultFormList, 'item---select');
+            let re = /{{(.*?)}}/g;
+            let array = [];
+            let temp;
+            let changeLen = 0;
+            while ((temp = re.exec(item))) {
+                array.push(temp[1]);
+            };
+            console.log(array, 'array--array');
+        },
         // 点击获取光标位置进行字段插入
-        handleGetChangeAll(item, field) {
+        handleGetChangeAll(item, field, lens, formId) {
             let node = document.getElementById(field);
             let startPos = node.selectionStart; // input 第0个字符到选中的字符
             let endPos = node.selectionEnd; // 选中的字符到最后的字符
@@ -2029,6 +2040,7 @@ export default {
                 node.selectionStart = startPos + item.length + 6;
                 node.selectionEnd = startPos + item.length + 6;
             }
+            this.judge(this.examinForm.getFieldsValue()[field], lens, formId);
             node.focus();
             node.blur();
         },
@@ -2207,6 +2219,7 @@ export default {
             });
         },
         handleFormInputChang(e, data) {
+            this.judge(e.target.value);
             const changeFiled = [];
             this.defaultFormList.forEach(item => {
                 if (item.id === data.id) {

+ 1 - 1
src/views/modules/headline-view/headline-view.vue

@@ -122,7 +122,7 @@
                     </div>
                     <div class="accountBodyRightInfoItem">
                         <span class="name">投放状态:</span>
-                        <span>{ topAccountMsg.accountMap && topAccountMsg.accountMap.accountStatus === '0' ? '投放中' : '未投放' }}</span>
+                        <span>{{ topAccountMsg.accountMap && topAccountMsg.accountMap.accountStatus === 0 ? '投放中' : '未投放' }}</span>
                     </div>
                     <div class="accountBodyRightInfoItem createNum" @click="gorejectCreativePage">
                         <span class="name">被拒创意数:</span>