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/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 @@
+
+
+ 退款金额
+ ¥{{orderlist.nurseItemPrice}}
+
+
+ 退款原因
+
+
+ 确认取消
+
+
+
+
+
+
+
+
+
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