* 'dev' of https://git.oa00.com/xiaowen/swsWecat:
  no message
  1

# Conflicts:
#	components/indexCom/dataChild/index.wxml
dev
xiaowen 3 years ago
commit 60526bfe58

@ -0,0 +1 @@
{"containers":[]}

@ -1,4 +1,5 @@
<view>
<!-- 时间组件 -->
<time-component></time-component>
<view class="trend">
<view class="text">入库数据趋势</view>
@ -32,7 +33,7 @@
</view>
<view class="content_text">
<view class="total_text">{{item.text}}</view>
<view class="total_num">{{item.num}}%</view>
<view class="total_num">{{item.num}}</view>
</view>
</view>
</view>

@ -28,8 +28,8 @@ Component({
grid: {
left: 20,
right: 20,
bottom: 15,
top: 40,
bottom: 10,
top: 20,
containLabel: true
},
yAxis: [
@ -81,7 +81,7 @@ Component({
],
series:
{
name: '尾翼互动量',
barWidth : 24,
type: 'bar',
data: [1400, 2000, 1500, 1800, 1490, 900, 310],
stack:"Search Engine",
@ -123,8 +123,8 @@ Component({
grid: {
left: 20,
right: 20,
bottom: 15,
top: 40,
bottom: 10,
top: 20,
containLabel: true
},
yAxis: [
@ -177,14 +177,13 @@ Component({
],
series:
{
name: '尾翼互动量',
barWidth : 24,
type: 'bar',
data: [1400, 2000, 1500, 1800, 1490, 900, 310],
stack:"Search Engine",
emphasis: {//折线图的高亮状态。
focus: "series",//聚焦当前高亮的数据所在的系列的所有图形。
},
emphasis: {//折线图的高亮状态。
focus: "series",//聚焦当前高亮的数据所在的系列的所有图形。
},
itemStyle: {
normal:{
color: '#20CC62',

@ -4,6 +4,7 @@
<view class="brand">
<view class="text">品牌传播声量</view>
<view class="brand_tu">
<!-- <Histogram></Histogram> -->
<c-echars showChart="{{showChart}}" canvasId="brandbar-canvas" chartId="brandbar" chartOption="{{brandOption}}" height="100%"></c-echars>
</view>
</view>

@ -12,5 +12,5 @@
}
.text{
font-size: 36rpx;
padding: 32rpx;
padding:32rpx;
}

@ -77,7 +77,7 @@ Component({
],
series:
{
name: '尾翼互动量',
barWidth : 24,
type: 'bar',
data: [1400, 2000, 1500, 1800, 1490, 900, 310],
stack:"Search Engine",
@ -173,8 +173,7 @@ Component({
],
series:
{
name: '尾翼互动量',
barWidth : 24,
type: 'bar',
data: [1400, 2000, 1500, 1800, 1490, 900, 310],
stack:"Search Engine",

@ -1,28 +1,39 @@
<view>
<!-- 时间组件 -->
<time-component></time-component>
<!-- 汽车销量排行 -->
<view class="total">
<view class="content_left">
<view class="img">
<image style="width: 48rpx;height: 48rpx;" src="/images/car_sales.png"></image>
<view class="box">
<view class="total">
<view class="content_left">
<view class="img">
<image style="width: 48rpx;height: 48rpx;" src="/images/car_sales.png"></image>
</view>
<view class="title">汽车销量排行</view>
</view>
<view class="content_left" bindtap="Rankdetail">
<view class="details_text">查看详情</view>
<van-icon size="22px" name="arrow" style="color:#0084FF ;margin-left: 10rpx;" />
</view>
<view class="title">汽车销量排行</view>
</view>
<view class="content_left" bindtap="Rankdetail">
<view class="details_text">查看详情</view>
<van-icon size="22px" name="arrow" style="color:#0084FF ;margin-left: 10rpx;" />
</view>
</view>
<view class="first_brand">
<view class="text">品牌销量排行</view>
<view class="brand_tu">
<c-echars showChart="{{showChart}}" canvasId="brandbar-canvas" chartId="brandbar" chartOption="{{brandOption}}" height="100%"></c-echars>
<view class="first_brand">
<view class="first_box">
<view class="text">品牌销量排行</view>
<view class="box_detail">
<view class="detial_text">销量详情</view>
<van-icon size="24rpx" name="arrow" style="color:#D0D0D0 ;margin-bottom: 10rpx;" />
</view>
</view>
<view class="brand_tu">
<c-echars showChart="{{showChart}}" canvasId="brandbar-canvas" chartId="brandbar" chartOption="{{brandOption}}" height="100%"></c-echars>
</view>
</view>
</view>
<view class="brand">
<view class="text">车型销量排行</view>
<view class="first_box">
<view class="text">车型销量排行</view>
<view class="box_detail">
<view class="detial_text">销量详情</view>
<van-icon size="24rpx" name="arrow" style="color:#D0D0D0 ;margin-bottom: 10rpx;" />
</view>
</view>
<view class="brand_tu">
<c-echars showChart="{{showChart}}" canvasId="modelbar-canvas" chartId="modelbar" chartOption="{{modelOption}}" height="100%"></c-echars>
</view>

@ -1,14 +1,15 @@
/* 热销排行 */
/* 点击详情 */
.box{
margin: 32rpx ;
}
.total{
height: 80rpx;
line-height: 80rpx;
display: flex;
text-align: center;
justify-content: space-between;
margin: 0 32rpx;
padding: 0 32rpx 0 32rpx;
/* margin: 0 32rpx; */
padding: 0 32rpx;
background-color: #ebf5ff;
}
@ -36,7 +37,7 @@
width: 686;
height: 488rpx;
background-color: #fff;
margin: 0 32rpx 32rpx 32rpx;
/* margin: 0 32rpx 32rpx 32rpx; */
border-radius: 4rpx;
}
.brand{
@ -54,3 +55,17 @@
font-size: 36rpx;
padding: 32rpx;
}
.first_box{
justify-content: space-between;
display: flex;
}
.box_detail{
display: flex;
padding: 32rpx;
}
.detial_text{
color:#D0D0D0;
font-size: 24rpx;
}

@ -78,6 +78,7 @@ Component({
{
name: '微博',
type: 'bar',
barWidth : 24,
data: [1400, 2000, 1500, 1800, 1490, 900, 310],
stack:"Search Engine",
emphasis: {//折线图的高亮状态。
@ -273,6 +274,7 @@ Component({
series: [
{
name: '微博',
barWidth : 24,
type: 'bar',
data: [1400, 2000, 1500, 1800, 1490, 900, 310],
stack:"Search Engine",

@ -33,7 +33,7 @@
align-items: center;
padding: 15px 13px;
font-size: 14px;
}
}
.bs-item-image {
display: inline-block;
width: 42px;

@ -4,7 +4,7 @@
* 页面的初始数据
*/
data: {
show:false,
sortOpt: [
{
text: '列表展示',
@ -15,7 +15,6 @@
value1: 1
}
],
value:0,
// 时间
priceOpt: ['2022年5月','2022年4月','2022年3月',
@ -27,14 +26,12 @@
],
prcieInterval: [0, 10, 20, 30, 40, 50, '不限'],
value1: 0,
// 品牌
value2: '全部品牌',
typeOpt: [
],
// 级别
level:[
{
@ -274,6 +271,7 @@
]
},
},
// sliderChange(event) {
// this.setData({
@ -290,14 +288,6 @@
priceSelected: e.currentTarget.dataset.index
})
},
showPopup(){
this.setData({show:true});
},
onClose(){
this.setData({
show:false
});
},
onclick() {
this.setData({ show: true });
},
@ -311,6 +301,7 @@
onLoad: function (options) {
console.log('111',this.data.sortOpt[0].value1)
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
@ -360,5 +351,6 @@
onShareAppMessage: function () {
}
})

@ -1,5 +1,6 @@
<!--pages/index/Rankdetail/Rankdetail.wxml-->
<view class="screen">
<van-dropdown-menu active-color="#027AFF">
<van-dropdown-item id="priceOpt" value="{{ value }}" title="2022年05月">
<view class="condition">
@ -7,7 +8,26 @@
</view>
</van-dropdown-item>
<van-dropdown-item value="{{ value1 }}" options="{{ sortOpt }}" title="列表展示" bind:change="dropdownSel" />
<van-dropdown-item value="{{ value2 }}" options="{{ typeOpt }}" title="品牌" />
<van-dropdown-item value="{{ value2 }}" options="{{ typeOpt }}" title="品牌">
<scroll-view style="height: clac(100vh-{{navHight}}px); " scroll-y bindscroll="onPageScroll" enhanced="true" scroll-into-view="contain">
<van-index-bar>
<view>
<van-index-anchor index="A" />
<van-cell title="文本" />
<van-cell title="文本" />
<van-cell title="文本" />
</view>
<view>
<van-index-anchor index="B" />
<van-cell title="文本" />
<van-cell title="文本" />
<van-cell title="文本" />
</view>
</van-index-bar>
</scroll-view>
</van-dropdown-item>
<van-dropdown-item value="{{ value3 }}" options="{{ complexOpt }}" title="车型" />
</van-dropdown-menu>
<van-dropdown-menu active-color="#027AFF">
@ -51,26 +71,30 @@
</view>
<view style="width: 30%;">
<view class="volume">{{item.volume}}</view>
<view class="trend" bindtap="onclick">
<van-icon size="16px" name="arrow" />
<view>销量趋势</view>
</view>
<van-popup show="{{ show }}" position="bottom" custom-style="height: 638rpx;" bind:close="onClose" close-icon="close" close-icon-position="top-left">
<view>
<view> 销量趋势</view>
</view>
</van-popup>
</view>
</view>
</view>
</view>
</view>
<!-- </view> -->
<!-- </view> -->
<van-popup show="{{ show }}" bind:close="onClose" position="bottom" closeable round close-icon-position="top-right" close-icon="cross" custom-style="height: 638rpx">
<view class="popContent">
<view class="popContent-text">销量趋势 </view>
<view class="popContent-title" >宏光MINIEV销量趋势</view>
<view class="popContent-echars">
<c-echars showChart="{{showChart}}" canvasId="rankbar-canvas" chartId="rankbar" chartOption="{{positiveOption}}" width="100%" height="100%"></c-echars>
<van-popup show="{{ show }}" bind:close="onClose" position="bottom" closeable round close-icon-position="top-right" close-icon="cross" custom-style="height: 638rpx">
<view class="popContent">
<view class="popContent-text">销量趋势 </view>
<view class="popContent-title">宏光MINIEV销量趋势</view>
<view class="popContent-echars">
<c-echars showChart="{{showChart}}" canvasId="rankbar-canvas" chartId="rankbar" chartOption="{{positiveOption}}" width="100%" height="100%"></c-echars>
</view>
</view>
</view>
</van-popup>
</van-popup>

@ -226,6 +226,20 @@
color: #0084FF;
}
.bs-item {
display: flex;
justify-items: flex-start;
align-items: center;
padding: 15px 13px;
font-size: 14px;
}
.bs-item-image {
display: inline-block;
width: 42px;
height: 42px;
margin-right: 15px;
}
.license{
width: 200rpx;
height: 200rpx;
@ -254,4 +268,5 @@
height: 386rpx;
margin:0 32rpx;
}
}

Loading…
Cancel
Save