diff --git a/.cloudbase/container/debug.json b/.cloudbase/container/debug.json new file mode 100644 index 0000000..79ca5f4 --- /dev/null +++ b/.cloudbase/container/debug.json @@ -0,0 +1 @@ +{"containers":[]} \ No newline at end of file diff --git a/components/indexCom/dataChild/index.wxml b/components/indexCom/dataChild/index.wxml index f6b320a..6ac787d 100644 --- a/components/indexCom/dataChild/index.wxml +++ b/components/indexCom/dataChild/index.wxml @@ -1,4 +1,5 @@ + 入库数据趋势 @@ -32,7 +33,7 @@ {{item.text}} - {{item.num}}% + {{item.num}} diff --git a/components/indexCom/insightChild/index.js b/components/indexCom/insightChild/index.js index b29008c..bec9080 100644 --- a/components/indexCom/insightChild/index.js +++ b/components/indexCom/insightChild/index.js @@ -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', diff --git a/components/indexCom/insightChild/index.wxml b/components/indexCom/insightChild/index.wxml index 0f0a1f2..d25e5f1 100644 --- a/components/indexCom/insightChild/index.wxml +++ b/components/indexCom/insightChild/index.wxml @@ -4,6 +4,7 @@ 品牌传播声量 + diff --git a/components/indexCom/insightChild/index.wxss b/components/indexCom/insightChild/index.wxss index 33bebf8..97909d9 100644 --- a/components/indexCom/insightChild/index.wxss +++ b/components/indexCom/insightChild/index.wxss @@ -12,5 +12,5 @@ } .text{ font-size: 36rpx; - padding: 32rpx; + padding:32rpx; } \ No newline at end of file diff --git a/components/indexCom/rankingChild/index.js b/components/indexCom/rankingChild/index.js index d71deb0..78e5d1d 100644 --- a/components/indexCom/rankingChild/index.js +++ b/components/indexCom/rankingChild/index.js @@ -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", diff --git a/components/indexCom/rankingChild/index.wxml b/components/indexCom/rankingChild/index.wxml index dadf5eb..42c7f51 100644 --- a/components/indexCom/rankingChild/index.wxml +++ b/components/indexCom/rankingChild/index.wxml @@ -1,28 +1,39 @@ - - - - - - + + + + + + + 汽车销量排行 + + + 查看详情 + - 汽车销量排行 - - - 查看详情 - - - - 品牌销量排行 - - + + + 品牌销量排行 + + 销量详情 + + + + + + - - 车型销量排行 + + 车型销量排行 + + 销量详情 + + + diff --git a/components/indexCom/rankingChild/index.wxss b/components/indexCom/rankingChild/index.wxss index c192a88..93e5783 100644 --- a/components/indexCom/rankingChild/index.wxss +++ b/components/indexCom/rankingChild/index.wxss @@ -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; + +} diff --git a/components/indexCom/soundChild/index.js b/components/indexCom/soundChild/index.js index b20c6cb..c62db31 100644 --- a/components/indexCom/soundChild/index.js +++ b/components/indexCom/soundChild/index.js @@ -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", diff --git a/pages/brandSearch/index.wxss b/pages/brandSearch/index.wxss index b7f7c3b..9882e90 100644 --- a/pages/brandSearch/index.wxss +++ b/pages/brandSearch/index.wxss @@ -33,7 +33,7 @@ align-items: center; padding: 15px 13px; font-size: 14px; - } + } .bs-item-image { display: inline-block; width: 42px; diff --git a/pages/index/Rankdetail/Rankdetail.js b/pages/index/Rankdetail/Rankdetail.js index b1230dd..7ed057b 100644 --- a/pages/index/Rankdetail/Rankdetail.js +++ b/pages/index/Rankdetail/Rankdetail.js @@ -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 () { } + }) \ No newline at end of file diff --git a/pages/index/Rankdetail/Rankdetail.wxml b/pages/index/Rankdetail/Rankdetail.wxml index be1bd67..e072f74 100644 --- a/pages/index/Rankdetail/Rankdetail.wxml +++ b/pages/index/Rankdetail/Rankdetail.wxml @@ -1,5 +1,6 @@ + @@ -7,7 +8,26 @@ - + + + + + + + + + + + + + + + + + + + + @@ -51,26 +71,30 @@ {{item.volume}} - - 销量趋势 + + + 销量趋势 + + + + - - + - - - 销量趋势 - 宏光MINIEV销量趋势 - - + + + 销量趋势 + 宏光MINIEV销量趋势 + + + - - \ No newline at end of file + \ No newline at end of file diff --git a/pages/index/Rankdetail/Rankdetail.wxss b/pages/index/Rankdetail/Rankdetail.wxss index 3509115..2e235cf 100644 --- a/pages/index/Rankdetail/Rankdetail.wxss +++ b/pages/index/Rankdetail/Rankdetail.wxss @@ -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; -} \ No newline at end of file +} +