fix: 3.3优化

components/index/common.js

@@ -8,8 +8,8 @@ const vm = new Vue();
 // Vue.prototype.$httpsUrl = 'http://slbfgctest.yaoyuankj.top/'; //测试域名
 // Vue.prototype.$httpsUrl = 'http://financeapi.test.all.yaoyuankj.top/'; //测试域名
 // Vue.prototype.$httpsUrl = 'https://api.cause.yaoyuankj.top/'; //正式域名
-Vue.prototype.$httpsUrl = 'https://api.s.yxwyxw.com/'; //正式域名
-// Vue.prototype.$httpsUrl = 'http://192.168.101.210:8051/'; //测试域名
+// Vue.prototype.$httpsUrl = 'https://api.s.yxwyxw.com/'; //正式域名
+Vue.prototype.$httpsUrl = 'http://192.168.101.199:8051/'; //测试域名
 // Vue.prototype.$httpsUrl = 'http://financeserver.test.all.yaoyuankj.top/'; //测试域名
 // Vue.prototype.$httpSign = 'a7c5314d2730a1fe8d9fc7e13c0cd2d3'; //签名
 Vue.prototype.$httpSign = '9f1449b01ce52c894c03963b2bb7bcff' //签名

pages.json

@@ -94,7 +94,21 @@
 				"path" : "user/myPoints",
 				"style" : 
 				{
-					"navigationBarTitleText" : "我的收益"
+					"navigationBarTitleText" : "我的消费券"
+				}
+			},
+			{
+				"path" : "user/myConsumption",
+				"style" : 
+				{
+					"navigationBarTitleText" : "消费记录"
+				}
+			},
+			{
+				"path" : "user/myCharge",
+				"style" : 
+				{
+					"navigationBarTitleText" : "充电记录"
 				}
 			},
 			{

pages/user/index.vue

@@ -19,7 +19,8 @@
 						<image class="icon" src="@/static/user/icon-income.png" mode=""></image>
 						<view class="fs-16 fw-b">账户中心</view>
 					</view>
-					<view class="fs-19 fw-b mr-15">{{userInfo.agileAmount ? userInfo.agileAmount.toFixed(2) : '0.00'}}</view>
+					<view class="fs-19 fw-b mr-15">{{userInfo.agileAmount ? userInfo.agileAmount.toFixed(2) : '0.00'}}
+					</view>
 				</view>
 				<view class="fr-ac-jsb function" v-for="(item,index) in list" :key='index' @click="toPath(item.url)">
 					<view class="fr-ac ml-15">
@@ -46,44 +47,27 @@
 		data() {
 			return {
 				list: [{
-					title: '我的充值',
-					icon: 'icon-recharge.png',
-					url: '/pagesA/recharge/myRecharge',
-					content: '充值清单与管理',
-					id: 1
-				},{
-					title: '我的收益',
-					icon: 'icon-points.png',
-					url: '/pagesA/user/myPoints',
-					content: '每天收入累计',
-					id: 2
-				},{
-					title: '我要提现',
-					icon: 'icon-withdrawal.png',
-					url: '/pagesA/withdrawal/myWithdrawal',
-					content: '提现信息管理',
-					id: 4
-				},{
-					title: '我要转账',
-					icon: 'icon-transfer.png',
-					url: '/pagesA/transferAccounts/transferAccounts',
-					content: '',
-					id: 5
-				},
-				// {
-				// 	title: '我的消费',
-				// 	icon: 'icon-consumption.png',
-				// 	url: '/pagesA/recharge/myRecharge',
-				// 	content: '',
-				// 	id: 6
-				// },
-				{
-					title: '账号设置',
-					icon: 'icon-setting.png',
-					url: '/pagesA/setting/index',
-					content: '',
-					id: 7
-				},],
+						title: '充电记录',
+						icon: 'icon-charge.png',
+						url: '/pagesA/user/myCharge',
+						content: '充电记录查询',
+						id: 6
+					},
+					{
+						title: '消费记录',
+						icon: 'icon-consumption.png',
+						url: '/pagesA/user/myConsumption',
+						content: '消费记录查询',
+						id: 7
+					},
+					{
+						title: '账号设置',
+						icon: 'icon-setting.png',
+						url: '/pagesA/setting/index',
+						content: '',
+						id: 8
+					},
+				],
 				userInfo: {}
 			}
 		},
@@ -103,24 +87,24 @@
 			},
 			init() {
 				const tokenData = uni.getStorageSync('tokenData');
-				if(tokenData && tokenData.token) {
+				if (tokenData && tokenData.token) {
 					this.$Request.post('server_api/account_info/account_info', {
-						
+
 					}).then((res) => {
 						this.userInfo = res.data;
 						let resultIndex = this.list.findIndex(item => item.id === 3)
-						if(this.userInfo.proxyId && resultIndex === -1) {
-							this.list.splice(2, 0 , {
+						if (this.userInfo.proxyId && resultIndex === -1) {
+							this.list.unshift({
 								title: '我的代理',
 								icon: 'icon-agent.png',
 								url: '/pagesA/user/myTeam',
 								content: '代理信息管理',
 								id: 3
-							}) 
+							})
 						}
 					});
 					return
-				}else{
+				} else {
 					this.skipUrl('/pages/login/index');
 				}
 			},
@@ -139,20 +123,20 @@
 		padding-top: 200rpx;
 		padding-bottom: 50rpx;
 		position: relative;
-			
+
 		.avatar-box {
 			width: 120rpx;
 			height: 120rpx;
 			border-radius: 50%;
 			margin: 0 30rpx 0 40rpx;
 			position: relative;
-			
+
 			.avatar {
 				width: 120rpx;
 				height: 120rpx;
 				border-radius: 50%;
 			}
-			
+
 			.level {
 				width: 46rpx;
 				height: 52rpx;
@@ -161,39 +145,39 @@
 				bottom: 0;
 			}
 		}
-		
+
 		.name {
 			font-weight: bold;
 			font-size: 40rpx;
 			color: #FFFFFF;
 			margin-bottom: 15rpx;
 		}
-		
+
 		.user-id {
 			font-size: 24rpx;
 			color: #B5E2D6;
 		}
 	}
-	
+
 	.function-box {
 		width: 100%;
 		background: #F6FAFF;
 		padding-top: 44rpx;
 		margin-top: 20rpx;
-		
+
 		.function {
 			width: 694rpx;
 			height: 98rpx;
 			background: #FFFFFF;
-			box-shadow: 0rpx 10rpx 10rpx 0rpx rgba(185,187,205,0.08);
+			box-shadow: 0rpx 10rpx 10rpx 0rpx rgba(185, 187, 205, 0.08);
 			border-radius: 20rpx;
 			margin: 0 auto 18rpx;
 		}
-		
+
 		.icon {
 			width: 48rpx;
 			height: 48rpx;
 			margin-right: 16rpx;
 		}
 	}
-</style>
+</style>

pagesA/setting/resetPassword.vue

@@ -50,11 +50,13 @@ export default {
 			this.title = '支付验证'
 			this.money = options.money
 			this.bank_card_id = options.bank_card_id
+			this.init()
 		} else if(this.type == 4) {
 			this.title = '支付验证'
 			this.money = options.money
 			this.tranPhone = options.phone
 			this.desc = options.desc
+			this.init()
 		}
 	},
 	onUnload() {
@@ -63,6 +65,20 @@ export default {
 		}
 	},
 	methods: {
+		init() {
+			const tokenData = uni.getStorageSync('tokenData');
+			if (tokenData && tokenData.token) {
+				this.$Request.post('server_api/account_info/account_info', {
+		
+				}).then((res) => {
+					//手机号赋值
+					this.phone = res.data.account;
+				});
+				return
+			} else {
+				this.skipUrl('/pages/login/index');
+			}
+		},
 		// 获取验证码
 		getCode() {
 			if (!this.phone) return this.$Common.showToast('请输入手机号');

pagesA/user/myCharge.vue

@@ -0,0 +1,163 @@
+<template>
+	<view class="app-bg pb-2">
+		<navbar title="充电记录" :scrollTop="mixinScrollTop"></navbar>
+		<view class="card top-box fc-ac">
+			<view class="fs-16 fw-b mb-10">累计充电金额</view>
+			<view class="fs-24 fw-b mb-10">{{agileAmount.toFixed(2) || '0.00'}} <span class="fs-12 ml-6">元</span> </view>
+		</view>
+
+		<!-- <view class="list-box"> -->
+		<scroll-view scroll-y="true" class="fixed-rent-scroll" @scrolltolower="getMore">
+			<view class="fs-24 fw-b mb-10">我的充电记录</view>
+			<None v-if="list.length == 0" text="暂无数据"></None>
+			<view v-else>
+				<view class="item-box" v-for="(item,index) in list" :key="index">
+					<view class="fr-ac-jsb mb-8">
+						<view class="fr-ac">
+							<view class="green-label"></view>
+							<view class="fs-16 fw-b mr-6">充电</view>
+						</view>
+						<view class="fs-16">-36.64</view>
+					</view>
+					<view class="fr-ac-jsb">
+						<view class="fs-12" style="color: #CCCCCC;">{{item.createTime}}</view>
+					</view>
+					<view v-if="item.reason" class="fs-12 mt-8" style="color: #999999;">备注：{{item.reason}}</view>
+				</view>
+			</view>
+			<view class="lower" v-if="nomore && list.length>0">到底了</view>
+		</scroll-view>
+		<!-- </view> -->
+	</view>
+</template>
+
+<script>
+	import None from '@/components/none.vue';
+	export default {
+		components: {
+			None
+		},
+		data() {
+			return {
+				agileAmount: 0, //资金
+				list: [],
+				page: 1,
+				pageSize: 10,
+				nomore: false,
+				account: ''
+			}
+		},
+		onShow() {
+			this.init()
+		},
+		methods: {
+			init() {
+				const tokenData = uni.getStorageSync('tokenData');
+				if (tokenData && tokenData.token) {
+					this.$Request.post('server_api/account_info/account_info', {
+
+					}).then((res) => {
+						this.account = res.data.account;
+						// this.agileAmount = res.data.agileAmount
+						this.getList()
+					});
+					return
+				} else {
+					this.skipUrl('/pages/login/index');
+				}
+			},
+			//获取列表
+			getList() {
+				// this.$Request.post('server_api/recharge_withdrawal/recharge_list', {
+				// 	account: this.account,
+				// 	financeType: 1,
+				// 	page: this.page,
+				// 	pageSize: this.pageSize
+				// }).then((res) => {
+				// 	if (res.success) {
+				// 		if (this.page == 1) {
+				// 			this.list = res.data;
+				// 		} else {
+				// 			this.list = this.list.concat(res.data);
+				// 		}
+				// 	}
+				// });
+			},
+			getMore() {
+				if (this.list.length % this.pageSize != 0) return this.nomore = true;
+				this.nomore = false;
+				this.page += 1;
+				this.getList();
+			},
+			toRecharge() {
+				uni.navigateTo({
+					url: '/pagesA/recharge/recharge'
+				})
+			},
+			toThirdRecharge() {
+				uni.navigateTo({
+					url: '/pagesA/recharge/thirdPartyRecharge'
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.top-box {
+		margin: 35rpx auto 24rpx;
+		padding: 50rpx 0 38rpx;
+
+		.recharge-btn {
+			width: 280rpx;
+			height: 78rpx;
+			line-height: 78rpx;
+			text-align: center;
+			background: #4B6C9D;
+			border-radius: 39rpx;
+			font-weight: bold;
+			font-size: 32rpx;
+			color: #EEEEEE;
+			margin-right: 22rpx;
+		}
+
+		.pay-btn {
+			width: 320rpx;
+			height: 78rpx;
+			line-height: 78rpx;
+			text-align: center;
+			background: #EDEEF4;
+			border-radius: 39rpx;
+			font-weight: bold;
+			font-size: 32rpx;
+			color: #3F2727;
+		}
+	}
+
+	.fixed-rent-scroll {
+		height: calc(100vh - 157px - 59rpx - 60rpx);
+		width: 694rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 10rpx 10rpx 0rpx rgba(185, 187, 205, 0.08);
+		border-radius: 20rpx;
+		padding: 20rpx 30rpx 10rpx;
+		margin: 0 auto 30rpx;
+		box-sizing: border-box;
+	}
+
+	.item-box {
+		padding: 43rpx 0 45rpx;
+		border-bottom: 1rpx solid #EEEEEE;
+	}
+
+	.item-box:last-child {
+		border-bottom: none;
+	}
+
+	.green-label {
+		width: 9rpx;
+		height: 22rpx;
+		background: #4CB986;
+		margin-right: 25rpx;
+	}
+</style>

pagesA/user/myConsumption.vue

@@ -0,0 +1,163 @@
+<template>
+	<view class="app-bg pb-2">
+		<navbar title="消费记录" :scrollTop="mixinScrollTop"></navbar>
+		<view class="card top-box fc-ac">
+			<view class="fs-16 fw-b mb-10">累计消费金额</view>
+			<view class="fs-24 fw-b mb-10">{{agileAmount.toFixed(2) || '0.00'}} <span class="fs-12 ml-6">元</span> </view>
+		</view>
+
+		<!-- <view class="list-box"> -->
+		<scroll-view scroll-y="true" class="fixed-rent-scroll" @scrolltolower="getMore">
+			<view class="fs-24 fw-b mb-10">我的消费记录</view>
+			<None v-if="list.length == 0" text="暂无数据"></None>
+			<view v-else>
+				<view class="item-box" v-for="(item,index) in list" :key="index">
+					<view class="fr-ac-jsb mb-8">
+						<view class="fr-ac">
+							<view class="green-label"></view>
+							<view class="fs-16 fw-b mr-6">共享茶室消费</view>
+						</view>
+						<view class="fs-16">-36.64</view>
+					</view>
+					<view class="fr-ac-jsb">
+						<view class="fs-12" style="color: #CCCCCC;">{{item.createTime}}</view>
+					</view>
+					<view v-if="item.reason" class="fs-12 mt-8" style="color: #999999;">备注：{{item.reason}}</view>
+				</view>
+			</view>
+			<view class="lower" v-if="nomore && list.length>0">到底了</view>
+		</scroll-view>
+		<!-- </view> -->
+	</view>
+</template>
+
+<script>
+	import None from '@/components/none.vue';
+	export default {
+		components: {
+			None
+		},
+		data() {
+			return {
+				agileAmount: 0, //资金
+				list: [],
+				page: 1,
+				pageSize: 10,
+				nomore: false,
+				account: ''
+			}
+		},
+		onShow() {
+			this.init()
+		},
+		methods: {
+			init() {
+				const tokenData = uni.getStorageSync('tokenData');
+				if (tokenData && tokenData.token) {
+					this.$Request.post('server_api/account_info/account_info', {
+
+					}).then((res) => {
+						this.account = res.data.account;
+						// this.agileAmount = res.data.agileAmount
+						this.getList()
+					});
+					return
+				} else {
+					this.skipUrl('/pages/login/index');
+				}
+			},
+			//获取列表
+			getList() {
+				// this.$Request.post('server_api/recharge_withdrawal/recharge_list', {
+				// 	account: this.account,
+				// 	financeType: 1,
+				// 	page: this.page,
+				// 	pageSize: this.pageSize
+				// }).then((res) => {
+				// 	if (res.success) {
+				// 		if (this.page == 1) {
+				// 			this.list = res.data;
+				// 		} else {
+				// 			this.list = this.list.concat(res.data);
+				// 		}
+				// 	}
+				// });
+			},
+			getMore() {
+				if (this.list.length % this.pageSize != 0) return this.nomore = true;
+				this.nomore = false;
+				this.page += 1;
+				this.getList();
+			},
+			toRecharge() {
+				uni.navigateTo({
+					url: '/pagesA/recharge/recharge'
+				})
+			},
+			toThirdRecharge() {
+				uni.navigateTo({
+					url: '/pagesA/recharge/thirdPartyRecharge'
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.top-box {
+		margin: 35rpx auto 24rpx;
+		padding: 50rpx 0 38rpx;
+
+		.recharge-btn {
+			width: 280rpx;
+			height: 78rpx;
+			line-height: 78rpx;
+			text-align: center;
+			background: #4B6C9D;
+			border-radius: 39rpx;
+			font-weight: bold;
+			font-size: 32rpx;
+			color: #EEEEEE;
+			margin-right: 22rpx;
+		}
+
+		.pay-btn {
+			width: 320rpx;
+			height: 78rpx;
+			line-height: 78rpx;
+			text-align: center;
+			background: #EDEEF4;
+			border-radius: 39rpx;
+			font-weight: bold;
+			font-size: 32rpx;
+			color: #3F2727;
+		}
+	}
+
+	.fixed-rent-scroll {
+		height: calc(100vh - 157px - 59rpx - 60rpx);
+		width: 694rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 10rpx 10rpx 0rpx rgba(185, 187, 205, 0.08);
+		border-radius: 20rpx;
+		padding: 20rpx 30rpx 10rpx;
+		margin: 0 auto 30rpx;
+		box-sizing: border-box;
+	}
+
+	.item-box {
+		padding: 43rpx 0 45rpx;
+		border-bottom: 1rpx solid #EEEEEE;
+	}
+
+	.item-box:last-child {
+		border-bottom: none;
+	}
+
+	.green-label {
+		width: 9rpx;
+		height: 22rpx;
+		background: #4CB986;
+		margin-right: 25rpx;
+	}
+</style>

pagesA/user/myIncome.vue

@@ -10,13 +10,16 @@
 						<!-- <image src="@/static/user/level.png" class="level" mode=""></image> -->
 					</view>
 					<view class="">
-						<view class="fs-16 mb-4 fw-b" style="color: #FFF">{{userInfo.realName || userInfo.accountDesensitization}}</view>
+						<view class="fs-16 mb-4 fw-b" style="color: #FFF">
+							{{userInfo.realName || userInfo.accountDesensitization}}
+						</view>
 						<view class="fs-12" style="color: #7D7777;">邀请码 {{userInfo.promotionCode}}</view>
 					</view>
 				</view>
 				<image src="@/static/user/code.png" @click="showPopup" class="code" mode=""></image>
 			</view>
-			<view class="money">{{userInfo.agileAmount ? userInfo.agileAmount.toFixed(2) : '0.00'}}<span class="fs-12 ml-4">元</span> </view>
+			<view class="money">{{userInfo.agileAmount ? userInfo.agileAmount.toFixed(2) : '0.00'}}<span
+					class="fs-12 ml-4">元</span> </view>
 			<view class="cumulative-gain">不可用金: {{userInfo.agileFrozenAmount || 0}} 元</view>
 			<!-- <view class="horizontal-line1"></view>
 			<view class="horizontal-line2"></view>
@@ -31,66 +34,17 @@
 				</view>  
 			</view> -->
 		</view>
-		
-		<!-- 查询 -->
-		<!-- <view class="fc top-box">
-			<view class="fr-ac" style="height: 108rpx;border-bottom: 1rpx solid #f3f3f3;">
-				<view class="fs-16 fw-b ml-20" style="width: 465rpx;">查询记录</view>
-				<view class="fr-ac-jc condition">
-					<view class="mr-5 fs-14" style="color: #35A3C8;">按日期查询</view>
-					<u-icon class="mt-4" name="arrow-down" color="#CCCCCC" size="14"></u-icon>
+		<view class="function-box">
+			<view class="fr-ac-jsb function" v-for="(item,index) in list" :key='index' @click="toPath(item.url)">
+				<view class="fr-ac ml-15">
+					<image class="icon" :src="require('@/static/user/' + item.icon)" mode=""></image>
+					<view class="fs-16 fw-b">{{item.title}}</view>
+					<view class="fs-12 ml-8" style="color: #CBD8E9;">{{item.content}}</view>
 				</view>
+				<u-icon class="mr-15" name="arrow-right" color="#efefef" size="18"></u-icon>
 			</view>
-			<view class="fr-ac" style="height: 118rpx;">
-				<u-icon class="ml-18 mr-2" name="calendar" color="#CCCCCC" size="22"></u-icon>
-				<view class="date">请选择开始日期</view>
-				<view class="horizontal-line mr-24"></view>
-				<view class="date">请选择结束日期</view>
-			</view>
-		</view> -->
-		<!-- 当日收益 -->
-		<!-- <view class="profit-preview" v-for="(item,index) in 10" :key="index">
-			<view class="fr-ac-jsb" style="padding: 40rpx 0;">
-				<view class="fs-16 fw-b ml-20">当日收益<span class="ml-8" style="color: #FF6600;">+386.85</span> </view>
-				<view class="fs-12 mr-20 fr-ac" style="color: #999999;">
-					2024.02.06 星期三
-					<u-icon class="mt-2 ml-4" name="arrow-down" color="#CCCCCC" size="10"></u-icon>
-				</view>
-			</view>
-			<view class="profit-detail fr-ac-jsb" v-show="true">
-				<view class="fc">
-					<view class="fs-16 fw-b">56.08<span class="fs-12">元</span></view>
-					<view class="fr-ac mt-6">
-						<view class="mr-2" style="color: #999999;">消费提成</view>
-						<u-icon class="mt-2" name="arrow-right" color="#505050" size="12"></u-icon>
-					</view>
-				</view>
-				<view class="fc">
-					<view class="fs-16 fw-b">56.08<span class="fs-12">元</span></view>
-					<view class="fr-ac mt-6">
-						<view class="mr-2" style="color: #999999;">代理收益</view>
-						<u-icon class="mt-2" name="arrow-right" color="#505050" size="12"></u-icon>
-					</view>
-				</view>
-				<view class="fc">
-					<view class="fs-16 fw-b">56.08<span class="fs-12">元</span></view>
-					<view class="fr-ac mt-6">
-						<view class="mr-2" style="color: #999999;">感恩奖</view>
-						<u-icon class="mt-2" name="arrow-right" color="#505050" size="12"></u-icon>
-					</view>
-				</view>
-			</view>
-		</view> -->
-		<!-- <view class="fr-ac-jsb day-income">
-			<view class="fr-ac fs-16 fw-b">
-				<view class="mr-10">当日收益</view>
-				<view style="color: #FF6600;">+286.85</view>
-			</view>
-			<view class="fr-ac">
-				<view class="fs-12" style="color: #999999;">2024.02.05 星期二</view>
-				<u-icon class="mt-2 ml-4" name="arrow-down" color="#CCCCCC" size="10"></u-icon>
-			</view>
-		</view> -->
+		</view>
+
 		<u-popup :show="isShowPopup" mode="center" @close="closePopup" bgColor="transparent">
 			<view class="popup-box">
 				<image class="close-icon" src="/static/user/close-icon.png" @click="closePopup" mode=""></image>
@@ -111,7 +65,32 @@
 			return {
 				isShowPopup: false,
 				userInfo: {},
-				codeUrl: ''
+				codeUrl: '',
+				list: [{
+					title: '我的充值',
+					icon: 'icon-recharge.png',
+					url: '/pagesA/recharge/myRecharge',
+					content: '充值清单与管理',
+					id: 1
+				}, {
+					title: '我的消费券',
+					icon: 'icon-points.png',
+					url: '/pagesA/user/myPoints',
+					content: '每天收入累计',
+					id: 2
+				}, {
+					title: '我要提现',
+					icon: 'icon-withdrawal.png',
+					url: '/pagesA/withdrawal/myWithdrawal',
+					content: '提现信息管理',
+					id: 4
+				}, {
+					title: '我要转账',
+					icon: 'icon-transfer.png',
+					url: '/pagesA/transferAccounts/transferAccounts',
+					content: '',
+					id: 5
+				}, ],
 			}
 		},
 		onLoad() {
@@ -127,7 +106,7 @@
 				const tokenData = uni.getStorageSync('tokenData');
 				if (tokenData && tokenData.token) {
 					this.$Request.post('server_api/account_info/account_info', {
-			
+
 					}).then((res) => {
 						this.userInfo = res.data;
 						// #ifndef MP-WEIXIN
@@ -156,7 +135,7 @@
 			getMpCode() {
 				const accountInfo = uni.getAccountInfoSync();
 				const miniProgramVersion = accountInfo.miniProgram.version;
-				console.log(miniProgramVersion,"miniProgramVersion");
+				console.log(miniProgramVersion, "miniProgramVersion");
 				this.$Request.post('server_api/account_share/get_qr_code', {
 					scene: this.userInfo.promotionCode,
 					page: "pages/login/index",
@@ -171,7 +150,12 @@
 			},
 			closePopup() {
 				this.isShowPopup = false
-			}
+			},
+			toPath(url) {
+				uni.navigateTo({
+					url
+				})
+			},
 		}
 	}
 </script>
@@ -181,25 +165,25 @@
 		width: 692rpx;
 		height: 308rpx;
 		background: linear-gradient(135deg, #1E1E1E, #373737, #1E1E1E);
-		box-shadow: 0rpx 10rpx 10rpx 0rpx rgba(21,21,23,0.2);
+		box-shadow: 0rpx 10rpx 10rpx 0rpx rgba(21, 21, 23, 0.2);
 		border-radius: 20rpx;
 		border: 1px solid;
 		margin: 35rpx auto 47rpx;
 		// border-image: linear-gradient(-61deg, #C8CC60, #CECA5D) 10 10;
 	}
-	
+
 	.avatar-box {
 		width: 76rpx;
 		height: 76rpx;
 		border-radius: 50%;
 		position: relative;
-		
+
 		.avatar {
 			width: 76rpx;
 			height: 76rpx;
 			border-radius: 50%;
 		}
-		
+
 		.level {
 			width: 29rpx;
 			height: 33rpx;
@@ -208,19 +192,19 @@
 			bottom: 0;
 		}
 	}
-	
+
 	.code {
 		width: 40rpx;
 		height: 40rpx;
 	}
-	
+
 	.money {
 		font-weight: bold;
 		font-size: 38rpx;
 		color: #FFFFBD;
 		margin: 50rpx 0 15rpx 46rpx;
 	}
-	
+
 	.cumulative-gain {
 		font-size: 24rpx;
 		color: #62583C;
@@ -229,34 +213,34 @@
 		-webkit-text-fill-color: transparent;
 		margin-left: 46rpx;
 	}
-	
+
 	.top-box {
 		background: #FFFFFF;
 		border-radius: 20rpx;
 		width: 694rpx;
 		margin: 36rpx auto 30rpx;
-		
+
 		.condition {
 			width: 229rpx;
 			height: 108rpx;
 			background: #F4F4F4;
 			border-radius: 0rpx 20rpx 0rpx 0rpx;
 		}
-		
+
 		.date {
 			width: 240rpx;
 			font-weight: 500;
 			font-size: 28rpx;
 			color: #CCCCCC;
 		}
-		
+
 		.horizontal-line {
 			width: 81rpx;
 			height: 2rpx;
 			background: #EEEEEE;
 		}
 	}
-	
+
 	// .horizontal-line1 {
 	// 	width: 588rpx;
 	// 	height: 1rpx;
@@ -270,44 +254,34 @@
 	// 	background: #000000;
 	// 	margin: 0 auto 36rpx;
 	// }
-	
-	.profit-preview {
-		width: 694rpx;
-		background: #FFFFFF;
-		box-shadow: 0rpx 10rpx 10rpx 0rpx rgba(185,187,205,0.08);
-		border-radius: 20rpx;
-		margin: 0 auto 20rpx;
-		background-image: url('/static/public/green-bg.png');
-		background-size: contain;
-		background-repeat: no-repeat;
-		
-		.green-box {
+
+	.function-box {
+		width: 100%;
+		background: #F6FAFF;
+		padding-top: 44rpx;
+		margin-top: 20rpx;
+
+		.function {
 			width: 694rpx;
-			height: 8rpx;
-			background: #A2D2C0;
-			border-radius: 6rpx 6rpx 0rpx 0rpx;
+			height: 98rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 10rpx 10rpx 0rpx rgba(185, 187, 205, 0.08);
+			border-radius: 20rpx;
+			margin: 0 auto 18rpx;
 		}
-		
-		.profit-detail {
-			flex-wrap: wrap;
-			padding: 30rpx 60rpx 47rpx;
+
+		.icon {
+			width: 48rpx;
+			height: 48rpx;
+			margin-right: 16rpx;
 		}
 	}
-	
-	.day-income {
-		width: 694rpx;
-		padding: 42rpx;
-		background-color: #FFFFFF;
-		box-shadow: 0rpx 10rpx 10rpx 0rpx rgba(185,187,205,0.08);
-		border-radius: 20rpx;
-		margin: 0 auto 20rpx;
-	}
-	
+
 	.popup-box {
 		width: 687rpx;
 		height: 930rpx;
 		position: relative;
-		
+
 		.close-icon {
 			position: absolute;
 			right: 30rpx;
@@ -316,24 +290,24 @@
 			height: 62rpx;
 			z-index: 9;
 		}
-		
+
 		.envelope-bg {
 			width: 687rpx;
 			height: 930rpx;
 		}
-		
+
 		.content-box {
 			position: absolute;
 			top: 516rpx;
 			left: 50%;
 			transform: translateX(-50%);
 			color: #FFF;
-			margin-left:10rpx;
-			
+			margin-left: 10rpx;
+
 			.code-img {
 				width: 170rpx;
 				height: 170rpx;
 			}
 		}
 	}
-</style>
+</style>

pagesA/user/myPoints.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="app-bg">
-		<navbar title="我的收益" :scrollTop="mixinScrollTop"></navbar>
+		<navbar title="我的消费券" :scrollTop="mixinScrollTop"></navbar>
 		<view class="fc top-box">
 			<view class="fr-ac" style="height: 108rpx;">
 				<view class="fs-16 fw-b ml-20" style="width: 465rpx;">查询记录</view>
@@ -29,21 +29,21 @@
 				<view class="fc-ac">
 					<view class="fs-18 fw-b">{{item.agileInterestDay || 0}}<span class="fs-12 ml-2">元</span></view>
 					<view class="fr-ac mt-6">
-						<view class="fs-14" style="color: #999999;">抵用券收益</view>
+						<view class="fs-14" style="color: #999999;">消费券1</view>
 						<!-- <u-icon class="mt-2 ml-2" name="arrow-right" color="#505050" size="12"></u-icon> -->
 					</view>
 				</view>
 				<view class="fc-ac">
 					<view class="fs-18 fw-b">{{item.proxyRebateDay || 0}}<span class="fs-12 ml-2">元</span></view>
 					<view class="fr-ac mt-6">
-						<view class="fs-14" style="color: #999999;">服务收益</view>
+						<view class="fs-14" style="color: #999999;">消费券2</view>
 						<!-- <u-icon class="mt-2 ml-2" name="arrow-right" color="#505050" size="12"></u-icon> -->
 					</view>
 				</view>
 				<view class="fc-ac">
 					<view class="fs-18 fw-b">{{item.proxyGratitudeDay || 0}}<span class="fs-12 ml-2">元</span></view>
 					<view class="fr-ac mt-6">
-						<view class="fs-14" style="color: #999999;">市场经费</view>
+						<view class="fs-14" style="color: #999999;">消费券3</view>
 						<!-- <u-icon class="mt-2 ml-2" name="arrow-right" color="#505050" size="12"></u-icon> -->
 					</view>
 				</view>