diff --git a/app.json b/app.json index 0339c99..ba4b841 100644 --- a/app.json +++ b/app.json @@ -52,7 +52,7 @@ { "pagePath": "pages/brandCrisis/index", "iconPath": "/custom-tab-bar/icons/appSearch.png", - "selectedIconPath": "/custom-tab-bar/icons/appSearchActive.png", + "selectedIconPath": "", "text": "品牌搜索" }, { diff --git a/custom-tab-bar/icons/appSearch.png b/custom-tab-bar/icons/appSearch.png index 3a801c4..3996982 100644 Binary files a/custom-tab-bar/icons/appSearch.png and b/custom-tab-bar/icons/appSearch.png differ diff --git a/custom-tab-bar/icons/appSearchActive.png b/custom-tab-bar/icons/appSearchActive.png deleted file mode 100644 index a74330b..0000000 Binary files a/custom-tab-bar/icons/appSearchActive.png and /dev/null differ diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index bdc504b..1973403 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -19,7 +19,7 @@ Component({ { "pagePath": "pages/brandCrisis/index", "iconPath": "icons/appSearch.png", - "selectedIconPath": "icons/appSearchActive.png", + "selectedIconPath": "", "text": "", diyClass: 'diy' }, diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml index ab86092..9ec3a21 100644 --- a/custom-tab-bar/index.wxml +++ b/custom-tab-bar/index.wxml @@ -1,5 +1,6 @@ + {{item.text}} diff --git a/custom-tab-bar/index.wxss b/custom-tab-bar/index.wxss index a64c859..1aa979a 100644 --- a/custom-tab-bar/index.wxss +++ b/custom-tab-bar/index.wxss @@ -52,12 +52,13 @@ .tab-bar-item image.diy { position: absolute; - width: 134rpx; + width: 140rpx; height: 140rpx; bottom: 25.6%; z-index: 100; - border-radius: 140rpx; + border-radius: 200rpx; background: #fff; + box-shadow: 0px -2px 10px 0px rgba(0,0,0,0.15); } .tab-bar-item view.diy { @@ -71,4 +72,10 @@ .activeBg { background: #0579FF; } + .tab-middle { + position: absolute; + width: 140rpx; + height: 100%; + background: #fff; + } \ No newline at end of file diff --git a/pages/brandCrisis/index.js b/pages/brandCrisis/index.js index e7753c5..d5d5175 100644 --- a/pages/brandCrisis/index.js +++ b/pages/brandCrisis/index.js @@ -110,7 +110,7 @@ Page({ let intermediateCrisis = Math.round((new Decimal(res.crisis[1].value).div(new Decimal(negativeNum))).toFixed(2) * 100); let seniorCrisis = Math.round((new Decimal(res.crisis[2].value).div(new Decimal(negativeNum))).toFixed(2) * 100); this.setData({ - healthIndex: healthIndex, + healthIndex: 100, topBg: topBg, healthIndexMsg: healthIndexMsg, negativeNum: negativeNum, diff --git a/pages/brandCrisis/index.wxml b/pages/brandCrisis/index.wxml index c7e9ea5..39160b6 100644 --- a/pages/brandCrisis/index.wxml +++ b/pages/brandCrisis/index.wxml @@ -1,31 +1,31 @@ - 健康指数 + 健康指数 {{healthIndex}} {{healthIndexMsg}} {{headlBrand}} - 健康指数 + 健康指数 {{healthIndex}} {{healthIndexMsg}} {{headlBrand}} - 健康指数 + 健康指数 {{healthIndex}} {{healthIndexMsg}} {{headlBrand}} - 健康指数 + 健康指数 {{healthIndex}} {{healthIndexMsg}} {{headlBrand}} - 健康指数 + 健康指数 {{healthIndex}} {{healthIndexMsg}} {{headlBrand}} diff --git a/pages/brandCrisis/index.wxss b/pages/brandCrisis/index.wxss index 99a0cb0..16dde35 100644 --- a/pages/brandCrisis/index.wxss +++ b/pages/brandCrisis/index.wxss @@ -4,17 +4,18 @@ .bc-top { position: relative; width: 100%; - height: 900rpx; + height: 840rpx; border-top: 1px solid transparent; } .bc-top-inner { - width: 100%; + width: 90%; background-repeat: no-repeat; background-size: cover; display: flex; justify-content: center; align-items: center; flex-direction: column; + margin: 0 auto; margin-top: 100rpx; height: 660rpx; }