merge...

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

@@ -66,7 +66,6 @@ export default {
   methods: {
     /* 退出登录 - 跳转方法 */
     logout() {
-      // this.$router.push({ path: '/login/index' })
       cAction.Other.outLogin()
         .then(str => {
           window.G.UserInfo = {}
@@ -185,8 +184,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 || window.G.UserInfo.student_info.personal_name
+      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}`