瀏覽代碼

提交代码

朱鑫波 4 年之前
父節點
當前提交
bdcdd95e96

+ 1 - 1
.env

@@ -1 +1 @@
-VUE_APP_BASE_API_URL = http://localhost:3030
+VUE_APP_BASE_API_URL = http://118.24.244.213:3030

+ 3 - 3
src/views/modules/kuaishouapp/account/stepForm/Step2.vue

@@ -120,14 +120,14 @@
         </a-checkbox-group>
       </a-form-item>
 
-      <!-- <a-form-item label="投放范围" :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
+      <a-form-item label="投放范围" :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
         :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }"
         v-if="allianceAccount">
         <a-radio-group buttonStyle="solid" v-model="allForm.allianceAccount">
           <a-radio-button value="1">默认</a-radio-button>
           <a-radio-button value="2">联盟广告</a-radio-button>
         </a-radio-group>
-      </a-form-item> -->
+      </a-form-item>
 
 
       <div style="text-align:center;font-size:16px;margin-bottom:10px">
@@ -245,7 +245,7 @@
         :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }">
          <a-radio-group buttonStyle="solid" v-decorator="['unitType', { initialValue: '4' }]">
           <a-radio-button value="4">自定义</a-radio-button>
-          <a-radio-button value="7">程序化创意2.0</a-radio-button>
+          <a-radio-button value="7" :disabled="allForm.allianceAccount=='2'">程序化创意2.0</a-radio-button>
         </a-radio-group>
        </a-form-item>
       <div style="text-align:center;font-size:16px">优化目标和计费</div>

+ 18 - 13
src/views/modules/kuaishouapp/account/stepForm/Step3.vue

@@ -126,14 +126,7 @@
             <a-input v-model="pane.tab" readOnly></a-input>
           </a-form-item>
 
-          <a-form-item label="素材类型" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="pane.sceneId.indexOf(5)>=0||pane.sceneId.indexOf(1)>=0||pane.sceneId.indexOf(7)>=0||pane.sceneId.indexOf(6)>=0">
-            <a-radio-group buttonStyle="solid" v-decorator="['creativeMaterialType', { initialValue: '1' }]"  @change="changeType(bestIndex)">
-              <a-radio-button value="1">竖版视频</a-radio-button>
-              <a-radio-button value="2">横版视频</a-radio-button>
-              <!-- <a-radio-button value="4" v-if="JSON.parse(pane.sceneId).indexOf(7)>0">便利贴创意</a-radio-button> -->
-              
-            </a-radio-group>
-          </a-form-item>
+         
           <!-- <a-form-item label="素材同步" :labelCol="labelCol" :wrapperCol="wrapperCol">
            
           </a-form-item> -->
@@ -147,6 +140,14 @@
                       <a-icon type="close" style="float:right;cursor: pointer;"
                         @click="deleteCreative(bestIndex, index)" />
                       <div style="clear:both"></div>
+                      <a-form-item label="素材类型">
+                        <a-radio-group buttonStyle="solid" v-model="item.creativeMaterialType"  @change="changeType(item)">
+                          <a-radio-button value="1">竖版视频</a-radio-button>
+                          <a-radio-button value="2">横版视频</a-radio-button>
+                          <!-- <a-radio-button value="4" v-if="JSON.parse(pane.sceneId).indexOf(7)>0">便利贴创意</a-radio-button> -->
+                          
+                        </a-radio-group>
+                      </a-form-item>
                       <div class="dynamically_add_form_item">
 
                         <a-form-item label="" v-if="getData('creativeMaterialType')!='4'">
@@ -745,8 +746,14 @@
       }
     },
     methods: {
-      changeType(index) {
+      changeType(item) {
         this.$nextTick(() => {
+          if(item.creativeMaterialType=='1'){
+            item.name = '自定义创意_竖版视频_' 
+          }else{
+            item.name = '自定义创意_横版视频_' 
+          }
+           
           console.log(this.getData('creativeMaterialType'))
           // if (this.getData('creativeMaterialType') == '1') {
           //   if (this.verticalPhoto.length > 0) {
@@ -1293,7 +1300,6 @@
               content: this.content
             }
             console.log(params)
-            this.loading = false
             postAction('/kuaishou/batch/createCreative', params).then(res => {
               if (res.success) {
                 this.visible = true
@@ -1322,10 +1328,9 @@
           this.pans[index].list.push({
             videoList: '',
             imageList: [],
-            name: this.getData('creativeMaterialType') == '1' ?
-              '自定义创意_竖版视频_' : '自定义创意_横版视频_',
+            name: '自定义创意_竖版视频_' ,
             description: '',
-            creativeMaterialType: this.getData('creativeMaterialType'),
+            creativeMaterialType: '1',
             actionBarText: '',
             imageUrlList: [],
             checkArrImage: [],

+ 36 - 64
src/views/modules/kuaishouapp/account/stepForm/Step4.vue

@@ -174,7 +174,7 @@ li.chouzhen.first:before {
             <a-layout>
               <a-layout-content style="padding: 10px">
                 <div :style="{ marginBottom: '16px' }" style="float: right">
-                  <a-button @click="addCreative(bestIndex)" :disabled="videoCount >= 8 || listCheck">添加创意</a-button>
+                  <a-button @click="addCreative(bestIndex)" :disabled="videoCount >= 5 || listCheck">添加创意</a-button>
                 </div>
                 <a-row style="margin-top: 50px">
                   <a-col :span="24" v-for="(item, index) of pane.list" :key="index">
@@ -332,21 +332,6 @@ li.chouzhen.first:before {
             ></a-input>
           </a-form-item>
           <!-- , { validator: handleConfirmValue } -->
-          <a-form-item label="监测链接" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-input
-              v-decorator="[
-                'actionbarClickUrl',
-                {
-                  rules: [{ message: '请输入第三方监测链接' }],
-                },
-              ]"
-              placeholder="请输入第三方监测链接"
-            ></a-input>
-            <a v-if="getData('clickTrackUrl')" @click="clickTrackUrlShow = true" style="margin-right: 10px"
-              >收藏监测链接</a
-            >
-            <a @click="getClickTrackUrlList()">监测链接列表</a>
-          </a-form-item>
 
           <a-form-item label="创意标题" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input
@@ -362,8 +347,9 @@ li.chouzhen.first:before {
     </a-form-item>
     <checkMatemal ref="check" @showVideo="showData"></checkMatemal>
     <a-modal :maskClosable="false" v-model="visible" title="广告创意创建情况">
-      <div>
-        创建成功:{{ allForm.success.length }}条
+      <div style="font-size:24px">
+        {{ allForm.success }}
+        <!-- 创建成功:{{ allForm.success.length }}条
         <div style="margin-top: 20px">
           <p v-for="(item, index) of allForm.success" :key="index">
             <span>名称:{{ item.creativeName }}</span>
@@ -377,8 +363,9 @@ li.chouzhen.first:before {
             <br />
             <span>错误信息:{{ item.failMessage }}</span>
           </p>
-        </div>
+        </div> -->
       </div>
+      <div v-if="allForm.fail">失败原因:{{ allForm.fail }}</div>
       <template slot="footer">
         <a-button key="back" @click="handleCancel">关闭</a-button>
         <a-button key="submit" type="primary" @click="handleOk">返回列表</a-button>
@@ -393,7 +380,7 @@ li.chouzhen.first:before {
     >
       <template slot="footer">
         <a-button key="back" @click="closeImage">取消</a-button>
-        <a-button key="submit" type="primary" @click="handleOkImage" :loading="loadingImage">确定</a-button>
+        <a-button type="primary" @click="handleOkImage" :loading="loadingImage">确定</a-button>
       </template>
       <a-form-item label class="add-image-material">
         <uploadFile
@@ -434,7 +421,7 @@ li.chouzhen.first:before {
     >
       <template slot="footer">
         <a-button key="back" @click="closeVideo">取消</a-button>
-        <a-button key="submit" type="primary" @click="handleOkVideo" :loading="loadingVideo">确定</a-button>
+        <a-button type="primary" @click="handleOkVideo" :loading="loadingVideo">确定</a-button>
       </template>
       <a-form-item label class="add-image-material">
         <uploadFile
@@ -457,7 +444,7 @@ li.chouzhen.first:before {
     <a-modal :maskClosable="false" title="抽帧展示" v-model="chouzhen" :width="1000">
       <template slot="footer">
         <a-button key="back" @click="chouzhen = false">关闭</a-button>
-        <a-button key="submit" type="primary" @click="handleOkChouzhen">确定</a-button>
+        <a-button type="primary" @click="handleOkChouzhen">确定</a-button>
       </template>
       <!-- <a-button type="primary" @click="onCheckAllChange">全选</a-button> -->
       <!-- </a-checkbox> -->
@@ -612,11 +599,7 @@ li.chouzhen.first:before {
     </a-modal>
     <a-modal title="监测链接名称" v-model="clickTrackUrlShow">
       <template slot="footer">
-        <a-button
-          key="submit"
-          :disabled="trackUrlName == '' && !showTrackUrlNameElse"
-          type="primary"
-          @click="clickTrackUrlOk"
+        <a-button :disabled="trackUrlName == '' && !showTrackUrlNameElse" type="primary" @click="clickTrackUrlOk"
           >确定</a-button
         >
       </template>
@@ -766,8 +749,8 @@ export default {
       allForm: {
         videoList: '',
         imageList: [],
-        fail: [],
-        success: [],
+        fail: null,
+        success: null,
       },
       form: this.$form.createForm(this),
       list: [],
@@ -1285,22 +1268,17 @@ export default {
       }
     },
     handleOk() {
-      if (this.allForm.fail.length == 0) {
-        this.remove(this.pansKey)
-        if (localStorage.getItem('originality')) {
-          this.$router.replace({
-            path: '/account/originality',
-          })
-        } else {
-          this.$router.replace({
-            path: '/account/accountIndex',
-          })
-        }
-
-        this.visible = false
+      this.remove(this.pansKey)
+      if (localStorage.getItem('originality')) {
+        this.$router.replace({
+          path: '/account/originality',
+        })
       } else {
-        this.visible = false
+        this.$router.replace({
+          path: '/account/accountIndex',
+        })
       }
+      this.visible = false
     },
     handleCancel(e) {
       this.visible = false
@@ -1401,30 +1379,24 @@ export default {
           postAction('/ctop/kuaishouProgramCreative/createProgramCreative', params).then((res) => {
             if (res.success) {
               this.loading = false
-              // this.visible = true
-              // this.allForm.fail = res.result.fail
-              // this.allForm.success = res.result.success
-              if (localStorage.getItem('originality')) {
-                this.$router.replace({
-                  path: '/account/originality',
-                })
-              } else {
-                this.$router.replace({
-                  path: '/account/accountIndex',
-                })
-              }
+              this.visible = true
+              this.allForm.success = '创建成功'
+              // if (localStorage.getItem('originality')) {
+              //   this.$router.replace({
+              //     path: '/account/originality',
+              //   })
+              // } else {
+              //   this.$router.replace({
+              //     path: '/account/accountIndex',
+              //   })
+              // }
             } else {
               this.loading = false
               this.$message.error(res.message)
-              if (localStorage.getItem('originality')) {
-                this.$router.replace({
-                  path: '/account/originality',
-                })
-              } else {
-                this.$router.replace({
-                  path: '/account/accountIndex',
-                })
-              }
+              this.loading = false
+              this.visible = true
+              this.allForm.fail = res.message
+              this.allForm.success = '创建失败'
             }
           })
         }

+ 2 - 2
vue.config.js

@@ -68,7 +68,7 @@ module.exports = {
     open : true,
     proxy: {
       '/jeecg-boot': {
-        //  target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+         target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.1.72:8080', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
@@ -80,7 +80,7 @@ module.exports = {
         // target: 'http://192.168.1.94:8081', //请求本地 需要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: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目
          // target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目