diff --git a/components/c-echars/index.js b/components/c-echars/index.js index 906f850..3bcf9df 100644 --- a/components/c-echars/index.js +++ b/components/c-echars/index.js @@ -38,7 +38,7 @@ Component({ detached(e) { // 组件移除 this[this.data.chartId] = null this[this.data.canvasId] = null - this[this.data.showChart]=false + this[this.data.showChart] = false }, }, /** @@ -48,9 +48,9 @@ Component({ initChart() { this[this.data.chartId]?.init((canvas, width, height, dpr) => { const chart = echarts.init(canvas, null, { // 配置图表的配置项 - width:width, // 宽度 + width: width, // 宽度 height: height, // 高度 - devicePixelRatio:dpr// 像素 + devicePixelRatio: dpr// 像素 }) chart.setOption(this.getOption()) return chart diff --git a/components/c-echars/index.wxml b/components/c-echars/index.wxml index 60fe6ec..bbf066c 100644 --- a/components/c-echars/index.wxml +++ b/components/c-echars/index.wxml @@ -1,4 +1,4 @@ - + diff --git a/components/indexCom/dataChild/index.js b/components/indexCom/dataChild/index.js index 34fc4d0..8274981 100644 --- a/components/indexCom/dataChild/index.js +++ b/components/indexCom/dataChild/index.js @@ -59,18 +59,20 @@ Component({ icon: 'rectangle',//data图标样式 itemWidth: 10,//data图标大小 itemHeight: 10, + left: 7, textStyle: { - fontSize: 9 + fontSize: 10, + fontWeight: 400 }, - data: ['微博', '其他','短视频', '微信','APP', '论坛', '新闻'], - // color:['#FF4852','#FF6E25','#FFBF00','#20CC62','#00D6D6','#00AAFF','#7257FF'], + data: ['微博', '其他','短视频', '微信','APP', '论坛', '新闻'], + // color:['#FF4852','#FF6E25','#FFBF00','#20CC62','#00D6D6','#00AAFF','#7257FF'], }, //图表位置 grid: { - left: 20, - right: 20, - bottom: 15, - top: 40, + left: 7, + right: 7, + bottom: 7, + top: 36, containLabel: true }, yAxis: [ @@ -222,16 +224,32 @@ Component({ } ] } - }, - onShow() { - this.getTabBar().init(); + lifetimes: { + created() { + wx.removeStorageSync('currTemplateType'); + }, + attached() { + setTimeout(() => { + + },1000) + + }, + detached(e) { + console.log(2222) + this.setData({ + showChart: false + }) + }, }, methods: { priceSel(e){ this.setData({ intervalSel: e.currentTarget.dataset.index }) + }, + changeTab(val) { + console.log(val) } } diff --git a/pages/index/index.js b/pages/index/index.js index f8c945c..8b717da 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -50,5 +50,10 @@ Page({ onLoad: function (options) { }, - + changeTab(val) { + let n = val.detail.index; + this.setData({ + active: n + }) + } }) \ No newline at end of file diff --git a/pages/index/index.wxml b/pages/index/index.wxml index d68be2c..dcb2893 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,12 +1,12 @@ - + - - - - - + + + + + diff --git a/project.private.config.json b/project.private.config.json index 8bebb5d..f986cd6 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -6,5 +6,5 @@ "urlCheck": false }, "condition": {}, - "libVersion": "2.14.1" + "libVersion": "2.23.4" } \ No newline at end of file