修改显示

components/mapChina/index.js

@@ -89,16 +89,21 @@ Component({
             mapType: "china",
             geoIndex: 0,
             zppm: 1.25,
+            label: {
+              normal: {
+                show: false
+              },
+              emphasis:{
+                show: false
+              }
+            },
             scaleLimit: {
               //滚轮缩放的极限控制
               min: 1.25,
-              max: 6,
+              max: 2,
             },
             itemStyle: {
               normal: {
-                label: {
-                  show: false
-                },
                 borderColor: "#76acff",//每个区域的边框色
                 areaColor: 'rgba(118,172,255, 0)'//区域背景色
               },

components/mapChina/index.wxml

@@ -1,3 +1,4 @@
 <view class="canvas" wx:if="{{show}}" >
+  <view class="title" wx:if="name">{{name}}</view>
   <ec-canvas id="{{id}}" canvasId="{{canvasId}}" ec="{{ ec }}"></ec-canvas>
 </view>

pages/home/components/topic/topic.wxml

@@ -15,16 +15,18 @@
         class="topicItem">总转发量
         <text wx:if="{{select == 1}}" class="show">?</text> ：
       </view>
-      <view wx:if="{{headData.live_digg != -1}}" data-introduce="live_digg" 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>
     </view>
     <view class="topicTable">
       <view wx:if="{{headData.total_pv != -1}}" class="topicItem">{{filter.valueFormat(headData.total_pv)}}</view>
       <view wx:if="{{headData.total_digg != -1}}" class="topicItem">{{filter.valueFormat(headData.total_digg)}}</view>
-      <view wx:if="{{headData.total_comment != -1}}" class="topicItem">{{filter.valueFormat(headData.total_forward)}}
+      <view wx:if="{{headData.total_comment != -1}}" class="topicItem">
+        {{filter.valueFormat(headData.total_forward)}}
       </view>
-      <view wx:if="{{headData.live_digg != -1}}" class="topicItem">{{filter.valueFormat(headData.live_digg)}}</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"
@@ -37,7 +39,7 @@
         <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_digg != -1}}" data-introduce="live_digg" 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>
@@ -48,7 +50,7 @@
       <view class="topicItem">
         <view wx:if="{{headData.live_uv != -1}}">{{filter.valueFormat(headData.live_uv)}}</view>
       </view>
-      <view wx:if="{{headData.live_digg != -1}}" class="topicItem">{{filter.valueFormat(headData.live_comment)}}
+      <view wx:if="{{headData.live_comment != -1}}" class="topicItem">{{filter.valueFormat(headData.live_comment)}}
       </view>
     </view>
   </view>

pages/live/components/douyin/douyin.wxml

@@ -54,7 +54,7 @@
     </view>
   </view>
 
-  <view class="itemView" wx:if="{{series.length || (region.length && region[0].length)}}">
+  <view class="itemView" wx:if="{{series.length}}">
     <view class="localCells">观众来源</view>
   </view>
 
@@ -63,6 +63,10 @@
   </view>
   <!-- <chart wx:if="{{region.length && region[0].length}}" list="{{region}}" id="{{'douyinid' + 1}}"
     canvasId="{{'douyincanvasId' + 1}}" yType="value" xType="name" /> -->
+    
+  <view class="itemView" wx:if="{{region.length && region[0].length}}">
+    <view class="localCells">观众地域分布</view>
+  </view>
   <mapChina wx:if="{{region.length && region[0].length}}" id="{{'douyinMap' + 1}}" canvasId="{{'douyinMapID' + 1}}" list="{{region}}"></mapChina>
 
   <view class="itemView" wx:for="{{lineList}}" wx:key="id">

pages/live/components/kuaishou/kuaishou.wxml

@@ -10,7 +10,7 @@
         粉丝数
       </view>
       <view data-introduce="like_count" bindtap="showDetail" class="liveDataItem">
-        直播点赞数
+        涨粉数(直播点赞数)
       </view>
     </view>
     <view class="liveDataTable">

pages/live/live.json

@@ -2,6 +2,5 @@
   "usingComponents": {
     "kuaishou": "./components/kuaishou/kuaishou",
     "douyin": "./components/douyin/douyin"
-  },
-  "disableScroll":true
+  }
 }

pages/live/live.wxml

@@ -1,9 +1,7 @@
 <!--pages/live/live.wxml-->
-<view style="height:100%">
-  <scroll-view style="height: 92%" scroll-y="{{true}}">
+<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>
-  </scroll-view>
 
   <cover-view class="nabar" wx:if="{{isdou || iskuai}}">
     <cover-view class="navarItem" wx:for="{{list}}" wx:key="text" data-index="{{item.type}}" bindtap="tabChange">

pages/live/live.wxss

@@ -7,6 +7,7 @@
   bottom: 0;
   display: flex;
   box-shadow: 0 0 8px #1989fa;
+  background-color: #20223b;
 }
 
 .nabar .navarItem{

pages/sonTopic/sonTopic.wxml

@@ -31,7 +31,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_digg != -1}}" data-introduce="live_digg" bindtap="showDetail" class="topicItem">直播评论数
+      <view wx:if="{{headData.live_digg != -1}}" data-introduce="live_digg" bindtap="showDetail" class="topicItem">
+        直播评论数
         <text wx:if="{{select == 1}}" class="show">?</text> ：</view>
     </view>
     <view class="topicTable">