assets

api/market.js

@@ -59,4 +59,12 @@ export function joinActivity(data,id) {
 		method: 'post',
 		data
 	});
+}
+
+export function myActivity(data,id) {
+	return request({
+		url: '/api/activity/children/'+id,
+		method: 'get',
+		data
+	});
 }

pages.json

@@ -32,6 +32,32 @@
 				"navigationBarTitleText": "拼团合伙人"
 			}
 		},
+		{
+			"path": "pages/collection/collection",
+			"style": {
+				"navigationBarTitleText": "银行卡管理"
+			}
+		},
+		{
+			"path": "pages/collection/bank",
+			"style": {
+				"navigationBarTitleText": "添加银行卡"
+			}
+		},
+		{
+			"path": "pages/collection/zfb",
+			"style": {
+				"navigationBarTitleText": "添加支付宝"
+			}
+		},
+		
+		{
+			"path": "pages/collection/wx",
+			"style": {
+			"navigationBarTitleText": "添加微信"
+			}
+		},
+		
 		{
 			"path": "pages/money/phone",
 			"style": {
@@ -518,12 +544,6 @@
 				"navigationBarTitleText": "兑换"
 			}
 		},
-		{
-			"path": "pages/money/account",
-			"style": {
-				"navigationBarTitleText": "提现账号"
-			}
-		},
 		{
 			"path": "pages/order/order",
 			"style": {
@@ -584,13 +604,20 @@
 				"navigationBarTitleText": "提现"
 			}
 		},
+		//糖果充值
 		{
 			"path": "pages/money/recharge",
 			"style": {
 				"navigationBarTitleText": "充值"
 			}
 		},
-
+		//货款充值
+		{
+			"path": "pages/money/huodai",
+			"style": {
+				"navigationBarTitleText": "充值"
+			}
+		},
 		{
 			"path": "pages/redirect/redirect",
 			"style": {

pages/collection/bank.vue

@@ -0,0 +1,77 @@
+<template>
+	<view class="content">
+		<view class="box">
+			<view class="item ">
+				<text>姓名</text>
+				<input type="text" value="" placeholder="请输入真实姓名" />
+			</view>
+			<view class="item top">
+				<text>银行卡号</text>
+				<input type="text" value="" placeholder="请输入银行卡账号" />
+			</view>
+			<view class="item">
+				<text>所属银行</text>
+				<input type="text" value="" placeholder="请输入银行" />
+			</view>
+		</view>
+		<view class="button">确认</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {};
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	height: 100%;
+	padding: 0;
+	margin: 0;
+}
+.top {
+	border-top: 1rpx solid #f3f3f3;
+	border-bottom: 1rpx solid #f3f3f3;
+}
+.box {
+	background: #ffffff;
+	margin: 20rpx 0 70rpx 0;
+	.item {
+		display: flex;
+		align-items: center;
+		text {
+			margin: 0 40rpx 0 25rpx;
+			width: 150rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #333333;
+			line-height: 100rpx;
+		}
+		input {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #999999;
+			line-height: 100rpx;
+		}
+	}
+}
+.button {
+	text-align: center;
+	width: 560rpx;
+	height: 80rpx;
+	background: linear-gradient(0deg, #2e58ff, #32c6ff);
+	border-radius: 40rpx;
+	font-size: 30rpx;
+	font-family: PingFangSC;
+	font-weight: 500;
+	color: #ffffff;
+	line-height: 80rpx;
+	margin: 0 auto;
+}
+</style>

pages/collection/collection.vue

@@ -0,0 +1,151 @@
+<template>
+	<view class="content">
+		<view class="collection-box">
+			<view class="collection-item">
+				<view class="left">
+					<view class="img">
+						<image src="../../static/user/mybank.png" mode=""></image>
+					</view>
+					<view class="bank">
+						银行卡
+					</view>
+				</view>
+				<view class="gg" @click="nav('/pages/collection/bank')">
+					<view class="status">
+						未添加
+					</view>
+					
+					<view class="img1" @click="nav('')">
+						<text class="iconfont iconenter"></text>
+					</view>
+				</view>
+			</view>
+			<view class="collection-item">
+				<view class="left">
+					<view class="img">
+						<image src="../../static/user/zfb.png" mode=""></image>
+					</view>
+					<view class="bank">
+						支付宝
+					</view>
+				</view>
+				<view class="gg" @click="nav('/pages/collection/zfb')">
+					<view class="status">
+						未添加
+					</view>
+					<view class="img1">
+						<text class="iconfont iconenter"></text>
+					</view>
+				</view>
+			</view>
+			<view class="collection-item">
+				<view class="left">
+					<view class="img">
+						<image src="../../static/user/wx.png" mode=""></image>
+					</view>
+					<view class="bank">
+						微信
+					</view>
+				</view>
+				<view class="gg" @click="nav('/pages/collection/wx')">
+					<view class="status">
+						未添加
+					</view>
+					<view class="img1">
+						<text class="iconfont iconenter"></text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		onLoad() {
+			this.loadData();
+		},
+		methods: {
+			loadData(){
+				
+			},
+			nav(url){
+				uni.navigateTo({
+					url
+				})
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	page,
+	.content {
+		height: 100%;
+		margin: 0;
+		height: 0;
+	}
+
+	.collection-box {
+		background: #FFFFFF;
+		margin: 50rpx 20rpx;
+		width: 710rpx;
+		display: flex;
+		flex-direction: column;
+
+		.collection-item {
+			margin: 35rpx 30rpx;
+			display: flex;
+			justify-content: space-between;
+
+			.left {
+				display: flex;
+
+				.img {
+					height: 40rpx;
+					width: 40rpx;
+
+					image {
+						height: 100%;
+						width: 100%;
+					}
+				}
+
+				.bank {
+					margin-left: 25rpx;
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+			}
+
+			.gg {
+				display: flex;
+
+				.status {
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+					margin-right: 20rpx;
+				}
+
+				.img1 {
+					width: 15rpx;
+					height: 25rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+
+					}
+				}
+			}
+		}
+	}
+</style>

pages/collection/wx.vue

@@ -0,0 +1,94 @@
+<template>
+	<view class="content">
+		<view class="box">
+			<view class="wx">
+				<text>微信号</text>
+				<input type="text" value="" placeholder="请输入微信号" />
+			</view>
+			<view class="erweima">
+				<text>微信收款码</text>
+				<view class="img">
+					<image src="../../static/user/erweima.png" mode=""></image>
+				</view>
+			</view>
+		</view>
+		<view class="button">
+			确认
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+page , .content{
+	height: 100%;
+	margin: 0;
+	padding: 0;
+	
+}
+.box{
+	margin:20rpx 0  100rpx 0;
+	width: 100%;
+	background: #FFFFFF;
+	
+	.wx{
+		border-bottom: #F0F0F0 solid 1rpx;
+		padding: 20rpx 0 30rpx 0;
+		display: flex;
+		text{
+			width: 150rpx;
+			margin: 0 30rpx;
+		}
+		input{
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #999999;
+			line-height: 100rpx;
+		}
+	}
+	.erweima{
+		padding: 30rpx 0;
+		display: flex;
+		text{
+			margin: 0 30rpx;
+			width: 150rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #333333;
+			
+		}
+		.img{
+			width: 160rpx;
+			height: 160rpx;
+			image{
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+}
+.button{
+	margin: 0 auto;
+	width: 560rpx;
+	height: 80rpx;
+	background: linear-gradient(0deg, #2E58FF, #32C6FF);
+	border-radius: 40rpx;
+	font-size: 30rpx;
+	font-family: PingFangSC;
+	font-weight: 500;
+	color: #FFFFFF;
+	line-height: 80rpx;
+	text-align: center;
+}
+</style>

pages/collection/zfb.vue

@@ -0,0 +1,78 @@
+<template>
+	<view class="content">
+		<view class="box">
+			<view class="item top">
+				<text>真实姓名</text>
+				<input type="text" value="" placeholder="请输入真实姓名" />
+			</view>
+			<view class="item">
+				<text>支付宝账号</text>
+				<input type="text" value="" placeholder="请输入支付宝账号" />
+			</view>
+		</view>
+		<view class="button">
+			确认
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+page , .content{
+	height: 100%;
+	padding: 0;
+	margin: 0;
+}
+.top{
+		border-bottom: 1rpx solid #F3F3F3;
+}
+.box{
+	background: #FFFFFF;
+	margin: 20rpx 0 70rpx 0;
+	.item{
+		
+		display: flex;
+		align-items: center;
+		text{
+			margin: 0 40rpx 0 25rpx;
+			width: 150rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #333333;
+			line-height: 100rpx;
+		}
+		input{
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #999999;
+			line-height: 100rpx;
+		}
+	}
+
+}
+	.button{
+		text-align: center;
+		width: 560rpx;
+		height: 80rpx;
+		background: linear-gradient(0deg, #2E58FF, #32C6FF);
+		border-radius: 40rpx;
+		font-size: 30rpx;
+		font-family: PingFangSC;
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 80rpx;
+		margin: 0 auto;
+	}
+
+</style>

pages/conversion/candy.vue

@@ -11,46 +11,97 @@
 				<view class=" icon">
 				<input class="input" type="number" v-model="withdrawal > integral ? integral : withdrawal" 
 				placeholder="申请兑换糖果数量" placeholder-class="placeholder" /></view>
+				<view class="icon">{{ money }}</view>
+			</view>
+			<view class="interval"></view>
+			<view class="buttom">
+				<text class="text">申请兑换积分数量</text>
+				<view class=" icon"><input class="input" type="number" v-model="withdrawal" placeholder="申请兑换积分数量" placeholder-class="placeholder" /></view>
+			</view>
+			<view class="interval"></view>
+			<view class="buttom">
+				<text class="text">可兑换成</text>
+				<view class="input">{{ moneyReta }}糖果</view>
 			</view>
 			<view class="interval"></view>
 			<view class="tip">
-				<view class=" tip-icon" @click="all()">全部转换</view>
+				<view class=" tip-icon" @click="allbuy()">全部转换</view>
 			</view>
 		</view>
 		<view class="code">
 			
 		</view>
-		<view class="btn" @click="submit">
+		<view class="btn" @click="buy()">
 			提交申请
 		</view>
 	</view>
 </template>
 
 <script>
-import { exchange } from '@/api/market.js';
+import { wallet } from '@/api/finance.js';
 export default {
 	data(){
 		return{
-			// money: 1000,
-			withdrawal:'',
+			money: 0,
+			withdrawal: "",
+			buying: false,
+			all:'',
+			add:'',
 		}
 	},
 	computed: {
-		//可兑换积分
+		// 转换金额
+		moneyReta() {
+			// 保存当前选中的对象
+			const obj = this.all;
+			return (this.withdrawal * +obj.usdt_price) / +this.add.usdt_price;
+		},
 		integral() {
 			return this.$store.state.user.userInfo.integral
 		}
 	},
-	methods: {
-		//全部转换
-		all() {
-			this.withdrawal = this.integral
+	onLoad() {
+		wallet({}).then(({ data }) => {
+			const obj = this
+			const arr = Object.keys(data.back);
+			arr.forEach(e => {
+				if(e == 'USDC'){
+					obj.money = (data.back[e].money.money*1)
+					obj.all = data.back[e]
+				}
+				if(e == 'LALA'){
+					obj.money = (data.back[e].money.money*1)
+					obj.add = data.back[e]
+				}
+			});
+		});
+	},
+	methods:{
+		allbuy(){
+			this.withdrawal = this.money
 		},
-		//提交申请兑换
-		submit() {
+		buy(){
+			if (this.buying) {
 			
+			} else {
+				this.buying = true
+				shan({
+					origin_money_type: this.moneyType[this.index].name,
+					money_type: this.add.name,
+					num: this.pushMoney,
+				}).then(({
+					data
+				}) => {
+					console.log(data)
+					this.buying = false
+					this.$api.msg("闪兑成功")
+				}).catch(e => {
+					this.buying = false
+					console.log(e)
+				})
+			}
 		}
-	}
+	},
 }
 </script>
 

pages/conversion/transfers.vue

@@ -6,37 +6,91 @@
 		</view>
 		<view class="main">
 			<view class="main-font">收款人账户</view>
-			<input class="main-input" type="text" v-model="uid" placeholder="请输入收款人账户" placeholder-class="main-input" />
+			<input class="main-input" type="text" value="" v-model="account" placeholder="请输入收款人账户" placeholder-class="main-input" />
+		</view>
+		<view class="main">
+			<view class="main-font">收款人UID</view>
+			<input class="main-input" type="text" value="" v-model="uid" placeholder="请输入收款人UID" placeholder-class="main-input" />
+		</view>
+		<view class="main">
+			<view class="main-font">交易密码</view>
+			<input class="main-input" type="text" value="" v-model="password" placeholder="请输入交易密码" placeholder-class="main-input" />
 		</view>
 		<view class="main">
 			<view class="main-font">转账数量</view>
 			<input class="main-input" type="number" v-model="num > jf ? jf : num" placeholder="请输入转账数量" placeholder-class="main-input" />
 		</view>
 		<view class="btn" @click="submit">
+		<view class="btn" @click="transfer">
 			提交申请
 		</view>
 	</view>
+	</view>
 </template>
 
 <script>
+import { moneyLog, recharge, wallet } from '@/api/finance.js';
 export default {
 	data() {
 		return {
-			uid: '', //收款人账户
-			num: '' //转账数量
+			jf: 0, //可转账购物积分
+			uid: '', //收款人UID
+			account:'',//收款人账号
+			password:'',//交易密码
+			num: '' ,//转账数量
+			type:'',//转账的类型0是拼团积分，1是货款
 		};
 	},
-	computed: {
-		//可转账购物积分
-		jf() {
-			return this.$store.state.user.userInfo.integral
+	onLoad(option) {
+		if(option.type == 1) {
+			uni.setNavigationBarTitle({
+				title: "货款转账"
+			});
 		}
+		wallet({}).then(({ data }) => {
+			const obj = this
+			const arr = Object.keys(data.back);
+			console.log(arr);
+			arr.forEach(e => {
+				if(e == 'USDC'){
+					obj.jf = (data.back[e].money.money*1)
+				}
+			});
+		});
 	},
-	methods: {
-		//提交申请
-		submit() {
-			
-		}
+	methods:{
+		transfer() {
+			let obj = this;
+			if (obj.account == '') {
+				obj.$api.msg('请输入对方账号！');
+				return;
+			}
+			if (obj.uid == '') {
+				obj.$api.msg('请输入对方UID！');
+				return;
+			}
+			if (obj.password == '') {
+				obj.$api.msg('请输入交易密码！');
+				return;
+			}
+			if (obj.num == '') {
+				obj.$api.msg('请输入转账数量！');
+				return;
+			}
+			goPay({
+				type: 'USDC',
+				num: obj.num,
+				to_uid: obj.uid,
+				trade_psw: obj.password,
+				to_user_account: obj.account
+			}).then(data => {
+				obj.num = '';
+				obj.UID = '';
+				obj.password = '';
+				obj.account = '';
+				obj.$api.msg(data.msg);
+			});
+		},
 	}
 };
 </script>

pages/market/details.vue

@@ -1,6 +1,11 @@
 <template>
 	<view class="center">
-		<view class="top"><image :src="list.logo" mode=""></image></view>
+		<!-- <view class="top"><image :src="list.logo" mode=""></image></view> -->
+		<swiper :autoplay="true" :interval="3000" :duration="1000" class="top" indicator-color="rgba(0, 0, 0, .2)" indicator-dots indicator-active-color="#fff">
+			<swiper-item v-for="item in list.imgs.split(',')">
+				<image :src="item" mode="">
+			</swiper-item>
+		</swiper>
 		<view class="name-box">
 			<view class="price-box">
 				兑换价：

pages/message/message.vue

@@ -12,10 +12,10 @@
 					<view class="bottom">
 						<view class="concent clamp2">{{ l.last_message.detail }}</view>
 						<view class="icon" v-show="l.unwatch_message > 0"></view>
+						<view class="title">{{ l.name }}</view><view class="time">{{ l.time }}</view>
 					</view>
 				</view>
 			</view>
-			
 		</view>
 	</view>
 </template>

pages/money/account.vue

@@ -1,236 +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">
-				<view class="row b-b">
-					<text class="tit">姓名</text>
-					<input class="input" v-model="tabItem.orderList.name" type="text" placeholder="提款人姓名" placeholder-class="placeholder" />
-				</view>
-				<view class="row b-b">
-					<text class="tit">{{ tabIndex == 0 ? '账号' : '银行卡号' }}</text>
-					<input class="input" v-model="tabItem.orderList.code" type="text" placeholder="请输入账号" placeholder-class="placeholder" />
-				</view>
-				<view class="row b-b" v-if="tabIndex == 1">
-					<text class="tit">所属银行</text>
-					<input class="input" v-model="tabItem.orderList.bankName" type="text" placeholder="请输入账号" placeholder-class="placeholder" />
-				</view>
-			</swiper-item>
-		</swiper>
-
-		<button class="add-btn up" @click="confirm">提交申请</button>
-	</view>
-</template>
-
-<script>
-import { aliInfo, bankInfo, setAliInfo, setBankInfo } from '@/api/wallet.js';
-export default {
-	data() {
-		return {
-			tabCurrentIndex: 0,
-			navList: [
-				{
-					state: 0,
-					text: '支付宝',
-					loadingType: 'more',
-					orderList: {
-						name: '',
-						code: '',
-						id:''
-					}
-				},
-				{
-					state: 1,
-					text: '银行卡',
-					loadingType: 'more',
-					orderList: {
-						name: '',
-						code: '',
-						bankName: '',
-						id:''
-					}
-				}
-			]
-		};
-	},
-
-	onLoad(options) {
-		this.tabCurrentIndex = +options.state || 0;
-		this.loadAli();
-		this.loadBank();
-	},
-
-	methods: {
-		//加载数据
-		loadAli(source) {
-			aliInfo({}).then(({data}) => {
-				let order = this.navList[0].orderList;
-				this.$set(order,'name',data.fullname)
-				this.$set(order,'code',data.alino)
-				this.$set(order,'id',data.id)
-			});
-		},
-		loadBank() {
-			bankInfo({}).then(({data}) => {
-				let order = this.navList[1].orderList;
-				this.$set(order,'name',data.fullname);
-				this.$set(order,'code',data.bankno);
-				this.$set(order,'bankName',data.bank);
-				this.$set(order,'id',data.id)
-			});
-		},
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-		},
-		//顶部tab点击
-		tabClick(index) {
-			this.tabCurrentIndex = index;
-		},
-		// 提交保存
-		confirm() {
-			let obj = this;
-			let arr = obj.navList[obj.tabCurrentIndex].orderList;
-			if (obj.tabCurrentIndex == 1) {
-				obj.setBankInfo({
-					fullname: arr.name,
-					bank: arr.bankName,
-					bankno: arr.code,
-					id:arr.id
-				});
-			}
-			if (obj.tabCurrentIndex == 0) {
-				obj.setAliInfo({
-					fullname: arr.name,
-					alino: arr.code,
-					id:arr.id
-				});
-			}
-		},
-		/* 保存银行卡详细 */
-		setBankInfo(obj) {
-			setBankInfo(obj)
-				.then(e => {
-					uni.showToast({
-						title: '修改成功',
-						duration: 2000,
-						position: 'top'
-					});
-					this.$api.prePage().dataUp()
-					setTimeout(() => {
-						uni.navigateBack()
-					},1500)
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		// 修改支付宝信息
-		setAliInfo(obj) {
-			setAliInfo(obj)
-				.then(e => {
-					uni.showToast({
-						title: '修改成功',
-						duration: 2000,
-						position: 'top'
-					});
-					this.$api.prePage().dataUp()
-					setTimeout(() => {
-						uni.navigateBack()
-					},1500)
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-	}
-};
-</script>
-
-<style lang="scss">
-.row {
-	display: flex;
-	align-items: center;
-	position: relative;
-	padding: 0 30rpx;
-	height: 110rpx;
-	background: #fff;
-	.tit {
-		flex-shrink: 0;
-		width: 120rpx;
-		font-size: 30rpx;
-		color: $font-color-dark;
-	}
-	.input {
-		flex: 1;
-		font-size: 30rpx;
-		color: $font-color-dark;
-	}
-	.iconlocation {
-		font-size: 36rpx;
-		color: $font-color-light;
-	}
-}
-page,
-.content {
-	background: $page-color-base;
-	height: 100%;
-}
-
-.swiper-box {
-	height: 750rpx;
-}
-
-.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: $base-color;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid $base-color;
-			}
-		}
-	}
-}
-
-.add-btn {
-	&.up {
-		background-color: $base-color;
-		color: #fff;
-	}
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 690rpx;
-	height: 80rpx;
-	margin: 0 auto;
-	margin-top: 30rpx;
-	font-size: $font-lg;
-	border-radius: 10rpx;
-	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
-}
-</style>

pages/money/huodai.vue

@@ -0,0 +1,357 @@
+<template>
+	<view class="content">
+		<view class="row-box">
+			<view class="money-box">
+				<view class="money">{{  userInfo.now_money*1 }}</view>
+				<view class="money-text">我的货款</view>
+			</view>
+			<!-- <view class="chong">充值记录</view> -->
+		</view>
+		<view class="main-box">
+			<view class="main-top flex">
+				<view @click="change(item)" class="main-item" v-for="(item, index) in numList" :class="{check: money === item}" :key="index">
+					<view class="item-top">
+						<view class="bg"><image src="../../static/icon/candy.png" mode=""></image></view>
+						<view class="item-name" :class="{checks: money === item}">{{ item }}货款</view>
+					</view>
+					<view class="item-price" :class="{checks: money === item}">
+						￥
+						<text>{{ item }}元</text>
+					</view>
+				</view>
+			</view>
+			<view class="list">
+				<radio-group @change="tabRadio">
+					<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="#EB001C" :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>
+							<view class="right"><radio value="weixin" color=" #EB001C" :checked="type == 'weixin'" /></view>
+						</view>
+					</label>
+				</radio-group>
+			</view>
+			<button class="add-btn up" :class="{ 'active-bg': payLoding }" @click="!payLoding ? confirm() : ''">确认充值</button>
+		</view>
+	</view>
+</template>
+
+<script>
+import { wallet } from '@/api/finance.js';
+// #ifdef H5
+import { rechargeWechat } from '@/api/wallet.js';
+// #endif
+// #ifdef MP
+import { rechargeRoutine } from '@/api/wallet.js';
+// #endif
+import { mapState } from 'vuex';
+export default {
+	filters: {
+		rule(i) {
+			console.log(i)
+			let j = (Math.floor(i*100)) / 100
+			return j
+		}
+	},
+	data() {
+		return {
+			type: 'weixin',
+			numList: ['10', '20', '50', '80', '100', '200'],
+			money: 10, //充值金额
+			payLoding: false, //是否加载中
+			myMoney: 0, //我的糖果数
+			all:'',//糖果的具体情况
+		};
+	},
+	onLoad(options) {
+		wallet({}).then(({ data }) => {
+			const obj = this
+			const arr = Object.keys(data.back);
+			arr.forEach(e => {
+				if(e == 'LALA'){
+					obj.myMoney = (data.back[e].money.money*1).toFixed(0);
+					obj.all = data.back[e]
+				}
+			});
+		});
+	},
+	computed: {
+		// #ifdef H5
+		...mapState(['weichatObj']),
+		// #endif
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	methods: {
+		// 跳转
+		navTo(url) {
+			uni.navigateTo({
+				url: url
+			});
+		},
+		change(item){
+			this.money = item
+		},
+		// 切换选中对象
+		tabRadio(e) {
+			this.type = e;
+		},
+		// 提交
+		confirm() {
+			let obj = this;
+			obj.payLoding = true;
+			console.log(this.money)
+			// #ifdef H5
+			rechargeWechat({ price: this.money, from: this.type })
+				.then(e => {
+					let da = e.data.data;
+					obj.weichatObj.chooseWXPay({
+						timestamp: da.timestamp,
+						nonceStr: da.nonceStr,
+						package: da.package,
+						signType: da.signType,
+						paySign: da.paySign,
+						success: function(res) {
+							uni.showToast({
+								title: '充值成功',
+								duration: 2000,
+								position: 'top'
+							});
+						}
+					});
+					obj.payLoding = false;
+				})
+				.catch(e => {
+					obj.payLoding = false;
+					console.log(e);
+				});
+			// #endif
+			// #ifdef MP
+			rechargeRoutine({ price: this.money })
+				.then(e => {
+					let da = e.data;
+					wx.requestPayment({
+						timeStamp: da.timestamp,
+						nonceStr: da.nonceStr,
+						package: da.package,
+						signType: da.signType,
+						paySign: da.paySign,
+						success: function(res) {
+							uni.redirectTo({
+								url: '/pages/money/paySuccess'
+							});
+						}
+					});
+
+					obj.payLoding = false;
+				})
+				.catch(e => {
+					obj.payLoding = false;
+					console.log(e);
+				});
+			// #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>
+
+<style lang="scss">
+page {
+	height: 100%;
+	background: #ffffff;
+}
+
+.add-btn {
+	&.modified {
+		color: $base-color;
+	}
+	&.up {
+		background-color: $base-color;
+		color: #fff;
+	}
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 690rpx;
+	height: 80rpx;
+	margin: 0 auto;
+	margin-top: 30rpx;
+	font-size: $font-lg;
+	border-radius: 10rpx;
+	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+}
+.row-box {
+	width: 750rpx;
+	height: 354rpx;
+	background: linear-gradient(0deg, #2e58ff, #32c6ff);
+	.money-box {
+		padding-top: 80rpx;
+		margin: 0 auto;
+		text-align: center;
+		position: relative;
+		.money {
+			font-size: 74rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #ffffff;
+		}
+		.money-text {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #ffffff;
+		}
+	}
+	.chong {
+		position: absolute;
+		top: 36rpx;
+		right: 0;
+		width: 128rpx;
+		height: 45rpx;
+		line-height: 45rpx;
+		background: #2e58ff;
+		border-radius: 23rpx 0px 0px 23rpx;
+		font-size: 25rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #ffffff;
+		text-align: center;
+	}
+}
+.main-box {
+	margin-top: -100rpx;
+	width: 750rpx;
+	background: #ffffff;
+	border-radius: 50rpx;
+	padding-top: 46rpx;
+	.main-top {
+		flex-wrap: wrap;
+		justify-content: space-around;
+		align-items: center;
+		.check {
+			background: #FFF6F6 !important;
+			border: 1px solid #D7272B;
+		}
+		.main-item {
+			text-align: center;
+			margin-top: 30rpx;
+			width: 220rpx;
+			background: #ffffff;
+			box-shadow: 0px 2rpx 20rpx 0px rgba(215, 39, 43, 0.12);
+			border-radius: 20rpx;
+			padding: 46rpx 0 52rpx;
+			.item-top {
+				display: flex;
+				justify-content: center;
+				.bg {
+					width: 42rpx;
+					height: 42rpx;
+					image {
+						width: 42rpx;
+						height: 42rpx;
+					}
+				}
+				.item-name {
+					padding-left: 6rpx;
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
+			}
+			.checks{
+				color: #D7272B !important;
+			}
+			.item-price {
+				padding-top: 14rpx;
+				font-size: 20rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #999999;
+				text {
+					font-size: 28rpx;
+				}
+			}
+		}
+	}
+}
+.list {
+	padding-left: 30rpx;
+	margin-top: 30rpx;
+	background-color: #ffffff;
+	.box {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: 120rpx;
+		border-bottom: 1px solid $border-color-light;
+		.icon {
+			font-size: 48rpx;
+			padding-right: 20rpx;
+		}
+		.iconweixin1 {
+			color: #18bf16;
+		}
+		.iconzhifubao {
+			color: #08aaec;
+		}
+		.title-box {
+			flex-grow: 1;
+			text-align: left;
+			.title {
+				font-size: $font-base + 2rpx;
+				color: $font-color-base;
+			}
+			.node {
+				font-size: $font-sm;
+				color: $font-color-light;
+			}
+		}
+	}
+}
+/deep/ .uni-radio-input {
+	width: 45rpx;
+	height: 45rpx;
+}
+
+.active-bg {
+	background-color: $color-gray !important;
+}
+</style>

pages/money/paySuccess.vue

@@ -4,87 +4,82 @@
 		<text class="tit" v-if="type == 1">订单支付成功</text>
 		<text class="tit" v-else>订单预约成功</text>
 		<view class="btn-group">
-			<navigator url="/pages/user/fulilist" open-type="redirect" class="mix-btn" v-if="type == 1">继续兑换</navigator>
-			<navigator url="/pages/assets/myPing" open-type="redirect" class="mix-btn" v-else>我的拼购</navigator>
+			<navigator url="/pages/order/order" open-type="redirect" class="mix-btn">查看订单</navigator>
 			<navigator url="/pages/index/index" open-type="switchTab" class="mix-btn hollow">返回首页</navigator>
 		</view>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				type: 2//1为兑换支付成功2为预购成功
-			}
-		},
-		onLoad(opt) {
-			
-			// 保存订单号
-			if('type' in opt){
-				this.type = opt.type;
-			}
-			if (this.type == 1){
-				uni.setNavigationBarTitle({
-				　　title:"兑换成功"
-				})
-			}
-			if (this.type == 2) {
-				uni.setNavigationBarTitle({
-					　　title:"预约成功"
-				})
-			}
-			
-		},
-		methods: {
-			
+export default {
+	data() {
+		return {
+			type: 2 //1为兑换支付成功2为预购成功
+		};
+	},
+	onLoad(opt) {
+		// 保存订单号
+		if ('type' in opt) {
+			this.type = opt.type;
 		}
-	}
+		if (this.type == 1) {
+			uni.setNavigationBarTitle({
+				title: '兑换成功'
+			});
+		}
+		if (this.type == 2) {
+			uni.setNavigationBarTitle({
+				title: '预约成功'
+			});
+		}
+	},
+	methods: {}
+};
 </script>
 
-<style lang='scss'>
-	.content{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-	}
-	.success-icon{
-		margin-top: 100rpx;
-		width: 302rpx;
-		height: 320rpx;
-	}
-	.tit{
-		margin-top: 40rpx;
-		font-size: 32rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #333333;
-	}
-	.btn-group{
-		padding-top: 130rpx;
-		display: flex;
-		justify-content: flex-start;
-	}
-	.mix-btn {
-		margin-top: 30upx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		width: 301rpx;
-		height: 78rpx;
-		background: #59BAB0;
-		border-radius: 10rpx;
-		font-size: $font-lg;
-		font-size: 30rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #FFFFFF;
-		&.hollow{
-			margin-left: 36rpx;
-			background: #fff;
-			color: #59BAB0;
-			border: 1px solid #59BAB0;
-		}
+<style lang="scss">
+.content {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+.success-icon {
+	margin-top: 100rpx;
+	width: 302rpx;
+	height: 320rpx;
+}
+.tit {
+	margin-top: 40rpx;
+	font-size: 32rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #333333;
+}
+.btn-group {
+	padding-top: 130rpx;
+	display: flex;
+	justify-content: flex-start;
+}
+.mix-btn {
+	margin-top: 30upx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 301rpx;
+	height: 78rpx;
+	background: linear-gradient(0deg, #2e58ff, #32c6ff);
+	border-radius: 10rpx;
+	font-size: $font-lg;
+	font-size: 30rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #ffffff;
+	&.hollow {
+		margin-left: 36rpx;
+		background: #fff;
+		color: #438bed;
+		border: 1px solid #438bed;
 	}
+}
 </style>

pages/money/recharge.vue

@@ -5,14 +5,14 @@
 				<view class="money">{{ now_money }}</view>
 				<view class="money-text">我的糖果数量</view>
 			</view>
-			<view class="chong">充值记录</view>
+			<!-- <view class="chong">充值记录</view> -->
 		</view>
 		<view class="main-box">
 			<view class="main-top flex">
 				<view @click="change(item)" class="main-item" v-for="(item, index) in numList" :class="{check: money === item}" :key="index">
 					<view class="item-top">
 						<view class="bg"><image src="../../static/icon/candy.png" mode=""></image></view>
-						<view class="item-name" :class="{checks: money === item}">{{ item }}糖果</view>
+						<view class="item-name" :class="{checks: money === item}">{{ (item / all.rmb_price) * 1 | rule }}糖果</view>
 					</view>
 					<view class="item-price" :class="{checks: money === item}">
 						￥
@@ -48,7 +48,7 @@
 </template>
 
 <script>
-import { getMoneyStyle } from '@/utils/rocessor.js';
+import { wallet } from '@/api/finance.js';
 // #ifdef H5
 import { rechargeWechat } from '@/api/wallet.js';
 // #endif
@@ -58,19 +58,34 @@ import { rechargeRoutine } from '@/api/wallet.js';
 import { mapState } from 'vuex';
 export default {
 	filters: {
-		getMoneyStyle
+		rule(i) {
+			console.log(i)
+			let j = (Math.floor(i*100)) / 100
+			return j
+		}
 	},
 	data() {
 		return {
 			type: 'weixin',
 			numList: ['10', '20', '50', '80', '100', '200'],
-			money: '', //充值金额
+			money: 10, //充值金额
 			payLoding: false, //是否加载中
 			myMoney: 0, //我的糖果数
-			money: '10' //充值糖果数
+			all:'',//糖果的具体情况
 		};
 	},
-	onLoad(options) {},
+	onLoad(options) {
+		wallet({}).then(({ data }) => {
+			const obj = this
+			const arr = Object.keys(data.back);
+			arr.forEach(e => {
+				if(e == 'LALA'){
+					obj.myMoney = (data.back[e].money.money*1).toFixed(0);
+					obj.all = data.back[e]
+				}
+			});
+		});
+	},
 	computed: {
 		// #ifdef H5
 		...mapState(['weichatObj']),
@@ -98,8 +113,9 @@ export default {
 		confirm() {
 			let obj = this;
 			obj.payLoding = true;
+			console.log(this.money)
 			// #ifdef H5
-			rechargeWechat({ price: this.money, from: this.type })
+			rechargeWechat({ price: this.money, from: this.type,get_money_type:'LALA' })
 				.then(e => {
 					let da = e.data.data;
 					obj.weichatObj.chooseWXPay({
@@ -277,7 +293,7 @@ page {
 				}
 				.item-name {
 					padding-left: 6rpx;
-					font-size: 30rpx;
+					font-size: 28rpx;
 					font-family: PingFang SC;
 					font-weight: bold;
 					color: #333333;

pages/money/withdrawal.vue

@@ -63,7 +63,7 @@
 		</view>
 		<!-- #endif -->
 		<button class="add-btn up" @click="confirm">提交申请</button>
-		<button class="add-btn modified" v-if="!weichatBsrowser" @click="navTo('/pages/money/account')">账号管理</button>
+		<button class="add-btn modified" v-if="!weichatBsrowser" @click="navTo('/pages/collection/collection')">账号管理</button>
 	</view>
 </template>
 
@@ -74,7 +74,7 @@ export default {
 	data() {
 		return {
 			type: 'weixin', //提现方式
-			money: 10, //可提现金额
+			money: 0, //可提现金额
 			withdrawal: '', //提现金额
 			minPrice: '', //最少提现金额
 			aliData: {},

pages/product/pingDetails.vue

@@ -1,6 +1,11 @@
 <template>
 	<view class="center">
-		<view class="top"><image :src="list.data.background_image" mode=""></image></view>
+		<!-- <view class="top"><image :src="list.data.background_image" mode=""></image></view> -->
+		<swiper  :autoplay="true" :interval="3000" :duration="1000" class="top" indicator-color="rgba(0, 0, 0, .2)" indicator-dots indicator-active-color="#fff">
+			<swiper-item v-for="item in list.data.background_image.split(',')">
+				<image :src="item" mode="">
+			</swiper-item>
+		</swiper>
 		<view class="name-box">
 			<view class="price-box">
 				<text class="price">

pages/user/extension.vue

@@ -16,7 +16,7 @@
 				</view>
 			</view>
 		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: maxheight }" class="swiper-box" duration="300" @change="changeTab">
+		<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">
 					<!-- 空白页 -->
@@ -31,7 +31,7 @@
 									<text>{{ item.nickname }}</text>
 								</view>
 								<view class="time">
-									<text>{{ item.time }}</text>
+									<text>{{ item.account }}</text>
 								</view>
 							</view>
 						</view>
@@ -74,14 +74,6 @@ export default {
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
-				{
-					state: 1,
-					text: '间接推荐',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}
 			],
 			all:'',
 			list:'',
@@ -89,7 +81,7 @@ export default {
 	},
 	onLoad(options) {},
 	onShow() {
-		// this.loadData();	
+		this.loadData();
 	},
 	methods: {
 		// 页面跳转
@@ -122,8 +114,6 @@ export default {
 				{
 					page: navItem.page,
 					limit: navItem.limit,
-					keyword:'',
-					grade:state
 				},
 			)
 				.then(({ data }) => {
@@ -399,138 +389,46 @@ page {
 	}
 }
 
-.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: #ff0000;
-
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid #ff0000;
-			}
-		}
-	}
-}
-
-.main {
-	position: relative;
-	z-index: 10;
-	width: 691rpx;
-	height: auto;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-	margin: -160rpx auto 0;
-	padding: 40rpx 40rpx;
-	.today {
-		position: absolute;
-		top: -50rpx;
-		right: 20rpx;
-		color: #fff;
-	}
-	.main-box {
-		flex-direction: column;
-		align-items: center;
-		.bottom {
-			margin-top: 20rpx;
-		}
-		.item {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			.num {
-				font-size: 38rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #0f253a;
-			}
-			.font {
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #6d7c88;
-				margin-top: 18rpx;
-			}
-		}
-	}
-}
-.box {
-	width: 690rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 17rpx 0px rgba(0, 0, 0, 0.05);
-	border-radius: 20rpx;
-	margin: 20rpx auto;
-	padding: 34rpx;
-	.box-item:first-child {
-		margin-top: 0;
-	}
-	.box-item {
-		margin-top: 20rpx;
-		justify-content: space-between;
-		align-items: center;
-		.box-left {
-			font-size: 26rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #6d7c88;
-		}
-		.box-right {
-			font-size: 26rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #0f253a;
-		}
-	}
-}
-.liebiao {
-	width: 692rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-	padding: 34rpx;
-	margin: 24rpx auto 0;
-	align-items: center;
-	.left {
-		justify-content: flex-start;
-		align-items: center;
-		image {
-			width: 46rpx;
-			height: 36rpx;
-		}
-		.leibiao-font {
-			margin-left: 10rpx;
-			font-size: 32rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #333333;
-		}
-	}
-	image {
-		width: 15rpx;
-		height: 27rpx;
-	}
+.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;
+	}
 }
 </style>

pages/user/myjiedian.vue

@@ -10,7 +10,7 @@
 			<view class="jiedianbackground"><image src="../../static/img/myJ-bg.png" mode=""></image></view>
 			<view class="number-box">
 				<view class="number">
-					<text>{{ 100 }}</text>
+					<text>{{ count }}</text>
 					人
 				</view>
 				<view class="renshu">我的互助团队人数</view>
@@ -19,16 +19,16 @@
 		<view class="message">
 			<view class="yeji">
 				<view class="yeji-a">
-					<view class="yeji-buttom">8000</view>
+					<view class="yeji-buttom">{{ shouru * 1 || 0 }}</view>
 					<view class="yeji-top">收益</view>
 				</view>
 				<view class="border"></view>
 				<view class="yeji-a">
-					<view class="yeji-buttom">8000</view>
+					<view class="yeji-buttom">{{ zhichu * 1 || 0 }}</view>
 					<view class="yeji-top">支出</view>
 				</view>
 			</view>
-			<view class="back" @click="navBack()" v-if="parentList.length > 0">
+			<view class="back" @click="navBack()" v-if="fatherList.length > 0">
 				<image src="../../static/img/zhengyi10.png" mode=""></image>
 				返回
 			</view>
@@ -45,32 +45,19 @@
 					</view>
 				</view>
 				<view class="sanchaji"><image src="../../static/img/sanchaji.png" mode=""></image></view>
-				<view class="subordinate">
-					<view class="headbox" v-if="listA" @click="nav('a')">
-						<view class="head">
-							<view class="photo"><image v-if="listA.avatar" :src="listA.avatar" mode="scaleToFill"></image></view>
-						</view>
-						<view class="head-name">{{ listA.nickname }}</view>
-						<view class="head-phone">{{ listA.phone }}</view>
+				<view class="subordinate flex">
+					<view class="subordinate-box" v-for="(item, index) in childList" @click="findChildren(item)">
+						<view class="head1"><image :src="item.avatar || '/static/error/missing-face.png'" mode=""></image></view>
+						<view class="name clamp">{{ item.nickname }}</view>
+						<view class="phone clamp">{{ item.mobile }}</view>
 					</view>
-					<view class="zhuce" v-else @click="open('A')"><view class="jia"></view></view>
-					<view class="headbox" v-if="listB" @click="nav('b')">
-						<view class="head">
-							<view class="photo"><image :key="listB.id" :src="listB.avatar" mode="scaleToFill"></image></view>
+					<template v-if="childList.length < 3">
+						<view class="subordinate-box" v-for="item in 3 - childList.length">
+							<view class="head1"></view>
+							<view class="name clamp"></view>
+							<view class="phone clamp"></view>
 						</view>
-						<view class="head-name">{{ listB.nickname }}</view>
-						<view class="head-phone">{{ listB.phone }}</view>
-					</view>
-					<view class="zhuce" v-else @click="open('B')"><view class="jia"></view></view>
-
-					<view class="headbox" v-if="listC" @click="nav('c')">
-						<view class="head">
-							<view class="photo"><image v-if="listC.avatar" :src="listC.avatar" mode="scaleToFill"></image></view>
-						</view>
-						<view class="head-name">{{ listC.nickname }}</view>
-						<view class="head-phone">{{ listC.phone }}</view>
-					</view>
-					<view class="zhuce" v-else @click="open('C')"><view class="jia"></view></view>
+					</template>
 				</view>
 			</view>
 		</view>
@@ -78,26 +65,20 @@
 </template>
 
 <script>
-import { getjiedian, getReferralList, addJiedian } from '@/api/user.js';
+import { myActivity, activityDetail } from '@/api/market.js';
 import { mapState, mapMutations } from 'vuex';
 export default {
 	data() {
 		return {
-			bianhao: '1',
-			a: 1,
-			b: 2,
-			c: 3,
-			listA: '', //节点A
-			listB: '', //节点B
-			listC: '', //节点C
+			count: '', //互助人数
+			shouru: '', //我的收入
+			zhichu: '', //我的支持
 			name: '', //当前节点姓名
 			phone: '', //当前节点手机号
 			avatar: '', //当前节点头像
 			id: '',
-			uid: '',
-			jiedianList: [],
-			parentList: [], //保存打开层级用户数据
-			parent_area: ''
+			childList: [], //当前节点的下级
+			fatherList: []
 		};
 	},
 	computed: {
@@ -108,35 +89,49 @@ export default {
 		this.phone = this.userInfo.phone;
 		this.avatar = this.userInfo.avatar;
 		this.id = this.userInfo.uid;
-		// this.loadData();
+		activityDetail({}, 1).then(({ data }) => {
+			if (data.expend.length != 0) {
+				this.zhichu = data.expend[0].money;
+			} else {
+				this.zhichu = 0;
+			}
+			if (data.income.length != 0) {
+				this.shouru = data.income[0].money;
+			} else {
+				this.shouru = 0;
+			}
+		});
+		this.loadData();
 	},
 
 	methods: {
 		// 点击返回 我的页面
 		toBack() {
-			uni.navigateBack({
-				
-			})
+			uni.navigateBack({});
 		},
-		//切换按钮
-		radio(e) {
-			this.bianhao = e;
+		async findChildren(item) {
+			//存father
+			this.fatherList.push({
+				name: this.name,
+				phone: this.phone,
+				avatar: this.avatar,
+				id: this.id
+			});
+			//设置新father
+
+			this.id = item.id;
+			await this.loadData();
+			this.name = item.nickname;
+			this.phone = item.mobile;
+			this.avatar = item.avatar;
 		},
-		//返回
-		navBack() {
-			const obj = this;
-			// 删除
-			let parent = obj.parentList.pop();
-			console.log(parent);
-			console.log(obj.parentList, 'navBack');
-			// 保存回退后数据对象
-			obj.name = parent.name;
-
-			obj.avatar = parent.avatar;
-			obj.id = parent.id;
-			obj.listA = obj.listB = obj.listC = '';
-			console.log(parent, '对象');
-			obj.loadData();
+		back() {
+			let father = this.fatherList.pop();
+			this.name = father.name;
+			this.phone = father.phone;
+			this.avatar = father.avatar;
+			this.id = father.id;
+			this.loadData();
 		},
 		loadData() {
 			const obj = this;
@@ -144,8 +139,10 @@ export default {
 				title: '加载中。。。',
 				mask: true
 			});
-			getjiedian({}, this.id)
+			myActivity({ uid: obj.id }, 1)
 				.then(({ data }) => {
+					obj.count = data.count;
+					console.log(data);
 					uni.hideLoading();
 					if (data.list.length != 0) {
 						data.list.forEach(e => {
@@ -168,38 +165,6 @@ export default {
 				.catch(e => {
 					uni.hideLoading();
 				});
-		},
-		nav(type) {
-			const obj = this;
-			// 保存当前选中的对象
-			let item = '';
-			if (type == 'a') {
-				item = 'listA';
-			} else {
-				if (type == 'b') {
-					item = 'listB';
-				} else if (type == 'c') {
-					item = 'listC';
-				}
-			}
-			obj.parentList.push({
-				name: obj.name,
-				phone: obj.phone,
-				avatar: obj.avatar,
-				id: obj.id
-			});
-			console.log(obj.parentList, 's');
-			obj.name = obj[item].nickname;
-			obj.phone = obj[item].phone;
-			obj.avatar = '';
-			obj.$nextTick(function() {
-				obj.avatar = obj[item].avatar;
-				obj.id = obj[item].uid;
-				obj.listA = '';
-				obj.listB = '';
-				obj.listC = '';
-				obj.loadData();
-			});
 		}
 	}
 };
@@ -409,95 +374,54 @@ page {
 		.subordinate {
 			width: 750rpx;
 			display: flex;
-			justify-content: space-around;
-
-			.zhuce {
-				width: 154rpx;
-				height: 154rpx;
-
-				.jia {
-					width: 154rpx;
-					height: 154rpx;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					justify-content: center;
-
-					background: #e8e8e8;
-					box-shadow: 5rpx 0rpx 5rpx 0rpx rgba(110, 171, 78, 0.26);
-					border-radius: 50%;
-					overflow: hidden;
-
-					.jia_photo {
-						font-size: 80rpx;
-						line-height: 1;
-						color: #a3a3a3;
-					}
-
-					.font {
-						font-size: 22rpx;
-						font-weight: 500;
-						color: #999999;
-					}
-				}
-			}
-
-			.headbox {
-				width: 33.3%;
-				// height: 154rpx;
+			justify-content: flex-start;
+			align-items: flex-start;
+	
+			.subordinate-box {
+				flex: 1;
 				display: flex;
 				flex-direction: column;
-				// flex-wrap: nowrap;
 				align-items: center;
-				padding: 0 10rpx;
-
-				.head {
-					width: 154rpx;
-					height: 154rpx;
-					background: #2e58ff;
-					box-shadow: 5rpx 0rpx 5rpx 0rpx rgba(110, 171, 78, 0.26);
+	
+				.head1 {
+					position: relative;
 					border-radius: 50%;
-					overflow: hidden;
-
-					.photo {
-						width: 154rpx;
-						height: 154rpx;
-
+					background: #f1f1f1;
+					width: 120rpx;
+					height: 120rpx;
+					.vip {
+						position: absolute;
+						bottom: 0;
+						left: 10%;
+						width: 94rpx;
+						height: 32rpx;
 						image {
 							width: 100%;
 							height: 100%;
+							border-radius: 0;
 						}
 					}
-				}
-
-				.head-title {
-					margin: -30rpx 30rpx 0 30rpx;
-					width: 94rpx;
-					height: 32rpx;
-
 					image {
 						width: 100%;
 						height: 100%;
+						border-radius: 50%;
 					}
 				}
-
-				.head-name {
-					margin-top: 20rpx;
-					white-space: nowrap;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					width: 150rpx;
-					padding-top: 10rpx;
-					text-align: center;
-					// margin: 30rpx 0 0 0;
-					font-size: 32rpx;
+	
+				.name {
+					max-width: 120rpx;
+					margin-top: 10rpx;
+					font-size: 26rpx;
+					font-family: PingFang SC;
 					font-weight: bold;
-					color: #333333;
+					color: #ffffff;
 				}
-
-				.head-phone {
-					margin: 15rpx 0 0 0;
-					font-size: 26rpx;
+	
+				.phone {
+					max-width: 120rpx;
+					margin-top: 10rpx;
+					font-size: 22rpx;
+					font-family: PingFang SC;
 					font-weight: 500;
 					color: #999999;
 				}

pages/user/user.vue

@@ -208,7 +208,6 @@ export default {
 				this.weixin = data.service_wechat;
 			});
 			wallet({}).then(({ data }) => {
-				console.log(data)
 				const obj = this
 				const arr = Object.keys(data.back);
 				console.log(arr);