refactor：充值修改

common/js/api.js

@@ -3,14 +3,6 @@ import request from '../js/request.js';
 
 export default {
 
-	// get请求 通过电话及名称获取老系统会员信息
-	getOldMember(data) {
-		return request({
-			url: '/member/wechat/getOldMember',
-			method: 'GET',
-			data: data
-		})
-	},
 
 	// get请求 通过会员编号获取老系统充值记录
 	getOrderRechargeOldList(data) {
@@ -144,7 +136,7 @@ export default {
 	// post请求，微信支付（根据订单ID）
 	wechatPay(data) {
 		return request({
-			url: '/business/wxPay/jsapiPay',
+			url: '/business/wxPay/jsapiPay?orderNo='+data.orderNo,
 			method: 'POST',
 			data: data
 		})

myPages/recharge/index.vue

@@ -1,7 +1,10 @@
 <template>
-	<view class="content">
+	<view class="page">
 		<!-- 钱包 -->
 		<view class="recharge-me">
+			<view class="bg-img">
+				<!-- <image src="../../static/recharge/u1709.jpg" mode=""></image> -->
+			</view>
 			<view class="wallet-content">
 				<view class="h-balance-wrap">
 					<view class="h-balance">
@@ -11,7 +14,7 @@
 							</view>
 							<view class="name">储值余额</view>
 							<view class="balance-value">￥
-								<text v-if="userInfo.rechargeBalance">{{ userInfo.rechargeBalance }}</text>
+								<text v-if="userInfo.rechargeBalance">{{userInfo.rechargeBalance}}</text>
 								<text v-else>0</text>
 							</view>
 						</view>
@@ -21,7 +24,7 @@
 							</view>
 							<view class="name">赠送余额</view>
 							<view class="balance-value">￥
-								<text v-if="userInfo.rewardBalance" class="">{{ userInfo.rewardBalance }}</text>
+								<text v-if="userInfo.rewardBalance" class="">{{userInfo.rewardBalance}}</text>
 								<text v-else>0</text>
 							</view>
 						</view>
@@ -31,7 +34,7 @@
 							</view>
 							<view class="name">赠送优惠券</view>
 							<view class="balance-value">
-								<text v-if="userInfo.coupon">{{ userInfo.coupon }}</text>
+								<text  v-if="userInfo.coupon" >{{userInfo.coupon}}</text>
 								<text v-else>0</text>
 							</view>
 						</view>
@@ -41,7 +44,7 @@
 						<view @click="gotoTransactionRecords()" class="item-btn">
 							<text>交易记录</text>>
 						</view>
-						<view class="dashed-line"></view>
+						<view class="dashed-line" ></view>
 						<view @click="gotoTransactionOrderRecords()" class="item-btn">
 							<text>储值订单</text>>
 						</view>
@@ -54,8 +57,7 @@
 					<!--右边虚化-->
 					<!-- <view class="hide-content-box hide-content-box-right"></view> -->
 					<scroll-view scroll-x="true" class="kite-classify-scroll">
-						<view @click="selectActiveRecharge(item, index)" class="kite-classify-cell shadow"
-							v-for="(item, index) in rechargeList" :key="index">
+						<view @click="selectActiveRecharge(item,index)" class="kite-classify-cell shadow" v-for="(item, index) in rechargeList" :key="index">
 							<view v-if="currentTab === index" class="h-bg-img">
 								<image src="../../static/transaction/u2.png" mode=""></image>
 							</view>
@@ -64,10 +66,10 @@
 							</view>
 							<view class="content">
 								<view class="money">
-									￥<text class="v">{{ item.reachPrice }}</text>
+									￥<text class="v">{{item.reachPrice}}</text>
 								</view>
 								<view class="desc">
-									<text>{{ item.name }} </text>
+									<text>{{item.name}} </text>
 									<!-- <text>充￥{{item.reachPrice}}赚送￥{{item.discountsPrice}}</text> -->
 								</view>
 							</view>
@@ -75,6 +77,40 @@
 					</scroll-view>
 				</view>
 
+				<!-- 选择充值金额  -->
+				<!-- <view class="recharge-content-wrap">
+					<view v-for="(item,index) in rechargeList"
+						@click="selectActiveRecharge(item,index)" class="recharge-content">
+						<view v-if="currentTab === index" class="h-bg-img">
+							<image src="../../static/transaction/u2.png" mode=""></image>
+						</view>
+						<view v-else class="h-bg-img">
+							<image src="../../static/recharge/dianka.png" mode=""></image>
+						</view>
+						<view class="content">
+							<view class="money">
+								￥<text class="v">{{item.reachPrice}}</text>
+							</view>
+							<view class="desc">
+								<text>{{item.name}} </text>
+								<text>充￥{{item.reachPrice}}赚送￥{{item.discountsPrice}}</text>
+							</view>
+						</view>
+					</view>
+				</view> -->
+
+
+
+				<!-- 自定义充值金额 -->
+				<!-- <view class="h-custom">
+					<view class="h-icon">
+						<u-icon name="rmb" color="#333" size="22"></u-icon>
+					</view>
+					<view class="h-money">
+						<input v-model="reqOrderParm.rechargeAmount" @click="cancelChooseMoney" placeholder="请输入金额" type="number">
+					</view>
+				</view> -->
+
 				<!-- 充值按钮 -->
 				<view v-if="rechargeList.length > 0" @click="submitOrder()" class="h-submit-btn">
 					<text>立即充值</text>
@@ -82,8 +118,8 @@
 
 				<!-- 用户充值协议 -->
 				<view class="recharge-agreement">
-					<view class="radio-group">
-						<radio @click="toggleSelection" class="v-text" :checked="isSelected">我已阅读并同意</radio>
+					<view  class="radio-group">
+						<radio @click="toggleSelection" class="v-text" :checked="isSelected" >我已阅读并同意</radio>
 						<text @click="gotoTermOfService(8)" class="h-btn">《储值协议》</text>
 					</view>
 				</view>
@@ -94,7 +130,21 @@
 						<text>使用说明</text>
 					</view>
 					<view class="h-content">
-
+						<view class="h-v-text">
+							<text>1、 这上面的夜的天空，奇怪而高，我生平。</text>
+						</view>
+						<view class="h-v-text">
+							<text>2、 这上面的夜的天空，奇怪而高，我生平。</text>
+						</view>
+						<view class="h-v-text">
+							<text>3、 这上面的夜的天空，奇怪而高，我生平。</text>
+						</view>
+						<view class="h-v-text">
+							<text>4、 这上面的夜的天空，奇怪而高，我生平。</text>
+						</view>
+						<view class="h-v-text">
+							<text>5、 这上面的夜的天空，奇怪而高，我生平。</text>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -104,21 +154,425 @@
 </template>
 
 <script>
-export default {
+	export default {
+		data() {
+			return {
+				show: false,
+				currentTab: '', // 当前选中的 Tab
+				isSelected: true,
+				userInfo: {},
+				reqOrderParm: {
+					auth: true,
+					orderType: 3, // 订单类型;1-服务订单 2-产品订单 3-充值订单
+					rechargeAmount: null, // 充值金额
+					strategyId: null, // 优惠策略的ID  测试id 1694514233806888962
+					remark: null
+				},
+				reqPayParm: {
+					auth: true,
+					orderNo: null,
+					openid: null,
+					requstForm: true
+				},
+				rechargeList: [],
+			};
+		},
+		onLoad() {
+		},
+		onShow() {
+			// 获取充值面额
+			this.getRechargeList();
+			// 用户信息
+			this.userInfo = uni.getStorageSync('userInfo');
+		},
+		methods: {
 
-	data() {
-		return {
-		}
-	},
-	onLoad() {
+			// 获取充值面额
+			getRechargeList(){
+				console.log('+++++++++666666666666666666+++++++++++++++++++')
+				this.$api.getRechargeList(this.reqOrderParm).then((res)=>{
+					console.log('++++++++++++++getRechargeList+++++++++++++++++',res)
+					this.rechargeList = res.data.data;
+				}).catch(() =>{
+					uni.showToast({
+						title: "操作失败"
+					})
+				});
+			},
+			// 提交订单
+			submitOrder(){
+				const that = this;
 
-	},
-	methods: {
-	}
-}
+				if(!this.isSelected){ // 是否确定协议
+					uni.showToast({
+						title: '请选择充值协议!'
+					});
+					return;
+				}
+
+				if(this.reqOrderParm.strategyId == null){
+					uni.showToast({
+						title: '请选择充值项目!'
+					});
+					return;
+				}
+
+				// 提交订单
+				this.$api.commonGeneralOrder(this.reqOrderParm).then((res)=>{
+					console.log('+++++++++++commonGeneralOrder++++++++++',res)
+					that.reqPayParm.orderNo = res.data.data.orderNo;
+					// 调用微信支付
+					that.wechatPay();
+				}).catch(() =>{
+					uni.showToast({
+						title: "操作失败"
+					})
+				});
+			},
+			// 微信支付
+			wechatPay(){
+				const that = this;
+				// 用户信息
+				that.reqPayParm.requstForm = true;
+				this.$api.wechatPay(that.reqPayParm).then((res)=>{
+					var param = res.data.data;
+					uni.requestPayment({
+						appId: param.appid,
+						timeStamp: param.timestamp+"",
+						nonceStr: param.noncestr,
+						package: "prepay_id="+param.prepayid,
+						signType: "RSA",
+						paySign: param.sign,
+						success: res => {
+							uni.showToast({
+								title: '支付成功!'
+							});
+							// 刷新用户信息
+							that.getUserInfo()
+						},
+						fail: res => {
+							uni.showModal({
+								content: '支付失败',
+								showCancel: false
+							});
+						}
+					});
+				}).catch(() =>{
+					uni.showToast({
+						title: "操作失败"
+					})
+				});
+			},
+
+			getUserInfo(){
+				this.$api.getUserInfo().then(res=>{
+					console.log('++++++++++++获取用户信息++++++++++++++++++',res)
+					uni.setStorageSync('userInfo',res.data.data)
+					this.userInfo = res.data.data
+				})
+
+			},
+			// 取消上面选择的面值
+			cancelChooseMoney(){
+				this.reqOrderParm.strategyId = null;
+				this.reqOrderParm.rechargeAmount = null;
+				this.currentTab = '';
+			},
+			// 选择充值金额
+			selectActiveRecharge(item,index){
+				// 设置充值的金额和策略ID
+				this.reqOrderParm.strategyId = item.id;
+				this.reqOrderParm.rechargeAmount = item.reachPrice;
+				this.currentTab = index;
+			},
+			toggleSelection() {
+				this.isSelected = !this.isSelected;
+			},
+			// 交易记录
+			gotoTransactionRecords(){
+				uni.navigateTo({
+					url: '/myPages/transactionRecord/index',
+					params: {}
+				})
+			},
+			// 充值记录
+			gotoTransactionOrderRecords(){
+				uni.$u.route({
+					url: '/pages/transaction/transaction-order-records',
+					params: {}
+				})
+			},
+			// 查看储值协议
+			gotoTermOfService(type){
+				uni.$u.route({
+					url: '/pages/me/term-of-service-detatil',
+					params: {
+						data: type
+					}
+				})
+			},
+
+		},
+	};
 </script>
 
 <style scoped lang="scss">
-@import '/common/css/common.css';
-@import './index.rpx.scss';
+	.page{
+		background: red;
+	}
+
+	/*scroll-view外层*/
+	.skill-sequence-panel-content-wrapper {
+		position: relative;
+		white-space: nowrap;
+		// padding: 10rpx 0 10rpx 10rpx;
+		margin-top: 10px;
+	}
+
+	/*左右渐变遮罩*/
+	.hide-content-box {
+		position: absolute;
+		top: 0;
+		height: 100%;
+		width: 10px;
+		z-index: 2;
+	}
+
+	.hide-content-box-left {
+		left: 0;
+		background-image: linear-gradient(to left, rgba(255, 255, 255, 0), #f3f3f3 60%);
+	}
+
+	.hide-content-box-right {
+		right: 0;
+		background-image: linear-gradient(to right, rgba(255, 255, 255, 0), #f3f3f3 60%);
+	}
+
+	.kite-classify-scroll {
+		width: 100%;
+		// height: 380rpx;
+		overflow: hidden;
+		white-space: nowrap;
+	}
+
+	.kite-classify-cell {
+		display: inline-block;
+		width: 266rpx;
+		// height: 370rpx;
+		margin-right: 20rpx;
+		background-color: #ffffff;
+		border-radius: 10rpx;
+		overflow: hidden;
+		box-shadow: 2px 2px 3px rgba(26, 26, 26, 0.2);
+		position: relative;
+		.h-bg-img{
+			image{
+				height: 80px;
+			}
+		}
+		.content{
+			position: absolute;
+			bottom: 20%;
+			left:12px;
+			.money{
+				color: #333333;
+				.v{
+					font-size: 18px;
+					font-weight: bold;
+				}
+			}
+			.desc{
+				margin-top: 6px;
+				font-size: 12px;
+				color: #333333;
+				line-height: 22px;
+			}
+		}
+		.active{
+			display: block;
+		}
+	}
+
+
+	// 余额
+	.recharge-me{
+
+
+		position: relative;
+		.bg-img{
+			height: 160px;
+			background: #FFE05C;
+		}
+		.wallet-content{
+			position: absolute;
+			top: 0;
+			left: 0;
+			right: 0;
+			padding: 12px;
+			.h-balance-wrap{
+				background: #FFFCF1 ;
+				border-radius: 6px;
+				text-align: center;
+				padding-left: 20px;
+				padding-right: 20px;
+				.h-balance{
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					height: 118px;
+					.recharge-balance{
+						font-family: PingFangSC-Regular, PingFang SC;
+						.h-nav-img {
+							image{
+								height: 18px;
+								width: 18px;
+							}
+						}
+						.name{
+							font-size: 14px;
+							font-weight: 400;
+							color: #666666;
+							line-height: 22px;
+						}
+						.balance-value{
+							font-size: 18px;
+							font-weight: bold;
+							color: #333333;
+							line-height: 26px;
+						}
+					}
+				}
+				.btn{
+					display: flex;
+					font-size: 14px;
+					justify-content: space-between;
+					height: 60px;
+					align-items: center;
+					color: #999999;
+					.item-btn{
+						width: 50%;
+					}
+				}
+			}
+
+		}
+
+	}
+
+	// 充值金额选择
+	.recharge-content-wrap{
+		width: 100%;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		margin-top: 12px;
+		position: relative;
+		.recharge-content{
+			width: calc(50% - 6px);
+			margin-bottom: 12px;
+			position: relative;
+			.h-bg-img{
+				image{
+					height: 80px;
+				}
+			}
+			.content{
+				position: absolute;
+				bottom: 25%;
+				left:12px;
+				.money{
+					color: #333333;
+					.v{
+						font-size: 18px;
+						font-weight: bold;
+					}
+				}
+				.desc{
+					font-size: 12px;
+					color: #333333;
+					line-height: 22px;
+				}
+			}
+			.choose-status{
+				display: none;
+				position: absolute;
+				left: 0px;
+				top: 0px;
+				.active{
+					width: 0;
+					height: 0;
+					border-left: 0px solid transparent;
+					border-right: 30px solid transparent;
+					border-top: 30px solid green;
+				}
+				image{
+					height: 40px;
+					width: 40px;
+				}
+			}
+			.active{
+				display: block;
+			}
+		}
+
+	}
+
+	.h-custom{
+		background: #FFFCF1;
+		display: flex;
+		padding: 12px;
+		border-radius: 10px;
+		margin-top: 8px;
+		.h-money{
+			margin-left: 6px;
+		}
+	}
+
+	// 协议
+	.recharge-agreement{
+		margin-top: 12px;
+		margin-bottom: 12px;
+		margin-left: 12px;
+		text-align: center;
+		.radio-group{
+			.v-text{
+				// color:green;
+			}
+			.h-btn{
+				color:green;
+			}
+		}
+
+	}
+
+	// 提交按钮
+	.h-submit-btn{
+		margin-top: 12px;
+		width: 343px;
+		height: 42px;
+		background: #FFE05C;
+		border-radius: 27px;
+		text-align: center;
+		line-height: 42px;
+	}
+
+	// 使用说明
+	.h-desc{
+		font-family: PingFangSC-Regular, PingFang SC;
+		.title{
+			height: 24px;
+			font-size: 14px;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #333333;
+			line-height: 24px;
+		}
+		.h-content{
+			height: 40px;
+			font-size: 12px;
+			font-weight: 400;
+			color: #999999;
+			line-height: 20px;
+		}
+	}
 </style>

myPages/transactionRecord/index.vue

@@ -0,0 +1,282 @@
+<template>
+    <view class="page">
+
+
+
+    </view>
+</template>
+<script>
+
+    export default {
+        data() {
+            return {
+                showDataLoading: false,
+                serviceTimeShow: false,
+                show: false,
+                mode: 'single',
+                currentTab: 'tab1', // 当前选中的 Tab
+                currentServiceTab: 'orderTab1', // 当前选中的 Tab
+                searchTime: '2023-8-9',
+                reqParm: {
+                    auth: true,
+                    pageSize: 20,
+                    pageNum: 1,
+                    dataTime: null,
+                },
+                value1: '',
+                tranRecordsList: [],
+                tranFlowstatistic: {}
+            };
+        },
+        onLoad() {
+            // 查询交易列表
+            this.transactionRecordsList();
+            this.value1 = Date.now();
+            // 查询交流流水统计
+            this.transactionFlowstatistic();
+        },
+        methods: {
+            // 确定选择的服务日期
+            sureChooseDate(){
+                this.serviceTimeShow = false;
+                // this.reqParm.startTime = uni.$u.timeFormat(this.value1, 'yyyy-mm-dd hh:MM:ss');
+                this.reqParm.dataTime = uni.$u.timeFormat(this.value1, 'yyyy-mm');
+            },
+            // 交易列表
+            transactionRecordsList(){
+                let that = this;
+                that.showDataLoading = true;
+                this.$api.transactionRecordsList({data:this.reqParm}).then((res)=>{
+                    that.tranRecordsList = res.data.rows;
+                    that.showDataLoading = false;
+                }).catch(() =>{
+                    uni.showToast({
+                        title: "操作失败"
+                    })
+                });
+            },
+            // 查询交易流水统计
+            transactionFlowstatistic(){
+                let that = this;
+                that.showDataLoading = true;
+                this.$api.transactionFlowstatistic({data:this.reqParm}).then((res)=>{
+                    that.tranFlowstatistic = res.data.data;
+                    that.showDataLoading = false;
+                }).catch(() =>{
+                    uni.showToast({
+                        title: "操作失败"
+                    })
+                });
+            },
+            // 服务订单
+            changeServiceTab(tab){
+                // 交易号类型(订单号、退款单号):1 消费 2 充值 3退款
+                if(tab == 'orderTab1'){
+                    delete this.reqParm.tradeNoType;
+                } else if(tab == 'orderTab2'){
+                    this.reqParm.tradeNoType = '2';
+                } else if(tab == 'orderTab3'){
+                    this.reqParm.tradeNoType = '1';
+                } else if(tab == 'orderTab4'){
+                    this.reqParm.tradeNoType = '3';
+                }
+                // 处理查询参数
+                if(!this.reqParm.dataTime){
+                    let time = this.reqParm.dataTime;
+                    this.reqParm.beginTime = time+'-01 00:00:00';
+                    this.reqParm.endTime = this.maxDate(this.reqParm.beginTime);
+                }
+                this.transactionFlowstatistic();
+                this.transactionRecordsList();
+                this.currentServiceTab = tab;
+            },
+
+            // 详情
+            orderDetail(item){
+                uni.$u.route({
+                    url: '/pages/transaction/transaction-detail',
+                    params: {
+                        data: JSON.stringify(item)
+                    }
+                })
+            },
+            showDate(){
+                // this.show = true;
+                this.serviceTimeShow = true;
+            },
+            confirm(e) {
+                this.searchTime = e[0];
+                this.show = false;
+            },
+            close() {
+                this.show = false;
+            },
+            maxDate(selectedMonth) {
+                if (!this.$isDataEmpty(selectedMonth)) {
+                    // 将选定的月份转换为Date对象
+                    let selected = new Date(selectedMonth);
+                    // 获取下个月的第一天
+                    let nextMonth = new Date(selected.getFullYear(), selected.getMonth() + 1, 1);
+                    // 获取本月的最后一天
+                    let lastDay = new Date(nextMonth - 1);
+                    // 返回最大日期
+                    return lastDay.toISOString().slice(0, 10);
+                } else {
+                    // 如果没有选定月份，则返回当前月份的最大日期
+                    let today = new Date();
+                    let nextMonth = new Date(today.getFullYear(), today.getMonth() + 1, 1);
+                    let lastDay = new Date(nextMonth - 1);
+                    return lastDay.toISOString().slice(0, 10);
+                }
+            }
+        },
+    };
+</script>
+<style lang="scss" scoped>
+
+    /* 服务订单内容*/
+    .service-order-tab-bar{
+        background: #fff;
+        display: flex;
+        justify-content: space-around;
+        height: 50px;
+        background-color: #f5f5f5;
+        .service-order-tab-item{
+            flex: 1;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 16px;
+            color: #333;
+            line-height: 26px;
+        }
+        .service-order-tab-item.active {
+            color: #ff0000;
+        }
+
+        .underline {
+            border-bottom: 2px solid #ff0000;
+        }
+    }
+
+    .h-search{
+        font-size: 14px;
+        display: flex;
+        padding-left: 12px;
+        padding-top: 12px;
+        padding-right: 12px;
+        .h-time{
+            width: 30%;
+            display: flex;
+            color: #333333;
+            .time{
+                padding-right: 2px;
+            }
+        }
+        .h-name{
+            width: 70%;
+            text-align: right;
+            display: flex;
+            justify-content: flex-end;
+            color: #999999;
+            .name{
+                padding-right: 6px;
+            }
+        }
+    }
+
+    .service-order{
+        background: #fff;
+        margin-top: 12px;
+        padding-top: 12px;
+    }
+
+    /* 门店列表 */
+    .store-wrap{
+        border-radius: 2px;
+        .row-list{
+            padding-bottom: 12px;
+            padding-left: 12px;
+            padding-right: 12px;
+            .store-content{
+                display: flex;
+                padding-bottom: 12px;
+                font-size: 14px;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
+                .store-img{
+                    width: 60px;
+                    .title-name{
+                        width: 42px;
+                        height: 42px;
+                        color: #fff;
+                        border-radius: 25px;
+                        display: flex;
+                        justify-content: center;
+                        align-items: center;
+                    }
+                    .orange{
+                        background: #93D21A;
+                    }
+                    .skyblue{
+                        background: #ED569F;
+                    }
+                    .pink{
+                        background: #FFAF36;
+                    }
+                }
+                .content{
+                    width: 100%;
+                    padding-left: 8px;
+                    padding-top: 2px;
+                    .title-price{
+                        display: flex;
+                        .title{
+                            width: 60%;
+                            font-family: "黑体", sans-serif;
+                        }
+                        .price{
+                            text-align: right;
+                            width: 40%;
+                            color: #333333;
+                            font-weight: 600;
+                        }
+                    }
+
+                    .desc{
+                        display: flex;
+                        font-size: 12px;
+                        .time{
+                            color: #999999;
+                            width: 60%;
+                        }
+                        .balance{
+                            text-align: right;
+                            width: 40%;
+                            color: #999999;
+                        }
+                    }
+
+                }
+
+            }
+
+        }
+
+    }
+
+    /* 产品订单 */
+    .product-order{
+        margin-top: 12px;
+    }
+
+    /* 底部 */
+    .footer{
+        margin-top: 30px;
+        height: 120px;
+        font-size: 12px;
+        text-align: center;
+        color: #666;
+    }
+
+</style>

pages.json

@@ -133,6 +133,13 @@
 		{
 			"root": "myPages",
 			"pages": [
+				{
+					"path": "transactionRecord/index",
+					"style": {
+						"navigationBarTitleText": "交易记录",
+						"enablePullDownRefresh": false
+					}
+				},
 				{
 					"path": "recharge/index",
 					"style": {
@@ -193,4 +200,4 @@
 		"titleNView": false
 	},
 	"uniIdRouter": {}
-}
+}

pages/index/index.vue

@@ -317,20 +317,14 @@
 			},
 			// 去我的优惠劵页面
 			gotoCoupon(){
-				uni.$u.route({
-					url: '/pages/coupon/coupon',
-					params: {
-						name: 'lisa'
-					}
+				uni.navigateTo({
+					url: '/myPages/coupon/index?name=lisa',
 				})
 			},
 			// 储值服务
 			gotoRechargeService(){
-				uni.$u.route({
-					url: '/pages/transaction/recharge-service',
-					params: {
-						name: 'lisa'
-					}
+				uni.navigateTo({
+					url: '/myPages/recharge/index?name=lisa',
 				})
 			},
 			// 获取banner图片
@@ -441,24 +435,7 @@
 				})
 
 			},
-			// 储值服务
-			gotoRechargeService(){
-				uni.$u.route({
-					url: '/pages/transaction/recharge-service',
-					params: {
-						name: 'lisa'
-					}
-				})
-			},
-			// 去优惠劵页面
-			gotoCoupon(){
-				uni.$u.route({
-					url: '/pages/coupon/coupon',
-					params: {
-						name: 'lisa'
-					}
-				})
-			},
+
 			// 去订单页面
 			gotoOrder(){
 				uni.$u.route({
@@ -508,8 +485,10 @@
 	/* 头部内容 */
 	.head-wrap{
 		height: 1080px;
+		background: #FFE05C;
 		.content-info{
 			position: relative;
+
 			.h-bg{
 				height: 340px;
 			}