zhuxinbo hace 5 años
padre
commit
3e5c9be54a

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

@@ -58,7 +58,7 @@
       </a-form-item>
 
       <a-form-item label="转化目标" :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
-        :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }">
+        :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }" v-if="campaignType == 2||campaignType == 4||campaignType == 5">
         <span v-if="convertId&&!convert" style="display:block;font-size:16px">已选择转化目标: {{convertId.label}}</span>
         <a-button type="primary" @click="showConvert">{{convertId?'更换转化目标':'选择转化目标'}}</a-button>
       </a-form-item>
@@ -562,6 +562,7 @@
             this.$message.error('请选择应用')
           }
         } else {
+          this.convert = true
           this.convertType = '1'
         }
         this.getConvertList()

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

@@ -167,7 +167,7 @@
               allowClear placeholder="选择行动号召按钮文案" optionFilterProp="children" :filterOption="filterOption">
               <a-select-option v-for="appModel in appList" :key="appModel.id" :value="appModel.actionBarText">
                 {{ appModel.actionBarText }}
-              </a-select-option>x
+              </a-select-option>
             </a-select>
           </a-form-item>
           <a-form-item label="监测链接" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -354,7 +354,7 @@
     },
     data() {
       return {
-        tags:[],
+        tags: [],
         visibleMatemal: false,
         time: [],
         channelType: 0,
@@ -581,6 +581,11 @@
         params.materialType = this.getData('creativeMaterialType')
         params.pageSize = this.ipagination.pageSize
         params.pageNo = page
+        params.channelType = this.channelType
+        if (this.active == 0 && this.time.length > 0) {
+          params.startDate = moment(this.time[0]).format('YYYY-MM-DD')
+          params.endDate = moment(this.time[1]).format('YYYY-MM-DD')
+        }
         this.showVideoList('/kuaishou/batch/getVideoList', params)
       },
       showVideoList(url, params) {
@@ -1213,6 +1218,7 @@
           params.pageSize = this.ipagination.pageSize
           params.pageNo = 1
           params.channelType = this.channelType
+          this.ipagination.current = 1
           this.showVideoList('/kuaishou/batch/getVideoList', params)
         }
       }
@@ -1246,7 +1252,7 @@
       getAction('/kuaishou/batch/creativeWord', {
         accountId: localStorage.getItem('accountId')
       }).then(res => {
-        if(res.success){
+        if (res.success) {
           this.tags = res.result
         }
       })

+ 2 - 0
src/views/modules/kuaishouapp/account/stepForm/stepModule/checkMatemal.vue

@@ -117,6 +117,7 @@ export default {
       this.dataSource = []
       this.visibleMatemal = true
       this.joinVideo.key = key
+      this.ipagination.current = 1
       var params = {}
       params.accountId = localStorage.getItem('accountId')
       params.materialType = typeName
@@ -131,6 +132,7 @@ export default {
       this.getData(url, params)
     },
     getData(url, params) {
+      this.dataSource = []
       getAction(url, params).then(res => {
         if (res.success) {
           this.dataSource = res.result.records

+ 1 - 1
src/views/modules/material/scriptFile.vue

@@ -159,7 +159,7 @@
         visibleBind: false,
         wpsType: 'word',
         type: "add",
-        uploadAction: "http://api.tjyourong.com.cn/ctop/wpsFile/uploadFile",
+        uploadAction: "http://api.tjyourong.com.cn/jeecg-boot/ctop/wpsFile/uploadFile",
         columns: [{
             title: '脚本名称',
             align: "center",

+ 262 - 289
src/views/modules/yard/YardList.vue

@@ -1,36 +1,40 @@
 <style>
-.ping .ant-modal-content .ant-modal-footer {
-  display: none !important;
-}
-.ant-modal-body {
-  padding-top: 0px;
-}
-li {
-  list-style-type: none;
-}
+  .ping .ant-modal-content .ant-modal-footer {
+    display: none !important;
+  }
+
+  .ant-modal-body {
+    padding-top: 0px;
+  }
+
+  li {
+    list-style-type: none;
+  }
 </style>
 <style lang="scss" scoped>
-.actor-photo-list {
-  display: flex;
-  padding-left: 0;
-  li {
-    width: 25%;
-    margin: 10px;
-    position: relative;
-    height: 250px;
-    border: 1px solid #f2f2f2;
-    img,
-    video {
-      width: 100%;
-      margin-top: auto;
-      margin-bottom: auto;
-      top: 0;
-      bottom: 0;
-      position: absolute;
-      max-height: 250px;
+  .actor-photo-list {
+    display: flex;
+    padding-left: 0;
+
+    li {
+      width: 25%;
+      margin: 10px;
+      position: relative;
+      height: 250px;
+      border: 1px solid #f2f2f2;
+
+      img,
+      video {
+        width: 100%;
+        margin-top: auto;
+        margin-bottom: auto;
+        top: 0;
+        bottom: 0;
+        position: absolute;
+        max-height: 250px;
+      }
     }
   }
-}
 </style>
 <template>
   <a-card :bordered="false">
@@ -47,12 +51,7 @@ li {
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button
-                type="primary"
-                @click="searchReset"
-                icon="reload"
-                style="margin-left: 8px"
-              >重置</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
           </a-col>
         </a-row>
@@ -66,16 +65,8 @@ li {
 
     <!-- table区域-begin -->
     <div>
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-      >
+      <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
+        :pagination="ipagination" :loading="loading">
         <!-- 字符串超长截取省略号显示-->
         <span slot="esContent" slot-scope="text">
           <j-ellipsis :value="text" :length="10" />
@@ -110,22 +101,15 @@ li {
             <a type="primary" style="margin-left:10px" @click="addPhoto=true">新增场地图片</a>
             <ul class="actor-photo-list">
               <li v-for="(item,index) of photoList" :key="index">
-                <a-icon
-                  type="close-circle"
+                <a-icon type="close-circle"
                   style="position:absolute;top:-5px;right:-5px;color:red;z-index:10;cursor: pointer;"
-                  @click="deteleImg(item.id)"
-                />
+                  @click="deteleImg(item.id)" />
                 <img :src="item.photoUrl" alt />
               </li>
             </ul>
           </div>
           <div style="text-align:right">
-            <a-pagination
-              showQuickJumper
-              :total="total"
-              @change="pageChange"
-              :pageSize.sync="pageSize"
-            />
+            <a-pagination showQuickJumper :total="total" @change="pageChange" :pageSize.sync="pageSize" />
           </div>
         </a-tab-pane>
         <a-tab-pane tab="场地视频" key="2">
@@ -133,73 +117,32 @@ li {
             <a type="primary" style="margin-left:10px" @click="addVideo=true">新增场地视频</a>
             <ul class="actor-photo-list">
               <li v-for="(item,index) of videoList" :key="index">
-                <a-icon
-                  type="close-circle"
+                <a-icon type="close-circle"
                   style="position:absolute;top:-5px;right:-5px;color:red;z-index:10;cursor: pointer;"
-                  @click="deteleVideo(item.id)"
-                />
-                <video
-                  class="video"
-                  :src="item.videoUrl"
-                  controls="controls"
-                  style="min-height:160px"
-                >您的浏览器不支持 video 标签。</video>
+                  @click="deteleVideo(item.id)" />
+                <video class="video" :src="item.videoUrl" controls="controls" style="min-height:160px">您的浏览器不支持 video
+                  标签。</video>
               </li>
             </ul>
           </div>
           <div style="text-align:right">
-            <a-pagination
-              showQuickJumper
-              :total="videoTotal"
-              @change="pageChange"
-              :pageSize.sync="pageSize"
-            />
+            <a-pagination showQuickJumper  :total="videoTotal" @change="pageChange" :pageSize.sync="pageSize" />
           </div>
         </a-tab-pane>
       </a-tabs>
     </a-modal>
 
     <!-- 新增图集 -->
-    <a-modal
-      v-model="addPhoto"
-      title="新增图集"
-      @ok="handleOk('photo')"
-      @cancel="handleCancel('photo')"
-    >
-      <upload-to-ali
-        style="margin:10px"
-        v-model="imageUrl"
-        :customDomain="customDomain"
-        preview
-        :region="region"
-        :bucket="bucket"
-        :accept="acceptImage"
-        :max="1"
-        :size="1024000"
-        :accessKeyId="accessKeyId"
-        :accessKeySecret="accessKeySecret"
-      ></upload-to-ali>
+    <a-modal v-model="addPhoto" title="新增图集" @ok="handleOk('photo')" @cancel="handleCancel('photo')">
+      <upload-to-ali style="margin:10px" v-model="imageUrl" :customDomain="customDomain" preview :region="region"
+        :bucket="bucket" :accept="acceptImage" :max="1" :size="1024000" :accessKeyId="accessKeyId"
+        :accessKeySecret="accessKeySecret"></upload-to-ali>
     </a-modal>
     <!-- 新增作品 -->
-    <a-modal
-      v-model="addVideo"
-      title="新增作品"
-      @ok="handleOk('video')"
-      @cancel="handleCancel('video')"
-    >
-      <upload-to-ali
-        style="margin:10px"
-        v-model="videoUrl"
-        :customDomain="customDomain"
-        preview
-        :region="region"
-        :bucket="bucket"
-        :accept="acceptVideo"
-        :max="1"
-        :size="1024000"
-        :accessKeyId="accessKeyId"
-        :accessKeySecret="accessKeySecret"
-      ></upload-to-ali>
+    <a-modal v-model="addVideo" title="新增作品" @ok="handleOk('video')" @cancel="handleCancel('video')">
+      <upload-to-ali style="margin:10px" v-model="videoUrl" :customDomain="customDomain" preview :region="region"
+        :bucket="bucket" :accept="acceptVideo" :max="1" :size="1024000" :accessKeyId="accessKeyId"
+        :accessKeySecret="accessKeySecret"></upload-to-ali>
     </a-modal>
 
     <yard-modal ref="modalForm" @ok="modalFormOk"></yard-modal>
@@ -207,196 +150,226 @@ li {
 </template>
 
 <script>
-import YardModal from './modules/YardModal'
-import yardDetail from './modules/yardDetail'
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import JEllipsis from '@/components/jeecg/JEllipsis'
-import UploadToAli from '@femessage/upload-to-ali'
-import { yardPhotoList, yardVideoList, yardPhotoDelete, yardVideoDelete, yardPhotoAdd, yardVideoAdd } from '@/api/yard'
-export default {
-  name: 'YardList',
-  mixins: [JeecgListMixin],
-  components: {
-    JEllipsis,
-    YardModal,
-    UploadToAli
-  },
-  data() {
-    return {
-      queryParam: {},
-      description: '场地管理',
-      // 新增修改按钮是否显示
-      show: true,
-      // 表头
-      columns: [
-        {
-          title: 'ID',
-          align: 'center',
-          dataIndex: 'id'
-        },
-        {
-          title: '场地名称',
-          align: 'center',
-          dataIndex: 'buildingName'
-        },
-        {
-          title: '地址',
-          align: 'center',
-          dataIndex: 'address'
-        },
-        {
-          title: '联系人',
-          align: 'center',
-          dataIndex: 'contactName'
-        },
-        {
-          title: '联系电话',
-          align: 'center',
-          dataIndex: 'contactMobile'
-        },
-        {
-          title: '创建时间',
-          align: 'center',
-          dataIndex: 'createTime'
-        },
-        {
-          title: '操作',
-          dataIndex: 'action',
-          align: 'center',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      url: {
-        list: '/ctop/yard/list'
-      },
-      detail: false,
-      indexDetail: '1',
-      currentPage: 0,
-      pageSize: 4,
-      videoTotal: 0,
-      photoTotal: 0,
-      total: 0,
-      videoList: [],
-      photoList: [],
-      imageUrl: '',
-      videoUrl: '',
-      customDomain: '',
-      region: 'oss-cn-beijing',
-      bucket: 'ctop-media',
-      acceptVideo: 'video/mpeg,video/mp4',
-      acceptImage: 'image/jpeg,image/jpg,image/png',
-      accessKeyId: 'LTAIbNbqWzSOklQV',
-      accessKeySecret: '1rkPz7JNoXk8sJevPaeYHWqfkQXBGh',
-      addPhoto: false,
-      addVideo: false,
-      confirmLoading:true
-    }
-  },
-
-  methods: {
-    showDetail(item) {
-      console.log(item)
-      this.detail = true
-      this.id = item.id
-      this.getPhoto()
-    },
-    callback(key) {
-      console.log(key)
-      if (key == '1') {
-        this.currentPage = 1
-        this.getPhoto()
-      } else if (key == '2') {
-        this.currentPage = 1
-        this.getVideo()
-      }
-    },
-    pageChange: function(page) {
-      console.log(page)
-      this.currentPage = page
-      if (this.indexDetail == '1') {
-        this.getPhoto()
-      } else if (this.indexDetail == '2') {
-        this.getVideo()
-      }
-    },
-    getPhoto() {
-      yardPhotoList({ pageNo: this.currentPage, pageSize: 4, yardId: this.id }).then(res => {
-        if (res.code == 0) {
-          console.log(res)
-          this.photoList = res.result.records
-          this.total = res.result.total
-        }
-      })
+  import YardModal from './modules/YardModal'
+  import yardDetail from './modules/yardDetail'
+  import {
+    JeecgListMixin
+  } from '@/mixins/JeecgListMixin'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
+  import UploadToAli from '@femessage/upload-to-ali'
+  import {
+    yardPhotoList,
+    yardVideoList,
+    yardPhotoDelete,
+    yardVideoDelete,
+    yardPhotoAdd,
+    yardVideoAdd
+  } from '@/api/yard'
+  export default {
+    name: 'YardList',
+    mixins: [JeecgListMixin],
+    components: {
+      JEllipsis,
+      YardModal,
+      UploadToAli
     },
-    getVideo() {
-      yardVideoList({ pageNo: this.currentPage, pageSize: 4, yardId: this.id }).then(res => {
-        if (res.code == 0) {
-          console.log(res)
-          this.videoList = res.result.records
-          this.videoTotal = res.result.total
-        }
-      })
-    },
-    handleOk(type) {
-      const that = this
-      if (type == 'photo') {
-        yardPhotoAdd({ yardId: that.id, photoUrl: that.imageUrl })
-          .then(res => {
-            if (res.success) {
-              this.getPhoto()
-              this.handleCancel('photo')
-            } else {
-              that.$message.warning(res.message)
-            }
-          })
-          .finally(() => {
-            that.confirmLoading = false
-            that.handleCancel('photo')
-          })
-      } else {
-        yardVideoAdd({ yardId: that.id, videoUrl: that.videoUrl })
-          .then(res => {
-            if (res.success) {
-              this.getVideo()
-              this.handleCancel('video')
-            } else {
-              that.$message.warning(res.message)
+    data() {
+      return {
+        queryParam: {},
+        description: '场地管理',
+        // 新增修改按钮是否显示
+        show: true,
+        // 表头
+        columns: [{
+            title: 'ID',
+            align: 'center',
+            dataIndex: 'id'
+          },
+          {
+            title: '场地名称',
+            align: 'center',
+            dataIndex: 'buildingName'
+          },
+          {
+            title: '地址',
+            align: 'center',
+            dataIndex: 'address'
+          },
+          {
+            title: '联系人',
+            align: 'center',
+            dataIndex: 'contactName'
+          },
+          {
+            title: '联系电话',
+            align: 'center',
+            dataIndex: 'contactMobile'
+          },
+          {
+            title: '创建时间',
+            align: 'center',
+            dataIndex: 'createTime'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align: 'center',
+            scopedSlots: {
+              customRender: 'action'
             }
-          })
-          .finally(() => {
-            that.confirmLoading = false
-            that.handleCancel('video')
-          })
-      }
-    },
-    handleCancel(type) {
-      if (type == 'photo') {
-        this.imageUrl = ''
-        this.addPhoto = false
-      } else {
-        this.videoUrl = ''
-        this.addVideo = false
+          }
+        ],
+        url: {
+          list: '/ctop/yard/list'
+        },
+        detail: false,
+        indexDetail: '1',
+        currentPage: 0,
+        pageSize: 4,
+        videoTotal: 0,
+        photoTotal: 0,
+        total: 0,
+        videoList: [],
+        photoList: [],
+        imageUrl: '',
+        videoUrl: '',
+        customDomain: '',
+        region: 'oss-cn-beijing',
+        bucket: 'ctop-media',
+        acceptVideo: 'video/mpeg,video/mp4',
+        acceptImage: 'image/jpeg,image/jpg,image/png',
+        accessKeyId: 'LTAIbNbqWzSOklQV',
+        accessKeySecret: '1rkPz7JNoXk8sJevPaeYHWqfkQXBGh',
+        addPhoto: false,
+        addVideo: false,
+        confirmLoading: true
       }
     },
-    deteleImg(id) {
-      yardPhotoDelete({ id: id }).then(res => {
-        if (res.code == 200) {
-          console.log(res)
+
+    methods: {
+      showDetail(item) {
+        console.log(item)
+        this.detail = true
+        this.id = item.id
+        this.getPhoto()
+      },
+      callback(key) {
+        console.log(key)
+        if (key == '1') {
+          this.currentPage = 1
           this.getPhoto()
+        } else if (key == '2') {
+          this.currentPage = 1
+          this.getVideo()
         }
-      })
-    },
-    deteleVideo(id) {
-      yardVideoDelete({ id: id }).then(res => {
-        if (res.code == 200) {
-          console.log(res)
+      },
+      pageChange: function (page) {
+        console.log(page)
+        this.currentPage = page
+        if (this.indexDetail == '1') {
+          this.getPhoto()
+        } else if (this.indexDetail == '2') {
           this.getVideo()
         }
-      })
+      },
+      getPhoto() {
+        this.photoList = []
+        yardPhotoList({
+          pageNo: this.currentPage,
+          pageSize: 4,
+          yardId: this.id
+        }).then(res => {
+          if (res.code == 0) {
+            console.log(res)
+            this.photoList = res.result.records
+            this.total = res.result.total
+          }
+        })
+      },
+      getVideo() {
+        this.videoList = []
+        yardVideoList({
+          pageNo: this.currentPage,
+          pageSize: 4,
+          yardId: this.id
+        }).then(res => {
+          if (res.code == 0) {
+            console.log(res)
+            this.videoList = res.result.records
+            this.videoTotal = res.result.total
+          }
+        })
+      },
+      handleOk(type) {
+        const that = this
+        if (type == 'photo') {
+          yardPhotoAdd({
+              yardId: that.id,
+              photoUrl: that.imageUrl
+            })
+            .then(res => {
+              if (res.success) {
+                this.getPhoto()
+                this.handleCancel('photo')
+              } else {
+                that.$message.warning(res.message)
+              }
+            })
+            .finally(() => {
+              that.confirmLoading = false
+              that.handleCancel('photo')
+            })
+        } else {
+          yardVideoAdd({
+              yardId: that.id,
+              videoUrl: that.videoUrl
+            })
+            .then(res => {
+              if (res.success) {
+                this.getVideo()
+                this.handleCancel('video')
+              } else {
+                that.$message.warning(res.message)
+              }
+            })
+            .finally(() => {
+              that.confirmLoading = false
+              that.handleCancel('video')
+            })
+        }
+      },
+      handleCancel(type) {
+        if (type == 'photo') {
+          this.imageUrl = ''
+          this.addPhoto = false
+        } else {
+          this.videoUrl = ''
+          this.addVideo = false
+        }
+      },
+      deteleImg(id) {
+        yardPhotoDelete({
+          id: id
+        }).then(res => {
+          if (res.code == 200) {
+            console.log(res)
+            this.getPhoto()
+          }
+        })
+      },
+      deteleVideo(id) {
+        yardVideoDelete({
+          id: id
+        }).then(res => {
+          if (res.code == 200) {
+            console.log(res)
+            this.getVideo()
+          }
+        })
+      }
     }
   }
-}
 </script>
-<style  scoped>
-@import '~@assets/less/common.less';
+<style scoped>
+  @import '~@assets/less/common.less';
 </style>

+ 2 - 2
vue.config.js

@@ -73,13 +73,13 @@ module.exports = {
         // target: 'http://192.168.1.54:8080', //请求本地 需要jeecg-boot后台项目  孙震
         // target: 'http://192.168.1.165:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.165:8848', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        // target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
+        target: 'http://api.tjyourong.com.cn/jeecg-boot', //请求本地 需要jeecg-boot后台项目 
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
 
         // target: 'http://192.168.0.53:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.251:8088', //请求本地 需要jeecg-boot后台项目 
 
-        target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目 
+        // target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目 
 
         ws: false,
         changeOrigin: true,