2021-11-15

api/user.js

@@ -109,7 +109,6 @@ export function delcollect(data) {
 	});
 }
 
-<<<<<<< HEAD
 //我的团队
 export function spread(data) {
 	return request({
@@ -117,6 +116,4 @@ export function spread(data) {
 		method: 'POST',
 		data
 	});
-}
-=======
->>>>>>> 816ece1ef8c8e0e56644f3a87f788448870be352
+}

pages.json

@@ -613,7 +613,6 @@
 			}
 
 		}
-<<<<<<< HEAD
 	    ,{
             "path" : "pages/usdt/usdt",
             "style" :                                                                                    
@@ -726,12 +725,6 @@
       
         ,{
             "path" : "pages/user/jifen",
-=======
-
-
-		, {
-			"path": "pages/user/jifen",
->>>>>>> 296b013a504e73d2e21821d5532e2efab71edd8d
 			"style": {
 				"navigationBarBackgroundColor": "transparent",
 				"navigationBarTextStyle": "white",

pages/cart/cart.vue

@@ -15,11 +15,7 @@
 		<view v-else>
 			<view class="header">
 				<view class="">
-<<<<<<< HEAD
 					购物车共{{ all || 0 }}种商品
-=======
-					购物车共{{cartList.length}}件商品
->>>>>>> 816ece1ef8c8e0e56644f3a87f788448870be352
 				</view>
 				<view class=""  @click="allChecked ? clearCart() : ''">
 					清空购物车

pages/category/category.vue

@@ -5,7 +5,7 @@
 		</scroll-view>
 		<scroll-view :scroll-with-animation="scrollAnimation" scroll-y class="right-aside" :scroll-top="tabScrollTop" @scrolltolower="getProductsList(flist[currentId])">
 			<view class="t-list">
-				<view @click="navToList(item.id, titem.id)" class="t-item"  v-for="titem in flist[currentId].list" :key="titem.id">
+				<view @click="navToList(flist[currentId].id, titem.id)" class="t-item"  v-for="titem in flist[currentId].list" :key="titem.id">
 					<view class=""><image :src="titem.pic"></image></view>
 
 					<view class="titem-right">
@@ -150,7 +150,7 @@ export default {
 		navToList(sid, tid) {
 			// 点击导航跳转到详细页面
 			uni.navigateTo({
-				url: '/pages/product/product?fid=' + this.currentId + '&sid=' + sid + '&tid=' + tid
+				url: '/pages/product/product?fid=' + this.currentId + '&sid=' + sid + '&id=' + tid
 			});
 		}
 	}

pages/order/createOrder.vue

@@ -65,7 +65,7 @@
 						<text class="price">￥{{ ls.productInfo.attrInfo ? ls.productInfo.attrInfo.price : ls.productInfo.price }}</text>
 						<text class="ot-price">￥{{ ls.productInfo.attrInfo ? ls.productInfo.attrInfo.ot_price : ls.productInfo.ot_price }}</text>
 						<text class="number">{{ 'x ' + ls.cart_num + (ls.productInfo.unit_name || '') }}</text>
-						<view><text class="price">￥{{lss.price}}</text></view>
+						<view><text class="price">{{ls.price}}</text></view>
 						<!-- <view class="number">
 							<uni-number-box class="step" :value="lss.number" :index="indx" @eventChange="numberChange"></uni-number-box>
 						</view> -->

pages/user/balance.vue

@@ -2,13 +2,10 @@
 	<view class="content">
 		<view class="header">
 			<image src="../../static/user/yue.png" mode=""></image>
-			<view class="integral">
-				{{ userInfo.now_money*1 }}
-			</view>
+			<view class="integral">{{ userInfo.now_money * 1 }}</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" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
@@ -43,9 +40,7 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-	
-import { spreadCommission } from '@/api/wallet.js';
+import { spreadCommission, userBalance } from '@/api/wallet.js';
 import { mapState, mapMutations } from 'vuex';
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
@@ -54,12 +49,7 @@ export default {
 		empty,
 		uniLoadMore
 	},
-	onReady() {
-		
-	},
-	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-	},
+	onReady() {},
 	data() {
 		return {
 			tabCurrentIndex: 0,
@@ -79,8 +69,8 @@ export default {
 					orderList: [],
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
-				},
-			],
+				}
+			]
 		};
 	},
 	onShow() {
@@ -93,23 +83,24 @@ export default {
 			uni.navigateTo({
 				url: e
 			});
-=======
-	import {
-		moneyLog,
-		wallet
-	} from '@/api/finance.js';
-	//下拉加载
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	import empty from '@/components/u-empty/u-empty.vue';
-	export default {
-		components: {
-			uniLoadMore,
-			empty
->>>>>>> 296b013a504e73d2e21821d5532e2efab71edd8d
 		},
-		onReady() {
+		//获取收入支出信息
+		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 === 'loading') {
+				//防止重复加载
+				return;
+			}
+			// 修改当前对象状态为加载中
+			navItem.loadingType = 'loading';
 
-<<<<<<< HEAD
 			spreadCommission(
 				{
 					page: navItem.page,
@@ -120,6 +111,7 @@ export default {
 				.then(({ data }) => {
 					if (data.length > 0) {
 						navItem.orderList = navItem.orderList.concat(data[0].list);
+						console.log(navItem.orderList);
 						navItem.page++;
 					}
 					if (navItem.limit == data.length) {
@@ -129,137 +121,32 @@ export default {
 					} else {
 						//判断是否还有数据， 有改为 more， 没有改为noMore
 						navItem.loadingType = 'noMore';
-=======
-		},
-		data() {
-			return {
-				integral:0,
-				tabCurrentIndex: 0,
-				navList: [{
-						state: 1,
-						text: '收入',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					},
-					{
-						state: 0,
-						text: '支出',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					},
-				],
-			};
-		},
-		onShow() {
-			// 载入积分数据
-			this.loadData();
-		},
-		onLoad() {
-
-			wallet({}).then(({
-				data		
-			}) => {
-
-				const obj = this
-				const arr = Object.keys(data.back)
-				console.log(data.back,'9999')
-				arr.forEach(e => {
-					if (e == 'LALA') {
-						obj.integral = (data.back[e].money.money * 1)
-						console.log(obj.integral, '666');
->>>>>>> 296b013a504e73d2e21821d5532e2efab71edd8d
 					}
+					uni.hideLoading();
+					this.$set(navItem, 'loaded', true);
 				})
-			})
-			this.loadData();
-		},
-		methods: {
-			// 页面跳转
-			navto(e) {
-				uni.navigateTo({
-					url: e
+				.catch(e => {
+					console.log(e);
 				});
-			},
-			//获取收入支出信息
-			async 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';
-
-				moneyLog({
-							page: navItem.page,
-							limit: navItem.limit,
-							pm: navItem.state
-						},
-						'LALA'
-					)
-					.then(({
-						data
-					}) => {
-					console.log(data,'111222')
-								if (data.list.length > 0) {
-									//新旧数据合并
-									navItem.orderList = navItem.orderList.concat(data.list);
-									console.log(navItem.orderList);
-									navItem.page++;
-								}
-								//判断是否还有数据, 有改为more, 没有改为noMore
-								if (navItem.limit == data.length) {
-									navItem.loadingType = 'more';
-									return;
-								} else {
-									navItem.loadingType = 'noMore';
-								}
-								// uni.hideLoading();
-								this.$set(navItem, 'loaded', true);
-							})
-							.catch(e => {
-								console.log(e);
-							});
-					},
-
-			//swiper 切换
-			changeTab(e) {
-				console.log(e, '1111')
-				this.tabCurrentIndex = e.target.current;
-				this.loadData('tabChange');
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-			}
 		},
-<<<<<<< HEAD
+		//swiper 切换
+		changeTab(e) {
+			console.log(e, '1111');
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('tabChange');
+		},
 		//顶部tab点击
 		tabClick(index) {
 			this.tabCurrentIndex = index;
 		}
 	},
+	computed: {
+		//积分
+		integral() {
+			return this.$store.state.user.userInfo.integral;
+		}
+	}
 };
-=======
-		computed: {
-			//积分
-			integral() {
-				return this.$store.state.user.userInfo.integral
-			}
-		},
-	};
->>>>>>> 296b013a504e73d2e21821d5532e2efab71edd8d
 </script>
 
 <style lang="scss">
@@ -340,14 +227,6 @@ export default {
 		padding-top: 10rpx;
 	
 	.order-item {
-<<<<<<< HEAD
-		padding: 20rpx 30rpx;
-		line-height: 1.5;
-		.title-box {
-			.title {
-				font-size: $font-lg;
-				color: #000000;
-=======
 			padding: 20rpx 30rpx;
 			line-height: 1.5;
 
@@ -361,7 +240,6 @@ export default {
 					font-size: $font-base;
 					color: $font-color-light;
 				}
->>>>>>> 296b013a504e73d2e21821d5532e2efab71edd8d
 			}
 
 			.money {

pages/user/yongjin.vue

@@ -2,13 +2,10 @@
 	<view class="content">
 		<view class="header">
 			<image src="../../static/user/yongjin.png" mode=""></image>
-			<view class="integral">
-				{{ userInfo.brokerage_price || '0.00' }}
-			</view>
+			<view class="integral">{{ userInfo.brokerage_price || '0.00' }}</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" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
@@ -43,8 +40,6 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-	
 import { spreadCommission, userBalance } from '@/api/wallet.js';
 import { mapState, mapMutations } from 'vuex';
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
@@ -55,7 +50,7 @@ export default {
 		uniLoadMore
 	},
 	onReady() {
-		
+
 	},
 	data() {
 		return {
@@ -84,6 +79,12 @@ export default {
 		// 载入积分数据
 		this.loadData();
 	},
+	computed: {
+		//积分
+		integral() {
+			return this.$store.state.user.userInfo.integral
+		}
+	},
 	methods: {
 		// 页面跳转
 		navto(e) {
@@ -107,7 +108,7 @@ export default {
 			}
 			// 修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
-
+		
 			spreadCommission(
 				{
 					page: navItem.page,
@@ -118,6 +119,7 @@ export default {
 				.then(({ data }) => {
 					if (data.length > 0) {
 						navItem.orderList = navItem.orderList.concat(data[0].list);
+						console.log(navItem.orderList);
 						navItem.page++;
 					}
 					if (navItem.limit == data.length) {
@@ -127,280 +129,152 @@ export default {
 					} else {
 						//判断是否还有数据， 有改为 more， 没有改为noMore
 						navItem.loadingType = 'noMore';
-=======
-	import {
-		moneyLog,
-		wallet
-	} from '@/api/finance.js';
-	//下拉加载
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	import empty from '@/components/u-empty/u-empty.vue';
-	export default {
-		components: {
-			uniLoadMore,
-			empty
-		},
-		onReady() {
-
-		},
-		data() {
-			return {
-				integral:0,
-				tabCurrentIndex: 0,
-				navList: [{
-						state: 1,
-						text: '收入',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					},
-					{
-						state: 0,
-						text: '支出',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					},
-				],
-			};
-		},
-		onShow() {
-			// 载入积分数据
-			this.loadData();
-		},
-		onLoad() {
-
-			wallet({}).then(({
-				data		
-			}) => {
-
-				const obj = this
-				const arr = Object.keys(data.back)
-				console.log(data.back,'9999')
-				arr.forEach(e => {
-					if (e == 'USDC') {
-						obj.integral = (data.back[e].money.money * 1)
-						console.log(obj.integral, '666');
->>>>>>> 296b013a504e73d2e21821d5532e2efab71edd8d
 					}
+					uni.hideLoading();
+					this.$set(navItem, 'loaded', true);
 				})
-			})
-			this.loadData();
-		},
-		methods: {
-			// 页面跳转
-			navto(e) {
-				uni.navigateTo({
-					url: e
+				.catch(e => {
+					console.log(e);
 				});
-			},
-			//获取收入支出信息
-			async 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';
-
-				moneyLog({
-							page: navItem.page,
-							limit: navItem.limit,
-							pm: navItem.state
-						},
-						'USDC'
-					)
-					.then(({
-						data
-					}) => {
-					console.log(data,'111222')
-								if (data.list.length > 0) {
-									//新旧数据合并
-									navItem.orderList = navItem.orderList.concat(data.list);
-									console.log(navItem.orderList);
-									navItem.page++;
-								}
-								//判断是否还有数据, 有改为more, 没有改为noMore
-								if (navItem.limit == data.length) {
-									navItem.loadingType = 'more';
-									return;
-								} else {
-									navItem.loadingType = 'noMore';
-								}
-								// uni.hideLoading();
-								this.$set(navItem, 'loaded', true);
-							})
-							.catch(e => {
-								console.log(e);
-							});
-					},
-
-			//swiper 切换
-			changeTab(e) {
-				console.log(e, '1111')
-				this.tabCurrentIndex = e.target.current;
-				this.loadData('tabChange');
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-			}
 		},
-<<<<<<< HEAD
+		//swiper 切换
+		changeTab(e) {
+			console.log(e, '1111')
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('tabChange');
+		},
 		//顶部tab点击
 		tabClick(index) {
 			this.tabCurrentIndex = index;
 		}
 	},
-	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-	},
-};
-=======
-		computed: {
-			//积分
-			integral() {
-				return this.$store.state.user.userInfo.integral
-			}
-		},
-	};
->>>>>>> 296b013a504e73d2e21821d5532e2efab71edd8d
+}
 </script>
 
 <style lang="scss">
-	page {
-		background: #ffffff;
-		height: 100%;
-	}
+page {
+	background: #ffffff;
+	height: 100%;
+}
 
-	.header {
-		image {
-			width: 100%;
-			height: 400rpx;
-		}
+.header {
+	image {
+		width: 100%;
+		height: 400rpx;
+	}
 
-		.integral {
-			width: 100%;
-			text-align: center;
-			position: absolute;
-			top: 160rpx;
-			color: #fff;
-			font-size: 80rpx;
-			font-weight: bold;
-		}
+	.integral {
+		width: 100%;
+		text-align: center;
+		position: absolute;
+		top: 160rpx;
+		color: #fff;
+		font-size: 80rpx;
+		font-weight: bold;
+	}
 
-		.right {
-			position: absolute;
-			top: 120rpx;
-			right: 0;
-			background-color: #fff;
-			border-radius: 10rpx 0 0 10rpx;
-			color: #438BED;
-			padding: 5rpx 15rpx;
-			font-size: 28rpx;
-		}
+	.right {
+		position: absolute;
+		top: 120rpx;
+		right: 0;
+		background-color: #fff;
+		border-radius: 10rpx 0 0 10rpx;
+		color: #438bed;
+		padding: 5rpx 15rpx;
+		font-size: 28rpx;
 	}
+}
 
-	.navbar {
-		display: flex;
+.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;
 
-		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;
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: $font-color-dark;
+		position: relative;
 
-			&.current {
-				color: #438BED;
+		&.current {
+			color: #438bed;
 
-				&:after {
-					content: '';
-					position: absolute;
-					left: 50%;
-					bottom: 0;
-					transform: translateX(-50%);
-					width: 44px;
-					height: 0;
-					border-bottom: 2px solid #438BED;
-				}
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid #438bed;
 			}
 		}
 	}
+}
 
-	// 列表
+// 列表
 
-	.swiper-box {
-		height: calc(100% - 180rpx - 400rpx);
-		padding-top: 10rpx;
-	
-	.order-item {
-			padding: 20rpx 30rpx;
-			line-height: 1.5;
+.swiper-box {
+	height: calc(100% - 180rpx - 400rpx);
+	padding-top: 10rpx;
 
-			.title-box {
-				.title {
-					font-size: $font-lg;
-					color: $font-color-base;
-				}
+	.order-item {
+		padding: 20rpx 30rpx;
+		line-height: 1.5;
 
-				.time {
-					font-size: $font-base;
-					color: $font-color-light;
-				}
+		.title-box {
+			.title {
+				font-size: $font-lg;
+				color: $font-color-base;
 			}
 
-			.money {
-				color: #EF3A55;
-				font-size: $font-lg;
+			.time {
+				font-size: $font-base;
+				color: $font-color-light;
 			}
 		}
-	}
 
-	.list-scroll-content {
-		height: 100%;
+		.money {
+			color: #ef3a55;
+			font-size: $font-lg;
+		}
 	}
+}
 
-	.content {
-		height: 100%;
+.list-scroll-content {
+	height: 100%;
+}
 
-		.empty-content {
-			height: 100%;
-			background-color: #ffffff;
-		}
-	}
+.content {
+	height: 100%;
 
-	.button {
-		position: relative;
-		bottom: 0;
-		bottom: 50rpx;
-		width: 674rpx;
-		height: 88rpx;
-		background: linear-gradient(90deg, #44BFEC, #438BED);
-		border-radius: 44rpx;
-		font-size: 36rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #FFFFFF;
+	.empty-content {
+		height: 100%;
+		background-color: #ffffff;
 	}
+}
+
+.button {
+	position: relative;
+	bottom: 0;
+	bottom: 50rpx;
+	width: 674rpx;
+	height: 88rpx;
+	background: linear-gradient(90deg, #44bfec, #438bed);
+	border-radius: 44rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #ffffff;
+}
 </style>