diff --git a/src/custom-tab-bar/index.scss b/src/custom-tab-bar/index.scss index e3780b2..e323d49 100644 --- a/src/custom-tab-bar/index.scss +++ b/src/custom-tab-bar/index.scss @@ -16,20 +16,22 @@ height: 94rpx; } .popup-tip { - padding: 22rpx 48rpx; + padding: 22rpx 24rpx; position: absolute; - top: -50rpx; + top: -60rpx; left: 50%; transform: translate(-50%, -100%); border-radius: 16rpx; - background-color: rgba(20, 21, 21, 0.76); + background-color: #fff; + box-shadow: 0 4rpx 11rpx rgba(0, 0, 0, 0.08); .content { text-align: center; - font-size: 28rpx; - color: #fff; + font-size: 32rpx; + color: #141515; white-space: nowrap; - line-height: 32rpx; + line-height: 48rpx; .plus { + color: #01b4c5; font-size: 52rpx; font-weight: bold; } @@ -40,18 +42,24 @@ align-items: center; justify-content: center; gap: 24rpx; + white-space: nowrap; .cancel { - padding: 8rpx 28rpx; - font-size: 24rpx; - color: rgba(255, 255, 255, 1); + padding: 16rpx 58rpx; + font-size: 32rpx; + color: #01b4c5; + line-height: 32rpx; + border: 1px solid #01b4c5; + border-radius: 120rpx; } .ok { - padding: 8rpx 28rpx; + padding: 18rpx 58rpx; font-size: 24rpx; color: rgba(20, 21, 21, 1); + font-size: 32rpx; + color: #fff; line-height: 32rpx; - border-radius: 80rpx; - background-color: #fff; + border-radius: 120rpx; + background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%); } } &::after { @@ -64,7 +72,7 @@ height: 0; border-style: solid; border-width: 12rpx 12rpx 0 12rpx; - border-color: rgba(20, 21, 21, 0.76) transparent transparent transparent; + border-color: #fff transparent transparent transparent; } } } @@ -98,7 +106,7 @@ width: 16rpx; height: 16rpx; border-radius: 50%; - background-color: #ED4F39; + background-color: #ed4f39; } } .name { diff --git a/src/custom-tab-bar/index.ts b/src/custom-tab-bar/index.ts index c90507e..b1fbc0f 100644 --- a/src/custom-tab-bar/index.ts +++ b/src/custom-tab-bar/index.ts @@ -57,6 +57,14 @@ Component({ } }, }, + pageLifetimes: { + show() { + this.setData({ + showEntryCase: false, + notice: false, + }); + }, + }, lifetimes: { attached() { this.setData({ diff --git a/src/custom-tab-bar/index.wxml b/src/custom-tab-bar/index.wxml index b4010c0..8ce236d 100644 --- a/src/custom-tab-bar/index.wxml +++ b/src/custom-tab-bar/index.wxml @@ -17,7 +17,7 @@ diff --git a/src/module1/pages/entryCases/index.wxml b/src/module1/pages/entryCases/index.wxml index a87f924..7cef067 100644 --- a/src/module1/pages/entryCases/index.wxml +++ b/src/module1/pages/entryCases/index.wxml @@ -82,7 +82,7 @@ class="del" catch:tap="handleDelFile" data-index="{{index}}" - src="{{imageUrl}}icon-close.png?t={{Timestamp}}" + src="{{imageUrl}}icon-clsoe-green.png?t={{Timestamp}}" > diff --git a/src/module1/pages/userInfo/index.ts b/src/module1/pages/userInfo/index.ts index 481786a..05f27cb 100644 --- a/src/module1/pages/userInfo/index.ts +++ b/src/module1/pages/userInfo/index.ts @@ -166,7 +166,7 @@ Page({ title: "确认退出登录?", success(res) { if (res.confirm) { - app.globalData.isLogin = 0 + app.globalData.isLogin = 0; wx.ajax({ method: "POST", url: "?r=takeda/account/reg-logout", @@ -186,6 +186,7 @@ Page({ title: "确认注销该账号?", success(res) { if (res.confirm) { + app.globalData.isLogin = 0; wx.ajax({ method: "POST", url: "?r=takeda/account/delete-account", diff --git a/src/pages/cases/index.ts b/src/pages/cases/index.ts index 387df1e..4f4a25f 100644 --- a/src/pages/cases/index.ts +++ b/src/pages/cases/index.ts @@ -69,12 +69,13 @@ Page({ entryDetail: false, }, - onLoad() { + onLoad() {}, + onShow() { this.getTabBar().setData({ active: 2, + showEntryCase: false, + notice: false, }); - }, - onShow() { if (this.data.entryDetail) { this.setData({ entryDetail: false, diff --git a/src/pages/chatRoomList/index.ts b/src/pages/chatRoomList/index.ts index 11e1c88..7252de2 100644 --- a/src/pages/chatRoomList/index.ts +++ b/src/pages/chatRoomList/index.ts @@ -66,12 +66,13 @@ Page({ noReadCount: 0, }, - onLoad() { + onLoad() {}, + onShow() { this.getTabBar().setData({ active: 3, + showEntryCase: false, + notice: false, }); - }, - onShow() { app.waitLogin().then(() => { this.getBaseInfo(); this.getList(); diff --git a/src/pages/home/index.ts b/src/pages/home/index.ts index a78bf70..ba8c8e6 100644 --- a/src/pages/home/index.ts +++ b/src/pages/home/index.ts @@ -22,6 +22,8 @@ Page({ }); this.getTabBar().setData({ active: 1, + showEntryCase: false, + notice: false, }); app.waitLogin().then(() => { this.handleBindDoctor(); diff --git a/src/pages/my/index.ts b/src/pages/my/index.ts index 45f2320..6f2d8cb 100644 --- a/src/pages/my/index.ts +++ b/src/pages/my/index.ts @@ -5,12 +5,13 @@ Page({ userInfo: {}, DoctorTitleType: {}, }, - onLoad() { + onLoad() {}, + onShow() { this.getTabBar().setData({ active: 4, + showEntryCase: false, + notice: false, }); - }, - onShow() { app.waitLogin().then(() => { this.getDoctorDict(); app.getUserInfo(this, (userInfo) => {