Browse Source

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

魏志佳 5 years ago
parent
commit
1dd1e22f1c

+ 4 - 4
src/views/modules/kuaishouapp/account/originality.vue

@@ -28,7 +28,7 @@
               <a-row class="image-list-heading vm-panel" style="padding: 8px 20px;">
                 <a-col :md="7" :sm="8" style="display:flex">
                   <a-form-item label="创意id">
-                    <a-input placeholder="请输入广告创意id" v-model="creativeId"></a-input>
+                    <a-input placeholder="请输入广告创意id" v-model="creativeIdTwo"></a-input>
                   </a-form-item>
                 </a-col>
                 <a-col :md="7" :sm="8" style="display:flex">
@@ -231,7 +231,7 @@
     data: function () {
       return {
         creativeName: "",
-        creativeId: '',
+        creativeIdTwo: '',
         visible: false,
         visibleAll: false,
         allLoading: false,
@@ -514,7 +514,7 @@
         this.getDataList(localStorage.getItem('originalityKey'))
       },
       searchRe() {
-        this.creativeId = ''
+        this.creativeIdTwo = ''
         this.creativeName = ''
         this.getDataList(localStorage.getItem('originalityKey'))
       },
@@ -526,7 +526,7 @@
         params.accountId = localStorage.getItem('accountId')
         params.pageNo = this.ipagination.current
         params.pageSize = this.ipagination.pageSize
-        params.creativeId = this.creativeId
+        params.creativeId = this.creativeIdTwo
         params.creativeName = this.creativeName
         getAction('/kuaishou/batch/getCreativeList', params).then(res => {
           if (res.code == 0) {

+ 2 - 1
src/views/modules/kuaishouapp/account/stepForm/Step3.vue

@@ -229,7 +229,7 @@
         </div>
       </div>
       <template slot="footer">
-        <!-- <a-button key="back" @click="handleCancel">关闭</a-button> -->
+        <a-button key="back" @click="handleCancel">关闭</a-button>
         <a-button key="submit" type="primary" @click="handleOk">
           返回列表
         </a-button>
@@ -822,6 +822,7 @@
       },
       handleCancel(e) {
         this.visible = false
+        this.remove(this.pansKey)
       },
       handleSubmit(e) {
         e.preventDefault()

+ 1 - 1
vue.config.js

@@ -65,7 +65,7 @@ module.exports = {
        },*/
       '/jeecg-boot': {
        
-        // target: 'http://192.168.1.90:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+        target: 'http://192.168.1.90:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
        
         target: 'http://192.168.1.72:8088', //请求本地 需要jeecg-boot后台项目  英豪