diff --git a/components/option/multiColumnsOption.js b/components/option/multiColumnsOption.js index 90b8d15..3e45a86 100644 --- a/components/option/multiColumnsOption.js +++ b/components/option/multiColumnsOption.js @@ -1,4 +1,5 @@ //散点图 +import {doStr} from "./text" export default function multiColumnsOption(dx=[], dValue=[], dName=[]) { const newData = []; for(let i=0;i{ + let res=doStr(value,4) + return res + }, } }, yAxis: { - type: 'value' + type: 'value', + axisLabel: { + color: '#999999', //y轴文本颜色 + textStyle: { + fontSize: 9 + }, + formatter: (value) => { + if (value >= 10000) { + value = (value / 10000) + '万'; + } + return value; + } + }, }, series: newData // series: [ diff --git a/components/option/percentRankOption.js b/components/option/percentRankOption.js index 751f12c..dae570f 100644 --- a/components/option/percentRankOption.js +++ b/components/option/percentRankOption.js @@ -57,7 +57,7 @@ export default function pictographicOption(dRegion=[],dValue=[]){ // offset: [20, 0], color: '#333333', fontSize: 12, - position:[60,-2] + position:[60,-1] }, showBackground: true, backgroundStyle: { diff --git a/pages/brandCrisis/crisiSet/index.wxml b/pages/brandCrisis/crisiSet/index.wxml index c04c6ec..ea9eab8 100644 --- a/pages/brandCrisis/crisiSet/index.wxml +++ b/pages/brandCrisis/crisiSet/index.wxml @@ -15,7 +15,7 @@ 高级危机 - + 是否配置主题推送消息 diff --git a/pages/brandCrisis/crisiSet/index.wxss b/pages/brandCrisis/crisiSet/index.wxss index 9c8fa4f..d395767 100644 --- a/pages/brandCrisis/crisiSet/index.wxss +++ b/pages/brandCrisis/crisiSet/index.wxss @@ -1,6 +1,7 @@ .cs-container { width: calc(100% - 32px); padding: 0px 16px; + height: 100%; } .cs-dc { @@ -19,12 +20,14 @@ .cs-d1-title { font-size: 14px; font-weight: 600; + height: 27px; + line-height: 27px; color: #333333; } .cs-d1 { padding: 16px; background: #fff; - margin-top: 12px; + margin: 12px 0; } .cs-vcg .van-checkbox-group{ diff --git a/pages/insight/themeChild/index.wxml b/pages/insight/themeChild/index.wxml index 1b8bb73..44684a7 100644 --- a/pages/insight/themeChild/index.wxml +++ b/pages/insight/themeChild/index.wxml @@ -34,8 +34,8 @@ - 编辑主题 - 删除主题 + 编辑主题 + 删除主题 diff --git a/pages/insight/themeChild/index.wxss b/pages/insight/themeChild/index.wxss index efc16b5..a48e2db 100644 --- a/pages/insight/themeChild/index.wxss +++ b/pages/insight/themeChild/index.wxss @@ -3,77 +3,117 @@ line-height: 88rpx; font-size: 28rpx; } + .theme-add { padding: 12px; background-color: #006BFF; } + /* 主题卡片 */ .bottom-view { background-color: #F9F9F9; } -.card-content{ + +.card-content { margin: 16rpx 32rpx; background-color: #ffffff; border-radius: 8rpx; } -.content_text{ + +.content_text { display: flex; - justify-content : space-between; + justify-content: space-between; } -.content_event{ + +.content_event { padding: 0rpx 32rpx 12rpx 32rpx; } -.content_time{ + +.content_time { color: #999999; font-size: 24rpx; padding: 10rpx 0; height: 48rpx; line-height: 48rpx; } -.content_status{ + +.content_status { color: #FF4852; font-size: 12px; padding: 10rpx 0; line-height: 48rpx; font-weight: 600; } -.content_number{ + +.content_number { color: #333333; font-size: 14px; padding: 4rpx 0; font-weight: 500; line-height: 48rpx; } -.content_number_title{ + +.content_number_title { color: #999999; font-size: 14px; padding: 4rpx 0; line-height: 48rpx; } + .content_title { font-weight: 600; font-size: 16px; color: #333333; } -.content_button{ + +.content_button { + font-size: 30rpx; + width: 50%; display: flex; - margin-top: 20rpx; - margin-left: 42%; + justify-content: space-between; + text-align: left; + margin: 10rpx 0rpx 10rpx 50%; } + /* tabs */ -.view-tabs .van-tabs__nav{ - background-color: #006BFF;/* 标签背景颜色 */ - } - .view-tabs .van-tab { - color: #999999; /* 字体颜色 */ - background-color: #F9F9F9;/* 标签背景颜色 */ - } - - .view-tabs .van-tab--active{ - color: #0084FF; /* 字体颜色 */ +.view-tabs .van-tabs__nav { + background-color: #006BFF; + /* 标签背景颜色 */ +} + +.view-tabs .van-tab { + color: #999999; + /* 字体颜色 */ + background-color: #F9F9F9; + /* 标签背景颜色 */ +} + +.view-tabs .van-tab--active { + color: #0084FF; + /* 字体颜色 */ font-size: 19px; font-weight: 600; - } - .view-tabs .van-tabs__line { +} + +.view-tabs .van-tabs__line { background: transparent; - } \ No newline at end of file +} + +.button_text { + height: 68rpx; + width: 100px; + color: #0084FF; + border: 1rpx solid #efefef; + line-height: 68rpx; + padding: 0 10rpx; + margin-right: 20rpx; +} + +.button_text1 { + height: 68rpx; + width: 100px; + color: #FF4852; + border: 1rpx solid #efefef; + line-height: 68rpx; + padding: 0 10rpx; +} \ No newline at end of file diff --git a/pages/mine/pages/bindUser/index.js b/pages/mine/pages/bindUser/index.js index bbca58f..6e83dc8 100644 --- a/pages/mine/pages/bindUser/index.js +++ b/pages/mine/pages/bindUser/index.js @@ -168,9 +168,9 @@ Page({ content: '登录成功,但未关注公众号。', success: function (r) { if (r.confirm) { - wx.navigateBack({ - delta: 1 - }); + wx.switchTab({ + url: '/pages/index/index' + }) } else { console.log('取消') }