diff --git a/.neoconf.json b/.neoconf.json index a97367d..437bfce 100644 --- a/.neoconf.json +++ b/.neoconf.json @@ -1,3 +1,10 @@ { - "usingComponents": {} + "emmet_language_server": { + "init_options": { + "preferences": { + "css.intUnit": "rpx", + "css.floatUnitr": "rpx" + } + } + } } diff --git a/project.private.config.json b/project.private.config.json index ff2981d..be88c8b 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -9,6 +9,13 @@ "miniprogram": { "list": [ { + "name": "注销", + "pathName": "module1/pages/loginOut/index", + "query": "", + "launchMode": "default", + "scene": null + }, + { "name": "module1/pages/doctorHome/index", "pathName": "module1/pages/doctorHome/index", "query": "id=100", diff --git a/src/app.json b/src/app.json index 0e0b0bd..d34b005 100644 --- a/src/app.json +++ b/src/app.json @@ -34,7 +34,8 @@ "pages/chatRoom/index", "pages/chatRoomInfo/index", "pages/setChatDoctor/index", - "pages/doctorHome/index" + "pages/doctorHome/index", + "pages/loginOut/index" ] } ], diff --git a/src/custom-tab-bar/index.scss b/src/custom-tab-bar/index.scss index e323d49..247abdd 100644 --- a/src/custom-tab-bar/index.scss +++ b/src/custom-tab-bar/index.scss @@ -16,23 +16,30 @@ height: 94rpx; } .popup-tip { - padding: 22rpx 24rpx; + padding: 20rpx 34rpx 28rpx; position: absolute; top: -60rpx; left: 50%; transform: translate(-50%, -100%); border-radius: 16rpx; - background-color: #fff; + background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%); box-shadow: 0 4rpx 11rpx rgba(0, 0, 0, 0.08); + .close { + position: absolute; + top: -10rpx; + right: -10rpx; + width: 40rpx; + height: 40rpx; + } .content { text-align: center; font-size: 32rpx; - color: #141515; + color: #fff; white-space: nowrap; line-height: 48rpx; .plus { - color: #01b4c5; - font-size: 52rpx; + color: #fff; + font-size: 48rpx; font-weight: bold; } } @@ -43,23 +50,14 @@ justify-content: center; gap: 24rpx; white-space: nowrap; - .cancel { - padding: 16rpx 58rpx; - font-size: 32rpx; - color: #01b4c5; - line-height: 32rpx; - border: 1px solid #01b4c5; - border-radius: 120rpx; - } .ok { - padding: 18rpx 58rpx; + padding: 16rpx 42rpx; font-size: 24rpx; - color: rgba(20, 21, 21, 1); + color: #00b4c5; font-size: 32rpx; - color: #fff; line-height: 32rpx; border-radius: 120rpx; - background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%); + background: #fff; } } &::after { @@ -72,7 +70,7 @@ height: 0; border-style: solid; border-width: 12rpx 12rpx 0 12rpx; - border-color: #fff transparent transparent transparent; + border-color: #56cabb transparent transparent transparent; } } } diff --git a/src/custom-tab-bar/index.wxml b/src/custom-tab-bar/index.wxml index 8ce236d..dd31ede 100644 --- a/src/custom-tab-bar/index.wxml +++ b/src/custom-tab-bar/index.wxml @@ -3,6 +3,7 @@ + 点击 + @@ -11,7 +12,6 @@ 邀约合作医生一起讨论哦 - 跳过 去录入 diff --git a/src/images/icon-close-white.png b/src/images/icon-close-white.png new file mode 100644 index 0000000..11b499e Binary files /dev/null and b/src/images/icon-close-white.png differ diff --git a/src/images/invite-title.png b/src/images/invite-title.png index 8e61c8f..d5752b3 100644 Binary files a/src/images/invite-title.png and b/src/images/invite-title.png differ diff --git a/src/images/login-out-badge.png b/src/images/login-out-badge.png new file mode 100644 index 0000000..964fc41 Binary files /dev/null and b/src/images/login-out-badge.png differ diff --git a/src/module1/pages/invite/index.scss b/src/module1/pages/invite/index.scss index 494dd72..10210c0 100644 --- a/src/module1/pages/invite/index.scss +++ b/src/module1/pages/invite/index.scss @@ -8,8 +8,8 @@ .title { display: block; margin: 40rpx auto 0; - width: 592rpx; - height: 250rpx; + width: 486rpx; + height: 262rpx; } .container-wrap { margin: 100rpx 30rpx 0; diff --git a/src/module1/pages/loginOut/index.json b/src/module1/pages/loginOut/index.json new file mode 100644 index 0000000..a97367d --- /dev/null +++ b/src/module1/pages/loginOut/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} diff --git a/src/module1/pages/loginOut/index.scss b/src/module1/pages/loginOut/index.scss new file mode 100644 index 0000000..8f07b71 --- /dev/null +++ b/src/module1/pages/loginOut/index.scss @@ -0,0 +1,69 @@ +.page { + .container { + padding: 0 86rpx 0; + height: 100vh; + box-sizing: border-box; + .badge { + margin: 160px auto 0; + display: block; + width: 167rpx; + height: 167rpx; + } + .title { + margin-top: 26rpx; + font-size: 40rpx; + color: #141515; + font-weight: bold; + line-height: 64rpx; + text-align: center; + } + .content { + margin-top: 54rpx; + font-size: 32rpx; + color: #999999; + line-height: 56rpx; + } + .footer { + position: fixed; + bottom: 0; + left: 0; + width: 100%; + box-sizing: border-box; + padding: 32rpx 32rpx calc(env(safe-area-inset-bottom) + 32rpx); + flex-shrink: 0; + display: flex; + gap: 24rpx; + .cancel { + flex: 1; + height: 84rpx; + text-align: center; + line-height: 84rpx; + font-size: 32rpx; + color: rgba(1, 180, 197, 1); + border-radius: 96rpx 96rpx 96rpx 96rpx; + border: 1px solid #01b4c5; + } + .sure { + flex: 1; + height: 88rpx; + text-align: center; + line-height: 88rpx; + font-size: 32rpx; + color: #fff; + background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%); + border-radius: 96rpx 96rpx 96rpx 96rpx; + } + .wait { + flex: 1; + height: 88rpx; + text-align: center; + line-height: 88rpx; + font-size: 32rpx; + color: #fff; + opacity: 0.3; + background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%); + border-radius: 96rpx 96rpx 96rpx 96rpx; + } + } + } +} diff --git a/src/module1/pages/loginOut/index.ts b/src/module1/pages/loginOut/index.ts new file mode 100644 index 0000000..c6694d2 --- /dev/null +++ b/src/module1/pages/loginOut/index.ts @@ -0,0 +1,29 @@ +const _app = getApp(); + +Page({ + data: {}, + onLoad() {}, + handleCancel() { + wx.navigateBack(); + }, + handleLoginOut() { + wx.showModal({ + confirmColor: "#00B4C5", + cancelColor: "#141515", + title: "确认注销该账号？", + success(res) { + if (res.confirm) { + app.globalData.isLogin = 0; + wx.ajax({ + method: "POST", + url: "?r=takeda/account/delete-account", + }).then(() => { + wx.reLaunch({ + url: "/module1/pages/login/index", + }); + }); + } + }, + }); + }, +}); diff --git a/src/module1/pages/loginOut/index.wxml b/src/module1/pages/loginOut/index.wxml new file mode 100644 index 0000000..d73f0e0 --- /dev/null +++ b/src/module1/pages/loginOut/index.wxml @@ -0,0 +1,18 @@ + + + + + 注销后数据不可恢复 + + 请谨慎操作 + + 注销账号后，系统会删除当前用户的全部信息和数据 + + 取消 + 确认注销 + + + diff --git a/src/module1/pages/userInfo/index.ts b/src/module1/pages/userInfo/index.ts index 05f27cb..7568d25 100644 --- a/src/module1/pages/userInfo/index.ts +++ b/src/module1/pages/userInfo/index.ts @@ -180,23 +180,8 @@ Page({ }); }, handleLogout() { - wx.showModal({ - confirmColor: "#00B4C5", - cancelColor: "#141515", - title: "确认注销该账号？", - success(res) { - if (res.confirm) { - app.globalData.isLogin = 0; - wx.ajax({ - method: "POST", - url: "?r=takeda/account/delete-account", - }).then(() => { - wx.reLaunch({ - url: "/module1/pages/login/index", - }); - }); - } - }, + wx.navigateTo({ + url: "/module1/pages/loginOut/index", }); }, }); diff --git a/src/module1/pages/userInfo/index.wxml b/src/module1/pages/userInfo/index.wxml index 0d05075..4c89f9a 100644 --- a/src/module1/pages/userInfo/index.wxml +++ b/src/module1/pages/userInfo/index.wxml @@ -27,7 +27,7 @@ - + 专长 {{SpecialtyName || '无'}}