liyongli 3 lat temu
rodzic
commit
e9345777c6

+ 13 - 11
pages/home/components/topic/topic.wxml

@@ -15,7 +15,8 @@
         class="topicItem">总转发量
         <text wx:if="{{select == 1}}" class="show">?</text> :
       </view>
-      <view wx:if="{{headData.live_add_fans != -1}}" data-introduce="live_add_fans" bindtap="showDetail" class="topicItem">
+      <view wx:if="{{headData.live_add_fans != -1}}" data-introduce="live_add_fans" bindtap="showDetail"
+        class="topicItem">
         新增粉丝数
         <text wx:if="{{select == 1}}" class="show">?</text> :
       </view>
@@ -26,7 +27,8 @@
       <view wx:if="{{headData.total_comment != -1}}" class="topicItem">
         {{filter.valueFormat(headData.total_forward)}}
       </view>
-      <view wx:if="{{headData.live_add_fans != -1}}" class="topicItem">{{filter.valueFormat(headData.live_add_fans)}}</view>
+      <view wx:if="{{headData.live_add_fans != -1}}" class="topicItem">{{filter.valueFormat(headData.live_add_fans)}}
+      </view>
     </view>
     <view class="topicTable title">
       <view wx:if="{{headData.total_ori != -1}}" data-introduce="total_ori" bindtap="showDetail"
@@ -39,7 +41,8 @@
         <view wx:if="{{headData.live_uv != -1}}" data-introduce="live_uv" bindtap="showDetail">直播观看人数 <text
             wx:if="{{select == 1}}" class="show">?</text> :</view>
       </view>
-      <view wx:if="{{headData.live_comment != -1}}" data-introduce="live_comment" bindtap="showDetail" class="topicItem">直播评论数
+      <view wx:if="{{headData.live_comment != -1}}" data-introduce="live_comment" bindtap="showDetail"
+        class="topicItem">直播评论数
         <text wx:if="{{select == 1}}" class="show">?</text> :
       </view>
     </view>
@@ -57,7 +60,7 @@
 
   <view class="pKvm">
     <view class="kvm" bindtap="toLive" wx:if="{{headData.has_live_douyin_data || headData.has_live_kuaishou_data}}">
-      <view class="kvmText" style="line-height: 3.5em;padding: 0" >直播</view>
+      <view class="kvmText" style="line-height: 3.5em;padding: 0">直播</view>
     </view>
     <view class="kvm" bindtap="toSecond" wx:if="{{sonList && sonList.length}}">
       <view class="kvmText">二次传播</view>
@@ -67,7 +70,7 @@
     <view class="localCells">平台对比</view>
     <!-- <chart list="{{contrast}}" id="{{'id' + 1}}" canvasId="{{'canvasId' + 1}}" wx:if="{{contrast && contrast.length}}"
       yType="total_pv" xType="platform" /> -->
-      <pie id="pie001" wx:if="{{contrast.length}}" canvasId="pie002" list="{{contrast}}" />
+    <pie id="pie001" wx:if="{{contrast.length}}" canvasId="pie002" list="{{contrast}}" />
   </view>
   <view class="itemView" wx:if="{{all.length}}">
     <view class="localCells">账号排名</view>
@@ -75,12 +78,12 @@
       btnList="{{[{name:'点赞', type:'digg_count'},{name:'评论', type:'comment_count'},{name:'转发', type:'forward_count'}]}}"
       list="{{all}}" yType="digg_count" xType="nickname" />
   </view>
-  <view class="itemView" style="padding: 0" wx:if="{{!!imgURL}}">
+  <view class="itemView" wx:if="{{!!imgURL}}">
     <view class="localCells" style="padding: 5px 10px;">词云</view>
-    <image bindload="imgLoad"
-      style="{{'display: block;width: 100%;max-width: 441px;margin:0 auto;height:'+ height + 'px'}}" src="{{imgURL}}" />
-    <!-- <wordCloud wordsCloud="{{wordList}}" yType="value" xType="name" /> -->
   </view>
+  <image bindload="imgLoad" wx:if="{{!!imgURL}}"
+    style="{{'display: block;width: 100%;max-width: 441px;margin:0 auto;height:'+ height + 'px'}}" src="{{imgURL}}" />
+  <!-- <wordCloud wordsCloud="{{wordList}}" yType="value" xType="name" /> -->
   <view class="itemView" wx:if="{{douyin.length}}">
     <view class="localCells">抖音-评论排行</view>
     <chart id="{{'id' + 3}}" canvasId="{{'canvasId' + 3}}" list="{{douyin}}" wx:if="{{douyin && douyin.length}}"
@@ -154,8 +157,7 @@
       </cover-view>
     </cover-view>
     <cover-view class="local_dialog_body">
-      <cover-view
-        style="padding-right:5px;white-space:pre-wrap;line-height: 1.5em;width:490rpx;margin: 0 auto;">
+      <cover-view style="padding-right:5px;white-space:pre-wrap;line-height: 1.5em;width:490rpx;margin: 0 auto;">
         {{detail}}
       </cover-view>
     </cover-view>

+ 14 - 14
pages/live/components/douyin/douyin.js

@@ -82,15 +82,15 @@ Component({
             xType: "time",
             peopleList: []
           };
-          let AddUpFans = {
-            title: "累计粉丝量",
-            id: 'id' + 12,
-            canvasId: 'canvasId' + 12,
-            type: "line",
-            yType: "value",
-            xType: "time",
-            peopleList: []
-          };
+          // let AddUpFans = {
+          //   title: "累计粉丝量",
+          //   id: 'id' + 12,
+          //   canvasId: 'canvasId' + 12,
+          //   type: "line",
+          //   yType: "value",
+          //   xType: "time",
+          //   peopleList: []
+          // };
           let LikeTheTrend = {
             title: "点赞走势",
             id: 'id' + 13,
@@ -113,10 +113,10 @@ Component({
               value: v.stats_total_user || 0,
               time: time
             });
-            v.club_info_total_fans_count !== undefined && AddUpFans.peopleList.push({
-              value: v.club_info_total_fans_count || 0,
-              time: time
-            });
+            // v.club_info_total_fans_count !== undefined && AddUpFans.peopleList.push({
+            //   value: v.club_info_total_fans_count || 0,
+            //   time: time
+            // });
             v.like_count !== undefined && LikeTheTrend.peopleList.push({
               value: v.like_count || 0,
               time: time
@@ -178,7 +178,7 @@ Component({
                 }
               }
             ];
-          AddUpFans.peopleList.length && p.lineList.push(AddUpFans);
+          // AddUpFans.peopleList.length && p.lineList.push(AddUpFans);
           LikeTheTrend.peopleList.length && p.lineList.push(LikeTheTrend);
           RealTimeTraffic.peopleList.length && p.lineList.push(RealTimeTraffic);
           RealTimePersonTime.peopleList.length && p.lineList.push(RealTimePersonTime);

+ 2 - 6
pages/live/components/douyin/douyin.wxml

@@ -11,10 +11,6 @@
         直播观看人次:
         <!-- <text class="show">?</text> : -->
       </view>
-      <view data-introduce="like_count" bindtap="showDetail" class="liveDataItem">
-        直播点赞数:
-        <!-- <text class="show">?</text> : -->
-      </view>
       <view data-introduce="avg_user_count" bindtap="showDetail" class="liveDataItem">
         平均在线人数:
         <!-- <text class="show">?</text> : -->
@@ -25,9 +21,9 @@
       </view>
     </view>
     <view class="liveDataTable">
-      <view wx:if="{{ headData.peopel_time != -1  }}" class="liveDataItem">{{filter.valueFormat(headData.peopel_time)}}
+      <view wx:if="{{ headData.peopel_time != -1  }}" class="liveDataItem">
+        {{filter.valueFormat(headData.peopel_time)}}
       </view>
-      <view class="liveDataItem">{{filter.valueFormat(headData.like_count)}}</view>
       <view class="liveDataItem">{{filter.valueFormat(headData.avg_user_count)}}</view>
       <view class="liveDataItem">{{filter.valueFormat(headData.turn_rate)}}%</view>
     </view>

+ 15 - 15
pages/live/live.js

@@ -14,12 +14,12 @@ Page({
   },
 
   tabChange(e) {
-    // this.setData({
-    //   select: e.currentTarget.dataset.index
-    // })
-    wx.redirectTo({
-      url: "/pages/live/live?title=" + this.data.title + "&season=" + (this.data.season - 0 ) + "&isdou=" + this.data.isdou + "&iskuai=" + this.data.iskuai + "&type=" +e.currentTarget.dataset.index,
+    this.setData({
+      select: e.currentTarget.dataset.index
     })
+    // wx.redirectTo({
+    //   url: "/pages/live/live?title=" + this.data.title + "&season=" + (this.data.season - 0 ) + "&isdou=" + this.data.isdou + "&iskuai=" + this.data.iskuai + "&type=" +e.currentTarget.dataset.index,
+    // })
   },
   /**
    * 生命周期函数--监听页面加载
@@ -27,16 +27,16 @@ Page({
   onLoad: function (options) {
     let isdou = options.isdou === 'true' ? true : false,
     iskuai = options.iskuai === 'true' ? true : false, list = [];
-    isdou && list.push({
-      "text": "抖音",
-      "img": "douyin",
-      "type": "douyin",
-    })
-    iskuai && list.push({
-      "text": "快手",
-      "img": "kuaishou",
-      "type": "kuaishou",
-    })
+    // isdou && list.push({
+    //   "text": "抖音",
+    //   "img": "douyin",
+    //   "type": "douyin",
+    // })
+    // iskuai && list.push({
+    //   "text": "快手",
+    //   "img": "kuaishou",
+    //   "type": "kuaishou",
+    // })
     this.setData({
       title: options.title,
       select: options.type,

+ 9 - 7
pages/live/live.wxml

@@ -1,15 +1,17 @@
 <!--pages/live/live.wxml-->
 <view style="padding-bottom: 15%">
-    <kuaishou wx:if="{{select === 'kuaishou'}}" title="{{title}}" season="{{season}}"></kuaishou>
-    <douyin wx:if="{{select === 'douyin'}}" title="{{title}}"  season="{{season}}"></douyin>
+  <kuaishou wx:if="{{select === 'kuaishou'}}" title="{{title}}" season="{{season}}"></kuaishou>
+  <douyin wx:if="{{select === 'douyin'}}" title="{{title}}" season="{{season}}"></douyin>
 
-  <cover-view class="nabar" wx:if="{{isdou || iskuai}}">
+  <!-- <cover-view class="nabar" wx:if="{{isdou || iskuai}}">
     <cover-view class="navarItem" wx:for="{{list}}" wx:key="text" data-index="{{item.type}}" bindtap="tabChange">
-      <cover-image wx:if="{{item.type != select}}" style="width: 1.5em;height:1.5em;margin: 0 auto" src="../../assets/{{item.img}}.png"></cover-image>
-      <cover-image wx:if="{{item.type == select}}" style="width: 1.5em;height:1.5em;margin: 0 auto" src="../../assets/{{item.img}}_act.png"></cover-image>
+      <cover-image wx:if="{{item.type != select}}" style="width: 1.5em;height:1.5em;margin: 0 auto"
+        src="../../assets/{{item.img}}.png"></cover-image>
+      <cover-image wx:if="{{item.type == select}}" style="width: 1.5em;height:1.5em;margin: 0 auto"
+        src="../../assets/{{item.img}}_act.png"></cover-image>
       <cover-view style="{{item.type == select ? 'color:red' : ''}}">
         {{item.text}}
       </cover-view>
     </cover-view>
-  </cover-view>
-</view>
+  </cover-view> -->
+</view>

+ 2 - 0
pages/live/live.wxss

@@ -5,6 +5,7 @@
   line-height: 3vh;
   width: 750rpx;
   bottom: 0;
+  z-index: 1;
   display: flex;
   box-shadow: 0 0 8px #1989fa;
   background-color: #20223b;
@@ -16,6 +17,7 @@
   padding: 10rpx 0;
   text-align: center;
   color: #bfcbd9;
+  background-color: #20223b;
 }
 
 .nabar .act{