12-27-user

pages.json

@@ -71,6 +71,18 @@
 				}
 			}
 		},
+		{
+			"path": "pages/user/integralTransforms",
+			"style": {
+				"navigationBarTitleText": "余额转账"
+			}
+		},
+		{
+			"path": "pages/category/fillTable",
+			"style": {
+				"navigationBarTitleText": "申请美容院"
+			}
+		},
 		{
 			"path": "pages/public/wxLogin",
 			"style": {
@@ -332,9 +344,7 @@
 			"style": {
 				"navigationBarTitleText": "奖励明细",
 				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
+					"titleNView": false
 				}
 			}
 		},
@@ -355,11 +365,6 @@
 			"style": {
 				"navigationBarTitleText": "收藏夹"
 			}
-		}, {
-			"path": "pages/user/coupon",
-			"style": {
-				"navigationBarTitleText": "我的卡卷"
-			}
 		},
 		{
 			"path": "pages/user/scoreAccumulate",
@@ -425,9 +430,46 @@
 			"style": {
 				"navigationBarTitleText": "我的钱包",
 				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/user/jindou",
+			"style": {
+				"navigationBarTitleText": "我的金豆",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/category/apply",
+			"style": {
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": false
+				},
+				// #endif
+				"navigationBarTitleText": "申请美容院"
+		
+			}
+		},
+		{
+			"path": "pages/user/JDcool",
+			"style": {
+				"navigationBarTitleText": "金豆池",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/user/team",
+			"style": {
+				"navigationBarTitleText": "我的推广",
+				"app-plus": {
+					"titleNView": false
 				}
 			}
 		},

pages/category/apply.vue

@@ -0,0 +1,228 @@
+<template>
+	<view class="wrapper">
+			<view class="top-box" style="height: 135rpx;">
+				<image src="../../static/img/vip-bg.png" mode=""></image>
+			</view>
+			<view class="top">
+				<view class="top-tit">
+					陀罗商城美容院身份
+				</view>
+				<view class="top-btm">
+					<text class="hx"></text><text>购买美容院礼包即可升级为美容院身份</text><text class="hx"></text>
+				</view>
+			</view>
+			
+			<view class="item">
+				<view class="item-top">特权一</view>
+				<view class="item-tit">
+					享受3.5折拿货价
+					<view class="line"></view>
+				</view>
+				<view class="item-info">
+					<view class="info-y"></view>
+					<view class="info">美容院专区商品享受3.5折的拿货价</view>
+				</view>
+			</view>
+			<view class="item">
+				<view class="item-top">特权二</view>
+				<view class="item-tit">
+					金豆奖励
+					<view class="line"></view>
+				</view>
+				<view class="item-info">
+					<view class="info-y"></view>
+					<view class="info">购买美容院产品享受返10%的金豆奖励</view>
+				</view>
+			</view>
+			<!-- <view class="item">
+				<view class="item-top">特权三</view>
+				<view class="item-tit">
+					开实体店奖励
+					<view class="line"></view>
+				</view>
+				<view class="item-info">
+					<view class="info-y"></view>
+					<view class="info">享受伞下全部用户产生的业绩奖励</view>
+				</view>
+			</view> -->
+			<view class="more">
+				<image src="../../static/icon/i-left.png" mode=""></image>
+				<view class="more-tit">
+					更多店长特权持续开放中，敬请期待
+				</view>
+				<image src="../../static/icon/i-right.png" mode=""></image>
+			</view>
+			<view class="btn" @click="changeStep">立即申请成为美容院</view>
+	</view>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex';
+import { register, verify } from '@/api/login.js';
+import { upload ,enter} from '@/api/user.js';
+export default {
+	data() {
+		return {
+			
+		};
+	},
+	onLoad() {
+		let obj = this
+		obj.speed_id = uni.getStorageSync('spread') || '';
+		if(obj.speed_id == '') {
+			obj.speed_id = obj.userInfo.spread_uid || ''
+		}
+	},
+	methods: {
+		changeStep() {
+			uni.navigateTo({
+				url:'/pages/category/fillTable'
+			})
+		},
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.wrapper {
+	height: 100%;
+}
+.top {
+	position: relative;
+	z-index: 2;
+	margin: 0 auto 49rpx;
+	width: 674rpx;
+	background: linear-gradient(-23deg, #ffe7be, #fed591);
+	border-radius: 10rpx;
+	padding-bottom: 40rpx;
+	.top-tit {
+		padding-top: 80rpx;
+		text-align: center;
+		font-size: 49rpx;
+		font-family: Source Han Sans CN;
+		font-weight: 500;
+		color: #6A4714;
+	}
+	.top-btm {
+		margin-top: 40rpx;
+		font-size: 19rpx;
+		font-family: Source Han Sans CN;
+		font-weight: 400;
+		color: #6A4714;
+		text-align: center;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		text {
+			display: inline-block;
+			padding: 0 4rpx;
+		}
+		.hx {
+			width: 66rpx;
+			height: 1rpx;
+			background: #81504A;
+		}
+	}
+}
+.item {
+	margin: 44rpx auto;
+	width: 674rpx;
+	// height: 176rpx;
+	box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.2);
+	border-radius: 10rpx;
+	padding-bottom: 40rpx;
+	.item-top {
+		width: 85rpx;
+		line-height: 36rpx;
+		background-color: #fed591;
+		border-radius: 10rpx 18rpx 18rpx 0;
+		text-align: center;
+		font-size: 20rpx;
+		font-family: Source Han Sans CN;
+		font-weight: 400;
+		color: #975f4a;
+	}
+	.item-tit {
+		display: inline-block;
+		padding: 0 10rpx;
+		font-size: 26rpx;
+		font-family: Source Han Sans CN;
+		font-weight: 500;
+		color: #202020;
+		margin-left: 68rpx;
+		margin-top: 20rpx;
+		.line {
+			// width: 197rpx;
+			margin-top: -10rpx;
+			height: 15rpx;
+			background: #FFF0C5;
+		}
+	}
+	.item-info {
+		display: flex;
+		align-items: flex-start;
+		padding-left: 68rpx;
+		padding-top: 15rpx;
+		// align-items: center;
+		font-size: 21rpx;
+		font-family: Source Han Sans CN;
+		font-weight: 400;
+		color: #6F6F6F;
+		line-height: 40rpx;
+		.info-y {
+			width: 24rpx;
+			height: 24rpx;
+			background: #343238;
+			border-radius: 50%;
+			margin-right: 14rpx;
+			margin-top: 8rpx;
+			flex-shrink: 0;
+		}
+		.info {
+			padding-right: 20rpx;
+		}
+	}
+}
+.btn {
+	margin: 133rpx auto;
+	width: 606rpx;
+	height: 80rpx;
+	background: linear-gradient(-23deg, #ffe7be, #fed591);
+	border-radius: 40rpx;
+	font-size: 35rpx;
+	font-family: Source Han Sans CN;
+	font-weight: 500;
+	color: #704e1c;
+	line-height: 80rpx;
+	text-align: center;
+}
+.top-box {
+	position: relative;
+	z-index: 1;
+	image {
+		width: 750rpx;
+		height: 236rpx;
+		position: absolute;
+		top: 0;
+		
+	}
+}
+.more {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 21rpx;
+	font-family: Source Han Sans CN;
+	font-weight: 400;
+	color: #6F6F6F;
+	height: 40rpx;
+	line-height: 40rpx;
+	image {
+		height: 15rpx;
+		width: 40rpx;
+	}
+	view {
+		padding: 0 8rpx;
+	}
+}
+</style>

pages/category/fillTable.vue

@@ -0,0 +1,230 @@
+<template>
+	<view class="wrapper">
+		<view class="tab-wrapper">
+			<view class="tab-item">
+				<view class="itemx">
+					<view class="item-tit">店铺名称：</view>
+					<input type="text" v-model="merchant_name" placeholder="请输入店铺名称" />
+				</view>
+				<view class="up-wrapper">
+					店铺logo
+					<view class="imgs">
+						<view class="imgs-item">
+							<image :src="sfzz" mode="" v-if="yyzz" @click.stop="upImg('yyzz')"></image>
+							<image src="../../static/img/add.png" mode="" v-if="!yyzz" @click.stop="upImg('yyzz')"></image>
+						</view>
+					</view>
+				</view>
+				
+				<view class="itemx">
+					<view class="item-tit">联系电话：</view>
+					<input type="text" v-model="phone" placeholder="请输入联系电话" />
+				</view>
+				<view class="itemx">
+					<view class="item-tit">营业时间：</view>
+					<input type="text" v-model="time" placeholder="请输入营业时间" disabled />
+				</view>
+				<view class="itemx">
+					<view class="item-tit">店铺地址：</view>
+					<input type="text" v-model="area" placeholder="请输入店铺地址" />
+				</view>
+			</view>
+			
+			<view class="btn-tc"></view>
+			<view class="sub-btn" @click="sub">提交申请</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex';
+import { register, verify } from '@/api/login.js';
+import { upload, enter } from '@/api/user.js';
+export default {
+	data() {
+		return {
+			phone: '',
+			time:'',//输入营业时间
+			yyzz: '', //店铺logo
+			merchant_name: '', //店铺名称
+			area: '' //店长区域
+		};
+	},
+	onLoad() {
+		let obj = this;
+		obj.speed_id = uni.getStorageSync('spread') || '';
+		if (obj.speed_id == '') {
+			obj.speed_id = obj.userInfo.spread_uid || '';
+		}
+	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	watch: {
+		countDown(i) {
+			if (i == 0) {
+				clearInterval(this.time);
+			}
+		}
+	},
+	methods: {
+		upImg(item) {
+			let obj = this;
+			upload({
+				filename: ''
+			})
+				.then(res => {
+					console.log(res[0].url);
+
+					obj[item] = res[0].url;
+				})
+				.catch(err => {
+					console.log(err);
+				});
+		},
+		//提交
+		sub() {
+			let obj = this;
+			if (obj.phone == '') {
+				obj.$api.msg('请输入联系方式');
+				return;
+			}
+			if (this.phone.length < 11) {
+				this.$api.msg('请输入正确的手机号');
+				return;
+			}
+			if (obj.yyzz == '') {
+				obj.$api.msg('请上传店铺logo');
+				return;
+			}
+			if (obj.area == '') {
+				obj.$api.msg('请输入店铺地址');
+				return;
+			}
+			let card_id = obj.sfzz + ',' + obj.sfzf;
+			uni.showLoading({
+				title: '提交中...',
+				mask: true
+			});
+			enter({
+				type: 1,
+				merchant_name: obj.area,
+				link_user: obj.name,
+				link_tel: obj.phone,
+				spread_uid: obj.speed_id,
+				charter: obj.yyzz,
+				card_id: card_id
+			})
+				.then(res => {
+					uni.hideLoading();
+					uni.showToast({
+						title: '提交成功',
+						duration: 2000
+					});
+					setTimeout(() => {
+						uni.navigateBack({});
+					}, 2000);
+
+					console.log(res);
+				})
+				.catch(err => {
+					uni.hideLoading();
+					console.log(err);
+				});
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.wrapper {
+	height: 100%;
+}
+.tab-wrapper {
+	padding: 20rpx 30rpx;
+	background-color: #f2f3f5;
+	.itemx {
+		margin: 0 auto;
+		width: 100%;
+		background-color: #fff !important;
+		height: 100rpx;
+		display: flex;
+		// width: 690px;
+		border: 1px #f4f4f4 solid;
+		.code {
+			width: 150rpx;
+			flex-shrink: 0;
+			text-align: center;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #ff4c4c;
+			line-height: 100rpx;
+		}
+		.item-tit {
+			height: 100rpx;
+			line-height: 100rpx;
+			padding-left: 30rpx;
+			width: 310rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666666;
+			flex-shrink: 0;
+		}
+		input {
+			width: 440rpx;
+			padding-right: 20rpx;
+			height: 100rpx;
+			line-height: 100rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #333333;
+		}
+	}
+}
+.sub-btn {
+	// position: fixed;
+	// bottom: 0;
+	margin: 60rpx auto;
+	width: 600rpx;
+	height: 98rpx;
+	border-radius: 49rpx;
+	background: linear-gradient(180deg, #fd4646, #ff3535);
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #ffffff;
+	line-height: 98rpx;
+	text-align: center;
+}
+.btn-tc {
+	height: 98rpx;
+}
+.up-wrapper {
+	margin: auto;
+	padding: 38rpx 21rpx;
+	width: 690rpx;
+	// height: 250rpx;
+	background: #ffffff;
+	border-radius: 10rpx;
+	font-size: 28rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #333333;
+	.imgs {
+		padding: 27rpx 70rpx;
+		display: flex;
+		justify-content: space-around;
+		.imgs-item {
+			height: 160rpx;
+			width: 160rpx;
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+}
+</style>

pages/money/recharge.vue

@@ -1,66 +1,97 @@
 <template>
 	<view class="content">
-		<view class="row-box">
+		<view class="top_box">
+			<text class="yue-tit">当前余额：</text>
+			<text class="yue-num">￥{{ now_money | parseFloatNum }}</text>
+		</view>
+
+		<view class="line_box"></view>
+
+		<view class="cz_box">
+			<view class="cz_wrap">
+				<text class="cz_tit">￥</text>
+				<input class="cz_input" type="number" v-model="money" @focus="changeNum()" placeholder="请输入充值金额" placeholder-class="placeholder" />
+			</view>
+			<view class="zc_list_box">
+				<view class="zc_list_price" :class="{ seletPrice: seletNum == item }" @click="seletChange(item, index)" v-for="(item, index) in list" :key="index">
+					{{ item | parseFloatNum }}元
+				</view>
+			</view>
+		</view>
+		<!-- <view class="line_box"></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>
+		</view> -->
 
-		<view class="list">
-			<radio-group @change="tabRadio">
-				<!-- #ifdef APP-PLUS -->
-				<label>
-					<view class="box">
-						<view class="icon iconfont iconzhifubao"></view>
-						<view class="title-box">
-							<view class="title"><text>支付宝充值</text></view>
-						</view>
-						<view class="right"><radio value="alipay" color="#5dbc7c" :checked="type == 'alipay'" /></view>
-					</view>
-				</label>
-				<label>
-					<view class="box">
-						<view class="icon iconfont iconweixin1"></view>
-						<view class="title-box">
-							<view class="title"><text>微信充值</text></view>
-							<view class="node"><text>真实姓名(代勇明)</text></view>
-						</view>
-						<view class="right"><radio value="weixin" color=" #5dbc7c" :checked="type == 'weixin'" /></view>
-					</view>
-				</label>
-				<!-- #endif -->
-			</radio-group>
+		<!-- <view class="rechar-box">
+			<view class="rechar-title">注意事项</view>
+			<view class="rechar-text" v-for="(item, index) in zhuyi" :key="index">
+				<text>{{ index + 1 }}.{{item}}</text>
+			</view>
+		</view> -->
+		<view class="line_box"></view>
+		<view class="cz-type">
+			<view class="type-left">
+				<view class="icon iconfont iconweixin"></view>
+				<view class="tit">微信支付</view>
+			</view>
+			<view class="type-right"><image src="https://zhibo.liuniu946.com/img/checked.png" mode=""></image></view>
 		</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>
 
 <script>
 import { getMoneyStyle } from '@/utils/rocessor.js';
 // #ifdef H5
-import { rechargeWechat } from '@/api/wallet.js';
+import { rechargeWechat, rechargeIndex } from '@/api/wallet.js';
 // #endif
 // #ifdef MP
-import { rechargeRoutine } from '@/api/wallet.js';
+import { rechargeWechat, rechargeRoutine, rechargeIndex } from '@/api/wallet.js';
 // #endif
 import { mapState } from 'vuex';
+import { spreadCommission, userBalance } from '@/api/wallet.js';
 export default {
 	filters: {
-		getMoneyStyle
+		getMoneyStyle,
+		// 去处小数点后的0
+		parseFloatNum(clock) {
+			return parseFloat(clock);
+		}
 	},
 	data() {
 		return {
 			type: 'weixin',
-			money: '', //充值金额
-			payLoding: false //是否加载中
+			money: 300, //充值金额
+			payLoding: false ,//是否加载中
+			list: [
+				'300',
+				'200',
+				'150',
+				'100',
+				'50'
+			],
+			now_money:'',
+			seletNum: '300',	// 选中
+			zhuyi: [],
+			quota: '',	// 送的钱
+			typeText: 0,	// 0-微信 1-佣金
 		};
 	},
-	onLoad(options) {},
+	onLoad(options) {
+		this.loadData();
+	},
 	computed: {
 		// #ifdef H5
-		...mapState(['weichatObj'])
+		...mapState(['weichatObj', 'userInfo'])
+		// #endif
+		// #ifdef MP
+		...mapState(['userInfo'])
 		// #endif
 	},
 	methods: {
@@ -70,17 +101,51 @@ export default {
 				url: url
 			});
 		},
+		changeNum() {
+			this.seletNum = this.money = '';
+			console.log(this.seletNum, this.money);
+		},
+		seletChange(item, index) {
+			this.seletNum = item;
+			this.seletMoney = item;
+			console.log(this.seletNum);
+			this.money = item
+		},
 		// 切换选中对象
 		tabRadio(e) {
-			this.type = e;
+			this.type = e.detail.value;
+			if ( e.detail.value == 'weixin' ) {
+				this.typeText = 0
+			} else {
+				this.typeText = 1
+			}
 		},
+		// 充值金额
+		rechargeXuan(item) {
+			this.money = item.price;
+			this.quota = item.quota;
+		},
+
+		loadData() {
+			userBalance({}).then(({ data }) => {
+				this.now_money = data.now_money;
+			});
+		},
+
 		// 提交
 		confirm() {
 			let obj = this;
 			obj.payLoding = true;
+			if( !obj.money ) {
+				obj.$api.msg('请输入金额');
+				obj.payLoding = false;
+				return;
+			}
 			// #ifdef H5
-			rechargeWechat({ price: this.money, from: this.type })
-				.then(e => {
+			rechargeWechat({
+				price: this.money,
+				from: this.type ,
+			}).then(e => {
 					let da = e.data.data;
 					obj.weichatObj.chooseWXPay({
 						timestamp: da.timestamp,
@@ -92,7 +157,10 @@ export default {
 							uni.showToast({
 								title: '充值成功',
 								duration: 2000,
-								position: 'top'
+								position: 'top',
+								success: function(res) {
+									uni.navigateBack()
+								}
 							});
 						}
 					});
@@ -114,13 +182,18 @@ export default {
 								signType: da.signType,
 								paySign: da.paySign,
 								success: function(res) {
-									uni.redirectTo({
-										url: '/pages/money/paySuccess'
+									uni.showToast({
+										title: '充值成功',
+										duration: 2000,
+										position: 'top',
+										success: function(res) {
+											uni.navigateBack()
+										}
 									});
 								},
-								
+
 							})
-					
+
 					obj.payLoding = false;
 				})
 				.catch(e => {
@@ -129,33 +202,6 @@ export default {
 				});
 			// #endif
 		},
-		//获取订单列表
-		loadData(source) {
-			console.log(source);
-			//这里是将订单挂载到tab列表下
-			let index = this.tabCurrentIndex;
-			let navItem = this.navList[index];
-			let state = navItem.state;
-			if (source === 'tabChange' && navItem.loaded === true) {
-				//tab切换只有第一次需要加载数据
-				return;
-			}
-			if (navItem.loadingType === 'loading') {
-				//防止重复加载
-				return;
-			}
-			navItem.loadingType = 'loading';
-			setTimeout(() => {
-				let orderList = [];
-				orderList.forEach(item => {
-					navItem.orderList.push(item);
-				});
-				//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
-				this.$set(navItem, 'loaded', true);
-				//判断是否还有数据， 有改为 more， 没有改为noMore
-				navItem.loadingType = 'more';
-			}, 600);
-		}
 	}
 };
 </script>
@@ -163,26 +209,189 @@ export default {
 <style lang="scss">
 page {
 	height: 100%;
+	background: #ffffff;
+}
+.top_box {
+	padding: 20rpx 26rpx 20rpx 47rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	.yue-tit {
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #333333;
+	}
+	.yue-num {
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #ff6f0f;
+	}
 }
 
+.line_box {
+	width: 100%;
+	height: 20rpx;
+	background: #f8f8f8;
+}
+.cz_box {
+	padding: 40rpx 20rpx 20rpx;
+	.cz_wrap {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-bottom: 20rpx;
+		border-bottom: 1px solid #e6e6e6;
+		.cz_tit {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+		}
+		.cz_input {
+			text-align: right;
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			// color: #BFBFBF;
+		}
+	}
+	.zc_list_box {
+		display: flex;
+		flex-wrap: wrap;
+		.zc_list_price {
+			width: 202rpx;
+			height: 60rpx;
+			background: #f0f0f0;
+			border-radius: 8rpx;
+			margin-top: 36rpx;
+			margin-right: 50rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			&:nth-child(3n) {
+				margin-right: 0;
+			}
+		}
+		.seletPrice {
+			background: #FF4C4C;
+			color: #ffffff;
+		}
+	}
+}
+.recha-box {
+	padding: 50rpx 30rpx 0;
+	display: flex;
+	flex-wrap: wrap;
+	.recha-frame {
+		width: 210rpx;
+		height: 181rpx;
+		border: 1px solid #dbdede;
+		border-radius: 20rpx;
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		justify-content: center;
+		margin-right: 30rpx;
+		margin-bottom: 30rpx;
+		&:nth-child(3n) {
+			margin-right: 0;
+		}
+		.recha-top {
+			display: flex;
+			align-items: center;
+			.recha-img {
+				width: 64rpx;
+				height: 62rpx;
+			}
+			.recha-tit {
+				margin-left: 10rpx;
+				font-size: 36rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+		}
+		.recha-song {
+			margin-top: 20rpx;
+			font-size: $font-base;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #ff9900;
+		}
+	}
+	.select-frame {
+		border: 1px solid #ef041f;
+	}
+}
+
+.rechar-box {
+	padding: 30rpx 20rpx 0;
+	.rechar-title {
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #333333;
+		margin-bottom: 10rpx;
+	}
+	.rechar-text {
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #333333;
+	}
+}
+.cz-type {
+	margin-top: 22rpx;
+	display: flex;
+	justify-content: space-between;
+	padding: 32rpx;
+	align-items: center;
+	.type-left {
+		display: flex;
+		align-items: center;
+		.icon {
+			height: 38rpx;
+			image {
+				width: 48rpx;
+				height: 38rpx;
+			}
+		}
+		.iconweixin {
+			color: #36cb59;
+		}
+		.tit {
+			margin-left: 12rpx;
+			font-size: 30rpx;
+			color: #333333;
+		}
+	}
+	.type-right {
+		image {
+			width: 36rpx;
+			height: 36rpx;
+		}
+	}
+}
 .add-btn {
 	&.modified {
 		color: $base-color;
 	}
 	&.up {
-		background-color: $base-color;
+		// background:$base-color;
 		color: #fff;
 	}
 	display: flex;
 	align-items: center;
 	justify-content: center;
-	width: 690rpx;
+	width: 560rpx;
 	height: 80rpx;
 	margin: 0 auto;
-	margin-top: 30rpx;
+	margin-top: 120rpx;
 	font-size: $font-lg;
-	border-radius: 10rpx;
-	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+	background: #FF4C4C;
+	box-shadow: 0px 12rpx 45rpx 5rpx rgba(36, 17, 2, 0.04);
+	border-radius: 8rpx;
 }
 .row-box {
 	margin-top: 30rpx;
@@ -229,9 +438,15 @@ page {
 		width: 100%;
 		height: 120rpx;
 		border-bottom: 1px solid $border-color-light;
+		padding-right: 25rpx;
 		.icon {
 			font-size: 48rpx;
 			padding-right: 20rpx;
+			display: flex;
+		}
+		.yongjing {
+			width: 48rpx;
+			height: 48rpx;
 		}
 		.iconweixin1 {
 			color: #18bf16;

pages/money/withdrawal.vue

@@ -245,11 +245,11 @@ page {
 
 .add-btn {
 	&.modified {
-		color: #2ed8db;
-		border:1px solid  #2ed8db;
+		color: #FF4C4C;
+		border:1px solid  #FF4C4C;
 	}
 	&.up {
-		background: linear-gradient(90deg, #08c4e6, #50ead2);
+		background: #FF4C4C;
 		color: #fff;
 	}
 	display: flex;

pages/user/JDcool.vue

@@ -0,0 +1,233 @@
+<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/anchor12.png"></image>
+				<view class="money">100</view>
+				<view class="tip">
+					金豆数量
+				</view>
+			</view>
+		</view>
+		<view class="title">
+			- 实时瓜分 -
+		</view>
+		<scroll-view class="swiper-box" scroll-y>
+			<!-- 空白页 -->
+			<!-- <empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty> -->
+			<!-- 订单列表 -->
+			<template>
+				<view v-for="(item, i) in 10" class="order-item flex">
+					<view class="left flex">
+						<view class="avator">
+							<image src="" mode=""></image>
+						</view>
+						<view class="order-font">
+							御风获得<text>20</text>个金豆
+						</view>
+					</view>
+					<view class="time">
+						2019-12-02 12:00:00
+					</view>
+				</view>
+			</template>
+			<!-- <uni-load-more :status="tabItem.loadingType"></uni-load-more> -->
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+export default {
+	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 => {}
+		});
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #ffffff;
+	height: 100%;
+}
+.content-money {
+	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 {
+	height: 430rpx;
+	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: 430rpx;
+		display: block;
+	}
+	.text {
+		padding-top: 80rpx;
+		font-size: $font-lg;
+	}
+	.money {
+		position: absolute;
+		top: 0;
+		width: 100%;
+		padding-top: 186rpx;
+		font-size: 84rpx;
+		font-weight: bold;
+	}
+	.tip {
+		position: absolute;
+		top: 0;
+		width: 100%;
+		text-align: center;
+		padding-top: 304rpx;
+		font-size: 26rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+}
+
+.title {
+	height: 82rpx;
+	line-height: 82rpx;
+	text-align: center;
+	font-size: 30rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #333333;
+	border-bottom: 1px solid #f0f0f0;
+}
+
+// 列表
+.swiper-box {
+	.order-item {
+		padding: 18rpx 24rpx 14rpx;
+		border-bottom: 1px solid #f0f0f0;
+		.left {
+			justify-content: flex-start;
+			.avator {
+				width: 70rpx;
+				height: 70rpx;
+				border-radius: 50rpx;
+				background: #03A9F4;
+				image {
+					width: 70rpx;
+					height: 70rpx;
+					border-radius: 50rpx;
+				}
+			}
+			.order-font {
+				margin-left: 10rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #3F454B;
+				text {
+					color: #FF4D4C;
+				}
+			}
+		}
+		.time {
+			font-size: 22rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #999999;
+		}
+		
+	}
+}
+.content {
+	height: 100%;
+	.empty-content {
+		background-color: #ffffff;
+	}
+}
+</style>

pages/user/award.vue

@@ -2,49 +2,46 @@
 	<view class="content">
 		<view class="content-money">
 			<view class="money-box">
-				<view class="text">可提现佣金（元）</view>
-				<view class="money">{{ money | getMoneyStyle }}</view>		
-			</view>
-			<view class="moneyTx" @click="navto('./withdrawal')">提现</view>
-			<view class="flex buttom-box">
-				<view class="buttom" @click="navto('/pages/money/recharge')">
-					<view class="icon"><image src="/static/icon/i6.png" mode="aspectFill" class="icon-img"></image></view>
-					<text>统计</text>
-				</view>
-				<view class="interval"></view>
-				<view class="buttom" @click="navto('./withdrawal')">
-					<view class="icon"><image src="/static/icon/i7.png" mode="aspectFill" class="icon-img"></image></view>
-					<text>提现</text>
+				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/img/fanhui.png" mode=""></image></view>
+				<view class="yue" @click="navto('/pages/user/integralTransforms')">
+					积分转账
 				</view>
+				<view class="header">我的余额</view>
+				<image class="money_bg" src="../../static/img/anchor12.png"></image>
+				<view class="money">{{ money | 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 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+'px'}" class="swiper-box" duration="300" @change="changeTab">
+		<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 scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
 					<!-- 空白页 -->
 					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-					
 					<!-- 订单列表 -->
-					<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-						<view class="title-box">
-							<view class="title">
-								<text>{{ item.title }}</text>
+					<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="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>
+					</template>
 					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
+		<view class="wallet-btn" @click="navto('/pages/money/recharge')">立即充值</view>
 	</view>
 </template>
 
@@ -63,18 +60,16 @@ export default {
 		uniLoadMore
 	},
 	onReady() {
-		//初始化获取页面宽度
-		uni.createSelectorQuery().select('.content')
+		// 初始化获取页面宽度
+		uni.createSelectorQuery()
+			.select('.content')
 			.fields(
-			{
-				size:true
-			},
-			data => {
-				console.log(data);
-				console.log(Math.floor((data.width /750) * 300));
-				//保存头部高度
-				this.maxheight =data.height - Math.floor((data.width / 750) * 570);
-				console.log(this.maxheight);
+				{
+					size: true
+				},
+				data => {
+					// 保存头部高度
+					this.maxheight = data.height - Math.floor((data.width / 750) * 330) - 40 - 40;
 				}
 			)
 			.exec();
@@ -82,15 +77,15 @@ export default {
 	data() {
 		return {
 			// 头部图高度
-			maxheight:'',
+			maxheight: '',
 			tabCurrentIndex: 0,
 			navList: [
 				{
-					state: 0,
+					state: 2,
 					text: '收入',
 					loadingType: 'more',
 					orderList: [],
-					page: 1, //当前页面
+					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
 				{
@@ -98,43 +93,45 @@ export default {
 					text: '支出',
 					loadingType: 'more',
 					orderList: [],
-					page: 1, //当前页面
+					page: 1, //当前页数
 					limit: 10 //每次信息条数
-				},
+				}
 			],
 			money: ''
 		};
 	},
-	onLoad(options) {},
-	onShow() {
+	onLoad(options) {
 		this.loadData();
-		//获取用户余额
+	},
+	onShow() {
+		// 获取用户余额
 		userBalance({}).then(({ data }) => {
-			this.money = data.commissionCount;
+			this.money = data.now_money;
 		});
 	},
 	methods: {
+		// 页面跳转
 		navto(e) {
 			uni.navigateTo({
 				url: e
 			});
 		},
+		//获取收入支出信息
 		async loadData(source) {
-			//这里时将订单挂载到tab列表下
+			//这里是将订单挂载到tab列表下
 			let index = this.tabCurrentIndex;
 			let navItem = this.navList[index];
-			let state = navItem.state+3;
+			let state = navItem.state;
 			if (source === 'tabChange' && navItem.loaded === true) {
 				//tab切换只有第一次需要加载数据
 				return;
 			}
-			if (navItem.loadingType === 'loading') {
+			if (navItem.loadingType === 'noMore') {
 				//防止重复加载
 				return;
 			}
-			//修改当前对象状态为加载中
+			// 修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
-			
 			spreadCommission(
 				{
 					page: navItem.page,
@@ -143,16 +140,14 @@ export default {
 				state
 			)
 				.then(({ data }) => {
-					if(data.length > 0) {
-						navItem.orderList = navItem.orderList.concat(data[0].list);
-						console.log(navItem.orderList);
-						navItem.page++;
-					}
-					//判断是否还有数据, 有改为more, 没有改为noMore
+					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();
@@ -162,6 +157,7 @@ export default {
 					console.log(e);
 				});
 		},
+
 		//swiper 切换
 		changeTab(e) {
 			this.tabCurrentIndex = e.target.current;
@@ -170,9 +166,15 @@ export default {
 		//顶部tab点击
 		tabClick(index) {
 			this.tabCurrentIndex = index;
+		},
+		// 点击返回 我的页面
+		toBack() {
+			uni.switchTab({
+				url: '/pages/user/user'
+			});
 		}
 	}
-}
+};
 </script>
 
 <style lang="scss">
@@ -180,21 +182,28 @@ page {
 	background: #ffffff;
 	height: 100%;
 }
+// .header{
+// 	width: 100%;
+// 	height: 54px;
+// 	background-color: #FF0000;
+// }
 .content-money {
 	padding-bottom: 30rpx;
 	background: $page-color-base;
-	.moneyTx{
+	// border: 2px solid #ffffff;
+	// padding-top: var(--status-bar-height);
+	.moneyTx {
 		position: absolute;
-		top: 150rpx;
+		top: 120rpx;
 		right: 0rpx;
-		width: 150rpx;
-		padding: 10rpx 30rpx;
-		border: 2px solid #FFFFFF;
-		border-top-left-radius: 99rpx;
-		border-bottom-left-radius: 99rpx;
-		color: #FFFFFF;
+		// 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;
@@ -213,8 +222,8 @@ page {
 			background-color: #eeeeee;
 		}
 		.icon {
-			height: 50rpx;
-			width: 48rpx;
+			height: 36rpx;
+			width: 36rpx;
 			margin: 0 auto;
 			.icon-img {
 				width: 100%;
@@ -224,17 +233,72 @@ page {
 	}
 }
 .money-box {
-	background-color: $base-color;
-	padding-top: var(--status-bar-height);
-	height: 368rpx;
 	color: #ffffff;
 	text-align: center;
+	position: relative;
+	background-color: pink;
+	.yue{
+		position: absolute;
+		right: 0;
+		z-index: 9999;
+		text-align: center;
+		line-height: 50rpx;
+		top: 100rpx;
+		width: 142rpx;
+		height: 50rpx;
+		background: #FFFFFF;
+		border-radius: 7rpx;
+		font-size: 26rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FF4C4C;
+	}
+	.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: 360rpx;
+		display: block;
+	}
 	.text {
-		padding-top: 147rpx;
-		font-size: $font-sm;
+		padding-top: 80rpx;
+		font-size: $font-lg;
 	}
 	.money {
-		font-size: 56rpx;
+		position: absolute;
+		top: 0;
+		width: 100%;
+		padding-top: 186rpx;
+		font-size: 60rpx;
+		font-weight: bold;
+		&::before {
+			content: '￥';
+			font-size: 30rpx;
+		}
 	}
 }
 
@@ -253,10 +317,10 @@ page {
 		align-items: center;
 		height: 100%;
 		font-size: 15px;
-		color: $font-color-dark;
+		color: #999999;
 		position: relative;
 		&.current {
-			color: $base-color;
+			color: #000000;
 			&:after {
 				content: '';
 				position: absolute;
@@ -265,12 +329,12 @@ page {
 				transform: translateX(-50%);
 				width: 44px;
 				height: 0;
-				border-bottom: 2px solid $base-color;
+				border-bottom: 2px solid #FF4C4C;
 			}
 		}
 	}
 }
-//列表
+// 列表
 
 .swiper-box {
 	padding-top: 10rpx;
@@ -288,7 +352,7 @@ page {
 			}
 		}
 		.money {
-			color: #fd5b23;
+			color: #ff0000;
 			font-size: $font-lg;
 		}
 	}
@@ -296,6 +360,22 @@ page {
 .list-scroll-content {
 	height: 100%;
 }
+.wallet-btn {
+	width: 674rpx;
+	height: 88rpx;
+	background: #FF4C4C;
+	border-radius: 44rpx;
+	font-size: $font-lg;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #ffffff;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	position: fixed;
+	left: 38rpx;
+	bottom: 50rpx;
+}
 .content {
 	height: 100%;
 	.empty-content {

pages/user/coupon.vue

@@ -1,310 +0,0 @@
-<template>
-	<view class="content">
-		<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">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<!-- 空白页 -->
-				<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-				<view v-for="(item, index) in tabItem.orderList" :key="index" class="row flex">
-					<view class="list-money flex">
-						<image :src="item._type == 2 ? '/static/img/img03.png' : '/static/img/img02.png'" mode="scaleToFill"></image>
-						<view class="list-money-text">
-							<view class="tit" :class="{ action: item._type} == 2">
-								<text>{{ item.coupon_price }}</text>
-							</view>
-							<view class="price">
-								<text>满{{ item.use_min_price }}元</text>
-							</view>
-						</view>
-					</view>
-					<view class="list-interval position-relative">
-						<view class="bottom"></view>
-						<view class="top"></view>
-					</view>
-					<view class="row_list_right">
-						<view class="right_top">
-							<text class="right_title" :class="{ action: item._type == 2}">{{ item.coupon_title }}</text>
-						</view>
-						<view class="right_time">
-							<text>{{ item._add_time }}-{{ item.end_time }}</text>
-						</view>
-						<view class="right_use action" v-if="item._type == 2">
-							<text>{{ item._msg }}</text>
-						</view>
-						<view class="right_use noAction" v-if="item._type == 0">
-							<text>{{ item._msg }}</text>
-						</view>
-					</view>
-				</view>
-				<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
-import { getCouponsList } from '@/api/order.js';
-export default{
-	components: {
-		uniLoadMore,
-		empty
-	},
-	data() {
-		return {
-			tabCurrentIndex: 0,
-			navList:[
-				{
-					state: 0,
-					text: '全部',
-					loadingType: 'more',
-					orderList: [],
-					page: 1,//当前页数
-					limit: 10 //每次信息条数
-				},
-				{
-					state: 1,
-					text: '未使用',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
-				{
-					state: 2,
-					text: '已使用',
-					loadingType: 'more',
-					orderList: [],
-					page: 1,//当前页数
-					limit: 10 //每次信息条数
-				}
-			]
-		};
-	},
-	onLoad(options) {
-		this.loadData();
-	},
-	methods: {
-		//返回首页
-		navTo(){
-			uni.switchTab({
-				url: '/pages/index/index'
-			});
-		},
-		//获取订单列表
-		loadData(source) {
-			//将订单挂载到tab列表下
-			let index = this.tabCurrentIndex;
-			let navItem = this.navList[index];
-			let state = navItem.state;
-			if (source === 'tabChange' && navItem.loaded === true) {
-				//tab切换只有第一次需要加载数据
-				return;
-			}
-			if (navItem.loadingType === 'loading'){
-				//防止重复加载
-				return;
-			}
-			//修改当前对象状态为加载中
-			navItem.loadingType = 'loading';
-			getCouponsList(
-				{
-					page: navItem.page,
-					limit: navItem.limit
-				},
-				index
-			)
-				.then(({ data }) => {
-					let da = data.map(e => {
-						e.coupon_price = +e.coupon_price.replace(',', '');
-						e.use_min_price = +e.use_min_price.replace(',', '');
-						return e
-					});
-					navItem.orderList = navItem.orderList.concat(da);
-					console.log(navItem.orderList);
-					navItem.page++;
-					if (navItem.limit == data.length) {
-						// 判断是否还有数据，有改为more，没有改为noMore
-						navItem.loadingType = 'more';
-						return;
-					}else {
-						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;
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-// 卡卷可用时颜色
-$card-color-action: #fc4141;
-page,
-.content {
-	background: $page-color-base;
-	height: 100%;
-}
-
-.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: $font-color-dark;
-		position: relative;
-		&.current {
-			color: #bc253a;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid #bc253a;
-			}
-		}
-	}
-}
-
-.swiper-box {
-	height: calc(100% - 40px);
-	.tab-content {
-		padding: 25rpx 0px;
-		font-size: 28rpx;
-		color: #1b1b1b;
-	}
-}
-
-.row {
-	border-radius: 15rpx;
-	margin: 0 25rpx;
-	margin-bottom: 25rpx;
-	height: 200rpx;
-	overflow: hidden;
-	background-color: #ffffff;
-	.list-interval {
-		border: 1px dashed $border-color-light;
-		height: 100%;
-		.top,
-		.bottom {
-			border-radius: 100rpx;
-			width: 30rpx;
-			height: 30rpx;
-			position: absolute;
-			background-color: $page-color-base;
-			right: -15rpx;
-		}
-		.top {
-			top: -18rpx;
-		}
-		.bottom {
-			bottom: -18rpx;
-		}
-	}
-	.list-money {
-		height: 100%;
-		image {
-			height: 100%;
-			width: 20rpx;
-		}
-		.list-money-text {
-			width: 220rpx;
-			padding: 0 25rpx;
-			text-align: center;
-			color: $font-color-light;
-			.tit {
-				padding: 15rpx 0rpx;
-				font-size: 55rpx;
-				font-weight: bold;
-				&.action {
-					color: $card-color-action;
-				}
-			}
-			.price {
-				padding-bottom: 25rpx;
-			}
-		}
-	}
-	.row_list_right {
-		flex-grow: 1;
-		padding-left: 25rpx;
-		line-height: 1;
-		.right_time {
-			color: $font-color-light;
-			font-size: $font-sm;
-		}
-		.right_use {
-			margin: 15rpx 0;
-			padding: 10rpx;
-			width: 140rpx;
-			text_align: center;
-			border-radius: 50rpx;
-			color: #fff;
-			font-size: $font-sm - 4rpx;
-			&.action {
-				background-color: $card-color-action;
-			}
-			&.noAction {
-				background-color: $color-gray;
-			}
-		}
-		.right_top {
-			margin: 15rpx 0;
-			font-size: $font-lg;
-			height: 50rpx;
-			color: $font-color-light;
-			.right_name {
-				font-weight: bold;
-			}
-			.right_title {
-				font-weight: bold;
-				&.action {
-					color: $font-color-base;
-				}
-			}
-		}
-	}
-	
-	.iconlocation {
-		font-size: 36rpx;
-		color: $font-color-light;
-	}
-}
-// uni-load-more
-.uni-load-more {
-	display: flex;
-	flex-direction: row;
-	height: 80rpx;
-	align-items: center;
-	justify-content: center;
-}
-</style>

pages/user/integralTransforms.vue

@@ -0,0 +1,139 @@
+<template>
+	<view class="integralTransforms">
+		<view class="header">
+			<text class="title">{{ jifen || '0.00' }}</text><br>
+			<text>可转换积分</text>
+		</view>
+		<view class="account">
+			<text class="title">收款人UID</text>
+			<input type="number" placeholder="请输入收款人UID" v-model="account" />
+		</view>
+		<view class="num">
+			<text class="title">转账数量</text>
+			<view class="">
+				<text class="ti">￥</text>
+				<input type="number" v-model.number="num" placeholder="请输入转账数量" />
+			</view>
+		</view>
+		<view class="button" @click="submit">
+			提交申请
+		</view>
+	</view>
+</template>
+
+<script>
+// import { goPay } from '@/api/finance.js';
+import { spreadCommission, userBalance } from '@/api/wallet.js';
+import { mapState, mapMutations } from 'vuex';
+	
+	export default {
+		data() {
+			return {
+				password:'',//交易密码
+				jifen:'',//可转积分
+				num: '', //转账数量
+				account: '', //收款人账户
+				type:''
+			}
+		},
+		methods: {
+			
+			submit() {
+				let obj = this
+				if(obj.account == ''){
+					obj.$api.msg('请输入对方账号ID')
+					return
+				}
+				if(obj.num ==''){
+					obj.$api.msg('请输入转账数量')
+					return
+				}
+				if(obj.account == this.userInfo.uid){
+					obj.$api.msg('请勿转账给自己')
+					return
+				}
+				goPay({
+					num: obj.num,
+					uid: obj.account,
+				}).then(data =>{
+					console.log(data,'转账')
+					obj.num = ''
+					obj.account = ''
+					obj.$api.msg('转账成功')
+				})
+				
+				
+			}
+		},
+		computed: {
+
+			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+		},
+		onLoad(option) {
+		
+			// 获取用户余额
+			userBalance({}).then(({ data }) => {
+				this.jifen = data.now_money;
+			});
+		},
+		watch: {
+			num() {
+				if (this.num > this.jifen) {
+					this.num = this.jifen
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.integralTransforms {
+
+		.header,
+		.account,
+		.num {
+			background-color: #fff;
+			margin: 20rpx 0;
+			padding: 30rpx;
+
+			input {
+				margin-top: 10rpx;
+			}
+
+			.title {
+				font-size: 30rpx;
+				color: #333333;
+				font-family: PingFang-SC-Regular;
+			}
+		}
+
+		.header {
+			text-align: center;
+
+			text:nth-child(1) {
+				font-size: 45rpx;
+			}
+
+			text:nth-child(3) {
+				font-size: 30rpx;
+				color: #666666;
+			}
+		}
+
+		.num {
+			.ti {
+				float: left;
+			}
+		}
+
+		.button {
+			width: 520rpx;
+			margin: 60rpx auto;
+			padding: 20rpx;
+			text-align: center;
+			border-radius: 10rpx;
+			background: #FF4C4C;
+			color: #fff;
+		}
+	}
+</style>

pages/user/jindou.vue

@@ -0,0 +1,335 @@
+<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/anchor12.png"></image>
+				<view class="money">{{ userInfo.brokerage_price | 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: 360rpx;
+		display: block;
+	}
+	.text {
+		padding-top: 80rpx;
+		font-size: $font-lg;
+	}
+	.money {
+		position: absolute;
+		top: 0;
+		width: 100%;
+		padding-top: 186rpx;
+		font-size: 60rpx;
+		font-weight: bold;
+		&::before {
+			content: '￥';
+			font-size: 30rpx;
+		}
+	}
+}
+
+.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/team.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 src="../../static/img/anchor12.png" mode="" class="money_bg"></image>
+				<view class="money">
+					<text>共</text>
+					{{ all.all || 0 }}
+					<text>人</text>
+				</view>
+			</view>
+		</view>
+		<view class="navbar flex">
+			<view class="nav-item">
+				<view class="num">0</view>
+				<view class="font">个人消费</view>
+			</view>
+			<view class="xian"></view>
+			<view class="nav-item">
+				<view class="num">0</view>
+				<view class="font">团体消费</view>
+			</view>
+		</view>
+		<view class="swiper-box" :style="{ height: height }">
+			<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData" :style="{ height: height }">
+
+				<!-- 空白页 -->
+				<!-- <empty v-if="list.length === 0"></empty> -->
+
+				<!-- 订单列表 -->
+				<view class="order-item flex" v-for="(item, index) in list" :key="index">
+					<view class="title-box flex_item">
+						<view class="title-avatar"><image :src="item.avatar || '/static/error/missing-face.png'"></image></view>
+						<view class="list_tpl">
+							<view class="title">
+								<text>{{ item.mobile || item.email }}</text>
+							</view>
+							<view class="time">
+								<text>{{ item.time }}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<uni-load-more :status="loadingType"></uni-load-more>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { spread_children,num } from '@/api/user.js';
+import { mapState, mapMutations } from 'vuex';
+import { getMoneyStyle, getTime } from '@/utils/rocessor.js';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+export default {
+	components: {
+		empty,
+		uniLoadMore
+	},
+	onReady(res) {
+		var obj = this;
+		uni.getSystemInfo({
+			success: resu => {
+				const query = uni.createSelectorQuery();
+				query.select('.swiper-box').boundingClientRect();
+				query.exec(function(res) {
+					console.log(res, 'ddddddddddddd');
+					obj.height = resu.windowHeight - res[0].top + 'px';
+					console.log('打印页面的剩余高度', obj.height);
+				});
+			},
+			fail: res => {}
+		});
+	},
+	data() {
+		return {
+			// 头部图高度
+			height: '',
+			tabCurrentIndex: 0,
+			all: '',
+			list: [],
+			loadingType: 'more',
+			limit: 10,
+			page: 1,
+			id: ''
+		};
+	},
+	onShow() {
+		this.id = this.userInfo.id;
+		num().then(({data}) =>{
+			console.log(data)
+			this.all = data
+		})
+		this.loadData();
+	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	methods: {
+		loadData() {
+			const obj = this;
+			if (obj.loadingType == 'noMore' || obj.loadingType == 'loading') {
+				return;
+			}
+			obj.loadingType == 'loading';
+			spread_children({ limit: obj.limit, page: obj.page }, obj.id).then(({ data }) => {
+				data.forEach(e => {
+					e.time = getTime(e.createtime);
+				});
+				console.log(data,'123456');
+				obj.list = obj.list.concat(data);
+				// obj.list = data
+				obj.page++;
+				if (data.length == obj.limit) {
+					obj.loadingType = 'more';
+					return
+				} else {
+					obj.loadingType = 'noMore';
+				}
+			});
+		},
+		navto(e) {
+			uni.navigateTo({
+				url: e
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #f1f1f1;
+	height: 100%;
+}
+.content-money {
+	height: 480rpx;
+	padding-bottom: 30rpx;
+	background: $page-color-base;
+	position: relative;
+	.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 {
+	height: 480rpx;
+	color: #FFFFFF;
+	text-align: center;
+	position: relative;
+	.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: 480rpx;
+		display: block;
+	}
+	.text {
+		padding-top: 80rpx;
+		font-size: $font-sm;
+	}
+	.money {
+		position: absolute;
+		top: 0;
+		width: 100%;
+		padding-top: 186rpx;
+		font-size: 60rpx;
+		font-weight: bold;
+		font-size: 82rpx;
+		text {
+			font-size: 36rpx;
+		}
+	}
+}
+
+.navbar {
+	width: 702rpx;
+	height: auto;
+	padding: 20rpx 0;
+	background: #FFFFFF;
+	border-radius: 10rpx;
+	position: relative;
+	z-index: 10;
+	margin: -60rpx auto;
+	.xian {
+		width: 2rpx;
+		height: 54rpx;
+		background: #eeeeee;
+	}
+	.nav-item {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: #fff;
+		position: relative;
+		width: 50%;
+		.num {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #000;
+		}
+		.font {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #000;
+		}
+	}
+}
+//列表
+
+
+.swiper-box {
+	margin-top: 74rpx;
+	background: #FFFFFF;
+	.order-item {
+		padding: 20rpx 30rpx;
+		line-height: 1.5;
+
+		.title-box {
+			width: 100%;
+
+			.title-avatar {
+				width: 100rpx;
+				height: 100rpx;
+				margin-right: 25rpx;
+				border-radius: 100%;
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 100%;
+				}
+			}
+
+			.list_tpl {
+				width: 85%;
+
+				.title {
+					font-size: $font-lg;
+					color: $font-color-base;
+					overflow: hidden; //超出的文本隐藏
+					text-overflow: ellipsis; //溢出用省略号显示
+					white-space: nowrap;
+				}
+
+				.time {
+					font-size: $font-base;
+					color: $font-color-light;
+				}
+			}
+		}
+
+		.money {
+			color: #db1935;
+			font-size: $font-lg;
+		}
+	}
+}
+.content {
+	height: 100%;
+	.empty-content {
+		background-color: #000;
+	}
+}
+</style>

pages/user/user.vue

@@ -65,9 +65,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="vip-box">
-				<image src="../../static/user/open-m.png" mode=""></image>
-			</view>
+			<view class="vip-box"><image src="../../static/user/open-m.png" mode=""></image></view>
 			<view>
 				<view class="item-box item-box-a">
 					<view class="order-section">
@@ -79,7 +77,7 @@
 							<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/shareQrCode')" hover-class="common-hover" :hover-stay-time="50">
+						<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>
@@ -91,11 +89,11 @@
 				</view>
 				<view class="history-section icon">
 					<uni-list>
-						<uni-list-item title="批发订单" @click="navTo('/pages/user/favorites')" thumb="/static/user/u1.png"></uni-list-item>
-						<uni-list-item title="金豆池" @click="navTo('/pages/set/address')" thumb="/static/user/u2.png"></uni-list-item>
-						<uni-list-item title="申请美容院" @click="navTo('/pages/set/address')" thumb="/static/user/u3.png"></uni-list-item>
-						<uni-list-item title="分享海报" @click="navTo('/pages/set/address')" thumb="/static/user/u4.png"></uni-list-item>
-						<uni-list-item title="我的收藏" @click="navTo('/pages/set/address')" thumb="/static/user/u5.png"></uni-list-item>
+						<uni-list-item title="批发订单" @click="navTo('')" 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>
 				</view>
@@ -178,11 +176,11 @@ export default {
 		 */
 		navTo(url) {
 			// if (!this.hasLogin) {
-			// 	// 保存地址
+			//  // 保存地址
 			// 	saveUrl();
-			// 	// 登录拦截
+			//  	// 登录拦截
 			// 	interceptor();
-			// } else {
+			//  } else {
 				uni.navigateTo({
 					url
 				});
@@ -442,7 +440,7 @@ page {
 	width: 710rpx;
 	height: 90rpx;
 	margin: 32rpx auto 0;
-	image{
+	image {
 		width: 100%;
 		height: 100%;
 	}

store/index.js

@@ -6,7 +6,7 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
 	state: {
 		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
-		baseURL:'http://base.liuniu946.com',//请求地址配置 
+		baseURL:'http://lt.frp.liuniu946.com',//请求地址配置 
 		urlFile:'/index',//项目部署所在文件夹
 		userInfo: {}, //登录信息
 		loginInterceptor:false,//是否打开强制登录

uni.scss

@@ -4,7 +4,7 @@ $page-row-spacing: 30rpx;
 $page-color-base: #f8f8f8;//页面背景颜色
 $page-color-light: #f8f6fc;
 // 主题颜色
-$base-color: #5dbc7c;//项目颜色
+$base-color: #FF4C4C;//项目颜色
 $box-shadow-color:#5dbc7c;//阴影颜色
 $font-color:#5dbc7c;//字体颜色
 $font-color-spec: #5dbc7c;//可操作文字颜色