diff --git a/app.json b/app.json index 7a61ebe..45e2a8e 100644 --- a/app.json +++ b/app.json @@ -30,8 +30,8 @@ "navigationBarBackgroundColor": "#ffffff" }, "tabBar": { - "color": "#999999", - "selectedColor": "#4285FF", + "color": "#222222", + "selectedColor": "#FFC300", "backgroundColor": "#ffffff", "borderStyle": "white", "list": [ diff --git a/app.wxss b/app.wxss index cc92615..ac5528f 100644 --- a/app.wxss +++ b/app.wxss @@ -90,7 +90,7 @@ radio{ } radio .wx-radio-input{ border-radius: 50%; - border-color: #1A4DEB; + border-color:var(--main-color); box-sizing: border-box; width: 100%; height: 100%; @@ -100,7 +100,7 @@ radio .wx-radio-input{ } radio .wx-radio-input.wx-radio-input-checked{ background-color:transparent; - border-color: #1A4DEB; + border-color: var(--main-color); } radio .wx-radio-input.wx-radio-input-checked::before{ content: ''; @@ -109,7 +109,7 @@ radio .wx-radio-input.wx-radio-input-checked::before{ height:22rpx; left:4rpx;top:4rpx; border-radius: 50%; - background: #1A4DEB; + background: var(--main-color); transform: none; -webkit-transform:none } diff --git a/assets/icon/help/house@2x.png b/assets/icon/help/house@2x.png index 7988bce..913e97e 100644 Binary files a/assets/icon/help/house@2x.png and b/assets/icon/help/house@2x.png differ diff --git a/assets/icon/help/take@2x.png b/assets/icon/help/take@2x.png index 0e80584..33c5b74 100644 Binary files a/assets/icon/help/take@2x.png and b/assets/icon/help/take@2x.png differ diff --git a/assets/icon/my/cs@2x.png b/assets/icon/my/cs@2x.png index a34a31f..2cd1662 100644 Binary files a/assets/icon/my/cs@2x.png and b/assets/icon/my/cs@2x.png differ diff --git a/assets/icon/my/firend@2x.png b/assets/icon/my/firend@2x.png index 3b4d7c9..a214e09 100644 Binary files a/assets/icon/my/firend@2x.png and b/assets/icon/my/firend@2x.png differ diff --git a/assets/icon/my/share@2x.png b/assets/icon/my/share@2x.png index 4434975..0bd2b07 100644 Binary files a/assets/icon/my/share@2x.png and b/assets/icon/my/share@2x.png differ diff --git a/assets/icon/tabs/tab1-active@2x.png b/assets/icon/tabs/tab1-active@2x.png index 66c45de..2187bdd 100644 Binary files a/assets/icon/tabs/tab1-active@2x.png and b/assets/icon/tabs/tab1-active@2x.png differ diff --git a/assets/icon/tabs/tab2-active@2x.png b/assets/icon/tabs/tab2-active@2x.png index 6521f7c..7a23c6f 100644 Binary files a/assets/icon/tabs/tab2-active@2x.png and b/assets/icon/tabs/tab2-active@2x.png differ diff --git a/assets/icon/tabs/tab3-active@2x.png b/assets/icon/tabs/tab3-active@2x.png index 71d8f87..3b351b9 100644 Binary files a/assets/icon/tabs/tab3-active@2x.png and b/assets/icon/tabs/tab3-active@2x.png differ diff --git a/assets/icon/tabs/tab4-active@2x.png b/assets/icon/tabs/tab4-active@2x.png index f551421..5b6759f 100644 Binary files a/assets/icon/tabs/tab4-active@2x.png and b/assets/icon/tabs/tab4-active@2x.png differ diff --git a/pages/help/community/index.wxss b/pages/help/community/index.wxss index 0e83d34..172b9a5 100644 --- a/pages/help/community/index.wxss +++ b/pages/help/community/index.wxss @@ -7,7 +7,7 @@ border: 1rpx solid #fff; } .community-list .item.current{ - border-color: #1A4DEB; + border-color: var(--main-color); } .community-list .item .title{ font-weight: 600rpx; diff --git a/pages/help/index/index.wxss b/pages/help/index/index.wxss index c2977b6..72e944c 100644 --- a/pages/help/index/index.wxss +++ b/pages/help/index/index.wxss @@ -112,7 +112,7 @@ font-weight: 500; } .promotion-panel .text .title .spec{ - color: #1A4DEB; + color:var(--main-color); } .promotion-panel .text .sub-title{ diff --git a/pages/order/detail-group/index.wxss b/pages/order/detail-group/index.wxss index 7d2f7b0..f103064 100644 --- a/pages/order/detail-group/index.wxss +++ b/pages/order/detail-group/index.wxss @@ -127,8 +127,6 @@ font-size: 32rpx; } .bottom-bar .button2{ - color: #1A4DEB; - border: 1rpx solid #1A4DEB; font-size: 32rpx; margin-left:30rpx; } diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss index c6d12f9..583ebf5 100644 --- a/pages/order/index/index.wxss +++ b/pages/order/index/index.wxss @@ -29,7 +29,7 @@ } .order-list .head .icon-con{ padding: 10rpx; - background-color: #1A4DEB; + background-color: var(--main-color); border-radius: 50%; display: flex; align-items: center; diff --git a/pages/order/success/index.js b/pages/order/success/index.js index c9325b5..12bf488 100644 --- a/pages/order/success/index.js +++ b/pages/order/success/index.js @@ -14,7 +14,9 @@ Page({ onLoad(options) { }, - + back(){ + wx.navigateBack(); + }, /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/order/success/index.json b/pages/order/success/index.json index 8835af0..965b8e8 100644 --- a/pages/order/success/index.json +++ b/pages/order/success/index.json @@ -1,3 +1,4 @@ { - "usingComponents": {} + "usingComponents": {}, + "navigationStyle": "custom" } \ No newline at end of file diff --git a/pages/order/success/index.wxml b/pages/order/success/index.wxml index f121106..d43bf36 100644 --- a/pages/order/success/index.wxml +++ b/pages/order/success/index.wxml @@ -1,9 +1,9 @@ - + 扫码核销成功 - + \ No newline at end of file diff --git a/pages/order/success/index.wxss b/pages/order/success/index.wxss index f977661..6e4b1b0 100644 --- a/pages/order/success/index.wxss +++ b/pages/order/success/index.wxss @@ -4,7 +4,7 @@ height: 100%; width:100%; position: absolute; - padding-top:150rpx; + padding-top:300rpx; box-sizing: border-box; } .success .msg{