bug fixes

client/src/components/comTable/tableList.vue

@@ -61,6 +61,7 @@
         :page-size="page.size"
         layout="total, prev, pager, next, jumper"
         :total="page.total"
+        :hide-on-single-page="true"
         @current-change="handleCurrentChange"
       ></el-pagination>
     </div>
@@ -154,8 +155,8 @@ export default {
 
         // 分页
         if (this.hasPage) {
-          this.dataList = response.list
-          this.page.total = parseInt(response.count)
+          this.dataList = response.list || []
+          this.page.total = parseInt(response.count) || 0
         }
       })
     },

client/src/pages/mobileLive/list.vue

@@ -33,7 +33,7 @@
               <div class="live-item-content__time">{{subitem.start_time}}</div>
               <div
                 class="live-item-content__status"
-                v-if="subitem.enable_record"
+                v-if="!(subitem.live_status === 103 && !subitem.enable_record)"
               >{{calcTimeText(subitem.start_time, subitem.live_status)}}</div>
             </div>
           </div>
@@ -65,7 +65,7 @@ export default {
   methods: {
     /* 退出登录 - 跳转方法 */
     logout() {
-      cAction.Others.outLogin()
+      cAction.Other.outLogin()
         .then(str => {
           window.G.UserInfo = {}
           this.$router.push({ path: '/login/index' })
@@ -96,9 +96,10 @@ export default {
             this.dataList = response.data
           }
         })
-        .catch(e => {
-          this.$message.error(e.message)
-        })
+        // 取消报错提醒
+        // .catch(e => {
+        //   this.$message.error(e.message)
+        // })
         .finally(() => {
           if (this.loading) {
             this.loading.close()
@@ -182,6 +183,7 @@ export default {
     openCloudLive(data, message) {
       // https://doc.bokecc.com/live/Appendix_1.html
       const liveStatus = data.live_status
+      data.viewer_name = data.viewer_name || this.nickName
       if (liveStatus === 1) {
         // 进行中
         const url = `https://view.csslcloud.net/api/view/index?roomid=${data.room_id}&userid=${data.user_id}&autoLogin=true&viewername=${data.viewer_name}&viewertoken=${data.viewer_token}`
@@ -258,7 +260,7 @@ export default {
     this.timer = setInterval(() => {
       this.getNewLiveMsg()
       this.getLiveList()
-    }, 3000)
+    }, 10000)
   },
   beforeDestroy() {
     this.timer && clearInterval(this.timer)
@@ -292,7 +294,11 @@ body {
   padding: 0.2rem 0.2rem 0.16rem;
 }
 .head .logo {
-  height: 0.3rem;
+  width: 0.9rem;
+  /* height: 0.3rem; */
+}
+.head .logo:nth-child(2) {
+  margin-left: 0.1rem;
 }
 .head .user {
   display: flex;
@@ -379,7 +385,7 @@ body {
   font-size: 0.12rem;
   color: #333;
 }
-.live-item-content__time {
+.live-item-content__status {
   color: #b01c3d;
 }
 </style>