Quellcode durchsuchen

Merge branch 'feature/middle-jyf'

jiayufei vor 4 Jahren
Ursprung
Commit
801b04f582

+ 13 - 2
src/views/modules/BatchCreate/linkMultiSelect.vue

@@ -62,7 +62,19 @@
         checkedShowList:[],
       }
     },
-    watch: {},
+    watch: {
+		listArr(newVal) {
+			if (newVal) {
+				newVal.forEach(item => {
+					this.listArr1.forEach(ele => {
+						if (ele.value == item) {
+							ele.checked = true;
+						}
+					});
+				});
+			}
+		}
+	},
     methods: {
       getItemData(val) {
         this.$nextTick(() => {
@@ -569,7 +581,6 @@
                 parentCode:0,
                 level:this.maxLayers
             }).then((res)=>{
-                console.log(res);
                 if(res.success){
                     res.data.forEach((item,index)=>{
                         item.value=item.code

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

@@ -2242,7 +2242,7 @@ export default {
                             this.handleGetPackage();
                         }
                         setTimeout(() => {
-                            this.listArr = detailData.adCity.split(',');
+                            this.listArr = detailData.adCity.split(',').map(item => Number(item));
                             this.configForm.adSelectCity = detailData.adCity.split(',');
                         }, 1000);
                         let paramsData = {};

+ 1 - 0
src/views/modules/creative-copywrit/creative-copywrit.vue

@@ -592,6 +592,7 @@
                                 <div class="show-data">
                                     <span>抖音</span>
                                     <span>消耗:{{ items.bytedanceCost || 0 }}</span>
+                                    <!-- <span>广告语:{{ items.slogansCount || 0 }}</span> -->
                                 </div>
                                 <div class="show-data">
                                     <span>快手</span>

+ 6 - 3
src/views/modules/headline-view/headline-view.vue

@@ -449,7 +449,7 @@ export default {
                     key: 'adName',
                     align: 'center',
                     fixed: 'left',
-                    width: 240
+                    width: 340
                 },
                 {
                     title: '花费',
@@ -838,6 +838,7 @@ export default {
         },
         // 获取计划列表数据
         handleGetPlanTableList(data) {
+            this.planData = [];
             const paramsData = {
                 accountId: data.account.accountId,
                 startTime: this.planRangePicker[0],
@@ -847,10 +848,11 @@ export default {
             };
             getAction(urlAcount + '/bytedance-api/advertiser/bytedanceReportController/getReportPlanCost', paramsData).then(result => {
                 if (result.code === 0) {
-                    this.planData = result.result.list.map(item => {
+                    let defaultData = result.result.list.map(item => {
                         item.converRate = item.converRate + '%';
                         return item;
-                    });
+                    });;
+                    this.planData = [...defaultData];
                     this.planTotalAll = result.result.total;
                 }
                 else {
@@ -1148,6 +1150,7 @@ export default {
                         });
                         let option = isType + '<br/>';
                         for (let i = 0, length = params.length; i < length; i++) {
+                            console.log(params[i], 'params[i]--params[i]');
                             const showTime = specialIdentification === '时' ? params[i].seriesName : '';
                             option += `<span style="width:8px;height:8px;border-radius:50%;background:${params[i].color};display:inline-block;position:relative;top:-2px;margin-right:5px"></span>${showTime} ${params[i].axisValue}${specialIdentification} ${params[i].data}${showBai}<br />`;
                         }