1

pages.json

@@ -299,6 +299,15 @@
 				}
 			}
 		},
+		{
+			"path": "pages/user/jinquan",
+			"style": {
+				"navigationBarTitleText": "我的金券",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
 		{
 			"path": "pages/user/JDcool",
 			"style": {

pages/user/jinquan.vue

@@ -0,0 +1,331 @@
+<template>
+	<view class="content">
+		<view class="content-money">
+			<view class="money-box">
+				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/img/fanhui.png" mode=""></image></view>
+				<view class="header">我的金券</view>
+				<image class="money_bg" src="../../static/img/anchor10.png"></image>
+				<view class="money">{{ userInfo.integral | getMoneyStyle }}</view>
+			</view>
+
+		</view>
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+		<swiper :current="tabCurrentIndex" :style="{ height: maxheight }" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+					<!-- 订单列表 -->
+					<template v-for="(ls, index) in tabItem.orderList">
+						<view v-for="(item, i) in ls.list" class="order-item flex">
+							<view class="title-box">
+								<view class="title">
+									<text>{{ item.title }}</text>
+								</view>
+
+								<view class="time">
+									<text>{{ item.add_time }}</text>
+								</view>
+							</view>
+							<view class="money">
+								<text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
+							</view>
+						</view>
+					</template>
+					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+import { spreadCommission, userBalance } from '@/api/wallet.js';
+import { mapState, mapMutations } from 'vuex';
+import { getMoneyStyle } from '@/utils/rocessor.js';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+export default {
+	filters: {
+		getMoneyStyle
+	},
+	components: {
+		empty,
+		uniLoadMore
+	},
+	onReady(res) {
+		// 初始化获取页面宽度
+		var _this = this;
+		uni.getSystemInfo({
+			success: resu => {
+				const query = uni.createSelectorQuery();
+				query.select('.swiper-box').boundingClientRect();
+				query.exec(function(res) {
+					_this.maxheight = resu.windowHeight - res[0].top + 'px';
+					console.log('打印页面的剩余高度', _this.height);
+				});
+			},
+			fail: res => {}
+		});
+	},
+	data() {
+		return {
+			// 头部图高度
+			maxheight: '',
+			tabCurrentIndex: 0,
+			navList: [
+				{
+					state: 0,
+					text: '收入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 1,
+					text: '支出',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				}
+			],
+			money: ''
+		};
+	},
+	onLoad(options) {
+		this.loadData();
+	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	methods: {
+		//获取收入支出信息
+		async loadData(source) {
+			//这里是将订单挂载到tab列表下
+			let index = this.tabCurrentIndex;
+			let navItem = this.navList[index];
+			let state = navItem.state + 3;
+			if (source === 'tabChange' && navItem.loaded === true) {
+				//tab切换只有第一次需要加载数据
+				return;
+			}
+			if (navItem.loadingType === 'noMore') {
+				//防止重复加载
+				return;
+			}
+			// 修改当前对象状态为加载中
+			navItem.loadingType = 'loading';
+			spreadCommission(
+				{
+					page: navItem.page,
+					limit: navItem.limit
+				},
+				state
+			)
+				.then(({ data }) => {
+					navItem.orderList = navItem.orderList.concat(data);
+					navItem.page++;
+					if (navItem.limit == data.length) {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
+						navItem.loadingType = 'more';
+						return;
+					} else {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
+						navItem.loadingType = 'noMore';
+					}
+					uni.hideLoading();
+					this.$set(navItem, 'loaded', true);
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
+
+		//swiper 切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('tabChange');
+		},
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+		},
+		// 点击返回 我的页面
+		toBack() {
+			uni.switchTab({
+				url: '/pages/user/user'
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #ffffff;
+	height: 100%;
+}
+.content-money {
+	padding-bottom: 30rpx;
+	background: $page-color-base;
+	// border: 2px solid #ffffff;
+	// padding-top: var(--status-bar-height);
+	.moneyTx {
+		position: absolute;
+		top: 120rpx;
+		right: 0rpx;
+		// width: 150rpx;
+		padding: 10rpx 10rpx;
+		border: 2px solid #ffffff;
+		border-top-left-radius: 15rpx;
+		border-bottom-left-radius: 15rpx;
+		line-height: 1;
+		font-size: $font-base;
+		background: #ffffff;
+	}
+	.buttom-box {
+		background-color: #ffffff;
+		text-align: center;
+		margin: 0 30rpx;
+		padding: 20rpx 0;
+		border-radius: $border-radius-sm;
+		margin-top: -60rpx;
+		.buttom {
+			font-size: $font-lg;
+			flex-grow: 1;
+		}
+		.interval {
+			width: 2px;
+			height: 60rpx;
+			background-color: #eeeeee;
+		}
+		.icon {
+			height: 36rpx;
+			width: 36rpx;
+			margin: 0 auto;
+			.icon-img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+}
+.money-box {
+	color: #ffffff;
+	text-align: center;
+	position: relative;
+	background-color: pink;
+	.header {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 80rpx;
+		font-size: 32rpx;
+		font-weight: 700;
+		z-index: 99;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.goback-box {
+		position: absolute;
+		left: 18rpx;
+		top: 0;
+		height: 80rpx;
+		display: flex;
+		align-items: center;
+	}
+	.goback {
+		z-index: 100;
+		width: 34rpx;
+		height: 34rpx;
+	}
+	.money_bg {
+		width: 100%;
+		height: 400rpx;
+		display: block;
+	}
+	.text {
+		padding-top: 80rpx;
+		font-size: $font-lg;
+	}
+	.money {
+		position: absolute;
+		top: 0;
+		width: 100%;
+		padding-top: 186rpx;
+		font-size: 72rpx;
+		font-weight: bold;
+	}
+}
+
+.navbar {
+	display: flex;
+	height: 40px;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: #999999;
+		position: relative;
+		&.current {
+			color: #000000;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid #FF4C4C;
+			}
+		}
+	}
+}
+// 列表
+
+.swiper-box {
+	padding-top: 10rpx;
+	.order-item {
+		padding: 20rpx 30rpx;
+		line-height: 1.5;
+		.title-box {
+			.title {
+				font-size: $font-lg;
+				color: $font-color-base;
+			}
+			.time {
+				font-size: $font-base;
+				color: $font-color-light;
+			}
+		}
+		.money {
+			color: #ff0000;
+			font-size: $font-lg;
+		}
+	}
+}
+.list-scroll-content {
+	height: 100%;
+}
+.content {
+	height: 100%;
+	.empty-content {
+		background-color: #ffffff;
+	}
+}
+</style>

pages/user/user.vue

@@ -2,7 +2,9 @@
 	<view class="container">
 		<scroll-view class="content-box" scroll-y="true">
 			<view class="user-section">
-				<view class="bg"><image src="/static/user/bg.png" mode=""></image></view>
+				<view class="bg">
+					<image src="/static/user/bg.png" mode=""></image>
+				</view>
 				<view class="user-info-box ">
 					<view class="detail flex">
 						<view class="portrait-box" @click="navTo('/pages/set/userinfo')">
@@ -29,10 +31,12 @@
 			<view class="item-box item-box-b">
 				<view class="box-title flex borde-b">
 					<view class="title"><text>我的订单</text></view>
-					<view class="link" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover"><text class="iconfont iconenter"></text></view>
+					<view class="link" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover"><text
+							class="iconfont iconenter"></text></view>
 				</view>
 				<view class="order-section">
-					<view class="order-item" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="order-item" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover"
+						:hover-stay-time="50">
 						<view class=" icon position-relative">
 							<image class="icon-img" src="/static/user/order1.png" mode="aspectFit"></image>
 							<view class="corner" v-if="orderInfo.unpaid_count > 0">
@@ -41,7 +45,8 @@
 						</view>
 						<text>待付款</text>
 					</view>
-					<view class="order-item" @click="navTo('/pages/order/order?state=1')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="order-item" @click="navTo('/pages/order/order?state=1')" hover-class="common-hover"
+						:hover-stay-time="50">
 						<view class=" icon position-relative">
 							<image class="icon-img" src="/static/user/order2.png" mode="aspectFit"></image>
 							<view class="corner" v-if="orderInfo.unshipped_count > 0">
@@ -50,7 +55,8 @@
 						</view>
 						<text>待发货</text>
 					</view>
-					<view class="order-item" @click="navTo('/pages/order/order?state=2')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="order-item" @click="navTo('/pages/order/order?state=2')" hover-class="common-hover"
+						:hover-stay-time="50">
 						<view class="icon position-relative">
 							<image class="icon-img" src="/static/user/order3.png" mode="aspectFit"></image>
 							<view class="corner" v-if="orderInfo.received_count > 0">
@@ -59,43 +65,71 @@
 						</view>
 						<text>待收货</text>
 					</view>
-					<view class="order-item" @click="navTo('/pages/order/order?state=4')" hover-class="common-hover" :hover-stay-time="50">
-						<view class="icon position-relative"><image class="icon-img" src="/static/user/order4.png" mode="aspectFit"></image></view>
+					<view class="order-item" @click="navTo('/pages/order/order?state=4')" hover-class="common-hover"
+						:hover-stay-time="50">
+						<view class="icon position-relative">
+							<image class="icon-img" src="/static/user/order4.png" mode="aspectFit"></image>
+						</view>
 						<text>已完成</text>
 					</view>
 				</view>
 			</view>
-			<view class="vip-box" @click="navTo('/pages/category/vip')"><image src="../../static/user/open-m.png" mode=""></image></view>
+			<view class="vip-box" @click="navTo('/pages/category/vip')">
+				<image src="../../static/user/open-m.png" mode=""></image>
+			</view>
 			<view>
 				<view class="item-box item-box-a">
 					<view class="order-section">
-						<view class="order-item" @click="navTo('/pages/money/wallet')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon icon-b"><image class="icon-img" src="/static/user/yue.png" mode="aspectFit"></image></view>
+						<view class="order-item" @click="navTo('/pages/money/wallet')" hover-class="common-hover"
+							:hover-stay-time="50">
+							<view class="icon icon-b">
+								<image class="icon-img" src="/static/user/yue.png" mode="aspectFit"></image>
+							</view>
 							<view class="order-font">我的奖金</view>
 						</view>
-						<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon icon-b"><image class="icon-img" src="/static/user/yongjin.png" mode="aspectFit"></image></view>
+						<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover"
+							:hover-stay-time="50">
+							<view class="icon icon-b">
+								<image class="icon-img" src="/static/user/yongjin.png" mode="aspectFit"></image>
+							</view>
 							<view class="order-font">我的余额</view>
 						</view>
-						<view class="order-item" @click="navTo('/pages/user/jindou')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon icon-b"><image class="icon-img" src="/static/user/yaoqing.png" mode="aspectFit"></image></view>
+						<view class="order-item" @click="navTo('/pages/user/jindou')" hover-class="common-hover"
+							:hover-stay-time="50">
+							<view class="icon icon-b">
+								<image class="icon-img" src="/static/user/yaoqing.png" mode="aspectFit"></image>
+							</view>
 							<view class="order-font">我的金豆</view>
 						</view>
-						<view class="order-item" @click="navTo('/pages/user/team')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon icon-b"><image class="icon-img" src="/static/user/tuiguang.png" mode="aspectFit"></image></view>
-							<view class="order-font">我的推广</view>
+						<view class="order-item" @click="navTo('/pages/user/jinquan')" hover-class="common-hover"
+							:hover-stay-time="50">
+							<view class="icon icon-b">
+								<image class="icon-img" src="/static/user/jinquan.png" mode="aspectFit"></image>
+							</view>
+							<view class="order-font">我的金券</view>
 						</view>
 					</view>
 				</view>
 				<view class="history-section icon">
 					<uni-list>
-						<uni-list-item title="批发订单" @click="navTo('/pages/user/myWholesale')" thumb="/static/user/u1.png"></uni-list-item>
-						<uni-list-item title="金豆池" @click="navTo('/pages/user/JDcool')" thumb="/static/user/u2.png"></uni-list-item>
-						<uni-list-item title="申请美容院" @click="navTo('/pages/category/apply')" thumb="/static/user/u3.png"></uni-list-item>
-						<uni-list-item title="分享海报" @click="navTo('/pages/user/shareQrCode')" thumb="/static/user/u4.png"></uni-list-item>
-						<uni-list-item title="我的收藏" @click="navTo('/pages/user/favorites')" thumb="/static/user/u5.png"></uni-list-item>
-						<uni-list-item title="收货地址" @click="navTo('/pages/set/address')" thumb="/static/user/u6.png"></uni-list-item>
-						<uni-list-item title="交易密码" @click="navTo('/pages/money/moneyPwd')" thumb="/static/user/u7.png"></uni-list-item>
+						
+						<uni-list-item title="批发订单" @click="navTo('/pages/user/myWholesale')"
+							thumb="/static/user/u1.png"></uni-list-item>
+							
+						<uni-list-item title="金豆池" @click="navTo('/pages/user/JDcool')" thumb="/static/user/u2.png">
+						</uni-list-item>
+						<uni-list-item title='我的推广' @click="navTo('/pages/user/team')"
+							thumb="/static/user/tuiguang1.png">	</uni-list-item>
+						<uni-list-item title="申请美容院" @click="navTo('/pages/category/apply')"
+							thumb="/static/user/u3.png"></uni-list-item>
+						<uni-list-item title="分享海报" @click="navTo('/pages/user/shareQrCode')"
+							thumb="/static/user/u4.png"></uni-list-item>
+						<uni-list-item title="我的收藏" @click="navTo('/pages/user/favorites')" thumb="/static/user/u5.png">
+						</uni-list-item>
+						<uni-list-item title="收货地址" @click="navTo('/pages/set/address')" thumb="/static/user/u6.png">
+						</uni-list-item>
+						<uni-list-item title="交易密码" @click="navTo('/pages/money/moneyPwd')" thumb="/static/user/u7.png">
+						</uni-list-item>
 					</uni-list>
 				</view>
 			</view>
@@ -103,595 +137,614 @@
 	</view>
 </template>
 <script>
-import { mapState, mapMutations } from 'vuex';
-import uniList from '@/components/uni-list/uni-list.vue';
-import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
-import { orderData, getUserInfo } from '@/api/user.js';
-import { saveUrl, interceptor } from '@/utils/loginUtils.js';
-let startY = 0,
-	moveY = 0,
-	pageAtTop = true;
-export default {
-	components: {
-		uniList,
-		uniListItem
-	},
-	data() {
-		return {};
-	},
-	onShow() {
-		// 判断是否已经登录
-		if (this.hasLogin) {
-			this.loadBaseData();
-		}
-	},
-	onReady() {
-		// 初始化获取页面宽度
-		uni.createSelectorQuery()
-			.select('.container')
-			.fields(
-				{
-					size: true
-				},
-				data => {
-					// 计算最多下拉的高度
-					this.userDowm = Math.floor((data.width / 750) * 185);
-					// 计算最大触发修改高度事件
-					this.userMaxDowm = Math.floor((data.width / 750) * 250);
-				}
-			)
-			.exec();
-	},
-	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-		// 加载初始数据
-		loadBaseData() {
-			getUserInfo({})
-				.then(({ data }) => {
-					this.setUserInfo(data);
-					// 获取用户数据完毕后在获取订单数据防止多次跳转到登录页
-					orderData({})
-						.then(({ data }) => {
-							this.setOrderInfo(data);
-						})
-						.catch(e => {
-							this.setOrderInfo({
-								complete_count: 0, //完成
-								received_count: 0, //待收货
-								unshipped_count: 0, //待发货
-								order_count: 0, //订单总数
-								unpaid_count: 0 //待付款
-							});
-						});
-				})
-				.catch(e => {
-					console.log(e);
-				});
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import uniList from '@/components/uni-list/uni-list.vue';
+	import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
+	import {
+		orderData,
+		getUserInfo
+	} from '@/api/user.js';
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
+	let startY = 0,
+		moveY = 0,
+		pageAtTop = true;
+	export default {
+		components: {
+			uniList,
+			uniListItem
+		},
+		data() {
+			return {};
 		},
-		/**
-		 * 统一跳转接口,拦截未登录路由
-		 * navigator标签现在默认没有转场动画，所以用view
-		 */
-		navTo(url) {
-			// if (!this.hasLogin) {
-			//  // 保存地址
-			// 	saveUrl();
-			//  	// 登录拦截
-			// 	interceptor();
-			//  } else {
+		onShow() {
+			// 判断是否已经登录
+			if (this.hasLogin) {
+				this.loadBaseData();
+			}
+		},
+		onReady() {
+			// 初始化获取页面宽度
+			uni.createSelectorQuery()
+				.select('.container')
+				.fields({
+						size: true
+					},
+					data => {
+						// 计算最多下拉的高度
+						this.userDowm = Math.floor((data.width / 750) * 185);
+						// 计算最大触发修改高度事件
+						this.userMaxDowm = Math.floor((data.width / 750) * 250);
+					}
+				)
+				.exec();
+		},
+		computed: {
+			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+		},
+		methods: {
+			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+			// 加载初始数据
+			loadBaseData() {
+				getUserInfo({})
+					.then(({
+						data
+					}) => {
+						this.setUserInfo(data);
+						// 获取用户数据完毕后在获取订单数据防止多次跳转到登录页
+						orderData({})
+							.then(({
+								data
+							}) => {
+								this.setOrderInfo(data);
+							})
+							.catch(e => {
+								this.setOrderInfo({
+									complete_count: 0, //完成
+									received_count: 0, //待收货
+									unshipped_count: 0, //待发货
+									order_count: 0, //订单总数
+									unpaid_count: 0 //待付款
+								});
+							});
+					})
+					.catch(e => {
+						console.log(e);
+					});
+			},
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画，所以用view
+			 */
+			navTo(url) {
+				// if (!this.hasLogin) {
+				//  // 保存地址
+				// 	saveUrl();
+				//  	// 登录拦截
+				// 	interceptor();
+				//  } else {
 				uni.navigateTo({
 					url
 				});
-			// }
+				// }
+			}
 		}
-	}
-};
+	};
 </script>
 <style lang="scss">
-page {
-	height: 100%;
-	background-color: $page-color-base;
-}
-
-%flex-center {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-}
-
-%section {
-	display: flex;
-	justify-content: space-around;
-	align-content: center;
-	background: #fff;
-	border-radius: 10rpx;
-}
-
-.container {
-	height: 100%;
-	background-color: #fff;
-}
-
-.content-box {
-	height: 100%;
-}
-
-.user-section {
-	height: 420rpx;
-	padding: 50rpx 0rpx 0 30rpx;
-	position: relative;
-
-	.bg {
-		position: absolute;
-		left: 0;
-		top: 0;
-		width: 750rpx;
+	page {
+		height: 100%;
+		background-color: $page-color-base;
+	}
+
+	%flex-center {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	%section {
+		display: flex;
+		justify-content: space-around;
+		align-content: center;
+		background: #fff;
+		border-radius: 10rpx;
+	}
+
+	.container {
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.content-box {
+		height: 100%;
+	}
+
+	.user-section {
 		height: 420rpx;
-		image {
+		padding: 50rpx 0rpx 0 30rpx;
+		position: relative;
+
+		.bg {
+			position: absolute;
+			left: 0;
+			top: 0;
 			width: 750rpx;
 			height: 420rpx;
+
+			image {
+				width: 750rpx;
+				height: 420rpx;
+			}
 		}
 	}
-}
 
-.user-info-box {
-	height: 180rpx;
-	color: white;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	position: relative;
-	z-index: 1;
+	.user-info-box {
+		height: 180rpx;
+		color: white;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		position: relative;
+		z-index: 1;
 
-	.detail {
-		height: 130rpx;
+		.detail {
+			height: 130rpx;
 
-		.portrait-box {
-			height: 100%;
-
-			.portrait {
-				width: 130rpx;
+			.portrait-box {
 				height: 100%;
-				border: 5rpx solid #fff;
-				border-radius: 50%;
+
+				.portrait {
+					width: 130rpx;
+					height: 100%;
+					border: 5rpx solid #fff;
+					border-radius: 50%;
+				}
 			}
-		}
 
-		.info-box {
-			margin-left: 20rpx;
-			line-height: 1.5;
+			.info-box {
+				margin-left: 20rpx;
+				line-height: 1.5;
 
-			.username {
-				font-size: $font-lg + 2rpx;
-				height: 100%;
-				max-width: 200rpx;
-			}
-			.vip {
-				position: relative;
-				margin-left: 12rpx;
-				width: 120rpx;
-				height: 40rpx;
-				.vip-bg {
-					position: absolute;
-					top: 0;
-					left: 0;
-					right: 0;
-					width: 100%;
+				.username {
+					font-size: $font-lg + 2rpx;
 					height: 100%;
+					max-width: 200rpx;
 				}
-				.vip-title {
+
+				.vip {
 					position: relative;
-					z-index: 10;
-					font-size: 20rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #93794b;
-					padding-left: 36rpx;
-					line-height: 40rpx;
+					margin-left: 12rpx;
+					width: 120rpx;
+					height: 40rpx;
+
+					.vip-bg {
+						position: absolute;
+						top: 0;
+						left: 0;
+						right: 0;
+						width: 100%;
+						height: 100%;
+					}
+
+					.vip-title {
+						position: relative;
+						z-index: 10;
+						font-size: 20rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #93794b;
+						padding-left: 36rpx;
+						line-height: 40rpx;
+					}
 				}
-			}
 
-			.username-t {
-				font-size: $font-lg + 6rpx;
-				// height: 32rpx;
-				display: flex;
-				align-items: center;
-
-				image {
-					display: inline-block;
-					margin-left: 10rpx;
-					width: 147rpx;
-					height: 32rpx;
+				.username-t {
+					font-size: $font-lg + 6rpx;
+					// height: 32rpx;
+					display: flex;
+					align-items: center;
+
+					image {
+						display: inline-block;
+						margin-left: 10rpx;
+						width: 147rpx;
+						height: 32rpx;
+					}
 				}
-			}
 
-			.user-get {
-				font-size: $font-lg;
+				.user-get {
+					font-size: $font-lg;
 
-				text {
-					font-size: $font-lg + 6rpx;
+					text {
+						font-size: $font-lg + 6rpx;
+					}
 				}
 			}
 		}
-	}
 
-	.config {
-		font-size: 48rpx;
-		height: 130rpx;
+		.config {
+			font-size: 48rpx;
+			height: 130rpx;
 
-		.setting {
-			margin-right: 51rpx;
+			.setting {
+				margin-right: 51rpx;
+			}
 		}
-	}
 
-	.my-info {
-		margin-right: 30rpx;
-		width: 130rpx;
-		height: 50rpx;
-		border: 1px solid #ffffff;
-		border-radius: 26rpx;
-		justify-content: center;
+		.my-info {
+			margin-right: 30rpx;
+			width: 130rpx;
+			height: 50rpx;
+			border: 1px solid #ffffff;
+			border-radius: 26rpx;
+			justify-content: center;
 
-		image {
-			width: 30rpx;
-			height: 30rpx;
-		}
+			image {
+				width: 30rpx;
+				height: 30rpx;
+			}
 
-		.title {
-			padding-left: 9rpx;
-			font-size: 24rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #ffffff;
+			.title {
+				padding-left: 9rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #ffffff;
+			}
 		}
 	}
-}
-
-.vip-card-box {
-	display: flex;
-	flex-direction: column;
-	color: #f7d680;
-	height: 240rpx;
-	background: linear-gradient(left, rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.8));
-	border-radius: 16rpx 16rpx 0 0;
-	overflow: hidden;
-	position: relative;
-	padding: 20rpx 24rpx;
-
-	.card-bg {
-		position: absolute;
-		top: 20rpx;
-		right: 0;
-		width: 380rpx;
-		height: 260rpx;
-	}
 
-	.b-btn {
-		position: absolute;
-		right: 20rpx;
-		top: 16rpx;
-		width: 132rpx;
-		height: 40rpx;
-		text-align: center;
-		line-height: 40rpx;
-		font-size: 22rpx;
-		color: #36343c;
-		border-radius: 20px;
-		background: linear-gradient(left, #f9e6af, #ffd465);
-		z-index: 1;
-	}
-
-	.tit {
-		font-size: $font-base + 2rpx;
+	.vip-card-box {
+		display: flex;
+		flex-direction: column;
 		color: #f7d680;
-		margin-bottom: 28rpx;
-
-		.iconfont {
-			color: #f6e5a3;
-			margin-right: 16rpx;
+		height: 240rpx;
+		background: linear-gradient(left, rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.8));
+		border-radius: 16rpx 16rpx 0 0;
+		overflow: hidden;
+		position: relative;
+		padding: 20rpx 24rpx;
+
+		.card-bg {
+			position: absolute;
+			top: 20rpx;
+			right: 0;
+			width: 380rpx;
+			height: 260rpx;
 		}
-	}
 
-	.e-b {
-		font-size: $font-sm;
-		color: #d8cba9;
-		margin-top: 10rpx;
-	}
-}
-
-.cover-container {
-	background: $page-color-base;
-	margin-top: -150rpx;
-	padding: 0 30rpx;
-	position: relative;
-	background: #f5f5f5;
-	padding-bottom: 20rpx;
-
-	.arc {
-		position: absolute;
-		left: 0;
-		top: -34rpx;
-		width: 100%;
-		height: 36rpx;
-	}
-}
+		.b-btn {
+			position: absolute;
+			right: 20rpx;
+			top: 16rpx;
+			width: 132rpx;
+			height: 40rpx;
+			text-align: center;
+			line-height: 40rpx;
+			font-size: 22rpx;
+			color: #36343c;
+			border-radius: 20px;
+			background: linear-gradient(left, #f9e6af, #ffd465);
+			z-index: 1;
+		}
 
-.tj-sction {
-	@extend %section;
+		.tit {
+			font-size: $font-base + 2rpx;
+			color: #f7d680;
+			margin-bottom: 28rpx;
 
-	.tj-item {
-		@extend %flex-center;
-		flex-direction: column;
-		height: 140rpx;
-		font-size: $font-sm;
-		color: #75787d;
-	}
+			.iconfont {
+				color: #f6e5a3;
+				margin-right: 16rpx;
+			}
+		}
 
-	.num {
-		font-size: $font-lg;
-		color: $font-color-dark;
-		margin-bottom: 8rpx;
-	}
-}
-.vip-box {
-	width: 710rpx;
-	height: 90rpx;
-	margin: 32rpx auto 0;
-	image {
-		width: 100%;
-		height: 100%;
-	}
-}
-.item-box {
-	// width: 710rpx;
-	// height: 221rpx;
-	// background: #FFFFFF;
-	// box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	// border-radius: 20rpx;
-	// position: relative;
-	// top: -150rpx;
-	// left: 0;
-	// right: 0;
-	// margin: 0 auto -150rpx;
-	margin: 20rpx 0;
-
-	.box-title {
-		background-color: #fff;
-		line-height: 1;
-		// padding: 30rpx;
-		padding: 0 36rpx 0 35rpx;
-		height: 73rpx;
-		border-radius: 20rpx 20rpx 0 0;
-
-		.title {
-			font-weight: bold;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #333333;
+		.e-b {
+			font-size: $font-sm;
+			color: #d8cba9;
+			margin-top: 10rpx;
 		}
+	}
 
-		.link {
-			font-size: $font-base - 2rpx;
-			color: $font-color-light;
+	.cover-container {
+		background: $page-color-base;
+		margin-top: -150rpx;
+		padding: 0 30rpx;
+		position: relative;
+		background: #f5f5f5;
+		padding-bottom: 20rpx;
+
+		.arc {
+			position: absolute;
+			left: 0;
+			top: -34rpx;
+			width: 100%;
+			height: 36rpx;
 		}
 	}
 
-	.order-section {
-		height: 146rpx;
+	.tj-sction {
 		@extend %section;
 
-		// padding: 28rpx 0;
-		.order-item {
+		.tj-item {
 			@extend %flex-center;
-			width: 120rpx;
-			height: 146rpx;
-			border-radius: 10rpx;
+			flex-direction: column;
+			height: 140rpx;
 			font-size: $font-sm;
-			color: $font-color-dark;
+			color: #75787d;
 		}
 
-		.iconfont {
-			font-size: 48rpx;
-			margin-bottom: 18rpx;
-			color: #fa436a;
+		.num {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			margin-bottom: 8rpx;
 		}
+	}
 
-		.icon-shouhoutuikuan {
-			font-size: 44rpx;
+	.vip-box {
+		width: 710rpx;
+		height: 90rpx;
+		margin: 32rpx auto 0;
+
+		image {
+			width: 100%;
+			height: 100%;
 		}
+	}
 
-		.icon {
-			height: 50rpx;
-			width: 48rpx;
-			margin-bottom: 18rpx;
-			background-size: 100%;
-			background-repeat: no-repeat;
-			background-position: center;
-
-			.icon-img {
-				width: 100%;
-				height: 100%;
+	.item-box {
+		// width: 710rpx;
+		// height: 221rpx;
+		// background: #FFFFFF;
+		// box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		// border-radius: 20rpx;
+		// position: relative;
+		// top: -150rpx;
+		// left: 0;
+		// right: 0;
+		// margin: 0 auto -150rpx;
+		margin: 20rpx 0;
+
+		.box-title {
+			background-color: #fff;
+			line-height: 1;
+			// padding: 30rpx;
+			padding: 0 36rpx 0 35rpx;
+			height: 73rpx;
+			border-radius: 20rpx 20rpx 0 0;
+
+			.title {
+				font-weight: bold;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+
+			.link {
+				font-size: $font-base - 2rpx;
+				color: $font-color-light;
 			}
 		}
 
-		.icon-b {
-			height: 90rpx;
-			width: 88rpx;
+		.order-section {
+			height: 146rpx;
+			@extend %section;
+
+			// padding: 28rpx 0;
+			.order-item {
+				@extend %flex-center;
+				width: 120rpx;
+				height: 146rpx;
+				border-radius: 10rpx;
+				font-size: $font-sm;
+				color: $font-color-dark;
+			}
+
+			.iconfont {
+				font-size: 48rpx;
+				margin-bottom: 18rpx;
+				color: #fa436a;
+			}
+
+			.icon-shouhoutuikuan {
+				font-size: 44rpx;
+			}
+
+			.icon {
+				height: 50rpx;
+				width: 48rpx;
+				margin-bottom: 18rpx;
+				background-size: 100%;
+				background-repeat: no-repeat;
+				background-position: center;
+
+				.icon-img {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.icon-b {
+				height: 90rpx;
+				width: 88rpx;
+			}
 		}
 	}
-}
 
-.history-section {
-	// padding: 30rpx 0 0;
-	margin-top: 20rpx;
-	background: #fff;
-	border-radius: 10rpx;
+	.history-section {
+		// padding: 30rpx 0 0;
+		margin-top: 20rpx;
+		background: #fff;
+		border-radius: 10rpx;
 
-	.sec-header {
-		display: flex;
-		align-items: center;
-		font-size: $font-base;
-		color: $font-color-dark;
-		line-height: 40rpx;
-		margin-left: 30rpx;
-		padding-top: 30rpx;
-
-		.iconfont {
-			font-size: 44rpx;
-			color: $color-red;
-			margin-right: 16rpx;
+		.sec-header {
+			display: flex;
+			align-items: center;
+			font-size: $font-base;
+			color: $font-color-dark;
 			line-height: 40rpx;
+			margin-left: 30rpx;
+			padding-top: 30rpx;
+
+			.iconfont {
+				font-size: 44rpx;
+				color: $color-red;
+				margin-right: 16rpx;
+				line-height: 40rpx;
+			}
 		}
-	}
 
-	.h-list {
-		white-space: nowrap;
-		padding: 30rpx 30rpx 0;
+		.h-list {
+			white-space: nowrap;
+			padding: 30rpx 30rpx 0;
 
-		.h-list-image {
-			display: inline-block;
-			width: 160rpx;
-			height: 160rpx;
-			margin-right: 20rpx;
-			border-radius: 10rpx;
+			.h-list-image {
+				display: inline-block;
+				width: 160rpx;
+				height: 160rpx;
+				margin-right: 20rpx;
+				border-radius: 10rpx;
+			}
 		}
 	}
-}
-
-.up-box {
-	margin: 21rpx auto;
-	width: 710rpx;
-	height: 90rpx;
-	background: linear-gradient(73deg, #ffffff 0%, #fffbeb 0%, #fff1da 0%, #fed591 100%);
-	border-radius: 20rpx;
 
-	image {
-		width: 100%;
-		height: 100%;
+	.up-box {
+		margin: 21rpx auto;
+		width: 710rpx;
+		height: 90rpx;
+		background: linear-gradient(73deg, #ffffff 0%, #fffbeb 0%, #fff1da 0%, #fed591 100%);
 		border-radius: 20rpx;
-	}
-}
-
-.item-box-b {
-	width: 710rpx;
-	height: 221rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.5);
-	border-radius: 20rpx;
-	position: relative;
-	top: -150rpx;
-	left: 0;
-	right: 0;
-	margin: 0 auto -150rpx;
-}
-
-.popup-box {
-	width: 522rpx;
-	height: 605rpx;
-	background-color: #ffffff;
-	border-radius: 20rpx;
-	position: relative;
-
-	.img {
-		position: relative;
-		top: -56rpx;
-		left: 0;
-		width: 522rpx;
-		height: 132rpx;
-		display: flex;
-		justify-content: center;
 
 		image {
-			border-radius: 20rpx 20rpx 0 0;
-			width: 450rpx;
-			height: 132rpx;
+			width: 100%;
+			height: 100%;
+			border-radius: 20rpx;
 		}
 	}
 
-	.mian {
-		margin-top: -44rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		// padding: 32rpx 32rpx;
+	.item-box-b {
+		width: 710rpx;
+		height: 221rpx;
+		background: #ffffff;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.5);
+		border-radius: 20rpx;
+		position: relative;
+		top: -150rpx;
+		left: 0;
+		right: 0;
+		margin: 0 auto -150rpx;
+	}
+
+	.popup-box {
+		width: 522rpx;
+		height: 605rpx;
 		background-color: #ffffff;
-		border-radius: 0 0 20rpx 20rpx;
-		text-align: center;
+		border-radius: 20rpx;
+		position: relative;
 
-		.delivery {
-			font-size: 40rpx;
-			color: #333333;
+		.img {
+			position: relative;
+			top: -56rpx;
+			left: 0;
+			width: 522rpx;
+			height: 132rpx;
 			display: flex;
-			align-items: center;
-			flex-direction: column;
-
-			.title {
-			}
+			justify-content: center;
 
 			image {
-				margin-top: 48rpx;
-				width: 172rpx;
-				height: 160rpx;
+				border-radius: 20rpx 20rpx 0 0;
+				width: 450rpx;
+				height: 132rpx;
 			}
 		}
 
-		.nocancel {
-			font-size: 32rpx;
-			color: #333333;
-			margin-top: 14rpx;
-		}
-
-		.comfirm-box {
-			margin-top: 52rpx;
+		.mian {
+			margin-top: -44rpx;
 			display: flex;
-			// margin-bottom: 32rpx;
-
-			// justify-content: space-around;
-			.cancel {
+			flex-direction: column;
+			align-items: center;
+			// padding: 32rpx 32rpx;
+			background-color: #ffffff;
+			border-radius: 0 0 20rpx 20rpx;
+			text-align: center;
+
+			.delivery {
+				font-size: 40rpx;
+				color: #333333;
 				display: flex;
 				align-items: center;
-				justify-content: center;
-				width: 197rpx;
-				height: 74rpx;
-				border: 1px solid #dcc786;
-				border-radius: 38rpx;
+				flex-direction: column;
+
+				.title {}
 
+				image {
+					margin-top: 48rpx;
+					width: 172rpx;
+					height: 160rpx;
+				}
+			}
+
+			.nocancel {
 				font-size: 32rpx;
-				color: #605128;
+				color: #333333;
+				margin-top: 14rpx;
 			}
 
-			.comfirm {
-				margin-left: 32rpx;
+			.comfirm-box {
+				margin-top: 52rpx;
 				display: flex;
-				align-items: center;
-				justify-content: center;
-				width: 197rpx;
-				height: 74rpx;
-				background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
-				border-radius: 38px;
-				font-size: 32rpx;
-				color: #605128;
+				// margin-bottom: 32rpx;
+
+				// justify-content: space-around;
+				.cancel {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 197rpx;
+					height: 74rpx;
+					border: 1px solid #dcc786;
+					border-radius: 38rpx;
+
+					font-size: 32rpx;
+					color: #605128;
+				}
+
+				.comfirm {
+					margin-left: 32rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 197rpx;
+					height: 74rpx;
+					background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
+					border-radius: 38px;
+					font-size: 32rpx;
+					color: #605128;
+				}
 			}
 		}
 	}
-}
-
-.outlogin {
-	margin: 40rpx auto;
-	width: 500rpx;
-	background-color: #fff;
-	color: #ff4c4b;
-	border: 1px solid #ff4c4b;
-	text-align: center;
-	padding: 10rpx 0rpx;
-	border-radius: 50rpx;
-}
-.order-font {
-	margin-top: -24rpx;
-}
+
+	.outlogin {
+		margin: 40rpx auto;
+		width: 500rpx;
+		background-color: #fff;
+		color: #ff4c4b;
+		border: 1px solid #ff4c4b;
+		text-align: center;
+		padding: 10rpx 0rpx;
+		border-radius: 50rpx;
+	}
+
+	.order-font {
+		margin-top: -24rpx;
+	}
 </style>