user

pages.json

@@ -87,7 +87,10 @@
 		}, {
 			"path": "pages/myteam/myteam",
 			"style": {
-				"navigationBarTitleText": "我的团队"
+				"navigationBarTitleText": "我的团队",
+				"app-plus":{
+					"titleNView": false
+				}
 			}
 		},
 		{
@@ -321,11 +324,9 @@
 		}, {
 			"path": "pages/award/award",
 			"style": {
-				"navigationBarTitleText": "奖励明细",
+				"navigationBarTitleText": "我的佣金",
 				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
+					"titleNView": false
 				}
 			}
 		}, {
@@ -336,7 +337,10 @@
 		}, {
 			"path": "pages/scoreAccumulate/scoreAccumulate",
 			"style": {
-				"navigationBarTitleText": "积分明细"
+				"navigationBarTitleText": "我的积分",
+				"app-plus": {
+					"titleNView": false
+				}
 			}
 		}, {
 			"path": "pages/notice/notice",
@@ -378,11 +382,9 @@
 		{
 			"path": "pages/wallet/wallet",
 			"style": {
-				"navigationBarTitleText": "我的钱包",
+				"navigationBarTitleText": "我的余额",
 				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
+					"titleNView": false
 				}
 			}
 		},
@@ -569,7 +571,10 @@
 		{
 			"path": "pages/coupon/consumer",
 			"style": {
-				"navigationBarTitleText": "消费券"
+				"navigationBarTitleText": "我的消费券",
+				"app-plus":{
+					"titleNView": false
+				}
 			}
 		},
 		{

pages/award/award.vue

@@ -1,21 +1,19 @@
 <template>
 	<view class="content">
 		<view class="content-money">
-			<view class="money-box flex">
+			<view class="money-box">
+				<view class="bg"><image src="../../static/img/yong.png" mode=""></image></view>
+				<view class="body-title">
+					<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+					<view class="header">我的佣金</view>
+				</view>
 				<view>
-					<view class="text">可提现佣金（元）</view>
 					<view class="money">{{ money | getMoneyStyle }}</view>
 				</view>
-				<navigator url="/pages/wallet/freezeList">
-					<view>
-						<view class="text">冻结佣金（元）</view>
-						<view class="money">{{ freezeMoney | getMoneyStyle }}</view>
-					</view>
-				</navigator>
 			</view>
 			<!-- <view class="moneyTx" @click="navto('./withdrawal')">提现</view> -->
 			<!-- <view class="moneyTxs" @click="navto('./withdmoenys')" >转余额</view> -->
-			<view class="flex buttom-box">
+			<!-- <view class="flex buttom-box">
 				<view class="buttom" @click="navto('./withdrawal')">
 					<view class="icon"><image class="icon-img" src="/static/icon/i6.png" mode="aspectFit"></image></view>
 					<text class="font-size-sm">提现</text>
@@ -25,7 +23,7 @@
 					<view class="icon"><image class="icon-img" src="/static/icon/i7.png" mode="aspectFit"></image></view>
 					<text class="font-size-sm">转余额</text>
 				</view>
-			</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>
@@ -54,6 +52,7 @@
 				</scroll-view>
 			</swiper-item>
 		</swiper>
+		<view class="btn" @click="navto('/pages/award/withdrawal')">立即提现</view>
 	</view>
 </template>
 
@@ -131,6 +130,11 @@ export default {
 				url: e
 			});
 		},
+		//返回上一页面
+		toBack() {
+			console.log(111);
+			uni.navigateBack({});
+		},
 		//获取收入支出信息
 		async loadData(source) {
 			//这里是将订单挂载到tab列表下
@@ -198,71 +202,68 @@ page {
 .content-money {
 	padding-bottom: 30rpx;
 	background: $page-color-base;
-	.moneyTx {
-		position: absolute;
-		top: 150rpx;
-		right: 0rpx;
-		width: 150rpx;
-		padding: 10rpx 30rpx;
-		border: 2px solid #ffffff;
-		border-top-left-radius: 99rpx;
-		border-bottom-left-radius: 99rpx;
-		color: #ffffff;
-		line-height: 1;
-		font-size: $font-base;
-	}
-	.moneyTxs {
-		position: absolute;
-		top: 220rpx;
-		right: 0rpx;
-		width: 150rpx;
-		padding: 10rpx 30rpx;
-		border: 2px solid #ffffff;
-		border-top-left-radius: 99rpx;
-		border-bottom-left-radius: 99rpx;
-		color: #ffffff;
-		line-height: 1;
-		font-size: $font-base;
-	}
-	.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: 50rpx;
-			width: 48rpx;
-			margin: 0 auto;
-			.icon-img {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
 }
 .money-box {
 	background-color: $base-color;
 	padding-top: var(--status-bar-height);
-	height: 368rpx;
+	height: 468rpx;
 	color: #ffffff;
 	text-align: center;
-	justify-content: space-around;
-	.text {
-		font-size: $font-sm;
+	justify-content: center;
+	position: relative;
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		position: relative;
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 32rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.goback-box {
+			position: absolute;
+			z-index: 10;
+			left: 24rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+		.goback {
+			width: 30rpx;
+			height: 36rpx;
+		}
+	}
+	.bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		image {
+			width: 100%;
+			height: 100%;
+		}
 	}
 	.money {
+		position: relative;
+		z-index: 10;
 		font-size: 56rpx;
+		height: 388rpx;
+		line-height: 288rpx;
 	}
 }
 
@@ -330,4 +331,20 @@ page {
 		background-color: #ffffff;
 	}
 }
+.btn {
+	position: fixed;
+	bottom: 40rpx;
+	left: 50%;
+	width: 674rpx;
+	height: 88rpx;
+	background: #52c696;
+	border-radius: 44rpx;
+	margin-left: -337rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	text-align: center;
+	line-height: 88rpx;
+	color: #ffffff;
+}
 </style>

pages/award/withdrawal.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<uni-notice-bar single="true" text="每月25号到月底可提现上月结算余额"></uni-notice-bar>
+		<!-- <uni-notice-bar single="true" text="每月25号到月底可提现上月结算余额"></uni-notice-bar> -->
 		<view class="content-money">
 			<view class="flex ">
 				<view class="buttom">
@@ -22,13 +22,13 @@
 				<view class="buttom" @click="withdrawal = money">全部提现</view>
 			</view>
 		</view>
-		<view class="row-box">
+		<!-- <view class="row-box">
 			<view class="title">手续费</view>
 			<view class="row">
 				<text class="tit">￥</text>
 				<view class="placeholder">{{ withdrawal * 0.01*charge }}</view>
 			</view>
-		</view>
+		</view> -->
 		<!-- #ifndef MP-WEIXIN -->
 		<view class="list">
 			<radio-group @change="tabRadio">

pages/coupon/consumer.vue

@@ -1,26 +1,44 @@
 <template>
 	<view class="content">
-		<!-- <view class="navbar">
+		<view class="content-money">
+			<view class="money-box">
+				<view class="bg"><image src="../../static/img/consumer.png" mode=""></image></view>
+				<view class="body-title">
+					<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+					<view class="header">我的消费券</view>
+				</view>
+				<view>
+					<view class="money">{{ money | getMoneyStyle }}</view>
+				</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" class="swiper-box" duration="300" @change="changeTab">
+		</view>
+		<swiper :current="tabCurrentIndex" :style="{ height: maxheight + 'px' }" 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>
+
 					<!-- 订单列表 -->
-					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
-						<view class="title-box">
-							<view class="title">
-								<text>{{ item.mark }}</text>
+					<view class="itemList" v-for="(items, indexs) in tabItem.orderList" :key="indexs">
+						<!-- <view class='font-size-lg padding-l-30 bg-gray padding-v-10'>
+							{{items.time}}
+						</view> -->
+						<view v-for="(item, index) in items.list" :key="index" 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="time">
-								<text>{{ item.add_time }}</text>
+							<view class="money">
+								<text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
 							</view>
 						</view>
-						<view class="money">
-							<text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
-						</view>
 					</view>
 					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
 				</scroll-view>
@@ -30,38 +48,120 @@
 </template>
 
 <script>
-	
-import { consumerList } from '@/api/integral.js';
+import { spreadCommission, userBalance, rechargemoneys } from '@/api/wallet.js';
+// import { mapState } from 'vuex';
+import { getMoneyStyle } from '@/utils/rocessor.js';
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
+// #ifdef H5
+import { weixindata } from '@/utils/wxAuthorized';
+// #endif
 export default {
+	filters: {
+		getMoneyStyle
+	},
+
 	components: {
 		empty,
 		uniLoadMore
 	},
+	// computed: {
+	// 	...mapState(['weichatObj'])
+	// },
 	onReady() {
-		
+		let obj = this;
+		// 初始化获取页面高度
+		uni.createSelectorQuery()
+			.select('.content')
+			.fields(
+				{
+					size: true
+				},
+				data => {
+					// 初始化获取头部高度
+					uni.createSelectorQuery()
+						.select('.content-money')
+						.fields(
+							{
+								size: true
+							},
+							es => {
+								// 保存头部高度
+								obj.maxheight = data.height - es.height - 40;
+							}
+						)
+						.exec();
+				}
+			)
+			.exec();
 	},
 	data() {
 		return {
+			// 头部图高度
+			maxheight: '',
 			tabCurrentIndex: 0,
 			navList: [
 				{
-					state: 0,
-					text: '全部',
+					state: 1,
+					text: '支出',
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
+				{
+					state: 2,
+					text: '收入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				}
 			],
+			money: ''
 		};
 	},
+	onLoad(options) {
+		let bool = uni.getStorageSync('weichatBrowser');
+		if (bool) {
+			// 加载微信信息
+			weixindata();
+		}
+	},
 	onShow() {
-		// 载入积分数据
 		this.loadData();
+		// 获取用户余额
+		userBalance({}).then(({ data }) => {
+			this.money = data.now_money;
+		});
 	},
 	methods: {
+		// ToChangeInto() {
+		// 	// #ifdef H5
+		// 	this.weichatObj.scanQRCode({
+		// 		needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+		// 		scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
+		// 		success: function(res) {
+		// 			let result = JSON.parse(res.resultStr);
+
+		// 			rechargemoneys({
+		// 				id: result.id,
+		// 				money: result.money
+		// 			})
+		// 				.then(({ data }) => {
+		// 					uni.showModal({
+		// 						title: '标题',
+		// 						content: '成功',
+		// 						showCancel: false
+		// 					});
+		// 				})
+		// 				.catch(e => {
+		// 					console.log(e);
+		// 				});
+		// 		}
+		// 	});
+		// 	// #endif
+		// },
 		// 页面跳转
 		navto(e) {
 			uni.navigateTo({
@@ -85,15 +185,17 @@ export default {
 			// 修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
 
-			consumerList(
+			spreadCommission(
 				{
 					page: navItem.page,
 					limit: navItem.limit
-				}
+				},
+				state
 			)
 				.then(({ data }) => {
 					if (data.length > 0) {
 						navItem.orderList = navItem.orderList.concat(data);
+						console.log(navItem.orderList);
 						navItem.page++;
 					}
 					if (navItem.limit == data.length) {
@@ -111,7 +213,11 @@ export default {
 					console.log(e);
 				});
 		},
-
+		//返回上一页面
+		toBack() {
+			console.log(111);
+			uni.navigateBack({});
+		},
 		//swiper 切换
 		changeTab(e) {
 			this.tabCurrentIndex = e.target.current;
@@ -129,7 +235,76 @@ export default {
 page {
 	background: #ffffff;
 	height: 100%;
+	padding: 0;
 }
+.content-money {
+	padding-bottom: 30rpx;
+	background: $page-color-base;
+}
+.money-box {
+	background-color: $base-color;
+	padding-top: var(--status-bar-height);
+	height: 468rpx;
+	color: #ffffff;
+	text-align: center;
+	justify-content: center;
+	position: relative;
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		position: relative;
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 32rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.goback-box {
+			position: absolute;
+			z-index: 10;
+			left: 24rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+		.goback {
+			width: 30rpx;
+			height: 36rpx;
+		}
+	}
+	.bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.money {
+		position: relative;
+		z-index: 10;
+		font-size: 56rpx;
+		height: 388rpx;
+		line-height: 288rpx;
+	}
+}
+
 .navbar {
 	display: flex;
 	height: 40px;
@@ -165,7 +340,6 @@ page {
 // 列表
 
 .swiper-box {
-	height: calc(100% - 44px);
 	padding-top: 10rpx;
 	.order-item {
 		padding: 20rpx 30rpx;

pages/myteam/myteam.vue

@@ -2,29 +2,20 @@
 	<view class="content">
 		<view class="content-money">
 			<view class="money-box">
-				<!-- <view class="text">当前总积分</view>
-				<view class="money">{{ userInfo.integral | getMoneyStyle }}</view> -->
-				<image :src="userInfo.avatar" class="andr-mt-avatar andr-mt-avatarBd"></image>
-				<view class="text">{{ userInfo.nickname }}</view>
-				<!--<view class="text">试用赠予次数:5(暂时固定值,需要动态修改)</view>-->
-			</view>
-			<!-- <view class="moneyTx" @click="navto('/pages/wallet/recharge')">充值</view> -->
-			<!-- <view class="flex buttom-box">
-				<view class="buttom" @click="navto('/pages/wallet/recharge')">
-					<view class="icon"><image class="icon-img" src="/static/icon/i5.png" mode="aspectFit"></image></view>
-					<text>充值</text>
+				<view class="bg"><image src="../../static/img/team.png" mode=""></image></view>
+				<view class="body-title">
+					<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+					<view class="header">我的团队</view>
 				</view>
-				<view class="interval"></view>
-				<view class="buttom" @click="navto('/pages/award/award')">
-					<view class="icon"><image class="icon-img" src="/static/icon/i1.png" mode="aspectFit"></image></view>
-					<text>我的奖励</text>
+				<view>
+					<view class="money">共<text>{{ all }}</text>人</view>
 				</view>
-			</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)">
+				<text>{{ item.num }}</text>
 				<text>{{ item.text }}</text>
-				<text>{{ item.num || '' }}</text>
 			</view>
 		</view>
 		<swiper :current="tabCurrentIndex" :style="{ height: maxheight + 'rpx' }" class="swiper-box" duration="300" @change="changeTab">
@@ -53,13 +44,9 @@
 import { spreadPeople } from '@/api/myteam.js';
 import { userinfo } from '@/api/user.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
@@ -89,7 +76,7 @@ export default {
 			navList: [
 				{
 					state: 0,
-					text: '一级团队',
+					text: '一级推广',
 					loadingType: 'more',
 					num: 0, //人数
 					orderList: [],
@@ -98,7 +85,7 @@ export default {
 				},
 				{
 					state: 1,
-					text: '二级团队',
+					text: '二级推广',
 					num: 0, //团队人数
 					loadingType: 'more',
 					orderList: [],
@@ -106,7 +93,7 @@ export default {
 					limit: 10 //每次信息条数
 				}
 			],
-			money: ''
+			all: '0'
 		};
 	},
 	onLoad(options) {},
@@ -128,6 +115,11 @@ export default {
 				url: e
 			});
 		},
+		//返回上一页面
+		toBack() {
+			console.log(111);
+			uni.navigateBack({});
+		},
 		//获取收入支出信息
 		async loadData(source) {
 			let obj = this;
@@ -194,73 +186,82 @@ page {
 	background: #ffffff;
 	height: 100%;
 }
+
 .content-money {
-	padding-bottom: 30rpx;
 	background: $page-color-base;
-	// border: 2px solid #ffffff;
-	.moneyTx {
-		position: absolute;
-		top: 150rpx;
-		right: 0rpx;
-		width: 150rpx;
-		padding: 10rpx 30rpx;
-		border: 2px solid #ffffff;
-		border-top-left-radius: 99rpx;
-		border-bottom-left-radius: 99rpx;
-		color: #ffffff;
-		line-height: 1;
-		font-size: $font-base;
-	}
-	.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: 50rpx;
-			width: 48rpx;
-			margin: 0 auto;
-			.icon-img {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
 }
 .money-box {
 	background-color: $base-color;
 	padding-top: var(--status-bar-height);
-	// height: 368rpx;
-	height: 180rpx;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
+	height: 468rpx;
 	color: #ffffff;
-	// text-align: center;
-	.text {
-		// padding-top: 147rpx;
-		font-size: $font-sm;
+	text-align: center;
+	justify-content: center;
+	position: relative;
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		position: relative;
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 32rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.goback-box {
+			position: absolute;
+			z-index: 10;
+			left: 24rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+		.goback {
+			width: 30rpx;
+			height: 36rpx;
+		}
+	}
+	.bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		image {
+			width: 100%;
+			height: 100%;
+		}
 	}
 	.money {
-		font-size: 56rpx;
+		position: relative;
+		z-index: 10;
+		font-size: 36rpx;
+		height: 388rpx;
+		line-height: 288rpx;
+		text{
+			font-size: 82rpx;
+		}
 	}
 }
 
 .navbar {
+	width: 700rpx;
+	margin: -60rpx auto 0;
 	display: flex;
-	height: 40px;
+	height: 120rpx;
 	padding: 0 5px;
 	background: #fff;
 	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
@@ -269,6 +270,7 @@ page {
 	.nav-item {
 		flex: 1;
 		display: flex;
+		flex-direction: column;
 		justify-content: center;
 		align-items: center;
 		height: 100%;
@@ -293,7 +295,7 @@ page {
 // 列表
 
 .swiper-box {
-	padding-top: 10rpx;
+	padding-top: 30rpx;
 	.order-item {
 		padding: 20rpx 30rpx;
 		line-height: 1.5;

pages/scoreAccumulate/scoreAccumulate.vue

@@ -1,27 +1,44 @@
 <template>
 	<view class="content">
-		<!-- <view class="navbar">
+		<view class="content-money">
+			<view class="money-box">
+				<view class="bg"><image src="../../static/img/integral.png" mode=""></image></view>
+				<view class="body-title">
+					<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+					<view class="header">我的积分</view>
+				</view>
+				<view>
+					<view class="money">{{ money | getMoneyStyle }}</view>
+				</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" class="swiper-box" duration="300" @change="changeTab">
+		</view>
+		<swiper :current="tabCurrentIndex" :style="{ height: maxheight + 'px' }" 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>
 
 					<!-- 订单列表 -->
-					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
-						<view class="title-box">
-							<view class="title">
-								<text>{{ item.mark }}</text>
+					<view class="itemList" v-for="(items, indexs) in tabItem.orderList" :key="indexs">
+						<!-- <view class='font-size-lg padding-l-30 bg-gray padding-v-10'>
+							{{items.time}}
+						</view> -->
+						<view v-for="(item, index) in items.list" :key="index" 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="time">
-								<text>{{ item.add_time }}</text>
+							<view class="money">
+								<text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
 							</view>
 						</view>
-						<view class="money">
-							<text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
-						</view>
 					</view>
 					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
 				</scroll-view>
@@ -31,38 +48,120 @@
 </template>
 
 <script>
-	
-import { integrallist } from '@/api/integral.js';
+import { spreadCommission, userBalance, rechargemoneys } from '@/api/wallet.js';
+// import { mapState } from 'vuex';
+import { getMoneyStyle } from '@/utils/rocessor.js';
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
+// #ifdef H5
+import { weixindata } from '@/utils/wxAuthorized';
+// #endif
 export default {
+	filters: {
+		getMoneyStyle
+	},
+
 	components: {
 		empty,
 		uniLoadMore
 	},
+	// computed: {
+	// 	...mapState(['weichatObj'])
+	// },
 	onReady() {
-		
+		let obj = this;
+		// 初始化获取页面高度
+		uni.createSelectorQuery()
+			.select('.content')
+			.fields(
+				{
+					size: true
+				},
+				data => {
+					// 初始化获取头部高度
+					uni.createSelectorQuery()
+						.select('.content-money')
+						.fields(
+							{
+								size: true
+							},
+							es => {
+								// 保存头部高度
+								obj.maxheight = data.height - es.height - 40;
+							}
+						)
+						.exec();
+				}
+			)
+			.exec();
 	},
 	data() {
 		return {
+			// 头部图高度
+			maxheight: '',
 			tabCurrentIndex: 0,
 			navList: [
 				{
-					state: 0,
-					text: '全部',
+					state: 1,
+					text: '支出',
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
+				{
+					state: 2,
+					text: '收入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				}
 			],
+			money: ''
 		};
 	},
+	onLoad(options) {
+		let bool = uni.getStorageSync('weichatBrowser');
+		if (bool) {
+			// 加载微信信息
+			weixindata();
+		}
+	},
 	onShow() {
-		// 载入积分数据
 		this.loadData();
+		// 获取用户余额
+		userBalance({}).then(({ data }) => {
+			this.money = data.now_money;
+		});
 	},
 	methods: {
+		// ToChangeInto() {
+		// 	// #ifdef H5
+		// 	this.weichatObj.scanQRCode({
+		// 		needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+		// 		scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
+		// 		success: function(res) {
+		// 			let result = JSON.parse(res.resultStr);
+
+		// 			rechargemoneys({
+		// 				id: result.id,
+		// 				money: result.money
+		// 			})
+		// 				.then(({ data }) => {
+		// 					uni.showModal({
+		// 						title: '标题',
+		// 						content: '成功',
+		// 						showCancel: false
+		// 					});
+		// 				})
+		// 				.catch(e => {
+		// 					console.log(e);
+		// 				});
+		// 		}
+		// 	});
+		// 	// #endif
+		// },
 		// 页面跳转
 		navto(e) {
 			uni.navigateTo({
@@ -86,7 +185,7 @@ export default {
 			// 修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
 
-			integrallist(
+			spreadCommission(
 				{
 					page: navItem.page,
 					limit: navItem.limit
@@ -96,6 +195,7 @@ export default {
 				.then(({ data }) => {
 					if (data.length > 0) {
 						navItem.orderList = navItem.orderList.concat(data);
+						console.log(navItem.orderList);
 						navItem.page++;
 					}
 					if (navItem.limit == data.length) {
@@ -113,7 +213,11 @@ export default {
 					console.log(e);
 				});
 		},
-
+		//返回上一页面
+		toBack() {
+			console.log(111);
+			uni.navigateBack({});
+		},
 		//swiper 切换
 		changeTab(e) {
 			this.tabCurrentIndex = e.target.current;
@@ -131,7 +235,76 @@ export default {
 page {
 	background: #ffffff;
 	height: 100%;
+	padding: 0;
+}
+.content-money {
+	padding-bottom: 30rpx;
+	background: $page-color-base;
 }
+.money-box {
+	background-color: $base-color;
+	padding-top: var(--status-bar-height);
+	height: 468rpx;
+	color: #ffffff;
+	text-align: center;
+	justify-content: center;
+	position: relative;
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		position: relative;
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 32rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.goback-box {
+			position: absolute;
+			z-index: 10;
+			left: 24rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+		.goback {
+			width: 30rpx;
+			height: 36rpx;
+		}
+	}
+	.bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.money {
+		position: relative;
+		z-index: 10;
+		font-size: 56rpx;
+		height: 388rpx;
+		line-height: 288rpx;
+	}
+}
+
 .navbar {
 	display: flex;
 	height: 40px;
@@ -167,7 +340,6 @@ page {
 // 列表
 
 .swiper-box {
-	height: calc(100% - 44px);
 	padding-top: 10rpx;
 	.order-item {
 		padding: 20rpx 30rpx;

pages/user/user.vue

@@ -125,10 +125,10 @@
 			<!-- 浏览历史 -->
 			<view class="history-section ">
 				<uni-list>
-					<uni-list-item v-if="isShowIllegality" title="我的推广" @click="navTo('/pages/wallet/wallet')" thumb="/static/user/tuiguang.png"></uni-list-item>
-					<uni-list-item title="邀请海报" @click="navTo('/pages/myteam/myteam')" thumb="/static/user/haibao.png"></uni-list-item>
+					<uni-list-item v-if="isShowIllegality" title="我的推广" @click="navTo('/pages/myteam/myteam')" thumb="/static/user/tuiguang.png"></uni-list-item>
+					<uni-list-item title="邀请海报" @click="navTo('/pages/shareQrCode/index')" thumb="/static/user/haibao.png"></uni-list-item>
 					<uni-list-item title="我的收藏" @click="navTo('/pages/favorites/favorites')" thumb="/static/user/collect.png"></uni-list-item>
-					<uni-list-item title="收货地址" @click="navTo('/pages/shareQrCode/index')" thumb="/static/user/address.png"></uni-list-item>
+					<uni-list-item title="收货地址" @click="navTo('/pages/address/address')" thumb="/static/user/address.png"></uni-list-item>
 					<uni-list-item title="商家入口" @click="navTo('/pages/merchant/merchant')" thumb="/static/user/shopping.png"></uni-list-item>
 				</uni-list>
 			</view>

pages/wallet/recharge.vue

@@ -1,11 +1,19 @@
 <template>
 	<view class="content">
+		<view class="yue">
+			<view class="font">当前余额</view>
+			<view class="money">￥{{ nowmoney | getMoneyStyle }}</view>
+		</view>
 		<view class="row-box">
 			<view class="title">充值金额</view>
 			<view class="row">
 				<text class="tit">￥</text>
 				<input class="input" type="number" v-model="money" placeholder="请输入充值金额" placeholder-class="placeholder" />
 			</view>
+			<view class="xian"></view>
+			<view class="moneyBtn-box">
+				<view class="moneyBtn" v-for="(item, index) in moneyList" :class="{ current: choose == index }" :key="index" @click="changemoney(item, index)">{{ item }}元</view>
+			</view>
 		</view>
 
 		<view class="list" v-if="!weichatBsrowser">
@@ -32,7 +40,7 @@
 				</label>
 			</radio-group>
 		</view>
-		<button class="add-btn up" :class="{ 'active-bg': payLoding }" @click="!payLoding ? confirm() : ''">确认充值</button>
+		<button class="add-btn up" :class="{ 'active-bg': payLoding }" @click="!payLoding ? confirm() : ''">立即充值</button>
 	</view>
 </template>
 
@@ -46,6 +54,8 @@ export default {
 	},
 	data() {
 		return {
+			moneyList: [300, 200, 150, 100, 50],
+			choose: -1,
 			// #ifdef APP-PLUS
 			type: 'weixinapp',
 			// #endif
@@ -164,6 +174,10 @@ export default {
 				//判断是否还有数据， 有改为 more， 没有改为noMore
 				navItem.loadingType = 'more';
 			}, 600);
+		},
+		changemoney(item, index) {
+			this.choose = index;
+			this.money = item;
 		}
 	}
 };
@@ -173,7 +187,24 @@ export default {
 page {
 	height: 100%;
 }
-
+.yue {
+	display: flex;
+	justify-content: space-between;
+	padding: 30rpx 48rpx 30rpx 26rpx;
+	background: #ffffff;
+	.font {
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #333333;
+	}
+	.money {
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FF6F0F;
+	}
+}
 .add-btn {
 	&.modified {
 		color: $base-color;
@@ -195,7 +226,7 @@ page {
 }
 .row-box {
 	margin-top: 30rpx;
-	padding: 20rpx 30rpx;
+	padding: 20rpx 0rpx 20rpx 30rpx;
 	background: #fff;
 	.title {
 		font-size: $font-base + 2rpx;
@@ -227,6 +258,27 @@ page {
 			font-size: $font-base;
 		}
 	}
+	.xian {
+		width: 700rpx;
+		height: 1rpx;
+		background: #e6e6e6;
+		margin-bottom: 16rpx;
+	}
+	.moneyBtn-box {
+		display: flex;
+		justify-content: flex-start;
+		flex-wrap: wrap;
+		.moneyBtn {
+			margin-right: 30rpx;
+			width: 210rpx;
+			height: 70rpx;
+			background: #f0f0f0;
+			border-radius: 4px;
+			margin-top: 30rpx;
+			text-align: center;
+			line-height: 70rpx;
+		}
+	}
 }
 .list {
 	padding-left: 30rpx;
@@ -270,4 +322,8 @@ page {
 .active-bg {
 	background-color: $color-gray !important;
 }
+.current {
+	background: $base-color!important;
+	color: #fff;
+}
 </style>

pages/wallet/wallet.vue

@@ -1,26 +1,16 @@
 <template>
 	<view class="content">
 		<view class="content-money">
-			<view class="money-box flex">
+			<view class="money-box">
+				<view class="bg"><image src="../../static/img/money.png" mode=""></image></view>
+				<view class="body-title">
+					<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+					<view class="header">我的余额</view>
+				</view>
 				<view>
-					<view class="text">余额（元）</view>
 					<view class="money">{{ money | getMoneyStyle }}</view>
 				</view>
 			</view>
-			<view class="moneyTx" @click="navto('/pages/wallet/recharge')">充值</view>
-			<view class="moneyTxs" @click="navto('/pages/wallet/withdrawal')">提现</view>
-			<!-- <view class="moneyTxss" @click="ToChangeInto">转入</view> -->
-			<!-- <view class="flex buttom-box">
-				<view class="buttom" @click="ToChangeInto">
-					<view class="icon"><image class="icon-img" src="/static/icon/i1.png" mode="aspectFit"></image></view>
-					<text>收款</text>
-				</view>
-				<view class="buttom" @click="navto('/pages/coupon/details')">
-					<view class="icon"><image class="icon-img" src="/static/icon/i5.png" mode="aspectFit"></image></view>
-					<text>付款</text>
-				</view>
-				<view class="interval"></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>
@@ -54,6 +44,7 @@
 				</scroll-view>
 			</swiper-item>
 		</swiper>
+		<view class="btn" @click="navto('/pages/wallet/recharge')">立即充值</view>
 	</view>
 </template>
 
@@ -223,7 +214,11 @@ export default {
 					console.log(e);
 				});
 		},
-
+		//返回上一页面
+		toBack() {
+			console.log(111);
+			uni.navigateBack({});
+		},
 		//swiper 切换
 		changeTab(e) {
 			this.tabCurrentIndex = e.target.current;
@@ -246,86 +241,68 @@ page {
 .content-money {
 	padding-bottom: 30rpx;
 	background: $page-color-base;
-	.moneyTx {
-		position: absolute;
-		top: 150rpx;
-		right: 0rpx;
-		width: 150rpx;
-		padding: 10rpx 30rpx;
-		border: 2px solid #ffffff;
-		border-top-left-radius: 99rpx;
-		border-bottom-left-radius: 99rpx;
-		color: #ffffff;
-		line-height: 1;
-		font-size: $font-base;
-	}
-
-	.moneyTxs {
-		position: absolute;
-		top: 210rpx;
-		right: 0rpx;
-		width: 150rpx;
-		padding: 10rpx 30rpx;
-		border: 2px solid #ffffff;
-		border-top-left-radius: 99rpx;
-		border-bottom-left-radius: 99rpx;
-		color: #ffffff;
-		line-height: 1;
-		font-size: $font-base;
-	}
-
-	.moneyTxss {
-		position: absolute;
-		top: 270rpx;
-		right: 0rpx;
-		width: 150rpx;
-		padding: 10rpx 30rpx;
-		border: 2px solid #ffffff;
-		border-top-left-radius: 99rpx;
-		border-bottom-left-radius: 99rpx;
-		color: #ffffff;
-		line-height: 1;
-		font-size: $font-base;
-	}
-	.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: 50rpx;
-			width: 48rpx;
-			margin: 0 auto;
-			.icon-img {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
 }
 .money-box {
 	background-color: $base-color;
 	padding-top: var(--status-bar-height);
-	height: 368rpx;
+	height: 468rpx;
 	color: #ffffff;
 	text-align: center;
 	justify-content: center;
-	.text {
-		font-size: $font-sm;
+	position: relative;
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		position: relative;
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 32rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.goback-box {
+			position: absolute;
+			z-index: 10;
+			left: 24rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+		.goback {
+			width: 30rpx;
+			height: 36rpx;
+		}
+	}
+	.bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		image {
+			width: 100%;
+			height: 100%;
+		}
 	}
 	.money {
+		position: relative;
+		z-index: 10;
 		font-size: 56rpx;
+		height: 388rpx;
+		line-height: 288rpx;
 	}
 }
 
@@ -393,4 +370,20 @@ page {
 		background-color: #ffffff;
 	}
 }
+.btn {
+	position: fixed;
+	bottom: 40rpx;
+	left: 50%;
+	width: 674rpx;
+	height: 88rpx;
+	background: #52c696;
+	border-radius: 44rpx;
+	margin-left: -337rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	text-align: center;
+	line-height: 88rpx;
+	color: #ffffff;
+}
 </style>

static/static/css/cmy.css

@@ -1,432 +0,0 @@
-/*初始化类*/
-@font-face {
-	font-family: 'iconfont';
-	/* project id 1482221 */
-	src: url('http://at.alicdn.com/t/font_1482221_x9emymthrxs.eot');
-	src: url('http://at.alicdn.com/t/font_1482221_x9emymthrxs.eot?#iefix') format('embedded-opentype'),
-		url('http://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'),
-		url('http://at.alicdn.com/t/font_1482221_x9emymthrxs.woff') format('woff'),
-		url('http://at.alicdn.com/t/font_1482221_x9emymthrxs.ttf') format('truetype'),
-		url('http://at.alicdn.com/t/font_1482221_x9emymthrxs.svg#iconfont') format('svg');
-}
-
-.iconfont {
-	font-family: "iconfont" !important;
-	font-size: 34rpx;
-	font-style: normal;
-	-webkit-font-smoothing: antialiased;
-	-webkit-text-stroke-width: 0rpx;
-	-moz-osx-font-smoothing: grayscale;
-}
-
-.iconedit:before {
-	content: "\e649";
-}
-
-.iconfavorfill:before {
-	content: "\e64b";
-}
-
-.iconfavor:before {
-	content: "\e64c";
-}
-
-.iconlocation:before {
-	content: "\e651";
-}
-
-.iconroundcheckfill:before {
-	content: "\e656";
-}
-
-.iconroundcheck:before {
-	content: "\e657";
-}
-
-.iconunfold:before {
-	content: "\e661";
-}
-
-.iconlikefill:before {
-	content: "\e668";
-}
-
-.iconlike:before {
-	content: "\e669";
-}
-
-.iconshop:before {
-	content: "\e676";
-}
-
-.iconcart:before {
-	content: "\e6af";
-}
-
-.icondelete:before {
-	content: "\e6b4";
-}
-
-.iconhome:before {
-	content: "\e6b8";
-}
-
-.iconcartfill:before {
-	content: "\e6b9";
-}
-
-.iconhomefill:before {
-	content: "\e6bb";
-}
-
-.iconlock:before {
-	content: "\e6c0";
-}
-
-.iconfriendadd:before {
-	content: "\e6ca";
-}
-
-.iconfold:before {
-	content: "\e6de";
-}
-
-.iconapps:before {
-	content: "\e729";
-}
-
-.iconadd:before {
-	content: "\e767";
-}
-
-.iconmove:before {
-	content: "\e768";
-}
-
-.icontriangledownfill:before {
-	content: "\e79b";
-}
-
-.icontriangleupfill:before {
-	content: "\e79c";
-}
-
-.iconshaixuan:before {
-	content: "\e74a";
-}
-
-.iconyanzhengma:before {
-	content: "\e684";
-}
-
-.iconjifen:before {
-	content: "\e60f";
-}
-
-.iconwuliuxinxi:before {
-	content: "\e62b";
-}
-
-.iconmessage:before {
-	content: "\e78a";
-}
-
-.iconsetting:before {
-	content: "\e78e";
-}
-
-.iconaddition:before {
-	content: "\e6e0";
-}
-
-.iconclose:before {
-	content: "\e6e9";
-}
-
-.iconenter:after {
-	content: "\e6f8";
-}
-
-.iconprompt:before {
-	content: "\e71b";
-}
-
-.iconreturn:before {
-	content: "\e720";
-}
-
-.iconsearch:before {
-	content: "\e741";
-}
-
-.iconpengyouquan:before {
-	content: "\e62c";
-}
-
-.iconweixin:before {
-	content: "\e60e";
-}
-
-.iconzhifubao:before {
-	content: "\e673";
-}
-
-.iconyue:before {
-	content: "\e618";
-}
-
-.iconweixin1:before {
-	content: "\e622";
-}
-
-.iconlock1:before {
-	content: "\e64d";
-}
-
-.iconuser:before {
-	content: "\e64e";
-}
-
-.iconchenggongtixianshouyi:before {
-	content: "\e64f";
-}
-
-.iconviptuiguangdingdan:before {
-	content: "\e650";
-}
-
-.icondaifukuan:before {
-	content: "\e652";
-}
-
-.icondaijiesuanshouyi:before {
-	content: "\e653";
-}
-
-.icondaidakuanshouyi:before {
-	content: "\e654";
-}
-
-.icondaifahuo:before {
-	content: "\e655";
-}
-
-.icondaishouhuoshouyi:before {
-	content: "\e658";
-}
-
-.icondaishouhuo:before {
-	content: "\e659";
-}
-
-.iconwuxiaoshouyi:before {
-	content: "\e65a";
-}
-
-.icontixianmingxi:before {
-	content: "\e65b";
-}
-
-.iconshouyi:before {
-	content: "\e65c";
-}
-
-.iconkouchutixianshouxufei:before {
-	content: "\e65d";
-}
-
-.iconyishenqingshouyi:before {
-	content: "\e65e";
-}
-
-.icontuihuanhuo:before {
-	content: "\e65f";
-}
-
-
-/*水平线*/
-.hr {
-	width: 100%;
-	position: relative;
-	border-bottom: 1px solid #dddddd;
-	/* height: 0.5rpx; */
-}
-
-/* 一行显示 */
-.clamp {
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	display: block;
-}
-
-.common-hover {
-	background: #f5f5f5;
-}
-
-/* 角标 */
-.corner{
-	background-color:#e51c23;
-	position: absolute;
-	right: -18rpx;
-	top: -18rpx;
-	color:#FFFFFF;
-	text-align: center;
-	border-radius: 999px;
-	font-size: 24rpx !important;
-	min-width: 35rpx;
-	min-height: 35rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	line-height: 1;
-}
-/*文字对齐*/
-.text-left {
-	text-align: left !important;
-}
-
-.text-center {
-	text-align: center !important;
-}
-
-.text-justify {
-	text-align: justify !important;
-}
-
-.text-right {
-	text-align: right !important;
-}
-
-.text-default {
-	color: #212121 !important;
-}
-
-.text-white {
-	color: #ffffff !important;
-}
-
-.text-primary {
-	color: #00bcd4 !important;
-}
-
-.text-success {
-	color: #009688 !important;
-}
-
-.text-info {
-	color: #03a9f4 !important;
-}
-
-.text-warning {
-	color: #ffc107 !important;
-}
-
-.text-danger {
-	color: #e51c23 !important;
-}
-
-.text-pink {
-	color: #e91e63 !important;
-}
-
-.text-purple {
-	color: #673ab7 !important;
-}
-
-.text-indigo {
-	color: #3f51b5 !important;
-}
-
-.text-gray {
-	color: #999999 !important;
-}
-
-.bg-default {
-	background-color: #f5f5f5 !important;
-}
-
-.bg-primary {
-	background-color: #00bcd4 !important;
-}
-
-.bg-success {
-	background-color: #009688 !important;
-}
-
-.bg-info {
-	background-color: #03a9f4 !important;
-}
-
-.bg-warning {
-	background-color: #f1c40f !important;
-}
-
-.bg-danger {
-	background-color: #e51c23 !important;
-}
-
-.bg-pink {
-	background-color: #e91e63 !important;
-}
-
-.bg-purple {
-	background-color: #673ab7 !important;
-}
-
-.bg-indigo {
-	background-color: #3f51b5 !important;
-}
-
-.bg-white {
-	background-color: white !important;
-}
-
-.bg-gray {
-	background-color: #e3e3e3 !important;
-}
-
-/* 边框 */
-.border-radius-15 {
-	border-radius: 15rpx;
-}
-
-.border-radius-10 {
-	border-radius: 10rpx;
-}
-
-.border-radius-all {
-	border-radius: 1000rpx;
-}
-
-/* 底部边线 */
-.borde-b {
-	border-bottom: 1px solid #dddddd;
-}
-
-/* 弹性盒子 */
-.flex {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-}
-
-.items-left {
-	justify-content: flex-start;
-}
-
-.items-right {
-	justify-content: flex-end;
-}
-
-.flex-shrink-false {
-	flex-shrink: 0;
-}
-
-.flex-grow-true {
-	flex-grow: 1;
-}
-
-.position-relative {
-	position: relative;
-}