Browse Source

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-vue

魏志佳 4 years ago
parent
commit
2cc4630e92
2 changed files with 14 additions and 12 deletions
  1. 13 11
      src/views/modules/kuaishouapp/account/stepForm/Step4.vue
  2. 1 1
      vue.config.js

+ 13 - 11
src/views/modules/kuaishouapp/account/stepForm/Step4.vue

@@ -60,8 +60,8 @@
 .sticker-styles .ant-checkbox-wrapper + .ant-checkbox-wrapper {
 .sticker-styles .ant-checkbox-wrapper + .ant-checkbox-wrapper {
   margin-left: 0;
   margin-left: 0;
 }
 }
-.display-none-selset{
-  display: none!important;
+.display-none-selset {
+  display: none !important;
 }
 }
 </style>
 </style>
 <style scoped lang="scss">
 <style scoped lang="scss">
@@ -1153,14 +1153,14 @@ export default {
     okTitleCun(item) {
     okTitleCun(item) {
       if (this.guanggao.length > 0) {
       if (this.guanggao.length > 0) {
         if (this.guanggao[0].captions) {
         if (this.guanggao[0].captions) {
-          if(this.guanggao.length>3){
+          if (this.guanggao.length > 3) {
             this.$message.error('广告语最多选择3条')
             this.$message.error('广告语最多选择3条')
             return
             return
           }
           }
           this.captionsList = []
           this.captionsList = []
           this.captionsList.push(...this.guanggao)
           this.captionsList.push(...this.guanggao)
         } else {
         } else {
-           if(this.guanggao.length>6){
+          if (this.guanggao.length > 6) {
             this.$message.error('封面广告语最多选择6条')
             this.$message.error('封面广告语最多选择6条')
             return
             return
           }
           }
@@ -1517,7 +1517,7 @@ export default {
           var params = {
           var params = {
             // dataJson: allJson,
             // dataJson: allJson,
             ...values,
             ...values,
-            creativeCategory:values.creativeCategory?values.creativeCategory.pop():null,
+            creativeCategory: values.creativeCategory ? values.creativeCategory.pop() : null,
             unitId: this.pansKey,
             unitId: this.pansKey,
             accountId: localStorage.getItem('accountId'),
             accountId: localStorage.getItem('accountId'),
             content: this.content,
             content: this.content,
@@ -1525,9 +1525,12 @@ export default {
               return item.captions
               return item.captions
             }),
             }),
             stickerStyles: this.stickerStylesValue,
             stickerStyles: this.stickerStylesValue,
-            coverSlogans: this.coverSlogansList.map((item) => {
-              return item.coverSlogans
-            }),
+            coverSlogans:
+              this.stickerStylesValue.length > 0
+                ? this.coverSlogansList.map((item) => {
+                    return item.coverSlogans
+                  })
+                : [],
             horizontalPhotoIds: this.horizontalPhoto[0].videoList.map((item) => {
             horizontalPhotoIds: this.horizontalPhoto[0].videoList.map((item) => {
               return item.photoId
               return item.photoId
             }),
             }),
@@ -2081,8 +2084,8 @@ export default {
     },
     },
   },
   },
   watch: {
   watch: {
-    cunTitleVisible(n,o){
-      if(!n){
+    cunTitleVisible(n, o) {
+      if (!n) {
         this.guanggao = []
         this.guanggao = []
         this.cunTitleList = []
         this.cunTitleList = []
       }
       }
@@ -2184,7 +2187,6 @@ export default {
         }
         }
       })
       })
 
 
-
       getAction('/kuaishou/batch/getCreativeCategory', {
       getAction('/kuaishou/batch/getCreativeCategory', {
         accountId: localStorage.getItem('accountId'),
         accountId: localStorage.getItem('accountId'),
       }).then((res) => {
       }).then((res) => {

+ 1 - 1
vue.config.js

@@ -80,7 +80,7 @@ module.exports = {
         target: 'http://192.168.1.94:8080', //请求本地 需要jeecg-boot后台项目  赵西安
         target: 'http://192.168.1.94:8080', //请求本地 需要jeecg-boot后台项目  赵西安
 
 
 
 
-        //  target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
+         target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目
          // target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目
          // target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目