提交

README.md

@@ -22,9 +22,3 @@ yarn lint
 
 ### Customize configuration
 See [Configuration Reference](https://cli.vuejs.org/config/).
-
-
-接口缺少：
-1.央视新闻
-2.快手
-3.总数居中点赞数/转发数，浏览量/评论数求和

src/utils/request.js

@@ -38,7 +38,7 @@ service.interceptors.response.use(
         const res = response
         Toast.clear();
         if (res.status !== 200) {
-            Toast.fail('请稍后重试');
+            // Toast.fail('请稍后重试');
             //return Promise.reject('error')
         } else {
             return res.data

src/view/index/components/live/index.vue

@@ -7,7 +7,7 @@
           @click="() => showDetail('peopel_time')"
         >
           直播观看人次
-          <div class="showD">?</div>
+          <!-- <div class="showD">?</div> -->
         </td>
         <td v-if="baseData.peopel_time !== -1">
           {{ baseData.peopel_time | formatnum }}
@@ -17,7 +17,7 @@
           @click="() => showDetail('msg_count')"
         >
           直播评论数
-          <div class="showD">?</div>
+          <!-- <div class="showD">?</div> -->
         </td>
         <td v-if="baseData.msg_count !== -1">
           {{ baseData.msg_count | formatnum }}
@@ -29,7 +29,7 @@
           @click="() => showDetail('avg_user_count')"
         >
           平均在线人数
-          <div class="showD">?</div>
+          <!-- <div class="showD">?</div> -->
         </td>
         <td v-if="baseData.avg_user_count !== -1">
           {{ baseData.avg_user_count | formatnum }}
@@ -39,7 +39,7 @@
           @click="() => showDetail('total_fans_count')"
         >
           新增粉丝数
-          <div class="showD">?</div>
+          <!-- <div class="showD">?</div> -->
         </td>
         <td v-if="baseData.total_fans_count !== -1">
           {{ baseData.total_fans_count | formatnum }}
@@ -51,7 +51,7 @@
           @click="() => showDetail('turn_rate')"
         >
           转粉率
-          <div class="showD">?</div>
+          <!-- <div class="showD">?</div> -->
         </td>
         <td v-if="baseData.turn_rate !== -1">
           {{ baseData.turn_rate | formatnum }}
@@ -61,7 +61,7 @@
           @click="() => showDetail('total_fans_count')"
         >
           最大在线人数
-          <div class="showD">?</div>
+          <!-- <div class="showD">?</div> -->
         </td>
         <td v-if="baseData.total_fans_count !== -1">
           {{ baseData.total_fans_count | formatnum }}

src/view/index/index.vue

@@ -7,7 +7,7 @@
           @click="() => showDetail('total_pv')"
         >
           总浏览量
-          <div class="showD">?</div>
+          <div v-if="$route.query.season != 1" class="showD">?</div>
         </td>
         <td v-if="baseData.total_pv !== -1">
           {{ baseData.total_pv | formatnum }}
@@ -17,7 +17,7 @@
           @click="() => showDetail('total_ori')"
         >
           原创量
-          <div class="showD">?</div>
+          <div v-if="$route.query.season != 1" class="showD">?</div>
         </td>
         <td v-if="baseData.total_ori !== -1">
           {{ baseData.total_ori | formatnum }}
@@ -29,7 +29,7 @@
           @click="() => showDetail('total_digg')"
         >
           总点赞数
-          <div class="showD">?</div>
+          <div v-if="$route.query.season != 1" class="showD">?</div>
         </td>
         <td v-if="baseData.total_digg !== -1">
           {{ baseData.total_digg | formatnum }}
@@ -39,7 +39,7 @@
           @click="() => showDetail('total_comment')"
         >
           总评论数
-          <div class="showD">?</div>
+          <div v-if="$route.query.season != 1" class="showD">?</div>
         </td>
         <td v-if="baseData.total_comment !== -1">
           {{ baseData.total_comment | formatnum }}
@@ -51,14 +51,14 @@
           @click="() => showDetail('total_forward')"
         >
           总转发量
-          <div class="showD">?</div>
+          <div v-if="$route.query.season != 1" class="showD">?</div>
         </td>
         <td v-if="baseData.total_forward !== -1">
           {{ baseData.total_forward | formatnum }}
         </td>
         <td v-if="baseData.live_uv !== -1" @click="() => showDetail('live_uv')">
           直播观看人数
-          <div class="showD">?</div>
+          <div v-if="$route.query.season != 1" class="showD">?</div>
         </td>
         <td v-if="baseData.live_uv !== -1">
           {{ baseData.live_uv | formatnum }}
@@ -70,7 +70,7 @@
           @click="() => showDetail('live_add_fans')"
         >
           新增粉丝数
-          <div class="showD">?</div>
+          <div v-if="$route.query.season != 1" class="showD">?</div>
         </td>
         <td v-if="baseData.live_add_fans !== -1">
           {{ baseData.live_add_fans | formatnum }}
@@ -80,7 +80,7 @@
           @click="() => showDetail('live_comment')"
         >
           直播评论数
-          <div class="showD">?</div>
+          <div v-if="$route.query.season != 1" class="showD">?</div>
         </td>
         <td v-if="baseData.live_comment !== -1">
           {{ baseData.live_comment | formatnum }}
@@ -139,15 +139,16 @@
       :width="client.width"
       :height="client.height"
     ></canvas>
-    <div v-if="baseData.word_cloud_url" class="title">词云</div>
-    <!-- <van-image v-if="baseData.word_cloud_url" :src="baseData.word_cloud_url">
+    <div v-if="baseData.word_cloud_url || list.length" class="title">词云</div>
+    <van-image v-if="baseData.word_cloud_url && !list.length" :src="baseData.word_cloud_url">
       <template v-slot:loading>
         <van-loading type="spinner" size="20" />
       </template>
-    </van-image> -->
+    </van-image>
     <div
       ref="div1"
       id="div1"
+      v-if="baseData.word_cloud_url && list.length"
       class="wordCloud__tagBall"
       :style="{ width: client.width + 'px', height: client.height + 'px' }"
     >
@@ -314,8 +315,8 @@ import {
 import filters from "@/utils/filters/index";
 import live from "@/view/index/components/live/index.vue";
 import {
-  // Image as vanImage,
-  // Loading as vanLoading,
+  Image as vanImage,
+  Loading as vanLoading,
   Popup as vanPopup,
   Button as vanButton,
   Dialog,
@@ -330,8 +331,8 @@ import btnGroup from "./components/btnGroup/index";
 
 export default {
   components: {
-    // vanImage,
-    // vanLoading,
+    vanImage,
+    vanLoading,
     vanPopup,
     vanButton,
     btnGroup,
@@ -365,7 +366,7 @@ export default {
       color: ["#2D4DB6", "#04B67C", "#D1AF07", "#E27914", "#CB4A4D", "#B02690"],
       minFontSize: 12,
       maxFontSize: 18,
-      list: [ ],
+      list: [],
     };
   },
   created() {
@@ -786,6 +787,7 @@ export default {
       );
       getCould(url).then(res => {
         this.list = res || [];
+        if (!this.list.length) return;
         const RADIUSX = (this.client.width - 100) / 2;
         const RADIUSY = (this.client.height - 50) / 2;
         let contentEle = [];

src/view/skeleton/index.vue

@@ -50,7 +50,17 @@ export default {
     vanPopup,
   },
   created() {
-    getBase({ season: this.$route.query.season }).then(res => {
+    let season = this.$route.query.season;
+    if (!season) {
+      let search = location.search.replace("?", "").split("&");
+      let d = {};
+      for (let i = 0; i < search.length; i++) {
+        const v = search[i].split("=");
+        d[v[0]] = v[1];
+      }
+      season = d.season || season;
+    }
+    getBase({ season }).then(res => {
       if (!(res || []).length) return;
       this.options = (res || []).map((v, i) => {
         let children = (v.child_list || []).map((childItem, o) => {
@@ -76,7 +86,7 @@ export default {
       let data = {};
       for (let i = 0; i < this.options.length; i++) {
         const v = this.options[i];
-        if(v.text === this.fieldValue) {
+        if (v.text === this.fieldValue) {
           data = v;
           break;
         }
@@ -84,7 +94,7 @@ export default {
       if (this.$route.name == "home") return;
       this.$router.push({
         path: "/contrast/home",
-        query: { title: this.fieldValue, season: this.$route.query.season, data: JSON.stringify(data) },
+        query: { title: this.fieldValue, season, data: JSON.stringify(data) },
       });
     });
   },
@@ -109,14 +119,18 @@ export default {
       else this.fieldValue = "";
       for (let i = 0; i < this.options.length; i++) {
         const v = this.options[i];
-        if(v.text === this.fieldValue) {
+        if (v.text === this.fieldValue) {
           D = v;
           break;
         }
       }
       this.$router.push({
         path: "/contrast/home",
-        query: { title: this.fieldValue, season: this.$route.query.season, data: JSON.stringify(D) },
+        query: {
+          title: this.fieldValue,
+          season: this.$route.query.season,
+          data: JSON.stringify(D),
+        },
       });
     },
     onChange(data) {