From 04af81f0c0213a3a4b312635e6ad017520259414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Wed, 23 Nov 2022 16:41:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/goodsorderRate/index.js | 18 ++++
api/startup/index.js | 7 ++
pages.json | 9 +-
pages/Aftersalesdetails/Aftersalesdetails.vue | 2 +-
pages/CommodityOrder/CommodityOrder.vue | 16 ++-
.../Nursingstationserviceorder.vue | 3 +-
pages/Personal/Personal.vue | 96 ++++++++++++++++--
pages/ServiceDetails/ServiceDetails.vue | 52 +++++++++-
pages/appointmenttime/appointmenttime.scss | 2 +-
pages/confirmOrder/confirmOrder.scss | 2 +-
pages/detail/detail.scss | 2 +-
pages/detail/detail.vue | 2 +-
pages/disease/disease.vue | 6 ++
pages/login/login.vue | 37 +++----
pages/modify/modify.vue | 1 -
pages/order/order.vue | 11 +-
pages/register/register.scss | 1 +
pages/register/register.vue | 5 +-
pages/site/site.vue | 32 +++---
pages/startup/startup.vue | 35 +++++--
pages/user/user.vue | 63 +++++++++---
static/1024.png | Bin 184800 -> 124358 bytes
static/gb2.png | Bin 0 -> 2865 bytes
static/paishe.png | Bin 0 -> 4137 bytes
static/video.png | Bin 0 -> 2356 bytes
25 files changed, 313 insertions(+), 89 deletions(-)
create mode 100644 api/goodsorderRate/index.js
create mode 100644 api/startup/index.js
create mode 100644 static/gb2.png
create mode 100644 static/paishe.png
create mode 100644 static/video.png
diff --git a/api/goodsorderRate/index.js b/api/goodsorderRate/index.js
new file mode 100644
index 0000000..91e3bae
--- /dev/null
+++ b/api/goodsorderRate/index.js
@@ -0,0 +1,18 @@
+import request from "../request.js"
+
+export function insertGoodsEvaluate(data) {
+ return request({
+ url: `/nurseApp/orderEvaluate/insertGoodsEvaluate`,
+ method: 'POST',
+ data
+ })
+}
+
+//上传图片
+export function uploadEvaluatePictureUrl(data) {
+ return request({
+ url: `/nurseApp/orderEvaluate/uploadEvaluatePictureUrl`,
+ method: 'POST',
+ data
+ })
+}
\ No newline at end of file
diff --git a/api/startup/index.js b/api/startup/index.js
new file mode 100644
index 0000000..4df6918
--- /dev/null
+++ b/api/startup/index.js
@@ -0,0 +1,7 @@
+import request from "../request.js"
+export function getExistPatientByPatientId(patientId) {
+ return request({
+ url: `/nurseApplet/login/getExistPatientByPatientId?patientId=${patientId}`,
+ method: 'GET'
+ })
+}
diff --git a/pages.json b/pages.json
index daf494f..01e1afd 100644
--- a/pages.json
+++ b/pages.json
@@ -9,7 +9,14 @@
"navigationBarTitleText": "",
"navigationStyle": "custom"
}
- },{
+ }, {
+ "path": "pages/goodsorderRate/goodsorderRate",
+ "style": {
+ "navigationBarTitleText": "发表评价",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#ffffff" //背景颜色
+ }
+ }, {
"path": "pages/appointmenttime/appointmenttime",
"style": {
"navigationBarTitleText": "预约时间",
diff --git a/pages/Aftersalesdetails/Aftersalesdetails.vue b/pages/Aftersalesdetails/Aftersalesdetails.vue
index eb4ea08..553563e 100644
--- a/pages/Aftersalesdetails/Aftersalesdetails.vue
+++ b/pages/Aftersalesdetails/Aftersalesdetails.vue
@@ -28,7 +28,7 @@
订单编号：{{Aftersalesorder.goOrderNo}}
申请金额：￥{{Aftersalesorder.totalPrice}}
退款原因：{{Aftersalesorder.dictLabel}}
- 申请时间：{{Aftersalesorder.updateTime}}
+ 申请时间：{{Aftersalesorder.appleTime}}
diff --git a/pages/CommodityOrder/CommodityOrder.vue b/pages/CommodityOrder/CommodityOrder.vue
index 946f94e..96de110 100644
--- a/pages/CommodityOrder/CommodityOrder.vue
+++ b/pages/CommodityOrder/CommodityOrder.vue
@@ -12,7 +12,8 @@
退款中
已取消
待收货
- 已完成
+ 待评价
+ 已完成
待发货
退款成功
待退货
@@ -44,6 +45,8 @@
去支付
确认收货
+
+ 立即评价
@@ -99,6 +102,12 @@
}
},
methods: {
+ //评价
+ rate(item) {
+ uni.navigateTo({
+ url: `/pages/goodsorderRate/goodsorderRate?item=${JSON.stringify(item)}`
+ })
+ },
//收货
Receipts() {
confirmReceipt(this.orderNoitem.goOrderNo).then(res => {
@@ -111,8 +120,11 @@
this.show = false
setTimeout(e => {
uni.navigateTo({
- url: `/pages/orderDetails/orderDetails?goodsOrderId=${this.orderNoitem.goodsOrderId}`
+ url: `/pages/goodsorderRate/goodsorderRate?item=${JSON.stringify(this.orderNoitem)}`
})
+ // uni.navigateTo({
+ // url: `/pages/orderDetails/orderDetails?goodsOrderId=${this.orderNoitem.goodsOrderId}`
+ // })
}, 1000)
} else {}
})
diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
index c918ce3..a8b4726 100644
--- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
+++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
@@ -8,7 +8,8 @@
{{item.orderStatus=='PAY'?'已付款':''}}
{{item.orderStatus=='WAIT_DISPATCH'?'待服务':''}}
{{item.orderStatus=='NOT_FINISH'?'待完成':''}}
- {{item.orderStatus=='COMPLETE'?'服务完成':''}}
+ {{item.orderStatus=='COMPLETE'?'未评价':''}}
+ {{item.orderStatus=='EVALUATED'?'服务完成':''}}
{{item.orderStatus=='WAIT_REFUND'?'退款中':''}}
{{item.orderStatus=='REFUNDED'?'已退款':''}}
{{item.orderStatus=='CANCEL'?'已取消':''}}
diff --git a/pages/Personal/Personal.vue b/pages/Personal/Personal.vue
index 1582dfe..1b6fdd5 100644
--- a/pages/Personal/Personal.vue
+++ b/pages/Personal/Personal.vue
@@ -26,25 +26,107 @@
+