lrf402788946 5 年之前
父節點
當前提交
db3c6ae7f5
共有 4 個文件被更改,包括 11 次插入10 次删除
  1. 3 2
      src/components/pagination.vue
  2. 6 6
      src/views/hall/liveList.vue
  3. 1 1
      src/views/hall/parts/chat.vue
  4. 1 1
      vue.config.js

+ 3 - 2
src/components/pagination.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="pagination">
-    <el-row type="flex" align="middle" justify="end" style="padding-top:1rem">
-      <el-col :span="24" style="text-align:right;">
+    <el-row type="flex" align="middle" style="padding-top:1rem">
+      <el-col :span="24" :style="`text-align:${position};`">
         <el-pagination
           background
           layout="sizes, total, prev, pager, next"
@@ -25,6 +25,7 @@ import _ from 'lodash';
 export default {
   name: 'pagination',
   props: {
+    position: { type: String, default: 'right' },
     total: { type: Number, default: 0 },
   },
   components: {},

+ 6 - 6
src/views/hall/liveList.vue

@@ -60,14 +60,14 @@
                   </li>
                 </ul>
               </el-col>
+              <el-col :span="24">
+                <page :total="total" position="right"></page>
+              </el-col>
               <el-col :span="24" class="liveLisDown">
                 <p><span>主办单位:</span><span>吉林省计算中心对接直播中心</span></p>
                 <p><span>指导单位:</span><span>吉林省计算中心对接直播中心</span></p>
                 <p><span>技术支持:</span><span>长春福瑞科技有限公司</span></p>
               </el-col>
-              <el-col :span="24">
-                <page :total="total"></page>
-              </el-col>
             </el-col>
           </el-row>
         </div>
@@ -102,7 +102,7 @@
 <script>
 import page from '@/components/pagination.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: room } = createNamespacedHelpers('room');
+const { mapActions: room } = createNamespacedHelpers('dock');
 export default {
   name: 'liveList',
   props: {},
@@ -140,7 +140,7 @@ export default {
 @import '~@/style/style.css';
 // 直播中心
 .liveList {
-  min-height: 800px;
+  min-height: 850px;
   background: #8e2321;
   float: left;
   width: 100%;
@@ -204,7 +204,7 @@ export default {
 .liveLisDown {
   float: left;
   width: 100%;
-  height: 160px;
+  height: 260px;
   font-size: 16px;
   padding: 25px 0 0 0;
 }

+ 1 - 1
src/views/hall/parts/chat.vue

@@ -66,7 +66,7 @@ export default {
       });
     },
     onMessage(message) {
-      console.log('receive a message: ', message.body);
+      // console.log('receive a message: ', message.body);
       let body = _.get(message, 'body');
       if (body) {
         body = JSON.parse(body);

+ 1 - 1
vue.config.js

@@ -68,7 +68,7 @@ module.exports = {
         // pathRewrite: { '^/api/affairs': '/api' },
       },
       '/api/live': {
-        target: 'http://10.16.10.72:9009',
+        target: 'http://free.liaoningdoupo.com',
         changeOrigin: true,
         ws: true,
         // pathRewrite: { '^/api/affairs': '/api' },