diff --git a/project.private.config.json b/project.private.config.json
index 53d791d..53fc475 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -23,13 +23,20 @@
"miniprogram": {
"list": [
{
- "name": "患者-亲友列表",
- "pathName": "patient/pages/familyList/index",
+ "name": "患者-绑定医生",
+ "pathName": "patient/pages/bindDoctor/index",
"query": "",
"scene": null,
"launchMode": "default"
},
{
+ "name": "患者-亲友列表",
+ "pathName": "patient/pages/familyList/index",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
"name": "患者-亲友",
"pathName": "patient/pages/family/index",
"query": "",
diff --git a/src/app.json b/src/app.json
index 0e8ab27..e2370c2 100644
--- a/src/app.json
+++ b/src/app.json
@@ -41,7 +41,9 @@
"pages/changeTel/index",
"pages/loginOut/index",
"pages/family/index",
- "pages/familyList/index"
+ "pages/familyList/index",
+ "pages/bindDoctor/index",
+ "pages/selectDoctorList/index"
]
},
{
diff --git a/src/components/popup/index.scss b/src/components/popup/index.scss
index c4acccf..4ff51b7 100644
--- a/src/components/popup/index.scss
+++ b/src/components/popup/index.scss
@@ -90,7 +90,7 @@
display: block;
margin: 0 auto;
width: 146rpx;
- height: 40rpx;
+ height: 34rpx;
}
.card {
position: relative;
@@ -178,7 +178,7 @@
display: block;
margin: 0 auto;
width: 146rpx;
- height: 40rpx;
+ height: 34rpx;
}
.content {
margin-top: 16rpx;
@@ -833,6 +833,112 @@
}
}
+.popup15 {
+ .icon {
+ position: relative;
+ z-index: 1;
+ margin: 0 auto;
+ display: block;
+ width: 144rpx;
+ height: 144rpx;
+ }
+ .container {
+ margin-top: -94rpx;
+ padding: 106rpx 32rpx 32rpx;
+ width: 604rpx;
+ background: linear-gradient(7deg, #ffffff 19%, #ffe8e4 100%);
+ border-radius: 24rpx 24rpx 24rpx 24rpx;
+ box-sizing: border-box;
+ .title {
+ display: block;
+ margin: 0 auto;
+ width: 495rpx;
+ height: 78rpx;
+ }
+ .card {
+ position: relative;
+ margin-top: 32rpx;
+ padding: 32rpx;
+ background: #ffffff;
+ display: flex;
+ gap: 16rpx;
+ justify-content: space-between;
+ box-shadow: 0rpx 4rpx 32rpx 0rpx rgba(0, 0, 0, 0.05);
+ border-radius: 24rpx 24rpx 24rpx 24rpx;
+ &::after {
+ position: absolute;
+ bottom: -24rpx;
+ left: 32rpx;
+ content: '';
+ width: 476rpx;
+ height: 24rpx;
+ background: #ffebea;
+ border-radius: 0 0 24rpx 24rpx;
+ }
+ .avatar {
+ flex-shrink: 0;
+ width: 92rpx;
+ height: 92rpx;
+ border-radius: 50%;
+ }
+ .wrap {
+ flex: 1;
+ .name {
+ font-size: 32rpx;
+ color: rgba(1, 1, 5, 1);
+ font-weight: bold;
+ }
+ .hostipal {
+ margin-top: 16rpx;
+ line-height: 28rpx;
+ .content {
+ margin-right: 8rpx;
+ display: inline-block;
+ font-size: 28rpx;
+ color: rgba(161, 164, 172, 1);
+ }
+ .tag {
+ display: inline-block;
+ font-size: 20rpx;
+ color: rgba(255, 255, 255, 1);
+ padding: 0 8rpx;
+ background-color: rgba(255, 186, 1, 1);
+ border-radius: 6rpx;
+ }
+ }
+ }
+ }
+ .footer {
+ margin-top: 52rpx;
+ display: flex;
+ gap: 26rpx;
+ .cancel {
+ flex: 1;
+ padding: 22rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 32rpx;
+ color: rgba(246, 74, 58, 1);
+ border-radius: 84rpx;
+ border: 1px solid #f64a3a;
+ }
+ .submit {
+ flex: 1;
+ padding: 22rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 32rpx;
+ color: #fff;
+ background: linear-gradient(356deg, #f23a2f 0%, #fc684f 100%);
+ border-radius: 84rpx;
+ border: 1px solid #f64a3a;
+ }
+ }
+ }
+}
+
.close {
margin: 32rpx auto 0;
display: block;
diff --git a/src/components/popup/index.wxml b/src/components/popup/index.wxml
index 4a91ed2..ad58760 100644
--- a/src/components/popup/index.wxml
+++ b/src/components/popup/index.wxml
@@ -256,6 +256,29 @@
+
王青
-
+
{{message.msgCreateTimeName}}
-
+
+ 刘湖飞
-
- {{message.welcomeMsg.title}}
- {{message.welcomeMsg.questionDes}}
-
-
- {{index+1}}
- {{item.question}}
-
+ {{message.msgContent }}
+
+ 我的出诊时间如下：
+
+ 周二 上午
+
+ 周二 上午
+
+
+
+
+ 这是您的诊疗地图
+
+ 填写上你的注射日吧～
-
- {{message.welcomeMsg.guideClick}}
-
+ 点击查看
+
+
+
+ 您的专属随访计划
+
+ 已生成
+ 点击立即查看
-
- {{message.msgContent }}
- {{message.Reference}}
-
diff --git a/src/patient/pages/bindDoctor/index.json b/src/patient/pages/bindDoctor/index.json
new file mode 100644
index 0000000..ad4d4ef
--- /dev/null
+++ b/src/patient/pages/bindDoctor/index.json
@@ -0,0 +1,6 @@
+{
+ "navigationStyle": "custom",
+ "usingComponents": {
+ "navbar": "/components/navbar/index"
+ }
+}
diff --git a/src/patient/pages/bindDoctor/index.scss b/src/patient/pages/bindDoctor/index.scss
new file mode 100644
index 0000000..f5c0da4
--- /dev/null
+++ b/src/patient/pages/bindDoctor/index.scss
@@ -0,0 +1,46 @@
+.page {
+ padding: 232rpx 60rpx 0;
+ .badge {
+ margin: 0 auto;
+ display: block;
+ width: 232rpx;
+ height: 232rpx;
+ }
+ .title {
+ margin: 54rpx auto 0;
+ display: block;
+ width: 342rpx;
+ height: 44rpx;
+ }
+ .content {
+ margin-top: 28rpx;
+ font-size: 32rpx;
+ color: rgba(1, 1, 5, 1);
+ line-height: 48rpx;
+ text-align: center;
+ }
+ .tip {
+ margin-top: 32rpx;
+ font-size: 32rpx;
+ color: rgba(161, 164, 172, 1);
+ text-align: center;
+ }
+ .submit {
+ margin-top: 116rpx;
+ height: 88rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: linear-gradient(356deg, #f23a2f 0%, #fc684f 100%);
+ border-radius: 84rpx;
+ font-size: 32rpx;
+ color: rgba(255, 255, 255, 1);
+ }
+ .cancel {
+ margin-top: 30rpx;
+ padding: 24rpx;
+ text-align: center;
+ font-size: 32rpx;
+ color: rgba(246, 74, 58, 1);
+ }
+}
diff --git a/src/patient/pages/bindDoctor/index.ts b/src/patient/pages/bindDoctor/index.ts
new file mode 100644
index 0000000..c563ebc
--- /dev/null
+++ b/src/patient/pages/bindDoctor/index.ts
@@ -0,0 +1,11 @@
+const _app = getApp()
+
+Page({
+ data: {},
+ onLoad() {},
+ handleBack() {
+ wx.navigateBack()
+ },
+})
+
+export {}
diff --git a/src/patient/pages/bindDoctor/index.wxml b/src/patient/pages/bindDoctor/index.wxml
new file mode 100644
index 0000000..70d0a57
--- /dev/null
+++ b/src/patient/pages/bindDoctor/index.wxml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+ 绑定医生后
+
+ 医生可以实时看到您的检查进展
+
+ 您可以扫描不同医生邀约码绑定多个医生
+ 继续绑定
+ 取消
+
diff --git a/src/patient/pages/course/index.scss b/src/patient/pages/course/index.scss
index 52ec0d6..51ab25f 100644
--- a/src/patient/pages/course/index.scss
+++ b/src/patient/pages/course/index.scss
@@ -199,3 +199,12 @@
}
}
}
+
+.guide {
+ position: fixed;
+ z-index: 10;
+ top: 660rpx;
+ right: 86rpx;
+ width: 172rpx;
+ height: 256rpx;
+}
diff --git a/src/patient/pages/course/index.ts b/src/patient/pages/course/index.ts
index 6e6f767..bae8c3a 100644
--- a/src/patient/pages/course/index.ts
+++ b/src/patient/pages/course/index.ts
@@ -11,7 +11,7 @@ Page({
// position: 'bottom',
},
- current: 3,
+ current: 0,
},
onLoad() {},
handleSelectHostipal() {
diff --git a/src/patient/pages/course/index.wxml b/src/patient/pages/course/index.wxml
index 9d4d0d4..5ac60a9 100644
--- a/src/patient/pages/course/index.wxml
+++ b/src/patient/pages/course/index.wxml
@@ -404,6 +404,8 @@
+
+
随访期
-
- 查看全部
-
-
+ 添加随访记录
@@ -59,7 +56,10 @@
查看详情>
- 添加随访记录
+
+ 查看全部
+
+
@@ -94,7 +94,7 @@
>
- 向医生询问出诊时间
+ 向医生询问出诊时间
diff --git a/src/patient/pages/home/index.ts b/src/patient/pages/home/index.ts
index 4a1b654..d842548 100644
--- a/src/patient/pages/home/index.ts
+++ b/src/patient/pages/home/index.ts
@@ -7,12 +7,18 @@ Page({
// popupType: 'bindDoctorReject', // 绑定失败
// popupType: 'bindDoctor', // 绑定成功
// popupType: 'bindDoctorQuestion', // 为什么绑定医生
- popupType: 'conformBindDoctorQuestion', // 确认绑定曾经扫码医生
+ // popupType: 'conformBindDoctorQuestion', // 确认绑定曾经扫码医生
+ popupType: 'conformBindDoctorConform', // 注册后绑定医生码
popupParams: {},
progress: 1,
},
onLoad() {},
+ handleBindDoctor() {
+ wx.navigateTo({
+ url: '/patient/pages/bindDoctor/index',
+ })
+ },
handleProgress(e: any) {
const { index } = e.currentTarget.dataset
this.setData({
diff --git a/src/patient/pages/home/index.wxml b/src/patient/pages/home/index.wxml
index fc18583..8450d30 100644
--- a/src/patient/pages/home/index.wxml
+++ b/src/patient/pages/home/index.wxml
@@ -27,7 +27,7 @@
您还没有绑定任何医生
绑定后可随时随地联系专属医生
- 扫一扫绑定
+ 扫一扫绑定
@@ -39,7 +39,7 @@
>
王医生
-
+
添加医生
diff --git a/src/patient/pages/login/index.scss b/src/patient/pages/login/index.scss
index ce2a071..0ba2220 100644
--- a/src/patient/pages/login/index.scss
+++ b/src/patient/pages/login/index.scss
@@ -1,13 +1,11 @@
-page {
- background-color: rgba(247, 247, 250, 1);
-}
.page {
- padding: 0 70rpx 0;
+ padding: 0 70rpx 100rpx;
.logo {
display: block;
margin: 0 auto;
width: 164rpx;
height: 164rpx;
+ border-radius: 24rpx;
}
.title {
margin-top: 32rpx;
@@ -32,6 +30,26 @@ page {
}
.divider {
margin: 80rpx 150rpx 0;
+ .van-divider {
+ color: rgba(207, 209, 213, 1);
+ }
+ }
+ .tel-btn {
+ margin: 0 auto;
+ padding: 4rpx 0;
+ width: 266rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 12rpx;
+ background: #f7f7fa;
+ border-radius: 24rpx;
+ font-size: 24rpx;
+ color: rgba(161, 164, 172, 1);
+ .icon {
+ width: 40rpx;
+ height: 40rpx;
+ }
}
.form {
margin-top: 50rpx;
@@ -41,7 +59,7 @@ page {
justify-content: space-between;
align-items: center;
padding: 12rpx 12rpx 12rpx 32rpx;
- background-color: #fff;
+ background-color: rgba(247, 247, 250, 1);
border-radius: 24rpx;
.input {
flex: 1;
@@ -76,4 +94,27 @@ page {
border: 1px solid #f23a2f;
}
}
+ .signature {
+ margin-top: 88rpx;
+ font-size: 28rpx;
+ color: rgba(161, 164, 172, 1);
+ line-height: 48rpx;
+ .row {
+ margin-top: 24rpx;
+ display: flex;
+ .checkbox {
+ margin-top: -8rpx;
+ transform: scale(0.8);
+ }
+ }
+ .link {
+ color: rgba(246, 74, 58, 1);
+ }
+ }
+ .family-tip{
+ margin-top: 58rpx;
+ font-size: 28rpx;
+ color: rgba(246, 74, 58, 1);
+ text-align: center;
+ }
}
diff --git a/src/patient/pages/login/index.ts b/src/patient/pages/login/index.ts
index 93f529f..c6433bd 100644
--- a/src/patient/pages/login/index.ts
+++ b/src/patient/pages/login/index.ts
@@ -1,8 +1,15 @@
const _app = getApp()
Page({
- data: {},
+ data: {
+ showTel: false,
+ },
onLoad() {},
+ handleShowTel() {
+ this.setData({
+ showTel: !this.data.showTel,
+ })
+ },
handleSubmit() {
wx.navigateTo({
url: '/patient/pages/entryInfo/index',
diff --git a/src/patient/pages/login/index.wxml b/src/patient/pages/login/index.wxml
index a19fd99..390b715 100644
--- a/src/patient/pages/login/index.wxml
+++ b/src/patient/pages/login/index.wxml
@@ -1,14 +1,18 @@
欢迎加入愈见守护
- 或者
+ 或者
-
+
+
+ 手机号验证码
+
+
登录
+
+
+
+
+ 我特此同意
+ 《个人信息及隐私协议政策》
+ 规定收集我的相关敏感个人信息
+
+
+
+
+
+ 我特此同意
+ 《用户协议》
+ 中关于用户权利与义务的约定
+
+
+
+
+
+ 我特此同意
+ 《个人信息共享知情同意书》
+ 规定共享我的相关个人敏感数据
+
+
+
+ 已经有亲友注册？扫描亲友邀约码绑定
diff --git a/src/patient/pages/preDiagnosisReport/index.wxml b/src/patient/pages/preDiagnosisReport/index.wxml
index 6770ab6..cd44907 100644
--- a/src/patient/pages/preDiagnosisReport/index.wxml
+++ b/src/patient/pages/preDiagnosisReport/index.wxml
@@ -176,7 +176,7 @@
阳性（+）
阴性（-）
- 乙型肝炎病毒表面抗原（HBsAg）
+ 乙型肝炎病毒脱氧核糖核酸（HBV - DNA）
正常数值
偏高数值
diff --git a/src/patient/pages/selectDoctorList/index.json b/src/patient/pages/selectDoctorList/index.json
new file mode 100644
index 0000000..ad4d4ef
--- /dev/null
+++ b/src/patient/pages/selectDoctorList/index.json
@@ -0,0 +1,6 @@
+{
+ "navigationStyle": "custom",
+ "usingComponents": {
+ "navbar": "/components/navbar/index"
+ }
+}
diff --git a/src/patient/pages/selectDoctorList/index.scss b/src/patient/pages/selectDoctorList/index.scss
new file mode 100644
index 0000000..2fdefb2
--- /dev/null
+++ b/src/patient/pages/selectDoctorList/index.scss
@@ -0,0 +1,81 @@
+page {
+ background-color: rgba(247, 247, 250, 1);
+}
+
+.page {
+ padding: 0 40rpx 40rpx;
+ background: linear-gradient(180deg, #ffffff 0%, rgba(255, 255, 255, 0) 100%);
+ .card {
+ margin-top: 40rpx;
+ padding: 32rpx;
+ background: #ffffff;
+ border-radius: 24rpx 24rpx 24rpx 24rpx;
+ .user {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 24rpx;
+ .avatar {
+ flex-shrink: 0;
+ width: 92rpx;
+ height: 92rpx;
+ border-radius: 50%;
+ }
+ .wrap {
+ flex: 1;
+ .w-name {
+ font-size: 32rpx;
+ color: rgba(1, 1, 5, 1);
+ font-weight: bold;
+ }
+ .w-content {
+ margin-top: 4rpx;
+ line-height: 28rpx;
+ .hostipal {
+ margin-top: 12rpx;
+ margin-right: 12rpx;
+ display: inline-block;
+ font-size: 28rpx;
+ color: rgba(161, 164, 172, 1);
+ }
+ .tag {
+ margin-top: 12rpx;
+ vertical-align: middle;
+ display: inline-block;
+ padding: 0 8rpx;
+ font-size: 20rpx;
+ color: rgba(255, 255, 255, 1);
+ border-radius: 6rpx;
+ background-color: rgba(255, 186, 1, 1);
+ }
+ }
+ }
+ .select {
+ padding: 6rpx 32rpx;
+ font-size: 32rpx;
+ color: rgba(255, 255, 255, 1);
+ line-height: 44rpx;
+ background: linear-gradient(356deg, #f23a2f 0%, #fc684f 100%);
+ box-shadow: 0rpx 13rpx 26rpx 0rpx rgba(151, 151, 151, 0.05);
+ border-radius: 58rpx 58rpx 58rpx 58rpx;
+ }
+ }
+ .content {
+ margin-top: 32rpx;
+ font-size: 28rpx;
+ color: rgba(161, 164, 172, 1);
+ line-height: 40rpx;
+ }
+ }
+
+ .add {
+ position: fixed;
+ left: 50%;
+ bottom: 142rpx;
+ transform: translateX(-50%);
+ width: 156rpx;
+ height: 156rpx;
+ border-radius: 50%;
+ box-shadow: 0 20rpx 30rpx #f0b4af;
+ }
+}
diff --git a/src/patient/pages/selectDoctorList/index.ts b/src/patient/pages/selectDoctorList/index.ts
new file mode 100644
index 0000000..4a1473a
--- /dev/null
+++ b/src/patient/pages/selectDoctorList/index.ts
@@ -0,0 +1,17 @@
+const _app = getApp()
+
+Page({
+ data: {},
+ onLoad() {},
+ handleUnbind() {
+ wx.showModal({
+ title: '确认解绑？',
+ confirmColor: 'rgba(246, 74, 58, 1)',
+ })
+ },
+ handleBack() {
+ wx.navigateBack()
+ },
+})
+
+export {}
diff --git a/src/patient/pages/selectDoctorList/index.wxml b/src/patient/pages/selectDoctorList/index.wxml
new file mode 100644
index 0000000..78094de
--- /dev/null
+++ b/src/patient/pages/selectDoctorList/index.wxml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+ 王青
+
+ 北京积水潭医院龙泽院区
+ 三甲
+
+
+ 选择
+
+
+ 北京积水潭医院龙泽院区副主任医师，有 12 年的
+ 治疗经验。中华医学会血液学分会血栓与止血学组副组长，中国罕见病联盟血友病学组副秘书长，中国血友病青年协作组常务理事长，
+
+
+
diff --git a/src/patient/pages/selectHostipal/index.scss b/src/patient/pages/selectHostipal/index.scss
index b7c7465..4a7810c 100644
--- a/src/patient/pages/selectHostipal/index.scss
+++ b/src/patient/pages/selectHostipal/index.scss
@@ -38,6 +38,7 @@ page {
height: 40rpx;
}
.input {
+ flex: 1;
font-size: 28rpx;
}
.place-input {
diff --git a/src/patient/pages/selectHostipal/index.ts b/src/patient/pages/selectHostipal/index.ts
index 8c14ab2..d82f77a 100644
--- a/src/patient/pages/selectHostipal/index.ts
+++ b/src/patient/pages/selectHostipal/index.ts
@@ -15,6 +15,11 @@ Page({
popupShow: false,
})
},
+ handleBindDoctor() {
+ wx.navigateTo({
+ url: '/patient/pages/selectDoctorList/index',
+ })
+ },
handleBack() {
wx.navigateBack()
},
diff --git a/src/patient/pages/selectHostipal/index.wxml b/src/patient/pages/selectHostipal/index.wxml
index beaa026..c238e26 100644
--- a/src/patient/pages/selectHostipal/index.wxml
+++ b/src/patient/pages/selectHostipal/index.wxml
@@ -2,8 +2,8 @@
-
- 扫一扫绑定医生，自动定位检查医院
+
+ 选择您的绑定医生，自动确定您的就诊医院