朱鑫波 4 lat temu
rodzic
commit
d3cb13031e

+ 54 - 12
src/views/modules/kuaishouapp/account/stepForm/Step3.vue

@@ -667,15 +667,34 @@ li.chouzhen.first:before {
     <a-modal :maskClosable="false" title="选择素材" v-model="visibleMatemal" @ok="handleOkShow" :width="1000">
       <a-tabs type="card" @change="callback" v-model="active" class="check-video">
         <a-tab-pane :tab="item.label" v-for="item of tab" :key="item.value">
-          <a-range-picker name="buildTime" style="width: 400px; margin: 10px 0" v-model="time" />
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <a-form-item label="日期选择" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-range-picker name="buildTime" v-model="time" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="筛选条件" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <!-- <a-range-picker name="buildTime" v-model="time" /> -->
+                <a-select v-model="orderBy" style="width: 100%">
+                  <a-select-option value="time"> 按时间排序 </a-select-option>
+                  <a-select-option value="cost"> 按消耗排序</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </a-row>
+
           <ul v-if="dataSource.length > 0" style="overflow: auto; padding-left: 0">
             <a-checkbox-group v-model="checkVideo" @change="onChangeVideo" style="width: 100%">
-              <li v-for="(item, index) of dataSource" :key="index" class="chouzhen" style="height: 350px">
+              <li v-for="(item, index) of dataSource" :key="index" class="chouzhen" style="height: 400px">
                 <!-- <video class="video" :src="item.url" controls="controls" style="width:100%">
                   您的浏览器不支持 video 标签。
                 </video> -->
                 <a-checkbox :value="item" style="width: 100%; position: absolute; z-index: 100; right: 0; top: 0">
-                  <img :src="item.coverUrl" alt="" style="width: 100%; margin-bottom: 10px" />
+                  <img :src="item.coverUrl" alt="" style="width: 100%; margin-bottom: 30px" />
+                  <div style="width:100%;text-align:center">
+                    {{ item.statDate ? '时间:' + item.statDate.split(' ')[0] : '消耗:' + item.charge }}
+                  </div>
                 </a-checkbox>
                 <a @click="matemalVideo(item, index)" style="position: absolute; z-index: 100; right: 56px; bottom: 5px"
                   >查看视频</a
@@ -900,6 +919,7 @@ export default {
       visibleVideo: false,
       videoUrlShow: '',
       time: [],
+      orderBy: 'time',
       channelType: 0,
       checkVideo: [],
       dataSource: [],
@@ -1186,7 +1206,7 @@ export default {
         }
       })
     },
-    
+
     okTag() {
       var data = this.$refs.tree.getCheckedKeys()
       if (data.length > 1) {
@@ -1209,7 +1229,7 @@ export default {
               }),
             })
             this.creativeTagVisible = false
-          }else{
+          } else {
             this.$message.error('选择出错,请稍后选择或自行手填')
           }
         })
@@ -1448,7 +1468,7 @@ export default {
       // params.materialType = this.getData('creativeMaterialType')
       // params.pageSize = this.ipagination.pageSize
       // params.pageNo = this.ipagination.current
-      // this.showVideoList('/kuaishou/batch/getVideoList', params)
+      // this.showVideoList('/kuaishou/kuaiShouVideoGet/getVideoList', params)
     },
     getDataSource(page, pageSize) {
       this.ipagination.current = page
@@ -1459,20 +1479,22 @@ export default {
       params.pageNo = page
       params.channelType = this.channelType
       params.status = 0
+      params.orderBy = this.orderBy
       if (this.time.length > 0) {
         // params.startDate = moment(this.time[0]).format('YYYY-MM-DD')
         // params.endDate = moment(this.time[1]).format('YYYY-MM-DD')
         params.startDate = moment(this.time[0]).format('YYYY-MM-DD') + ' 00:00:00'
         params.endDate = moment(this.time[1]).format('YYYY-MM-DD') + ' 23:59:59'
       }
-      this.showVideoList('/kuaishou/batch/getVideoList', params)
+      this.showVideoList('/kuaishou/kuaiShouVideoGet/getVideoList', params)
     },
     showVideoList(url, params) {
       this.dataSource = []
       this.loadingVideoList = true
       getAction(url, params).then((res) => {
+        console.log(res)
         if (res.success) {
-          this.dataSource = res.result.records
+          this.dataSource = res.result.list
           this.ipagination.total = res.result.total
           this.loadingVideoList = false
         } else {
@@ -1484,6 +1506,7 @@ export default {
       if (type == 'video') {
         nowIndex = index
         bestIndex = bestIndex
+        this.orderBy = 'time'
         this.visibleMatemal = true
         this.checkVideo = []
         this.active = 0
@@ -1496,7 +1519,7 @@ export default {
         //   params.pageSize = this.ipagination.pageSize
         //   params.pageNo = this.ipagination.current
         //   params.params.channelType = 0 = 0
-        //   this.showVideoList('/kuaishou/batch/getVideoList', params)
+        //   this.showVideoList('/kuaishou/kuaiShouVideoGet/getVideoList', params)
       } else {
         this.creativeMaterialType = item.creativeMaterialType
         this.$refs.check.showCheck(
@@ -1728,13 +1751,14 @@ export default {
           params.pageNo = 1
           params.status = 0
           params.channelType = this.channelType
+          params.orderBy = this.orderBy
           if (this.time.length > 0) {
             // params.startDate = moment(this.time[0]).format('YYYY-MM-DD')
             // params.endDate = moment(this.time[1]).format('YYYY-MM-DD')
             params.startDate = moment(this.time[0]).format('YYYY-MM-DD') + ' 00:00:00'
             params.endDate = moment(this.time[1]).format('YYYY-MM-DD') + ' 23:59:59'
           }
-          this.showVideoList('/kuaishou/batch/getVideoList', params)
+          this.showVideoList('/kuaishou/kuaiShouVideoGet/getVideoList', params)
         } else {
           this.$message.error(res.message)
           this.tongbuLoading = false
@@ -2143,7 +2167,8 @@ export default {
         params.channelType = this.channelType
         params.startDate = moment(n[0]).format('YYYY-MM-DD') + ' 00:00:00'
         params.endDate = moment(n[1]).format('YYYY-MM-DD') + ' 23:59:59'
-        this.showVideoList('/kuaishou/batch/getVideoList', params)
+        params.orderBy = this.orderBy
+        this.showVideoList('/kuaishou/kuaiShouVideoGet/getVideoList', params)
       } else {
         var params = {}
         params.accountId = localStorage.getItem('accountId')
@@ -2152,9 +2177,26 @@ export default {
         params.pageNo = 1
         params.status = 0
         params.channelType = this.channelType
+        params.orderBy = this.orderBy
         this.ipagination.current = 1
-        this.showVideoList('/kuaishou/batch/getVideoList', params)
+        this.showVideoList('/kuaishou/kuaiShouVideoGet/getVideoList', params)
+      }
+    },
+    orderBy(n, o) {
+      var params = {}
+      params.accountId = localStorage.getItem('accountId')
+      params.materialType = this.creativeMaterialType
+      params.pageSize = this.ipagination.pageSize
+      params.pageNo = 1
+      params.status = 0
+      params.channelType = this.channelType
+      if (this.time.length > 0) {
+        params.startDate = moment(this.time[0]).format('YYYY-MM-DD') + ' 00:00:00'
+        params.endDate = moment(this.time[1]).format('YYYY-MM-DD') + ' 23:59:59'
+      } else {
       }
+      params.orderBy = n
+      this.showVideoList('/kuaishou/kuaiShouVideoGet/getVideoList', params)
     },
     visibleVideo(n, o) {
       if (!n) {

+ 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.188:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
@@ -85,7 +85,7 @@ module.exports = {
         // 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后台项目
-        target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
+        // target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
         // target:'http://118.24.244.213:8804',