diff --git a/api/Nursingstationserviceorder/Nursingstationserviceorder.js b/api/Nursingstationserviceorder/Nursingstationserviceorder.js new file mode 100644 index 0000000..4fd1a85 --- /dev/null +++ b/api/Nursingstationserviceorder/Nursingstationserviceorder.js @@ -0,0 +1,7 @@ +import request from "../request.js" +export function appServiceOrder(id,pageSize,pageNum) { + return request({ + url: `/nurseApp/login/appServiceOrder?pageSize=${pageSize}&pageNum=${pageNum}&patientId=${id}`, + method: 'GET' + }) +} diff --git a/api/ServiceDetails/ServiceDetails.js b/api/ServiceDetails/ServiceDetails.js new file mode 100644 index 0000000..e4ec850 --- /dev/null +++ b/api/ServiceDetails/ServiceDetails.js @@ -0,0 +1,28 @@ +import request from "../request.js" + +export function getOrderPatientInfo(orderNo) { + return request({ + url: `/nurseApp/login/getOrderPatientInfo?orderNo=${orderNo}`, + method: 'GET' + }) +} +export function getAppStationItemInfo(stationId,stationItemId,stationItemPriceId) { + return request({ + url: `/nurseApp/login/getAppStationItemInfo?stationId=${stationId}&stationItemId=${stationItemId}&stationItemPriceId=${stationItemPriceId}`, + method: 'GET' + }) +} + +export function introductionList(nurseStationId) { + return request({ + url: `/nurseApplet/nearbyNursingStation/introductionList?nurseStationId=${nurseStationId}`, + method: 'GET' + }) +} + +export function cancellationOrder(appointmentOrderId) { + return request({ + url: `/nurseApp/login/cancellationOrder?appointmentOrderId=${appointmentOrderId}`, + method: 'post' + }) +} \ No newline at end of file diff --git a/api/cancelorder/cancelorder.js b/api/cancelorder/cancelorder.js new file mode 100644 index 0000000..d6172f8 --- /dev/null +++ b/api/cancelorder/cancelorder.js @@ -0,0 +1,8 @@ +import request from "../request.js" + +export function cancellationOrder(appointmentOrderId,cancelAppointmentReason) { + return request({ + url: `/nurseApp/login/cancellationOrder?appointmentOrderId=${appointmentOrderId}&cancelAppointmentReason=${cancelAppointmentReason}`, + method: 'post' + }) +} \ No newline at end of file diff --git a/api/forgotPassword/forgotPassword.js b/api/forgotPassword/forgotPassword.js new file mode 100644 index 0000000..8580fee --- /dev/null +++ b/api/forgotPassword/forgotPassword.js @@ -0,0 +1,8 @@ +import request from "../request.js" + +export function ForgotPassword(phone, password,verification) { + return request({ + url: `/nurseApp/login/appForgotPassword?phone=${phone}&password=${password}&verification=${verification}`, + method: 'POST' + }) +} diff --git a/api/modify/modify.js b/api/modify/modify.js new file mode 100644 index 0000000..5b053b6 --- /dev/null +++ b/api/modify/modify.js @@ -0,0 +1,17 @@ +import request from "../request.js" + +// 修改信息 +export function updateInformation(data){ + return request({ + url: '/nurseApp/login/updateInformation', + method: 'POST', + data, + }) +} + +export function appPersonal(patientId) { + return request({ + url: `/nurseApp/login/appPersonal?patientId=${patientId}`, + method: 'GET' + }) +} \ No newline at end of file diff --git a/api/user/user.js b/api/user/user.js new file mode 100644 index 0000000..52939d2 --- /dev/null +++ b/api/user/user.js @@ -0,0 +1,7 @@ +import request from "../request.js" +export function appPersonal(patientId) { + return request({ + url: `/nurseApp/login/appPersonal?patientId=${patientId}`, + method: 'GET' + }) +} \ No newline at end of file diff --git a/pages/Aftersalesdetails/Aftersalesdetails.vue b/pages/Aftersalesdetails/Aftersalesdetails.vue index 9e899e6..f828162 100644 --- a/pages/Aftersalesdetails/Aftersalesdetails.vue +++ b/pages/Aftersalesdetails/Aftersalesdetails.vue @@ -83,7 +83,7 @@ padding: 3%; height: 100vh; font-size: 36rpx; - + //按钮修改申请和撤销申请 .evaluate { display: flex; diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue index d14689e..70ea842 100644 --- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue +++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue @@ -2,42 +2,22 @@ - 2022-10-11 15:44 - 待服务 + {{list.createTime}} + {{list.orderStatus=='WAIT_PAY'?'待付款':''}} + {{list.orderStatus=='WAIT_DISPATCH'?'待派单':''}} + {{list.orderStatus=='NOT_FINISH'?'未完成':''}} + {{list.orderStatus=='COMPLETE'?'服务完成':''}} - 换药 - ￥50.0 + {{list.nurseItemName}} + ￥{{list.totalPrice}} - 服务时长：1小时 - - - - - 确认完成 - - - - - - 2022-10-11 15:44 - 完成 - - - - - - - 换药 - ￥50.0 - - - 服务时长：1小时 + 服务时长：{{list.itemServeDurationUnit}} @@ -46,22 +26,37 @@ - - @@ -83,6 +131,7 @@ padding: 2%; font-size: 36rpx; padding-top: 10rpx; + // 服务商家 .detail { margin-top: 3%; @@ -93,6 +142,7 @@ margin-left: 10%; } + .name { width: 95%; height: 90rpx; @@ -102,7 +152,8 @@ border-bottom: 1rpx solid #D8D4D4; margin: 0 auto; } -//按钮取消订单和评价 + + //按钮取消订单和评价 .evaluate { display: flex; float: right; @@ -138,6 +189,7 @@ margin-left: 15%; } } + /* 耗材包 */ .Consumablespackage { width: 94%; @@ -180,7 +232,8 @@ } } -//服务项目和服务商家 + + //服务项目和服务商家 .content { width: 95%; height: 336rpx; @@ -209,11 +262,10 @@ .details { height: 250rpx; - .call { display: flex; - margin-top: -5%; - + margin-top: -7%; + margin-left: 3%; .Navigation { width: 103rpx; height: 48rpx; @@ -224,7 +276,6 @@ line-height: 48rpx; margin-left: 3%; text-align: center; - image { width: 24rpx; height: 24rpx; diff --git a/pages/cancelorder/cancelorder.vue b/pages/cancelorder/cancelorder.vue new file mode 100644 index 0000000..71ba8c3 --- /dev/null +++ b/pages/cancelorder/cancelorder.vue @@ -0,0 +1,113 @@ + + + + + diff --git a/pages/forgotPassword/forgotPassword.scss b/pages/forgotPassword/forgotPassword.scss new file mode 100644 index 0000000..f5f1a96 --- /dev/null +++ b/pages/forgotPassword/forgotPassword.scss @@ -0,0 +1,74 @@ + .app { + height: 100vh; + padding: 20rpx 0; + + .item { + font-size: 34rpx; + margin: 0 auto 20rpx; + width: 94%; + height: 100rpx; + line-height: 100rpx; + background-color: #fff; + box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03); + border-radius: 20rpx; + position: relative; + + .lefttext { + position: absolute; + top: 50%; + transform: translateY(-50%); + left: 3%; + } + + .righttext { + position: absolute; + top: 50%; + transform: translateY(-50%); + left: 18%; + height: 100rpx; + } + + .lefttext, + .righttext { + ::v-deep .uni-input-input { + font-size: 34rpx; + } + + ::v-deep .uni-input-wrapper { + height: 100rpx; + line-height: 100rpx; + } + + ::v-deep .uni-input-placeholder { + line-height: 100rpx; + font-size: 34rpx; + font-weight: 400; + color: #C3C1C1; + } + } + + .obtaincode { + text-align: center; + font-size: 36rpx; + color: #4C7BC9; + line-height: 100rpx; + position: absolute; + right: 5%; + top: 0%; + } + } + + .loginbtn { + width: 80%; + height: 100rpx; + text-align: center; + line-height: 100rpx; + background: #4C7BC9; + border-radius: 51rpx; + font-size: 41rpx; + color: #FFFFFF; + position: absolute; + top: 40%; + left: 10%; + } + } \ No newline at end of file diff --git a/pages/forgotPassword/forgotPassword.vue b/pages/forgotPassword/forgotPassword.vue new file mode 100644 index 0000000..5e0d0d4 --- /dev/null +++ b/pages/forgotPassword/forgotPassword.vue @@ -0,0 +1,123 @@ + + + + diff --git a/pages/login/login.scss b/pages/login/login.scss index 5ca073c..3d25319 100644 --- a/pages/login/login.scss +++ b/pages/login/login.scss @@ -3,6 +3,12 @@ color: #C3C1C1; font-weight: 400; height:100vh; + .forget{ + position: absolute; + top: 67%; + left: 10%; + color: #46ABD7; + } .switch { text-align: center; height: 100rpx; @@ -29,7 +35,7 @@ .loginphone { background-color: #fff; width: 80%; - height: 162rpx; + height: 150rpx; position: absolute; left: 10%; top: 23%; @@ -48,7 +54,7 @@ .phone { padding-left: 40rpx; - height: 100%; + height: 150rpx; box-shadow: 0px 9px 31px 9px rgba(0, 0, 0, 0.03); } } @@ -56,8 +62,9 @@ .logincode { position: absolute; left: 10%; - - + ::v-deep .u-input{ + border: 0; + } ::v-deep .u-input__input { padding-left: 20rpx; @@ -78,4 +85,5 @@ top: 13%; left: 13%; } - } \ No newline at end of file + } + diff --git a/pages/login/login.vue b/pages/login/login.vue index 9caada9..fe9064b 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -6,14 +6,26 @@ - + - + + + + {{getCodeText}} + + + 登录 - + + 登录 + + + {{switchs?'切换手机验证码登录':'切换密码登录'}} + + 没有账号,请先注册 @@ -21,36 +33,40 @@ diff --git a/pages/modify/modify.scss b/pages/modify/modify.scss new file mode 100644 index 0000000..e7df31f --- /dev/null +++ b/pages/modify/modify.scss @@ -0,0 +1,77 @@ + .app { + background-color: #F4F5F7; + width: 100%; + height: 100vh; + color: #000000; + padding: 3%; + font-size: 36rpx; + + .centercontent { + width: 99%; + height: 635rpx; + background: #FFFFFF; + box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03); + border-radius: 20rpx; + margin: 0 auto; + + .finish { + width: 217rpx; + font-size: 32rpx; + color: #FFFFFF; + height: 68rpx; + line-height: 68rpx; + text-align: center; + margin-top: 60%; + margin-left: 70%; + background: #4C7BC9; + border-radius: 26rpx; + } + + .content { + line-height: 100rpx; + + .name { + margin-left: 5%; + height: 100rpx; + border-bottom: 1rpx solid #D8D4D4; + + input { + font-size: 36rpx; + margin-top: -11%; + margin-left: 15%; + } + } + + .nursetype { + input { + margin-left: 25%; + } + } + } + + .Commodity { + line-height: 110rpx; + margin-left: 5%; + border-bottom: 1rpx solid #D8D4D4; + + .picture { + vertical-align: middle; + margin-left: 60%; + width: 103rpx; + height: 103rpx; + } + + .pictureA { + margin-left: 3%; + width: 18rpx; + height: 27rpx; + } + + .head { + line-height: 140rpx; + margin-left: 5%; + display: inline-block; + } + } + } + } \ No newline at end of file diff --git a/pages/modify/modify.vue b/pages/modify/modify.vue index 45edb69..883fb17 100644 --- a/pages/modify/modify.vue +++ b/pages/modify/modify.vue @@ -3,115 +3,104 @@ 头像 - + 昵称： - + - 姓名： - + 姓名: + 电话： - + 地址： - + - 疾病类型： - + + 疾病类型: + + {{item.diseaseName}} + - - 完成 + 完成 diff --git a/pages/user/user.scss b/pages/user/user.scss new file mode 100644 index 0000000..bbb24bc --- /dev/null +++ b/pages/user/user.scss @@ -0,0 +1,115 @@ + .app { + padding: 0; + font-size: 35rpx; + height: 100vh; + + .External { + width: 94%; + height: 100rpx; + line-height: 100rpx; + margin: 20rpx auto; + padding-left: 5%; + background: #FFFFFF; + box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03); + border-radius: 20rpx; + position: relative; + + .righttext { + position: absolute; + right: 12%; + top: 50%; + color: #969394; + transform: translateY(-50%); + } + + image { + width: 18rpx; + height: 27rpx; + position: absolute; + right: 5%; + top: 50%; + transform: translateY(-50%); + } + + .lefttext, + .righttext { + display: inline-block; + } + } + + .information { + width: 94%; + background: #FFFFFF; + box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03); + border-radius: 20rpx; + position: absolute; + top: 18%; + left: 3%; + color: #000000; + padding-left: 5%; + overflow: hidden; + font-size: 35rpx; + + .item { + // height: 110rpx; + line-height: 110rpx; + border-bottom: 1rpx solid #D8D4D4; + + .address { + position: absolute; + height: 80rpx; + // font-size: 30rpx; + line-height: 40rpx; + display: inline-block; + width: 80%; + margin-left: 30rpx; + margin-top: 33rpx; + } + } + } + + .user { + width: 100%; + height: 500rpx; + background: #4C7BC9; + position: relative; + color: #FFFFFF; + + .modify { + font-size: 32rpx; + position: absolute; + right: 3%; + top: 22%; + } + + .nickname { + position: absolute; + top: 26%; + left: 33%; + } + + .phone { + position: absolute; + top: 13%; + left: 33%; + } + + .img { + width: 150rpx; + height: 150rpx; + border-radius: 50%; + background: #F6F6F6; + position: absolute; + top: 10%; + left: 8%; + + image { + width: 100rpx; + margin-left: 50%; + margin-top: 50%; + transform: translate(-50%, -50%); + height: 100rpx; + } + } + } + } \ No newline at end of file diff --git a/pages/user/user.vue b/pages/user/user.vue index cddf827..5a18010 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -5,28 +5,35 @@ - 188****8888 + 电话：{{appPersonallist.phone}} 点此设置昵称 - + 修改信息 - 姓名: + 姓名：{{appPersonallist.patientName}} - 电话: + 电话：{{appPersonallist.phone}} - - 地址: + + + 地址: + + + {{appPersonallist.address}} + - - 疾病类型: + + 疾病类型:{{item.diseaseName}} @@ -34,7 +41,7 @@ 积分: - 100分 + {{appPersonallist.integral}} @@ -58,118 +65,39 @@ - diff --git a/static/daoh.png b/static/daoh.png new file mode 100644 index 0000000..758f9ed Binary files /dev/null and b/static/daoh.png differ diff --git a/static/head.png b/static/head.png new file mode 100644 index 0000000..ee21ec4 Binary files /dev/null and b/static/head.png differ