Merge branch 'dev' of git.oa00.com:xiaowen/swsWecat into dev

* 'dev' of git.oa00.com:xiaowen/swsWecat:
  ZX
dev
liuyongli 3 years ago
commit 99cdedb451

@ -5,9 +5,10 @@
}
.ei-item {
width: 90%;
margin: 32rpx auto;
padding: 24rpx 0;
width: 92%;
/* height: 90%; */
margin: 0rpx 0rpx 32rpx 21rpx;
padding: 24rpx 0rpx 16rpx 0rpx;
background-color: #ffffff;
border-radius: 8rpx;
}
@ -22,14 +23,14 @@
.ei-chart-title {
font-size: 18px;
padding-left: 32rpx;
margin-left: 32rpx;
font-weight: 600;
color: #333333;
}
.ei-chart-subTitle {
font-size: 12px;
padding-left: 32rpx;
margin-left: 32rpx;
margin-top: 8rpx;
color: #999999;
}

@ -5,7 +5,7 @@
.ta-item {
width: 92%;
/* height: 90%; */
margin: 0rpx 0rpx 32rpx 32rpx;
margin: 0rpx 0rpx 32rpx 24rpx;
padding: 24rpx 0rpx 16rpx 0rpx;
background-color: #ffffff;
border-radius: 8rpx;

@ -108,7 +108,7 @@
<c-echars showChart="{{showChart}}" canvasId="tfb-canvas" chartId="tfb" chartOption="{{topicData}}" height="100%"></c-echars>
</view>
<view class="tu-chart-title">TOP分发帖用户</view>
<view class="tu-chart-item" style="margin-top: 32rpx;">
<view class="tu-chart-item" style="margin-top: 32rpx;height: auto;">
<view class="kol-content">
<view class="kol-item" wx:for="{{topicUser}}" wx:key="index" wx:if="{{index < 3}}">
<!-- <image style="width: 64rpx;height: 64rpx;margin-top: 20rpx;" src="{{item._source.profileimgurl}}" /> -->
@ -159,27 +159,25 @@
</van-tabs>
</view>
</view>
<view>
<view class="ranking">
<view style="width: 33%;">排名</view>
<view style="width: 33%;">车型</view>
<view style="width: 33%;">数量</view>
</view>
<view class="ranking-number" wx:for="{{mainIdTypeData}}" wx:key="index" wx:if="{{index < 5}}" >
<view style="width: 33%;margin-top: 32rpx;color: #999999;">
<image class="rank_num" wx:if="{{index === 0}}" src="{{imageUrl}}/img_diyi.png"></image>
<image class="rank_num" wx:if="{{index === 1}}" src="{{imageUrl}}/img_dier.png"></image>
<image class="rank_num" wx:if="{{index === 2}}" src="{{imageUrl}}/img_disan.png"></image>
<view class="num" wx:if="{{index !== 0 &&index !== 1 &&index !== 2 }}">{{index >= 9 ? index + 1 : '0' + (index + 1)}}</view>
</view>
<view style="width: 33%;margin-top: 32rpx;color: #333333">{{item.name}}</view>
<view style="width: 33%;margin-top: 32rpx;color: #0084FF">{{item.value}}</view>
<view class="ranking">
<view class="title">排名</view>
<view class="title1">车型</view>
<view class="title2">数量</view>
</view>
<view class="rank" wx:for="{{mainIdTypeData}}" wx:key="index" wx:if="{{index < 5}}">
<view style="width: 30%;margin-top: 6rpx;color: #999999;">
<image class="rank_num" wx:if="{{index === 0}}" src="{{imageUrl}}/img_diyi.png"></image>
<image class="rank_num" wx:if="{{index === 1}}" src="{{imageUrl}}/img_dier.png"></image>
<image class="rank_num" wx:if="{{index === 2}}" src="{{imageUrl}}/img_disan.png"></image>
<view class="num" wx:if="{{index !== 0 &&index !== 1 &&index !== 2 }}">{{index >= 9 ? index + 1 : '0' + (index + 1)}}</view>
</view>
<view class="media">{{item.name}}</view>
<view class="volume">{{item.value}}</view>
</view>
</view>
<view class="tu-item">
<view class="tu-chart-title">主贴ID区域分布</view>
<view class="area-item" style="padding-left: 16rpx;">
<view class="area-item">
<view class="area-item-chart">
<c-echars showChart="{{showChart}}" canvasId="aua-canvas" chartId="aua" chartOption="{{mainIdArea1}}" height="100%"></c-echars>
</view>

@ -5,20 +5,20 @@
.tu-item {
width: 92%;
/* height: 90%; */
margin: 0rpx 0rpx 32rpx 32rpx;
margin: 0rpx 0rpx 32rpx 24rpx;
padding: 24rpx 0rpx 8rpx 0rpx;
background-color: #ffffff;
border-radius: 8rpx;
}
.tu-chart-title {
font-size: 18px;
padding-left: 32rpx;
margin-left: 32rpx;
font-weight: 600;
color: #333333;
}
.tu-chart-subTitle {
font-size: 12px;
padding-left: 32rpx;
margin-left: 32rpx;
margin-top: 8rpx;
color: #999999;
}
@ -86,11 +86,11 @@
.tu-area-title {
width: 100%;
font-size: 18px;
padding-left: 32rpx;
margin-left: 32rpx;
font-weight: 600;
color: #333333;
display: flex;
justify-content: flex-start;
justify-content: space-between;
}
/* kol */
.kol-content {
@ -125,12 +125,12 @@
/* 活跃用户地区 */
.area-item {
display: flex;
width: 656rpx;
height: 410rpx;
padding: 32rpx 0 0 32rpx;
width: 95%;
height: 390rpx;
margin: 32rpx 0 0 0rpx;
}
.area-item-chart{
width: 358rpx;
width: 100%;
height: 410rpx;
}
/* 主贴id车型分析 */
@ -138,12 +138,36 @@
width: 125%;
margin: 32rpx;
}
.title{
width: 30%;
font-size: 24rpx;
color: #999999;
}
.title1{
width: 30%;
font-size: 24rpx;
color: #999999;
text-align: center;
}
.title2{
width: 40%;
font-size: 24rpx;
color: #999999;
display: flex;
flex-direction:row-reverse
}
.rank{
width: calc(100% - 32px);
height: 104rpx;
line-height: 104rpx;
display: flex;
margin: 0 32rpx;
font-size: 14px;
}
.ranking{
width: calc(100% - 32px);
display: flex;
justify-content: space-between;
font-size: 12px;
font-weight: 400;
color: #999999;
margin: 0 32rpx;
}
.ranking-number{
display: flex;
@ -155,6 +179,19 @@
width: 53rpx;
height: 40rpx;
}
.media{
width: 30%;
font-size: 28rpx;
text-align: center;
}
.volume{
width: 40%;
font-size: 28rpx;
color: #0084FF;
display: flex;
flex-direction:row-reverse
}
.colorTags {
width: 10px;height: 10px;border-radius: 1px;
}

@ -12,7 +12,7 @@
}
.tr-chart-title {
font-size: 18px;
padding-left: 32rpx;
margin-left: 32rpx;
font-weight: 600;
height: 80rpx;
line-height: 80rpx;
@ -20,7 +20,7 @@
}
.tr-chart-subTitle {
font-size: 12px;
padding-left: 32rpx;
margin-left: 32rpx;
margin-top: 8rpx;
color: #999999;
}

@ -155,7 +155,7 @@
<view class="kol-item" wx:for="{{kolData}}" wx:key="index" wx:if="{{index < 3}}">
<image style="width: 64rpx;height: 64rpx;margin-top: 20rpx;" src="{{item._source.profileimgurl}}" />
<view class="kol-user-name">{{item._source.user_author.length > 7 ? item._source.user_author.slice(0,7)+'...':item._source.user_author}}</view>
<view style="display: flex;justify-content: space-between;padding: 24rpx 24rpx 0rpx 24rpx">
<view style="display: flex;justify-content: space-between;margin: 24rpx 12rpx 0rpx 12rpx">
<view class="kol-value">影响力</view>
<view class="kol-value-number">{{item._source.volume}}</view>
</view>
@ -165,7 +165,7 @@
<view class="kol-item" wx:for="{{kolData}}" wx:key="index" wx:if="{{index >= 3}}">
<image style="width: 64rpx;height: 64rpx;margin-top: 20rpx;" src="{{item._source.profileimgurl}}" />
<view class="kol-user-name">{{item._source.user_author.length > 7 ? item._source.user_author.slice(0,7)+'...':item._source.user_author}}</view>
<view style="display: flex;justify-content: space-between;padding: 24rpx 24rpx 0rpx 24rpx">
<view style="display: flex;justify-content: space-between;margin: 24rpx 12rpx 0rpx 12rpx">
<view class="kol-value">影响力</view>
<view class="kol-value-number">{{item._source.volume}}</view>
</view>

@ -15,14 +15,14 @@
.wb-chart-title {
font-size: 18px;
padding-left: 32rpx;
margin-left: 32rpx;
font-weight: 600;
color: #333333;
}
.wb-area-title {
font-size: 18px;
padding-left: 32rpx;
margin-left: 32rpx;
font-weight: 600;
color: #333333;
display: flex;
@ -175,7 +175,7 @@
background-color: #fff;
margin-top: 32rpx;
border-radius: 4rpx;
padding: 16px;
margin: 16px;
overflow: hidden;
}

Loading…
Cancel
Save