2022-1-4

api/user.js

@@ -27,6 +27,15 @@ export function spreadBanner(data) {
 	});
 }
 
+//好友列表
+export function spread(data) {
+	return request({
+		url: '/api/spread/people',
+		method: 'POST',
+		data
+	});
+}
+
 // 获取地址列表
 export function getAddressList(data) {
 	return request({

api/wallet.js

@@ -8,7 +8,23 @@ export function spreadCommission(data,state) {
 		data
 	});
 }
-//金豆池、
+//金豆列表
+export function goldList(data) {
+	return request({
+		url:'/api/gold/list',
+		method: 'get',
+		data
+	})
+}
+//积分列表
+export function integralList(data) {
+	return request({
+		url:'/api/integral/list',
+		method: 'get',
+		data
+	})
+}
+//金豆池
 export function jdCoool(data){
 	return request({
 		url:'/api/package/pool',

pages/user/JDcool.vue

@@ -27,7 +27,7 @@
 							<image :src="item.pay_evaluation" mode=""></image>
 						</view>
 						<view class="order-font">
-							{{item.user.real_name}}获得<text>{{item.use_integral}}</text>个金豆
+							{{item.user.real_name}}扣除<text>{{item.use_integral}}</text>个金豆
 						</view>
 					</view>
 					<view class="time">
@@ -61,9 +61,7 @@
 				loadingType: 'more',
 				limit: 10, //每次加载多少信息
 				page: 1, //页数
-				dataList: [
-
-				]
+				dataList: []
 
 			}
 		},
@@ -89,37 +87,29 @@
 		},
 		methods: {
 			toBack() {
-
 				uni.switchTab({
 					url: '/pages/user/user'
 				});
 			},
-
 			loadData() {
 				let obj = this
+				if(obj.loadingType == 'noMore'){
+					return
+				}
 				jdCoool({
 					page: obj.page,
 					limit: obj.limit
 				}).then(res => {
 					console.log(res);
-					obj.dataList = res.data.data;
-					console.log(obj.dataList, '我是强儿die');
-					obj.dataList = obj.dataList.map(item => {
+					obj.jd = res.data.sum
+					res.data.data = res.data.data.map(item => {
 						item.add_time = getTime(item.add_time);
-						console.log(item.add_time);
+						let data = item.add_time.split(' ');
+						item.add_time = data[0]
 						return item;
 					})
-					obj.limit = res.count
-					obj.jd = res.data.sum
-					// uni.hideLoading({
-					// 	title:'加载中'
-					// })
-					// uni.hideLoading()
-					
-					if(res.length>0){
-						obj.dataList = obj.dataList.concat(res.data.data[0])
-						obj.page++;
-					}
+					obj.dataList = obj.dataList.concat(res.data.data)
+					obj.page++;
 					//判断是否还有数据，有改为more，没有各位noMore
 					if(obj.limit == res.data.data.length){
 						obj.loadingType = 'more'
@@ -127,8 +117,7 @@
 					}else{
 						obj.loadingType = 'noMore'
 					}
-					uni.hideLoading()
-					// this.$set(obj.dataList,'loaded',true)
+					this.$set(obj.dataList,'loaded',true)
 				}).catch(e=>{
 					console.log(e);
 				})

pages/user/jindou.vue

@@ -5,7 +5,7 @@
 				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/img/fanhui.png" mode=""></image></view>
 				<view class="header">我的金豆</view>
 				<image class="money_bg" src="../../static/img/anchor10.png"></image>
-				<view class="money">{{ userInfo.integral | getMoneyStyle }}</view>
+				<view class="money">{{ userInfo.gold | getMoneyStyle }}</view>
 			</view>
 
 		</view>
@@ -18,11 +18,11 @@
 					<!-- 空白页 -->
 					<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">
+					<template >
+						<view v-for="(item, i) in tabItem.orderList" class="order-item flex">
 							<view class="title-box">
 								<view class="title">
-									<text>{{ item.title }}</text>
+									<text>{{ item.mark }}</text>
 								</view>
 
 								<view class="time">
@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import { spreadCommission, userBalance } from '@/api/wallet.js';
+import { goldList, 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';
@@ -77,7 +77,7 @@ export default {
 			tabCurrentIndex: 0,
 			navList: [
 				{
-					state: 0,
+					state: 1,
 					text: '收入',
 					loadingType: 'more',
 					orderList: [],
@@ -85,7 +85,7 @@ export default {
 					limit: 10 //每次信息条数
 				},
 				{
-					state: 1,
+					state: 0,
 					text: '支出',
 					loadingType: 'more',
 					orderList: [],
@@ -108,7 +108,7 @@ export default {
 			//这里是将订单挂载到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;
@@ -119,15 +119,16 @@ export default {
 			}
 			// 修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
-			spreadCommission(
+			goldList(
 				{
 					page: navItem.page,
-					limit: navItem.limit
+					limit: navItem.limit,
+					pm: state
 				},
-				state
 			)
 				.then(({ data }) => {
 					navItem.orderList = navItem.orderList.concat(data);
+					console.log(navItem.orderList)
 					navItem.page++;
 					if (navItem.limit == data.length) {
 						//判断是否还有数据， 有改为 more， 没有改为noMore

pages/user/jinquan.vue

@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import { spreadCommission, userBalance } from '@/api/wallet.js';
+import { integralList, 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';
@@ -77,7 +77,7 @@ export default {
 			tabCurrentIndex: 0,
 			navList: [
 				{
-					state: 0,
+					state: 1,
 					text: '收入',
 					loadingType: 'more',
 					orderList: [],
@@ -85,7 +85,7 @@ export default {
 					limit: 10 //每次信息条数
 				},
 				{
-					state: 1,
+					state: 0,
 					text: '支出',
 					loadingType: 'more',
 					orderList: [],
@@ -108,7 +108,7 @@ export default {
 			//这里是将订单挂载到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;
@@ -119,12 +119,12 @@ export default {
 			}
 			// 修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
-			spreadCommission(
+			integralList(
 				{
 					page: navItem.page,
-					limit: navItem.limit
+					limit: navItem.limit,
+					pm: state
 				},
-				state
 			)
 				.then(({ data }) => {
 					navItem.orderList = navItem.orderList.concat(data);

pages/user/team.vue

@@ -14,12 +14,12 @@
 		</view>
 		<view class="navbar flex">
 			<view class="nav-item">
-				<view class="num">0</view>
+				<view class="num">{{ userInfo.consume }}</view>
 				<view class="font">个人消费</view>
 			</view>
 			<view class="xian"></view>
 			<view class="nav-item">
-				<view class="num">0</view>
+				<view class="num">{{ userInfo.trem_consume }}</view>
 				<view class="font">团体消费</view>
 			</view>
 		</view>
@@ -50,7 +50,7 @@
 </template>
 
 <script>
-import { spread_children,num } from '@/api/user.js';
+import { spread } 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';
@@ -90,10 +90,6 @@ export default {
 	},
 	onShow() {
 		this.id = this.userInfo.id;
-		num().then(({data}) =>{
-			console.log(data)
-			this.all = data
-		})
 		this.loadData();
 	},
 	computed: {
@@ -106,13 +102,12 @@ export default {
 				return;
 			}
 			obj.loadingType == 'loading';
-			spread_children({ limit: obj.limit, page: obj.page }, obj.id).then(({ data }) => {
-				data.forEach(e => {
+			spread({ limit: obj.limit, page: obj.page }).then(({ data }) => {
+				data.list.forEach(e => {
 					e.time = getTime(e.createtime);
 				});
-				console.log(data,'123456');
-				obj.list = obj.list.concat(data);
-				// obj.list = data
+				obj.all = data.total;
+				obj.list = obj.list.concat(data.list);
 				obj.page++;
 				if (data.length == obj.limit) {
 					obj.loadingType = 'more';