From 47a5797e612cc32c69be7d82b0977fa4e9ff3683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 3 Mar 2023 13:31:01 +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

---
 pages/Applforrefund/Applforrefund.vue          |  4 +++-
 pages/CommodityDetails/CommodityDetails.vue    | 18 +++++++++++++++---
 .../CommodityDetailsstyle.scss                 |  8 ++++----
 pages/CommodityOrder/CommodityOrder.vue        |  5 +----
 pages/integral/integral.vue                    |  9 ++++++---
 pages/orderDetails/orderDetails.scss           | 14 +++++++-------
 pages/orderDetails/orderDetails.vue            | 17 ++++++++++++++---
 pages/payorderDetails/payorderDetails.vue      |  4 ++++
 pages/refundType/refundType.scss               |  3 ++-
 pages/refundType/refundType.vue                |  9 +++++++--
 10 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/pages/Applforrefund/Applforrefund.vue b/pages/Applforrefund/Applforrefund.vue
index cd2470b..b4151ca 100644
--- a/pages/Applforrefund/Applforrefund.vue
+++ b/pages/Applforrefund/Applforrefund.vue
@@ -10,7 +10,9 @@
 				<image src="../../static/huijiantou.png" mode=""></image>
 			</view>
 			<view class="priceinfo">退款金额
-				<view class="priceback">￥{{order.totalPrice}}
+				<view class="priceback" v-if="order.orderType=='DIRECT_BUY'">￥{{order.totalPrice}}
+				</view>
+				<view class="priceback" v-if="order.orderType=='INTEGRAL_EXCHANGE'">{{order.integralExchangeSill}}
 				</view>
 				<!-- <view class="words">
 					已修改，最多{{order.totalPrice}}，含发货邮费 0.00
diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue
index 578f80b..7106d8d 100644
--- a/pages/CommodityDetails/CommodityDetails.vue
+++ b/pages/CommodityDetails/CommodityDetails.vue
@@ -314,6 +314,7 @@
 					attributeDetailsId: '', //商品属性明细表id
 					goodsAttributeId: '',
 					goodsAttributeDetailsId: '',
+					originalTotalPrice: null,
 				},
 				couponListtrue: [],
 				couponListfalse: [],
@@ -394,10 +395,21 @@
 												type: 'error'
 											})
 										} else {
+											this.updata.goodsPrice = Number(this.updata.goodsPrice)
 											this.buyshow = false
-											this.updata.totalPrice = (this.updata.goodsPrice * this.updata
-												.goodsCount).toFixed(
-												2)
+											this.updata.totalPrice = Number((this.updata.goodsPrice *
+												this.updata.goodsCount).toFixed(
+												2))
+											this.updata.originalTotalPrice = this.updata.totalPrice
+											if (this.couponId) {
+												this.updata.couponId = this.couponId
+												this.updata.couponTitle = this.coupon.couponTitle
+												this.updata.discountPrice = Number(this.coupon.couponPrice)
+												this.updata.couponConsumePrice = Number(this.coupon
+													.couponConsumePrice)
+												this.updata.totalPrice = Number((this.updata.originalTotalPrice -
+													this.updata.discountPrice).toFixed(2))
+											}
 											addStationGoodsOrder(this.updata).then(res => {
 												if (res.code == 500) {
 													that.$refs.uToast.show({
diff --git a/pages/CommodityDetails/CommodityDetailsstyle.scss b/pages/CommodityDetails/CommodityDetailsstyle.scss
index ded3fc0..6530345 100644
--- a/pages/CommodityDetails/CommodityDetailsstyle.scss
+++ b/pages/CommodityDetails/CommodityDetailsstyle.scss
@@ -230,13 +230,13 @@
 					.goodsStock{
 						font-size: 24rpx;
 						position: absolute;
-						top: 75%;
+						top: 55%;
 						right: 10rpx;
 					}
 					.prices{
 						position: absolute;
 						top: 70%;
-						left: 35%;
+						left:  230rpx;
 						.Paidinprice{
 							margin-left: 10rpx;
 							color: #fff;
@@ -254,7 +254,7 @@
 						font-size: 36rpx;
 						position: absolute;
 						top: 3%;
-						left: 35%;
+						left: 230rpx;
 						font-weight: 600;
 						width: 58%;
 						// height: 85rpx;
@@ -262,7 +262,7 @@
 						      text-overflow: ellipsis;
 						      display: -webkit-box;
 						      -webkit-box-orient: vertical;
-						      -webkit-line-clamp: 3;
+						      -webkit-line-clamp:2;
 						      word-break: break-all;
 					}
 
diff --git a/pages/CommodityOrder/CommodityOrder.vue b/pages/CommodityOrder/CommodityOrder.vue
index bcf3f10..c56dd29 100644
--- a/pages/CommodityOrder/CommodityOrder.vue
+++ b/pages/CommodityOrder/CommodityOrder.vue
@@ -32,12 +32,9 @@
 								<span class="box">×{{item.goodsCount}}</span>
 							</view>
 							<view class="refund">
-								<span v-if="item.orderType=='DIRECT_BUY'">
+								<span>
 									实付款：
 								</span>
-								<span v-if="item.orderType=='INTEGRAL_EXCHANGE'">
-									实付：
-								</span>
 								<text class="price" v-if="item.orderType=='DIRECT_BUY'">￥{{item.totalPrice}}</text>
 								<text class="price"
 									v-if="item.orderType=='INTEGRAL_EXCHANGE'">{{item.integralExchangeSill}}</text>
diff --git a/pages/integral/integral.vue b/pages/integral/integral.vue
index e6fc9d5..8d84e31 100644
--- a/pages/integral/integral.vue
+++ b/pages/integral/integral.vue
@@ -12,7 +12,7 @@
 				</view> -->
 			</view>
 			<view class="title">
-				{{integral}}
+				{{list.integral}}
 			</view>
 			<view class="centertext">
 				<!-- 20积分将于2022.01.01过期 -->
@@ -184,7 +184,9 @@
 				buyshow: false, //兑换购买
 				yaoqingshow: false,
 				yaoqingimg: null,
-				list: null,
+				list: {
+					integral: 0
+				},
 				inviteimg: null, //邀请二维码
 				pageNum: 1,
 				pageSize: 10,
@@ -406,6 +408,7 @@
 			upbuy() {
 				integralGoodsOrder(this.updata).then(res => {
 					if (res.code == 200) {
+						this.selectPatientSignInifo();
 						this.$refs.uToast.show({
 							title: '兑换商品成功',
 							type: 'success'
@@ -483,12 +486,12 @@
 			signIninfo() {
 				signIn(this.patientId).then(res => {
 					if (res.code == 200) {
+						this.selectPatientSignInifo();
 						this.$refs.uToast.show({
 							title: '今日签到成功',
 							type: 'success',
 							duration: '1000',
 						})
-						this.selectPatientSignInifo();
 					}
 				})
 			},
diff --git a/pages/orderDetails/orderDetails.scss b/pages/orderDetails/orderDetails.scss
index dfae148..7ef8e22 100644
--- a/pages/orderDetails/orderDetails.scss
+++ b/pages/orderDetails/orderDetails.scss
@@ -133,7 +133,6 @@
 			border-radius: 20rpx;
 			margin: 30rpx auto;
 			position: relative;
-			padding-bottom: 130rpx;
 
 			.name {
 				width: 95%;
@@ -152,6 +151,8 @@
 			}
 
 			.details {
+				height: 380rpx;
+				position: relative;
 				.detailslist {
 					display: flex;
 
@@ -175,17 +176,18 @@
 							overflow: hidden;
 							text-overflow: ellipsis;
 							white-space: nowrap;
-							width: 70%;
+							width: 65%;
 						}
 
 						span:nth-child(2) {
 							color: #969394;
 							float: right;
-							margin-right: 30rpx;
+							margin-right: 20rpx;
 						}
 
 						.bottom {
-							margin-top: 40rpx;
+							// margin-top: 40rpx;
+							margin-top: 15rpx;
 
 							.box {
 								color: #969394;
@@ -209,7 +211,6 @@
 							right: 20rpx;
 							bottom: 100rpx;
 						}
-
 					}
 				}
 
@@ -218,7 +219,7 @@
 					position: absolute;
 					left: 2.5%;
 					bottom: 20rpx;
-
+				
 					.pay {
 						font-size: 30rpx;
 						color: #020000;
@@ -230,7 +231,6 @@
 						color: #D43953;
 						margin-right: 10rpx;
 					}
-
 				}
 			}
 		}
diff --git a/pages/orderDetails/orderDetails.vue b/pages/orderDetails/orderDetails.vue
index d944efb..5d73ba8 100644
--- a/pages/orderDetails/orderDetails.vue
+++ b/pages/orderDetails/orderDetails.vue
@@ -20,15 +20,20 @@
 					<view class="model">
 						<view class="top">
 							<span>{{order.goodsName}}</span>
-							<span>￥{{order.goodsPrice}}</span>
+							<span v-if="order.orderType=='DIRECT_BUY'">￥{{order.goodsPrice}}</span>
 						</view>
 						<view class="bottom">
 							<span class="box">型号：{{order.goodsAttributeName}}</span>
 							<span class="box">X{{order.goodsCount}}</span>
 						</view>
+						<view class="bottom" v-if="order.discountPrice>0">
+							<span class="box" style='width:40%'>优惠金额：</span>
+							<span class="box">-￥{{order.discountPrice}}</span>
+						</view>
 						<view class="refund" @tap='gorefundType'
 							v-if="order.orderStatus != 'WAIT_PAY'&& order.orderStatus!='CANCEL'&&order.orderStatus!='WAIT_REFUND'&&order.orderStatus!='REFUNDED'&&order.orderStatus!='RETURNED_GOODS'&&order.orderStatus!='WAIT_RETURNED_GOODS'">
-							申请退款
+							<text v-if="order.orderType=='INTEGRAL_EXCHANGE'">取消兑换</text>
+							<text v-if="order.orderType=='DIRECT_BUY'">申请退款</text>
 						</view>
 						<view class="refund" v-if="order.orderStatus=='WAIT_REFUND'" @tap='goAftersalesdetails(order)'>
 							退款中
@@ -47,9 +52,15 @@
 						</view>
 					</view>
 				</view>
+				<!-- <view class="payinfo" style="bottom:90rpx">
+					<text class="pay" style="color: #969394;">优惠金额</text>
+					<text class="pay" style="float: right;	color: #969394;">-￥{{order.discountPrice}}</text>
+				</view> -->
 				<view class="payinfo">
 					<text class="pay">实付款</text>
-					<text class="price">￥{{order.totalPrice}}</text>
+					<text class="price" v-if="order.orderType=='DIRECT_BUY'">￥{{order.totalPrice}}</text>
+					<text class="price"
+						v-if="order.orderType=='INTEGRAL_EXCHANGE'">{{order.integralExchangeSill}}积分</text>
 				</view>
 			</view>
 		</view>
diff --git a/pages/payorderDetails/payorderDetails.vue b/pages/payorderDetails/payorderDetails.vue
index 14e8932..82b29af 100644
--- a/pages/payorderDetails/payorderDetails.vue
+++ b/pages/payorderDetails/payorderDetails.vue
@@ -26,6 +26,10 @@
 							<span class="box">型号：{{order.goodsAttributeName}}</span>
 							<span class="box">X{{order.goodsCount}}</span>
 						</view>
+						<view class="bottom" v-if="order.discountPrice>0">
+							<span class="box" style='width:40%'>优惠金额：</span>
+							<span class="box">-￥{{order.discountPrice}}</span>
+						</view>
 						<view class="refund" @tap='gorefundType'
 							v-if="order.orderStatus != 'WAIT_PAY'&& order.orderStatus!='CANCEL'&&order.orderStatus!='WAIT_REFUND'&&order.orderStatus!='REFUNDED'&&order.orderStatus!='RETURNED_GOODS'&&order.orderStatus!='WAIT_RETURNED_GOODS'">
 							申请退款
diff --git a/pages/refundType/refundType.scss b/pages/refundType/refundType.scss
index 4edb73e..c1e4dc5 100644
--- a/pages/refundType/refundType.scss
+++ b/pages/refundType/refundType.scss
@@ -7,7 +7,6 @@
 			box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
 			border-radius: 20rpx;
 			margin: 0 auto;
-			padding-bottom: 60rpx;
 
 			.name {
 				width: 95%;
@@ -27,6 +26,8 @@
 
 			.details {
 				.detailslist {
+					position: relative;
+					height:340rpx;
 					display: flex;
 
 					image {
diff --git a/pages/refundType/refundType.vue b/pages/refundType/refundType.vue
index bfc6ce0..557b917 100644
--- a/pages/refundType/refundType.vue
+++ b/pages/refundType/refundType.vue
@@ -10,13 +10,18 @@
 					<view class="model">
 						<view class="top">
 							<span>{{order.goodsName}}</span>
-							<span>￥{{order.goodsPrice}}</span>
+							<span v-if="order.orderType=='DIRECT_BUY'">￥{{order.goodsPrice}}</span>
 						</view>
 						<view class="bottom">
 							<span>型号：{{order.goodsAttributeName}}</span>
 							<span>X{{order.goodsCount}}</span>
 						</view>
-
+					</view>
+					<view class="payinfo">
+						<text class="pay">实付款</text>
+						<text class="price" v-if="order.orderType=='DIRECT_BUY'">￥{{order.totalPrice}}</text>
+						<text class="price"
+							v-if="order.orderType=='INTEGRAL_EXCHANGE'">{{order.integralExchangeSill}}积分</text>
 					</view>
 				</view>
 			</view>