Merge pull request 'xbx' (#232) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/232

dist/index.html

@@ -61,11 +61,11 @@
             left: 0;
             z-index: 1001;
             display: none;
-        }</style><meta property="og:type" content="website"><meta property="og:title" content="分享测试测试"><meta property="og:description" content="分享描述"><meta property="og:image" content="http://1303872925.vod2.myqcloud.com/7db674eavodcq1303872925/a5d03b0c5285890810149245655/vrLgNu2JaBkA.png"><meta property="og:url" content="https://beelink.theluyuan.com/"><link href="/css/chunk-04e3a2fa.08ef3a2d.css" rel="prefetch"><link href="/css/chunk-05d3c41a.55076a31.css" rel="prefetch"><link href="/css/chunk-06828374.8e285ce3.css" rel="prefetch"><link href="/css/chunk-07015098.03da786d.css" rel="prefetch"><link href="/css/chunk-0d9de69e.0e433876.css" rel="prefetch"><link href="/css/chunk-18d6ebc2.07c0f4a4.css" rel="prefetch"><link href="/css/chunk-1abac668.206f270b.css" rel="prefetch"><link href="/css/chunk-2415f10c.0e433876.css" rel="prefetch"><link href="/css/chunk-27236dd2.3992b5d2.css" rel="prefetch"><link href="/css/chunk-2a197f09.b2772b24.css" rel="prefetch"><link href="/css/chunk-2b71f1e5.182b1bb8.css" rel="prefetch"><link href="/css/chunk-371ee143.78141e1e.css" rel="prefetch"><link href="/css/chunk-3c7641ed.f87c4e8b.css" rel="prefetch"><link href="/css/chunk-454d65e7.0739257f.css" rel="prefetch"><link href="/css/chunk-46e3b07d.9259aefd.css" rel="prefetch"><link href="/css/chunk-4e0b884c.48d44d85.css" rel="prefetch"><link href="/css/chunk-520d8a08.dd761c06.css" rel="prefetch"><link href="/css/chunk-5b9ca1f5.fefff9ef.css" rel="prefetch"><link href="/css/chunk-623eb100.c75b32b7.css" rel="prefetch"><link href="/css/chunk-650d0cb1.47d38586.css" rel="prefetch"><link href="/css/chunk-68091c98.14c0db2d.css" rel="prefetch"><link href="/css/chunk-6e7aa5b1.9851e10f.css" rel="prefetch"><link href="/css/chunk-737c53fe.6caedc04.css" rel="prefetch"><link href="/css/chunk-74d6e86d.85aed290.css" rel="prefetch"><link href="/css/chunk-8d0dacb4.b6d4145a.css" rel="prefetch"><link href="/css/chunk-977f0f52.6081abf8.css" rel="prefetch"><link href="/css/chunk-beffc790.fd4895e6.css" rel="prefetch"><link href="/css/chunk-da7e1532.17a6e0e0.css" rel="prefetch"><link href="/css/chunk-ebdb96a0.d22f743d.css" rel="prefetch"><link href="/css/chunk-ef207110.a20941ed.css" rel="prefetch"><link href="/js/chunk-04e3a2fa.0e6ec073.js" rel="prefetch"><link href="/js/chunk-05d3c41a.446246bd.js" rel="prefetch"><link href="/js/chunk-06828374.7fb4c686.js" rel="prefetch"><link href="/js/chunk-07015098.7c0388de.js" rel="prefetch"><link href="/js/chunk-0d9de69e.20013dc7.js" rel="prefetch"><link href="/js/chunk-18d6ebc2.bb390176.js" rel="prefetch"><link href="/js/chunk-1abac668.2378b36f.js" rel="prefetch"><link href="/js/chunk-2415f10c.791ed65f.js" rel="prefetch"><link href="/js/chunk-27236dd2.149a663c.js" rel="prefetch"><link href="/js/chunk-2a197f09.b4fd8d0f.js" rel="prefetch"><link href="/js/chunk-2b71f1e5.22084566.js" rel="prefetch"><link href="/js/chunk-371ee143.890d36ad.js" rel="prefetch"><link href="/js/chunk-3c7641ed.1eb528b5.js" rel="prefetch"><link href="/js/chunk-454d65e7.b966702d.js" rel="prefetch"><link href="/js/chunk-46e3b07d.3a324d67.js" rel="prefetch"><link href="/js/chunk-4e0b884c.a002a497.js" rel="prefetch"><link href="/js/chunk-520d8a08.61cd1105.js" rel="prefetch"><link href="/js/chunk-5b9ca1f5.3961d230.js" rel="prefetch"><link href="/js/chunk-623eb100.75ff2853.js" rel="prefetch"><link href="/js/chunk-650d0cb1.78963263.js" rel="prefetch"><link href="/js/chunk-68091c98.7bf25f05.js" rel="prefetch"><link href="/js/chunk-6e7aa5b1.9f49616a.js" rel="prefetch"><link href="/js/chunk-737c53fe.7752babd.js" rel="prefetch"><link href="/js/chunk-74d6e86d.92a1bab0.js" rel="prefetch"><link href="/js/chunk-8d0dacb4.2ea7e348.js" rel="prefetch"><link href="/js/chunk-977f0f52.f376ede8.js" rel="prefetch"><link href="/js/chunk-beffc790.d3d5c516.js" rel="prefetch"><link href="/js/chunk-da7e1532.4b71bb2c.js" rel="prefetch"><link href="/js/chunk-ebdb96a0.0296b8c3.js" rel="prefetch"><link href="/js/chunk-ef207110.b516af10.js" rel="prefetch"><link href="/css/app.30b6bfaa.css" rel="preload" as="style"><link href="/css/chunk-vendors.d0a33139.css" rel="preload" as="style"><link href="/js/app.fca91d8a.js" rel="preload" as="script"><link href="/js/chunk-vendors.5e652f88.js" rel="preload" as="script"><link href="/css/chunk-vendors.d0a33139.css" rel="stylesheet"><link href="/css/app.30b6bfaa.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but beelink doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><div id="make"></div><script>window.fbAsyncInit = function () {
+        }</style><meta property="og:type" content="website"><meta property="og:title" content="分享测试测试"><meta property="og:description" content="分享描述"><meta property="og:image" content="http://1303872925.vod2.myqcloud.com/7db674eavodcq1303872925/a5d03b0c5285890810149245655/vrLgNu2JaBkA.png"><meta property="og:url" content="https://beelink.theluyuan.com/"><link href="/css/chunk-04e3a2fa.08ef3a2d.css" rel="prefetch"><link href="/css/chunk-05d3c41a.55076a31.css" rel="prefetch"><link href="/css/chunk-06828374.8e285ce3.css" rel="prefetch"><link href="/css/chunk-07015098.03da786d.css" rel="prefetch"><link href="/css/chunk-0d9de69e.0e433876.css" rel="prefetch"><link href="/css/chunk-18d6ebc2.07c0f4a4.css" rel="prefetch"><link href="/css/chunk-1abac668.206f270b.css" rel="prefetch"><link href="/css/chunk-2415f10c.0e433876.css" rel="prefetch"><link href="/css/chunk-27236dd2.3992b5d2.css" rel="prefetch"><link href="/css/chunk-2a197f09.b2772b24.css" rel="prefetch"><link href="/css/chunk-2b71f1e5.182b1bb8.css" rel="prefetch"><link href="/css/chunk-371ee143.78141e1e.css" rel="prefetch"><link href="/css/chunk-3c7641ed.f87c4e8b.css" rel="prefetch"><link href="/css/chunk-454d65e7.0739257f.css" rel="prefetch"><link href="/css/chunk-46e3b07d.9259aefd.css" rel="prefetch"><link href="/css/chunk-4e0b884c.48d44d85.css" rel="prefetch"><link href="/css/chunk-520d8a08.dd761c06.css" rel="prefetch"><link href="/css/chunk-623eb100.c75b32b7.css" rel="prefetch"><link href="/css/chunk-650d0cb1.47d38586.css" rel="prefetch"><link href="/css/chunk-68091c98.14c0db2d.css" rel="prefetch"><link href="/css/chunk-6ad77e47.1a258ae6.css" rel="prefetch"><link href="/css/chunk-6e7aa5b1.9851e10f.css" rel="prefetch"><link href="/css/chunk-737c53fe.6caedc04.css" rel="prefetch"><link href="/css/chunk-74d6e86d.85aed290.css" rel="prefetch"><link href="/css/chunk-77546040.7032c1ea.css" rel="prefetch"><link href="/css/chunk-8d0dacb4.b6d4145a.css" rel="prefetch"><link href="/css/chunk-977f0f52.6081abf8.css" rel="prefetch"><link href="/css/chunk-da7e1532.17a6e0e0.css" rel="prefetch"><link href="/css/chunk-ebdb96a0.d22f743d.css" rel="prefetch"><link href="/css/chunk-ef207110.a20941ed.css" rel="prefetch"><link href="/js/chunk-04e3a2fa.0e6ec073.js" rel="prefetch"><link href="/js/chunk-05d3c41a.446246bd.js" rel="prefetch"><link href="/js/chunk-06828374.7fb4c686.js" rel="prefetch"><link href="/js/chunk-07015098.7c0388de.js" rel="prefetch"><link href="/js/chunk-0d9de69e.20013dc7.js" rel="prefetch"><link href="/js/chunk-18d6ebc2.bb390176.js" rel="prefetch"><link href="/js/chunk-1abac668.2378b36f.js" rel="prefetch"><link href="/js/chunk-2415f10c.791ed65f.js" rel="prefetch"><link href="/js/chunk-27236dd2.149a663c.js" rel="prefetch"><link href="/js/chunk-2a197f09.b4fd8d0f.js" rel="prefetch"><link href="/js/chunk-2b71f1e5.22084566.js" rel="prefetch"><link href="/js/chunk-371ee143.890d36ad.js" rel="prefetch"><link href="/js/chunk-3c7641ed.1eb528b5.js" rel="prefetch"><link href="/js/chunk-454d65e7.b966702d.js" rel="prefetch"><link href="/js/chunk-46e3b07d.3a324d67.js" rel="prefetch"><link href="/js/chunk-4e0b884c.a002a497.js" rel="prefetch"><link href="/js/chunk-520d8a08.61cd1105.js" rel="prefetch"><link href="/js/chunk-623eb100.75ff2853.js" rel="prefetch"><link href="/js/chunk-650d0cb1.78963263.js" rel="prefetch"><link href="/js/chunk-68091c98.7bf25f05.js" rel="prefetch"><link href="/js/chunk-6ad77e47.9656edb5.js" rel="prefetch"><link href="/js/chunk-6e7aa5b1.9f49616a.js" rel="prefetch"><link href="/js/chunk-737c53fe.7752babd.js" rel="prefetch"><link href="/js/chunk-74d6e86d.92a1bab0.js" rel="prefetch"><link href="/js/chunk-77546040.f6b7f5fe.js" rel="prefetch"><link href="/js/chunk-8d0dacb4.2ea7e348.js" rel="prefetch"><link href="/js/chunk-977f0f52.f376ede8.js" rel="prefetch"><link href="/js/chunk-da7e1532.4b71bb2c.js" rel="prefetch"><link href="/js/chunk-ebdb96a0.0296b8c3.js" rel="prefetch"><link href="/js/chunk-ef207110.b516af10.js" rel="prefetch"><link href="/css/app.30b6bfaa.css" rel="preload" as="style"><link href="/css/chunk-vendors.d0a33139.css" rel="preload" as="style"><link href="/js/app.1cbf7942.js" rel="preload" as="script"><link href="/js/chunk-vendors.5e652f88.js" rel="preload" as="script"><link href="/css/chunk-vendors.d0a33139.css" rel="stylesheet"><link href="/css/app.30b6bfaa.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but beelink doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><div id="make"></div><script>window.fbAsyncInit = function () {
             FB.init({
                 appId: '277826133389999',
                 autoLogAppEvents: true,
                 xfbml: true,
                 version: 'v8.0'
             });
-        };</script><script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script><script src="/js/cropper.min.js"></script><script src="/js/jquery-3.2.1.min.js"></script><div id="xiangqingdivadsensedisplaynone" style="display:none;"><script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script><ins class="adsbygoogle" style="display:inline-block;width:728px;height:90px" data-ad-client="ca-pub-7145171713084445" data-ad-slot="9189068072"></ins><script>(adsbygoogle = window.adsbygoogle || []).push({});</script></div><div id="guanlidivadsensedisplaynone" style="display:none;"><ins class="adsbygoogle" style="display:inline-block;width:450px;height:380px" data-ad-client="ca-pub-7145171713084445" data-ad-slot="4213570423"></ins><script>(adsbygoogle = window.adsbygoogle || []).push({});</script></div><script>$("meta[property='og:title']")[0].content = "测试动态"</script><script src="/js/chunk-vendors.5e652f88.js"></script><script src="/js/app.fca91d8a.js"></script></body></html>
+        };</script><script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script><script src="/js/cropper.min.js"></script><script src="/js/jquery-3.2.1.min.js"></script><div id="xiangqingdivadsensedisplaynone" style="display:none;"><script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script><ins class="adsbygoogle" style="display:inline-block;width:728px;height:90px" data-ad-client="ca-pub-7145171713084445" data-ad-slot="9189068072"></ins><script>(adsbygoogle = window.adsbygoogle || []).push({});</script></div><div id="guanlidivadsensedisplaynone" style="display:none;"><ins class="adsbygoogle" style="display:inline-block;width:450px;height:380px" data-ad-client="ca-pub-7145171713084445" data-ad-slot="4213570423"></ins><script>(adsbygoogle = window.adsbygoogle || []).push({});</script></div><script>$("meta[property='og:title']")[0].content = "测试动态"</script><script src="/js/chunk-vendors.5e652f88.js"></script><script src="/js/app.1cbf7942.js"></script></body></html>

src/views/regime/Live.vue

@@ -18,7 +18,7 @@
         </div>
     </div>
     <div class="list" v-if="tabindex == 1">
-        <LiveItemad></LiveItemad>
+        <LiveItemad v-if="livelist.total"></LiveItemad>
         <LiveItem
             :type="2"
             v-for="(i, j) in livelist.data"
@@ -35,7 +35,7 @@
     </div>
 
     <div class="list" v-if="tabindex == 0">
-        <LiveItemad></LiveItemad>
+        <LiveItemad v-if="livelist.total"></LiveItemad>
 
         <LiveItem
             :type="2"
@@ -52,7 +52,7 @@
         ></LiveItem>
     </div>
     <div class="list" v-if="tabindex == 2">
-        <LiveItemad></LiveItemad>
+        <LiveItemad v-if="livelist.total"></LiveItemad>
         <LiveItem
             :type="2"
             v-for="(i, j) in livelist.data"
@@ -71,7 +71,7 @@
             <a-empty />
     </template>
     <div class="pages">
-        <a-pagination v-if="livelist.total" v-model:current="page" :total="livelist.total" :showLessItems="true" @change="nextpage" />
+        <a-pagination :defaultPageSize="9" v-if="livelist.total" v-model:current="page" :total="livelist.total" :showLessItems="true" @change="nextpage" />
     </div>
   </div>
 </template>

src/views/regime/Video.vue

@@ -24,7 +24,7 @@
         <a-empty />
     </template>
     <div class="list" v-if="tabindex == 4">
-      <LiveItemad></LiveItemad>
+      <LiveItemad v-if="videolist.total"></LiveItemad>
       <VideoItem
         v-for="(i, j) in videolist.data"
         :key="j"
@@ -43,7 +43,7 @@
     </div>
 
     <div class="list" v-if="tabindex == 0">
-      <LiveItemad></LiveItemad>
+      <LiveItemad v-if="videolist.total"></LiveItemad>
       <VideoItem
         v-for="(i, j) in videolist.data"
         :key="j"
@@ -61,7 +61,7 @@
       ></VideoItem>
     </div>
     <div class="list" v-if="tabindex == 2">
-      <LiveItemad></LiveItemad>
+      <LiveItemad v-if="videolist.total"></LiveItemad>
       <VideoItem
         v-for="(i, j) in videolist.data"
         :key="j"
@@ -79,6 +79,7 @@
       ></VideoItem>
     </div>
     <div class="list" v-if="tabindex == 1">
+      <LiveItemad v-if="videolist.total"></LiveItemad>
       <VideoItem
         v-for="(i, j) in videolist.data"
         :key="j"
@@ -96,7 +97,7 @@
       ></VideoItem>
     </div>
     <div class="pages">
-      <a-pagination v-if="videolist.total" v-model:current="page" :total="videolist.total" :showLessItems="true" @change="pagechange" />
+      <a-pagination :defaultPageSize="9" v-if="videolist.total" v-model:current="page" :total="videolist.total" :showLessItems="true" @change="pagechange" />
     </div>
   </div>
 </template>