From 5d42e1d33e962be8eec4d9263ed8c097f42065f7 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Mon, 8 Aug 2022 09:55:31 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=85=85=E5=80=BC=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E4=B8=8D=E8=83=BD=E8=87=AA=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 high-unionPay/pages/login/resetpasswd.vue     |  6 +-
 high-unionPay/pages/user/deposit/deposit.vue  | 86 +++++++++++--------
 .../user/order_details/order_details.vue      |  8 ++
 3 files changed, 59 insertions(+), 41 deletions(-)

diff --git a/high-unionPay/pages/login/resetpasswd.vue b/high-unionPay/pages/login/resetpasswd.vue
index aed2ec0..9f506ea 100644
--- a/high-unionPay/pages/login/resetpasswd.vue
+++ b/high-unionPay/pages/login/resetpasswd.vue
@@ -8,13 +8,13 @@
 		<view class="form re">
 			<view class="username">
 				<!-- <view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">{{getCodeText}}</view> -->
-				<input placeholder="请输入旧密码" v-model="phoneNumber" placeholder-style="color: rgba(255,255,255,0.8);"/>
+				<input placeholder="请输入旧密码" v-model="phoneNumber" placeholder-style="color: #333333;"/>
 			</view>
 			<view class="code">
-				<input placeholder="请输入新密码" v-model="code"  password=true placeholder-style="color: rgba(255,255,255,0.8);"/>
+				<input placeholder="请输入新密码" v-model="code"  password=true placeholder-style="color: #333333;"/>
 			</view>
 			<view class="password">
-				<input placeholder="确认新密码" v-model="passwd" password=true placeholder-style="color: rgba(255,255,255,0.8);"/>
+				<input placeholder="确认新密码" v-model="passwd" password=true placeholder-style="color: #333333;"/>
 			</view>
 			<view class="btn" @click="sendUserPass">重置密码</view>
 
diff --git a/high-unionPay/pages/user/deposit/deposit.vue b/high-unionPay/pages/user/deposit/deposit.vue
index 6663886..b99fc85 100644
--- a/high-unionPay/pages/user/deposit/deposit.vue
+++ b/high-unionPay/pages/user/deposit/deposit.vue
@@ -13,19 +13,20 @@
 			</view>
 			<view class="content">
 				<view class="amount">
-					<view class="list">
-						<view class="box" v-for="(amount,index) in amountList" :key="index" @tap="select(amount)"
-							:class="{'on':amount == inputAmount}">
-							{{amount}}元
-						</view>
-					</view>
-					<view class="num">
-						<view class="text">
-							自定义充值金额
-						</view>
-						<view class="input">
-							<input type="number" v-model="inputAmount" />
-						</view>
+					<view class="list">
+						<view class="box" v-for="(amount,index) in amountList" :key="index" @tap="select(amount)"
+							:class="{'on':amount == inputAmount}">
+							<view class="heTitle">{{amount}}元</view>
+							<view class="font14">{{amount * 100}}分</view>
+						</view>
+					</view>
+					<view class="num">
+						<view class="text font13">
+							自定义充值金额(兑:{{inputAmount * 100}}分)
+						</view>
+						<view class="input">
+							<input type="number" v-model="inputAmount" />
+						</view>
 					</view>
 				</view>
 			</view>
@@ -205,31 +206,40 @@
 			.amount {
 				width: 100%;
 
-				.list {
-					display: flow-root;
-					justify-content: space-between;
-					padding: 20upx 0;
-
-					.box {
-						width: 30%;
-						height: 120rpx;
-						float: left;
-						margin-left: 3.333%;
-						margin-top: 20px;
-						display: flex;
-						justify-content: center;
-						align-items: center;
-						border-radius: 10rpx;
-						box-shadow: 0rpx 5rpx 20rpx rgba(0, 0, 0, 0.05);
-						font-size: 36rpx;
-						background-color: #f1f1f1;
-						color: 333;
-
-						&.on {
-							background-color: #0083f5;
-							color: #fff;
-						}
-					}
+				.list {
+					width: 94%;
+					margin-left: 3%;
+					display: flow-root;
+					justify-content: space-between;
+					align-items: center;
+					padding: 20upx 0;
+				
+					.box {
+						width: 30%;
+						margin-left: 1%;
+						margin-right: 2%;
+						margin-top: 20upx;
+						float: left;
+						height: 120upx;
+						// line-height: 120upx;
+						display: inline-grid;
+						justify-content: center;
+						align-items: center;
+						text-align: center;
+						box-shadow: 0upx 0upx 4upx #666666;
+						font-size: 36upx;
+						color: #089bf5;
+						background-color: #f1f1f1;
+						&.on {
+							background-color: #089bf5;
+							color: #ffffff;
+						}
+					}
+				
+					.heTitle {
+						width: 100%;
+						font-size: 15px;
+					}
 				}
 
 				.num {
diff --git a/high-unionPay/pages/user/order_details/order_details.vue b/high-unionPay/pages/user/order_details/order_details.vue
index f1a3999..8270a79 100644
--- a/high-unionPay/pages/user/order_details/order_details.vue
+++ b/high-unionPay/pages/user/order_details/order_details.vue
@@ -110,6 +110,14 @@
 					<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
 					</image>{{recinfo.deductionPrice*100}}
 				</view>
+			</view>
+			<view class="row" v-if="recinfo.payGold">
+				<view class="left">
+					抵扣积分 :
+				</view>
+				<view class="right">
+					￥{{recinfo.payGold}}
+				</view>
 			</view>
 			<view class="row">
 				<view class="left">