zhuxinbo %!s(int64=5) %!d(string=hai) anos
pai
achega
4ef0ed207b

+ 1 - 0
public/index.html

@@ -288,6 +288,7 @@
 </div>
 
 <!-- update_begin author:sunjianlei date:20190524 for: 去指定页面的加载动画 -->
+<script src="https://ssl.captcha.qq.com/TCaptcha.js"></script>
 <script>
   // 去指定页面的加载动画
   if (location.href.indexOf('online/desform/pureview') !== -1) {

+ 11 - 13
src/views/modules/Statistics/Statistics.vue

@@ -34,17 +34,7 @@
 .vm-video-list .ant-comment-inner {
   padding: 0;
 }
-.vm-video-list .bg:after {
-  content: '';
-  width: 110%;
-  height: 110%;
-  position: absolute;
-  left: -5%;
-  top: -5%;
-  background: inherit;
-  filter: blur(20px);
-  z-index: 2;
-}
+
 </style>
 <template>
   <div class="vm-video-list">
@@ -71,13 +61,21 @@ export default {
 
   data: function() {
     return {
-      title: '报表统计'
+      title: '报表统计',
+      statistics:[]
     }
   },
   methods: {},
   watch: {},
   mounted: function() {
-    this.$nextTick(() => {})
+    this.$nextTick(() => {
+        getAccountReport().then(res=>{
+            if(res.code == 0){
+                console.log(res)
+                // this.statistics = res
+            }
+        })
+    })
   }
 }
 </script>

+ 47 - 24
src/views/modules/video/video.vue

@@ -148,7 +148,15 @@
 import ARow from 'ant-design-vue/es/grid/Row'
 import ACol from 'ant-design-vue/es/grid/Col'
 import axios from 'axios'
-import { getLoginQr, getUserList, getLoginStatus, getVideoList, getCommentList, commentDelete,getAccountReport } from '@api/video.js'
+import {
+  getLoginQr,
+  getUserList,
+  getLoginStatus,
+  getVideoList,
+  getCommentList,
+  commentDelete,
+  getAccountReport
+} from '@api/video.js'
 export default {
   name: 'videoList',
   components: {
@@ -181,6 +189,7 @@ export default {
   methods: {
     handleChange(value) {
       this.ksid = value
+      this.dataShow = []
       this.getVideoList(value, null)
       //   this.getTest()
     },
@@ -212,38 +221,52 @@ export default {
       })
     },
     getVideoList(ksid, pcursor) {
-      if (pcursor) {
-      } else {
-        this.dataShow = []
-      }
+      var that = this
       getVideoList({ ksid: ksid, pcursor: pcursor }).then(res => {
         if (res.code == 0) {
-          var data = res.result.data.publicFeeds.list
+          var data = res.result.data.publicFeeds.list.map(item => {
+            return {
+              ...item,
+              commentList: []
+            }
+          })
           this.pcursor = res.result.data.publicFeeds.pcursor
-          for (let i = 0; i < data.length; i++) {
-            this.getCommentList(ksid, data[i].photoId).then(dataOne => {
-              if (dataOne) {
-                var a = { ...data[i], ...dataOne }
-              } else {
-                var a = { ...data[i], commentList: [] }
-              }
+          this.dataShow.push(...data)
+          var i = 0
+          //   for (let i = 0; i < data.length; i++) {
+          setInterval(() => {
+            if (i < that.dataShow.length) {
+              setTimeout(
+                that.getCommentList(ksid, that.dataShow[i].photoId).then(dataOne => {
+                  console.log(dataOne)
+                  if (dataOne) {
+                    that.dataShow[i].commentList = dataOne
+                  }
+                  //   commentList
+                  i++
+                }),
+                0
+              )
+            } else {
+            }
+          }, 3000)
 
-              //   commentList
-              this.dataShow.push(a)
-            })
-          }
+          //   }
         }
       })
     },
     getCommentList(ksid, photoId) {
       return new Promise(function(resolve) {
-        getCommentList({ ksid: ksid, photoId: photoId }).then(res => {
+        getCommentList({ ksid: ksid, photoId: photoId, pcursor: null }).then(res => {
           if (res.code == 0) {
-            resolve(res.result.data.shortVideoCommentList)
+            resolve(res.result.data.shortVideoCommentList.commentList)
           }
         })
       })
     },
+    sleep(d) {
+      return new Promise(resolve => setTimeout(resolve, d))
+    },
     remove(allItem, item, index) {
       console.log(allItem, item)
       allItem.commentList.splice(index, 1)
@@ -308,16 +331,16 @@ export default {
         // 其他时候把下拉刷新置为true
         _this.pullRefreshss = true
       }
-    },
+    }
   },
   watch: {},
   mounted: function() {
     this.$nextTick(() => {
       var that = this
       this.getUserList()
-      getAccountReport().then(res=>{
-          console.log(res)
-      })
+      //   getAccountReport().then(res => {
+      //     console.log(res)
+      //   })
       window.setInterval(() => {
         if (that.showCode) {
           setTimeout(function() {
@@ -346,7 +369,7 @@ export default {
       }, 1000)
       window.onscroll = function() {
         if (that.ksid) {
-          if (that.pcursor != 'nor_mal') {
+          if (that.pcursor != 'no_more') {
             that.scrollChange()
           }
         }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
src/views/modules/video/yz.js


+ 1 - 0
vue.config.js

@@ -66,6 +66,7 @@ module.exports = {
       '/jeecg-boot': {
         target: 'http://39.106.184.70:8080', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.2.132:8080', //请求本地 需要jeecg-boot后台项目
+        // target: 'http://192.168.43.23:8080', //请求本地 需要jeecg-boot后台项目
         ws: false,
         changeOrigin: true
       },