From 4da1250c935373442b5e479ab849e1904a21a9c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 10 Mar 2023 11:14:58 +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/materialbenefits/index.js | 8 ++
pages.json | 2 +-
pages/Applforrefund/Applforrefund.scss | 8 --
pages/Applforrefund/Applforrefund.vue | 3 +-
pages/CommodityOrder/CommodityOrder.scss | 12 ---
pages/CommodityOrder/CommodityOrder.vue | 5 +-
pages/Healthitem/Healthitem.vue | 5 +-
pages/Healthknowledge/Healthknowledge.vue | 19 +---
.../Nursingstationserviceorder.scss | 12 ---
.../Nursingstationserviceorder.vue | 5 +-
pages/ProductList/ProductList.vue | 22 +----
pages/classification/classification.vue | 24 +-----
.../confirmation.vue} | 81 ++++++++++--------
pages/coupon/coupon.scss | 14 ---
pages/coupon/coupon.vue | 5 +-
pages/integral/integral.scss | 14 ---
pages/integral/integral.vue | 5 +-
pages/materialbenefits/materialbenefits.vue | 37 +++-----
pages/medicine/medicine.scss | 14 ++-
pages/medicine/medicine.vue | 10 ++-
pages/nursestation/nursestation.scss | 11 ---
pages/nursestation/nursestation.vue | 10 +--
pages/site/site.scss | 11 ---
pages/site/site.vue | 5 +-
static/noorder.png | Bin 2577 -> 0 bytes
static/yis.png | Bin 0 -> 18115 bytes
26 files changed, 100 insertions(+), 242 deletions(-)
rename pages/{Informationconfirmation/Informationconfirmation.vue => confirmation/confirmation.vue} (84%)
delete mode 100644 static/noorder.png
create mode 100644 static/yis.png
diff --git a/api/materialbenefits/index.js b/api/materialbenefits/index.js
index 3674ab3..992f4ca 100644
--- a/api/materialbenefits/index.js
+++ b/api/materialbenefits/index.js
@@ -8,3 +8,11 @@ export function couponByUseStatus(pageNum, pageSize, patientId) {
method: 'get'
})
}
+
+//领取
+export function insertCouponReceive(patientId, couponId) {
+ return request({
+ url: `/nurseApplet/patientInfo/insertCouponReceive?patientId=${patientId}&couponId=${couponId}`,
+ method: 'post'
+ })
+}
diff --git a/pages.json b/pages.json
index dc5d149..487c989 100644
--- a/pages.json
+++ b/pages.json
@@ -25,7 +25,7 @@
"navigationBarBackgroundColor": "#ffffff"
}
},{
- "path" : "pages/Informationconfirmation/Informationconfirmation",
+ "path" : "pages/confirmation/confirmation",
"style" :
{
"navigationBarTitleText": "",
diff --git a/pages/Applforrefund/Applforrefund.scss b/pages/Applforrefund/Applforrefund.scss
index f3a8871..53b6d85 100644
--- a/pages/Applforrefund/Applforrefund.scss
+++ b/pages/Applforrefund/Applforrefund.scss
@@ -2,14 +2,6 @@
padding: 3%;
.frame {
- .image {
- position: absolute;
- right: 30rpx;
- top: 40rpx;
- width: 31rpx;
- height: 31rpx;
- }
-
.payment {
width: 95%;
font-size: 42rpx;
diff --git a/pages/Applforrefund/Applforrefund.vue b/pages/Applforrefund/Applforrefund.vue
index 1f8d6c4..7a70e9c 100644
--- a/pages/Applforrefund/Applforrefund.vue
+++ b/pages/Applforrefund/Applforrefund.vue
@@ -31,8 +31,7 @@
提交
-
-
+
请选择退款原因
diff --git a/pages/CommodityOrder/CommodityOrder.scss b/pages/CommodityOrder/CommodityOrder.scss
index daa0839..a5a0793 100644
--- a/pages/CommodityOrder/CommodityOrder.scss
+++ b/pages/CommodityOrder/CommodityOrder.scss
@@ -4,18 +4,6 @@
padding: 3%;
.noorder{
margin-top: 20%;
- image{
- display: block;
- margin: 0 auto;
- width: 200rpx;
- height: 240rpx;
- }
- view{
- margin-top: 100rpx;
- text-align: center;
- font-size: 36rpx;
- color: #BFBFBF;
- }
}
.submits {
width: 501rpx;
diff --git a/pages/CommodityOrder/CommodityOrder.vue b/pages/CommodityOrder/CommodityOrder.vue
index dd8a183..ab3df69 100644
--- a/pages/CommodityOrder/CommodityOrder.vue
+++ b/pages/CommodityOrder/CommodityOrder.vue
@@ -64,10 +64,7 @@
-
-
- 暂无商品订单
-
+
diff --git a/pages/Healthitem/Healthitem.vue b/pages/Healthitem/Healthitem.vue
index 53c9817..b45525e 100644
--- a/pages/Healthitem/Healthitem.vue
+++ b/pages/Healthitem/Healthitem.vue
@@ -3,15 +3,14 @@
{{item.informationTitle}}
-
-
+
diff --git a/pages/coupon/coupon.scss b/pages/coupon/coupon.scss
index 055159e..0f18619 100644
--- a/pages/coupon/coupon.scss
+++ b/pages/coupon/coupon.scss
@@ -3,20 +3,6 @@
.noorder {
margin-top: 20%;
-
- image {
- display: block;
- margin: 0 auto;
- width: 200rpx;
- height: 240rpx;
- }
-
- view {
- margin-top: 100rpx;
- text-align: center;
- font-size: 36rpx;
- color: #BFBFBF;
- }
}
.content {
width: 96%;
diff --git a/pages/coupon/coupon.vue b/pages/coupon/coupon.vue
index fbfd3d7..df9e235 100644
--- a/pages/coupon/coupon.vue
+++ b/pages/coupon/coupon.vue
@@ -68,10 +68,7 @@
-
-
- 暂无优惠券
-
+
diff --git a/pages/integral/integral.scss b/pages/integral/integral.scss
index b3bfdfb..917c572 100644
--- a/pages/integral/integral.scss
+++ b/pages/integral/integral.scss
@@ -5,20 +5,6 @@
}
.noorder {
margin-top: 20%;
-
- image {
- display: block;
- margin: 0 auto;
- width: 200rpx;
- height: 240rpx;
- }
-
- view {
- margin-top: 100rpx;
- text-align: center;
- font-size: 36rpx;
- color: #BFBFBF;
- }
}
.information {
width: 70%;
diff --git a/pages/integral/integral.vue b/pages/integral/integral.vue
index 9064a14..d66fe60 100644
--- a/pages/integral/integral.vue
+++ b/pages/integral/integral.vue
@@ -44,10 +44,7 @@
-
-
- 暂无可兑换商品
-
+
diff --git a/pages/materialbenefits/materialbenefits.vue b/pages/materialbenefits/materialbenefits.vue
index 86a935b..3eca50c 100644
--- a/pages/materialbenefits/materialbenefits.vue
+++ b/pages/materialbenefits/materialbenefits.vue
@@ -55,7 +55,7 @@
有效期至{{item.expirationEndTime}}
-
+
{{item.useStatus=='RECEIVE'?'领取':''}}
@@ -74,10 +74,7 @@
-
-
- 暂无
-
+
@@ -99,7 +96,8 @@