From 298e2261ca4829538f97989c4350a5d6f9e57406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 6 Mar 2023 11:38:44 +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/coupon/coupon.vue               | 160 +-------
 pages/integral/integral.vue           | 512 +-------------------------
 3 files changed, 10 insertions(+), 666 deletions(-)

diff --git a/pages/Applforrefund/Applforrefund.vue b/pages/Applforrefund/Applforrefund.vue
index 4cbebd9..1f8d6c4 100644
--- a/pages/Applforrefund/Applforrefund.vue
+++ b/pages/Applforrefund/Applforrefund.vue
@@ -9,7 +9,9 @@
 				<span v-else style='color: #000000;'>{{dictname}}</span>
 				<image src="../../static/huijiantou.png" mode=""></image>
 			</view>
-			<view class="priceinfo">退款金额
+			<view class="priceinfo">
+				<span v-if="order.orderType=='DIRECT_BUY'">退款金额</span>
+				<span v-if="order.orderType=='INTEGRAL_EXCHANGE'">退款积分</span>
 				<view class="priceback" v-if="order.orderType=='DIRECT_BUY'">￥{{order.totalPrice}}
 				</view>
 				<view class="priceback" v-if="order.orderType=='INTEGRAL_EXCHANGE'">{{order.integralExchangeSill}}积分
diff --git a/pages/coupon/coupon.vue b/pages/coupon/coupon.vue
index 18274c2..21166a0 100644
--- a/pages/coupon/coupon.vue
+++ b/pages/coupon/coupon.vue
@@ -143,163 +143,5 @@
 </script>
 
 <style lang="scss">
-	.app {
-		padding: 0;
-
-		.content {
-			width: 96%;
-			margin: 20rpx auto 0;
-			background-color: #fff;
-			padding-bottom: 100rpx;
-
-			.rollup {
-				border-radius: 5rpx;
-
-				.item {
-					width: 94%;
-					height: 240rpx;
-					margin: 20rpx auto 0;
-					border: 1rpx solid #f4f5f7;
-					border-radius: 10rpx;
-
-					.bottom {
-						font-size: 22rpx;
-						color: #969394;
-						line-height: 60rpx;
-						padding-left: 25rpx;
-						border-radius: 0 0 10rpx 10rpx;
-					}
-
-					.top {
-						width: 100%;
-						height: 180rpx;
-						background: #FDE9E8;
-						position: relative;
-						color: #F44B2F;
-						border-radius: 10rpx 10rpx 0 0;
-
-						.what {
-							padding: 0 10rpx;
-							height: 40rpx;
-							background: #FED1D2;
-							border-radius: 16rpx;
-							font-size: 20rpx;
-							line-height: 40rpx;
-							text-align: center;
-							position: absolute;
-							top: 120rpx;
-							left: 20rpx;
-						}
-
-						.btngq {
-							width: 110rpx;
-							height: 50rpx;
-							border: 2rpx solid #DFDEDE;
-							border-radius: 24rpx;
-							font-size: 24rpx;
-							position: absolute;
-							top: 70rpx;
-							right: 20rpx;
-							text-align: center;
-							line-height: 50rpx;
-							background: #DFDEDE;
-						}
-
-						.btn {
-							width: 98rpx;
-							height: 50rpx;
-							border: 2rpx solid #F44B2F;
-							border-radius: 24rpx;
-							font-size: 24rpx;
-							position: absolute;
-							top: 70rpx;
-							right: 20rpx;
-							text-align: center;
-							line-height: 50rpx;
-						}
-
-						.time {
-							font-size: 24rpx;
-							position: absolute;
-							top: 120rpx;
-							left: 240rpx;
-						}
-
-						.texts {
-							font-size: 32rpx;
-							font-weight: 800;
-							position: absolute;
-							top: 44rpx;
-							left: 240rpx;
-						}
-
-						.title {
-							position: absolute;
-							top: 30rpx;
-							left: 10rpx;
-
-							.price {
-								font-size: 54rpx;
-								font-weight: 700;
-							}
-
-							.text {
-								font-weight: 600;
-								font-size: 34rpx;
-							}
-						}
-					}
-				}
-			}
-
-			.statuss {
-				padding-top: 25rpx;
-
-				span {
-					color: #c1c1c1;
-					font-size: 18rpx;
-					line-height: 60rpx;
-				}
-
-				.statusitem {
-					text-align: center;
-					padding: 0 40rpx;
-					display: inline-block;
-					height: 60rpx;
-					font-size: 30rpx;
-					color: #969394;
-					line-height: 60rpx;
-				}
-			}
-		}
-
-		.tabs {
-			width: 100%;
-
-			.tab-item {
-				margin: 20rpx 0 0 24rpx;
-				text-align: center;
-				width: 20%;
-
-				.text {
-					width: 70%;
-					margin-left: 15%;
-					height: 30rpx;
-					background: #F44B2F;
-					border-radius: 9rpx;
-					color: #fff;
-					font-size: 24rpx;
-					line-height: 30rpx;
-				}
-
-				.title {
-					font-size: 40rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 500;
-					color: #F44B2F;
-					line-height: 59rpx;
-				}
-			}
-		}
-	}
+	@import "./coupon.scss";
 </style>
diff --git a/pages/integral/integral.vue b/pages/integral/integral.vue
index d7ff9c6..854885e 100644
--- a/pages/integral/integral.vue
+++ b/pages/integral/integral.vue
@@ -11,9 +11,12 @@
 					积分规则
 				</view> -->
 			</view>
-			<view class="title">
+			<view class="title" v-if="list.integral">
 				{{list.integral}}
 			</view>
+			<view class="title" v-else>
+				0
+			</view>
 			<view class="centertext">
 				<!-- 20积分将于2022.01.01过期 -->
 			</view>
@@ -419,9 +422,7 @@
 			yaoqingshowfalse() {
 				this.yapqingshow = false;
 				this.$nextTick(async () => {
-					await this.$refs.rCanvas.clearCanvas((res) => {
-						console.log(res)
-					})
+					await this.$refs.rCanvas.clearCanvas((res) => {})
 					await this.$refs.rCanvas.setCanvasWidth(0)
 					await this.$refs.rCanvas.setCanvasHeight(0)
 				})
@@ -624,506 +625,5 @@
 </script>
 
 <style lang="scss">
-	.app {
-		.masks {
-			z-index: 999;
-		}
-
-		.information {
-			width: 70%;
-			height: 400rpx;
-			margin: 50% auto;
-			background: #FFFFFF;
-			border-radius: 30rpx;
-			text-align: center;
-			color: #FFFFFF;
-			position: relative;
-
-			.determine,
-			.cancel {
-				width: 200rpx;
-				height: 70rpx;
-				border-radius: 26rpx;
-				font-size: 34rpx;
-				line-height: 70rpx;
-				position: absolute;
-				top: 74%;
-			}
-
-			.determine {
-				background: #4C7BC9;
-				right: 36rpx;
-			}
-
-			.cancel {
-				background: #C5BFBF;
-				left: 36rpx;
-			}
-
-			.title {
-				font-size: 42rpx;
-				margin-top: 40rpx;
-				color: #000000;
-			}
-
-			image {
-				width: 100rpx;
-				height: 100rpx;
-				margin: 10% 0 0 0;
-			}
-		}
-
-		.close {
-			width: 31rpx;
-			height: 31rpx;
-			position: absolute;
-			top: 2%;
-			right: 2%;
-			z-index: 999;
-		}
-
-		::v-deep .r-canvas {
-			width: 660rpx !important;
-			height: 1100rpx !important;
-			margin: 0 auto;
-			z-index: -1;
-		}
-
-		::v-deep .r-canvas-component {
-			width: 660rpx !important;
-			height: 1100rpx !important;
-			margin: 0 auto;
-			z-index: -1;
-		}
-
-		::v-deep .u-mode-center-box {
-			background: none !important;
-		}
-
-		.yaoqbtn {
-			color: #fff;
-			position: absolute;
-			bottom: 0;
-			text-align: center;
-			line-height: 71rpx;
-			left: 0;
-			width: 251rpx;
-			height: 71rpx;
-			background: linear-gradient(90deg, #85C8AE 0%, #03AD6B 59%);
-			border-radius: 36rpx;
-		}
-
-		.yaoqbtn2 {
-			color: #fff;
-			position: absolute;
-			text-align: center;
-			line-height: 71rpx;
-			bottom: 0;
-			right: 0;
-			width: 251rpx;
-			height: 71rpx;
-			background: linear-gradient(90deg, #64B0F9 0%, #436BF6 59%);
-			border-radius: 36rpx;
-		}
-
-		.yaoqing {
-			height: 1200rpx;
-		}
-
-		.PurchasePage {
-			position: fixed;
-			bottom: 0;
-			height: 930rpx;
-			width: 100%;
-			background: #FFFFFF;
-			border-radius: 30rpx 30rpx 0px 0px;
-			font-size: 36rpx;
-			padding-bottom: 20rpx;
-			z-index: 10;
-
-			.bodys {
-				background-color: #FFFFFF;
-				width: 96%;
-				margin: 10rpx auto 0;
-				border-radius: 20rpx;
-				padding: 15rpx 0 20rpx;
-				position: relative;
-
-				.addressinfo {
-					font-size: 32rpx;
-					line-height: 65rpx;
-					margin-left: 90rpx;
-
-					image {
-						width: 40rpx;
-						height: 50rpx;
-						position: absolute;
-						top: 50%;
-						left: 20rpx;
-						transform: translateY(-50%);
-					}
-
-					.address {
-						padding-top: 10rpx;
-						width: 92%;
-						font-size: 30rpx;
-						word-break: break-all;
-						line-height: 45rpx;
-					}
-
-					.namephone {
-						width: 70%;
-						text-overflow: ellipsis;
-						overflow: hidden;
-						white-space: nowrap;
-					}
-
-					.picture2 {
-						position: absolute;
-						top: 50%;
-						right: 20rpx;
-						transform: translateY(-50%);
-
-						image {
-							width: 18rpx;
-							height: 18rpx;
-							color: #FFFFFF;
-							margin-left: 20rpx;
-						}
-					}
-				}
-			}
-
-			.topcontent {
-				width: 96%;
-				margin: 0 auto;
-				padding-bottom: 15rpx;
-				position: relative;
-
-				.goodsStock {
-					font-size: 24rpx;
-					position: absolute;
-					top: 75%;
-					right: 10rpx;
-				}
-
-				.prices {
-					position: absolute;
-					top: 70%;
-					left: 35%;
-
-					.price {
-						color: #D43953;
-					}
-				}
-
-				.title {
-					font-size: 36rpx;
-					position: absolute;
-					top: 3%;
-					left: 35%;
-					font-weight: 600;
-					width: 58%;
-					// height: 85rpx;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 3;
-					word-break: break-all;
-				}
-
-				.image {
-					width: 200rpx;
-					height: 200rpx;
-					margin: 15rpx 0 0 0;
-
-					image {
-						width: 201rpx;
-						height: 201rpx;
-						margin: 7rpx 0 0 7rpx;
-					}
-
-				}
-			}
-
-			.buy {
-				width: 60%;
-				height: 71rpx;
-				background: #4C7BC9;
-				color: #FFFFFF;
-				text-align: center;
-				line-height: 71rpx;
-				border-radius: 26rpx;
-				position: absolute;
-				bottom: 30rpx;
-				left: 20%;
-			}
-
-			.centercontent {
-				font-size: 32rpx;
-				background-color: #FFFFFF;
-				margin-top: 10rpx;
-				padding-top: 20rpx;
-				border-radius: 20rpx;
-
-				.header {
-					margin-bottom: 20rpx;
-					margin-left: 17rpx;
-				}
-
-				.productmodel {
-					border: 4rpx solid #FFFFFF;
-				}
-
-				.Productmodel {
-					background: #ECF1FA;
-					border: 4rpx solid #4C7BC9;
-					color: #4C7BC9;
-				}
-
-				.productmodel,
-				.Productmodel {
-					background-color: #F6F6F6;
-					height: 300rpx;
-					text-align: center;
-					width: 30%;
-					font-size: 24rpx;
-					border-radius: 10rpx;
-					margin: 5rpx 1.5% 10rpx;
-					padding: 0 0 10rpx;
-
-					view {
-						background-color: #F6F6F6;
-						margin: 10rpx auto;
-						width: 98%;
-						// height: 90rpx;
-						border-radius: 10rpx;
-						font-size: 24rpx;
-						text-overflow: -o-ellipsis-lastline;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						display: -webkit-box;
-						-webkit-line-clamp: 2;
-						line-clamp: 2;
-						-webkit-box-orient: vertical;
-					}
-
-					image {
-						border-radius: 10rpx;
-						width: 100%;
-						height: 200rpx;
-					}
-				}
-			}
-		}
-
-		.mask {
-			position: fixed;
-			bottom: 0;
-			height: 600rpx;
-			width: 100%;
-			background-color: #fff;
-			z-index: 10;
-
-			.maskitems {
-				color: #fff;
-				width: 90%;
-				margin: 60rpx auto 0;
-
-				.item {
-					background: #557BC2;
-					width: 100%;
-					margin: 0 auto 20rpx;
-					height: 150rpx;
-					position: relative;
-					font-size: 26rpx;
-
-					.btn {
-						text-align: center;
-						width: 120rpx;
-						height: 50rpx;
-						background: #FFFFFF;
-						border-radius: 22rpx;
-						position: absolute;
-						right: 30rpx;
-						top: 58rpx;
-						line-height: 50rpx;
-						font-size: 28rpx;
-						color: #557BC2;
-					}
-
-					.text {
-						position: absolute;
-						left: 150rpx;
-						top: 90rpx;
-					}
-
-					.titletext {
-						position: absolute;
-						left: 150rpx;
-						top: 48rpx;
-					}
-
-					image {
-						margin: 49rpx 0 0 43rpx;
-						width: 66rpx;
-						height: 66rpx;
-					}
-				}
-			}
-
-			.title {
-				padding-top: 10rpx;
-				font-size: 38rpx;
-				font-weight: 600;
-				text-align: center;
-				width: 100%;
-			}
-		}
-
-		.items {
-			margin-top: 30rpx;
-
-			.item {
-				width: 92%;
-				margin: 0 auto 12rpx;
-				background-color: #FFFFFF;
-				height: 220rpx;
-				position: relative;
-
-				.text {
-					font-size: 24rpx;
-					position: absolute;
-					left: 220rpx;
-					top: 90rpx;
-					white-space: nowrap;
-					overflow: hidden;
-					text-overflow: ellipsis
-				}
-
-				.btn {
-					position: absolute;
-					right: 40rpx;
-					top: 140rpx;
-					width: 150rpx;
-					height: 50rpx;
-					background: #557BC2;
-					border-radius: 22rpx;
-					color: #fff;
-					text-align: center;
-					font-size: 28rpx;
-					color: #FFFFFF;
-					line-height: 50rpx;
-				}
-
-				.jifen {
-					position: absolute;
-					left: 220rpx;
-					top: 140rpx;
-					font-size: 26rpx;
-					color: #666666;
-				}
-
-				.title {
-					width: 460rpx;
-					font-size: 34rpx;
-					font-weight: 600;
-					position: absolute;
-					left: 220rpx;
-					top: 25rpx;
-					white-space: nowrap;
-					overflow: hidden;
-					text-overflow: ellipsis
-				}
-
-				image {
-					margin: 15rpx 0 0 15rpx;
-					width: 180rpx;
-					height: 180rpx;
-				}
-			}
-		}
-
-		.titles {
-			margin: 38rpx 0 0 31rpx;
-			font-size: 30rpx;
-		}
-
-		.vacancies {
-			width: 92%;
-			height: 330rpx;
-			margin: 0 auto;
-			position: relative;
-			color: #fff;
-
-			.bottombutton {
-				position: absolute;
-				top: 230rpx;
-				left: 50%;
-				font-size: 32rpx;
-				color: #557BC2;
-				line-height: 72rpx;
-				text-align: center;
-				transform: translateX(-50%);
-				width: 440rpx;
-				height: 72rpx;
-				background: #FFFFFF;
-				border-radius: 36rpx;
-			}
-
-			.centertext {
-				position: absolute;
-				top: 160rpx;
-				width: 100%;
-				text-align: center;
-				font-size: 28rpx;
-				opacity: 0.8;
-			}
-
-			.title {
-				position: absolute;
-				left: 50%;
-				font-size: 70rpx;
-				top: 90rpx;
-				transform: translateX(-50%);
-			}
-
-			.righttext {
-				position: absolute;
-				top: 32rpx;
-				right: 31rpx;
-				font-size: 24rpx;
-				line-height: 28rpx;
-				width: 130rpx;
-				height: 28rpx;
-
-				image {
-					position: absolute;
-					left: 0;
-					width: 28rpx;
-					height: 28rpx;
-				}
-
-				view {
-					opacity: 0.6;
-					position: absolute;
-					right: 0;
-				}
-			}
-
-			.lefttext {
-				position: absolute;
-				top: 32rpx;
-				left: 33rpx;
-				font-size: 30rpx;
-				line-height: 33rpx;
-			}
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
+	@import "./integral.scss";
 </style>