Merge branch 'master' of http://47.92.161.104:10080/zkx/JP-ChargeTeam51 into master

pages/user/finance/rechargeDet.vue

@@ -4,7 +4,7 @@
 		<u-navbar title="充值详情"></u-navbar>
 		<view class="rechargeDet-head">
 			<view class="payPrice">
-				<span>￥</span><font>{{detail.payFee}}</font>
+				<font>{{detail.payFee}}</font><span>元</span>
 			</view>
 			<p>充值金额(元)</p>
 		</view>
@@ -22,7 +22,9 @@
 				<p>充值渠道</p><span>{{detail.payNameStr}}</span>
 			</view>
 			<view class="rechargeDet-list">
-				<p>充值金额</p><span>￥{{detail.payFee}}元</span>
+
+				<p>充值金额</p><span>{{detail.payFee}}元</span>
+
 			</view>
 		</view>
 		<view class="rechargeDet-main">

pages/user/finance/rechargeList.vue

@@ -12,7 +12,7 @@
 		</view>
 		<view class="rechargeList" v-if="accountList.length > 0">
 			<view class="rechargeList-item" v-for="(item,index) in accountList" :key="item.id" @click="gotoUrl('pages/user/finance/rechargeDet?id=' + item.id)">
-				<view class="rechargeList-row"><span>充值金额</span><h4>{{item.amount}}</h4></view>
+				<view class="rechargeList-row"><span>充值金额</span><h4>{{item.amount}}元</h4></view>
 				<view class="rechargeList-row"><p>{{item.payNameStr}}</p><p>{{item.createTime}}</p></view>
 			</view>
 		</view>

pages/user/finance/rechargeRes.vue

@@ -5,7 +5,6 @@
 			<u-icon name="chenggong" custom-prefix="custom-icon" size="180" color="#00B962"></u-icon>
 			<view class="title">{{detail.payStatusStr}}</view>
 			<view class="payPrice">
-				<span>￥</span>
 				<font>{{detail.totalFee}}</font><span>元</span>
 			</view>
 			<p>{{detail.payNameStr}}</p>

pages/user/finance/refundDet.vue

@@ -4,7 +4,7 @@
 		<u-navbar title="退费详情"></u-navbar>
 		<view class="rechargeDet-head">
 			<view class="payPrice">
-				<span>￥</span><font>{{refund.refundRealAmount}}</font>
+				<font>{{refund.refundRealAmount}}</font><span>元</span>
 			</view>
 			<p>退费金额(元)</p>
 		</view>
@@ -13,7 +13,7 @@
 				<p>退费订单</p><span>{{refund.refundOrderNo}}</span>
 			</view>
 			<view class="rechargeDet-list">
-				<p>手续费</p><span>￥{{refund.proceduresAmount!=null?refund.proceduresAmount.toFixed(2):''}}</span>
+				<p>手续费</p><span>{{refund.proceduresAmount!=null?refund.proceduresAmount.toFixed(2):'0'}}元</span>
 			</view>
 			<view class="rechargeDet-list">
 				<p>退费时间</p><span>{{refund.applicationTime}}</span>
@@ -22,7 +22,7 @@
 				<p>退费渠道</p><span>{{refund.refundChannelText}}</span>
 			</view>
 			<view class="rechargeDet-list">
-				<p>退费金额</p><span>￥{{refund.refundRealAmount!=null?refund.refundRealAmount.toFixed(2):''}}</span>
+				<p>退费金额</p><span>{{refund.refundRealAmount!=null?refund.refundRealAmount.toFixed(2):'0'}}元</span>
 			</view>
 		</view>
 		<view class="rechargeDet-main">

pages/user/finance/refundList.vue

@@ -4,7 +4,7 @@
 		<view class="balance">
 			<view class="balanceHead">
 				<view class="payPrice">
-					<span>￥</span><font>{{account.totalAmount}}</font>
+					<font>{{account.totalAmount}}</font><span>元</span>
 				</view>
 				<view class="tips">
 					<p>可退费金额(元)</p><u-icon name="question-line" custom-prefix="custom-icon" color="#00B962" size="32" @click="showtip = true"></u-icon>
@@ -25,20 +25,10 @@
 						</view>
 						<view class="refundList-row" >
 							<p>{{item.applicationTime}}</p>
-							<p>￥{{item.refundAmount.toFixed(2)}}</p>
+							<p>{{item.refundAmount.toFixed(2)}}元</p>
 						</view>
 					</view>
-					<!--
-					<view class="refundList-item">
-						<view class="refundList-row">
-							<font>退至 微信</font>
-							<span class="state2">已退款</span>
-						</view>
-						<view class="refundList-row">
-							<p>2021-12-31 09:00</p>
-							<p>￥15.00</p>
-						</view>
-					</view>-->
+					
 					
 					<!-- <view class="refundList-none">
 						<u-image width="200px" height="200px" src="/static/img/none.svg"></u-image>

pages/user/index.vue

@@ -10,14 +10,14 @@
 		</view>
 		<view class="userData">
 			<view class="userData-num" @click="toBalance">
-				<view class="userData-data">￥{{personAccount.availableAmount != null ? personAccount.availableAmount.toFixed(2) : '0.00'}}</view>
+				<view class="userData-data">{{personAccount.availableAmount != null ? personAccount.availableAmount.toFixed(2) : '0.00'}}元</view>
 				<view class="userData-foot">可用余额</view>
 			</view>
 			<view class="line">
 				
 			</view>
 			<view class="userData-num" @click="toMyCoupon">
-				<view class="userData-data">{{myCouponList.length}}</view>
+				<view class="userData-data">{{recordsTotal}}张</view>
 				<view class="userData-foot">优惠券</view>
 			</view>
 		</view>
@@ -121,6 +121,7 @@
 		},
 		data() {
 			return {
+				recordsTotal: 0,
 				myCouponList: [],
 				elderStatus: false,
 				personAccount: {},
@@ -175,6 +176,7 @@
 					uni.hideLoading();
 					
 					this.myCouponList = res.data.data;
+					this.recordsTotal = res.data.recordsTotal;
 				}).catch(error => {
 					uni.showToast({
 						title: error,