12-10

api/user.js

@@ -101,4 +101,11 @@ export function delcollect(data) {
 	});
 }
 
-
+//我的推广
+export function spread(data) {
+	return request({
+		url: '/api/spread/people',
+		method: 'POST',
+		data
+	});
+}

pages.json

@@ -56,6 +56,27 @@
 				}
 			}
 		},
+		{
+			"path": "pages/user/team",
+			"style": {
+				"navigationBarTitleText": "我的推广",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/category/articleList",
+			"style": {
+				"navigationBarTitleText": "产品百科"
+			}
+		},
+		{
+			"path": "pages/category/detail",
+			"style": {
+				"navigationBarTitleText": "咨询详情"
+			}
+		},
 		{
 			"path": "pages/public/forget",
 			"style": {
@@ -67,10 +88,10 @@
 				}
 			}
 		},
-		
-		
-		
-		
+
+
+
+
 		{
 			"path": "pages/product/reply",
 			"style": {
@@ -93,7 +114,7 @@
 				}
 			}
 		},
-		
+
 		{
 			"path": "pages/product/list",
 			"style": {
@@ -161,7 +182,7 @@
 				"navigationBarTitleText": ""
 			}
 		},
-		
+
 		{
 			"path": "pages/set/password",
 			"style": {
@@ -179,7 +200,7 @@
 				"navigationBarTitleText": "购物车"
 			}
 		},
-		
+
 		{
 			"path": "pages/user/user",
 			"style": {
@@ -215,11 +236,9 @@
 		{
 			"path": "pages/user/award",
 			"style": {
-				"navigationBarTitleText": "奖励明细",
+				"navigationBarTitleText": "我的余额",
 				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
+					"titleNView": false
 				}
 			}
 		},
@@ -229,23 +248,12 @@
 				"navigationBarTitleText": "奖励提现"
 			}
 		},
-		
+
 		{
 			"path": "pages/user/favorites",
 			"style": {
 				"navigationBarTitleText": "收藏夹"
 			}
-		}, {
-			"path": "pages/user/coupon",
-			"style": {
-				"navigationBarTitleText": "我的卡卷"
-			}
-		},
-		{
-			"path": "pages/user/scoreAccumulate",
-			"style": {
-				"navigationBarTitleText": "积分明细"
-			}
 		},
 		{
 			"path": "pages/order/order",
@@ -288,7 +296,7 @@
 			"style": {
 				"navigationBarTitleText": "创建订单"
 			}
-		},  {
+		}, {
 			"path": "pages/money/pay",
 			"style": {
 				"navigationBarTitleText": "支付"
@@ -303,11 +311,9 @@
 		{
 			"path": "pages/money/wallet",
 			"style": {
-				"navigationBarTitleText": "我的钱包",
+				"navigationBarTitleText": "我的佣金",
 				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
+					"titleNView": false
 				}
 			}
 		},
@@ -351,37 +357,6 @@
 			}
 		}
 	],
-	"subPackages": [
-		{
-			"root": "pages/activity",
-			"name": "activity",
-			"pages":[{
-					"path": "goods_bargain/index",
-					"style": {
-						"navigationStyle": "custom"
-						// #ifdef MP
-						,"navigationBarTextStyle": "#fff"
-						// #endif
-					}
-				},
-				{
-					"path": "goods_bargain_details/index",
-					"style": {
-						"navigationStyle": "custom"
-						// #ifdef MP
-						,"navigationBarTextStyle": "#fff"
-						// #endif
-					}
-				},
-				{
-					"path": "bargain/index",
-					"style": {
-						"navigationBarTitleText": "砍价记录"
-					}
-				}
-			]
-		}
-	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
@@ -403,7 +378,7 @@
 				"pagePath": "pages/category/category",
 				"iconPath": "static/tabBar/tab-cate.png",
 				"selectedIconPath": "static/tabBar/tab-cate-current.png",
-				"text": "分类"
+				"text": "品牌故事"
 			},
 			{
 				"pagePath": "pages/cart/cart",

pages/activity/bargain/index.vue

@@ -1,267 +0,0 @@
-<template>
-	<view>
-		<block v-if="bargain.length>0">
-			<div class="bargain-record" ref="container">
-				<div class="item" v-for="(item, index) in bargain" :key="index">
-					<div class="picTxt acea-row row-between-wrapper">
-						<div class="pictrue">
-							<image :src="item.image" />
-						</div>
-						<div class="text acea-row row-column-around">
-							<div class="line1" style="width: 100%;">{{ item.title }}</div>
-							<count-down :justify-left="'justify-content:left'" :is-day="true" :tip-text="'倒计时 '" :day-text="' 天 '" :hour-text="' 时 '" :minute-text="' 分 '"
-							 :second-text="' 秒'" :datatime="item.datatime" v-if="item.status === 1"></count-down>
-							<div class="successTxt font-color-red" v-else-if="item.status === 3">砍价成功</div>
-							<div class="endTxt" v-else>活动已结束</div>
-							<div class="money font-color-red">
-								已砍至<span class="symbol">￥</span><span class="num">{{ item.residue_price }}</span>
-							</div>
-						</div>
-					</div>
-					<div class="bottom acea-row row-between-wrapper">
-						<div class="purple" v-if="item.status === 1">活动进行中</div>
-						<div class="success" v-else-if="item.status === 3">砍价成功</div>
-						<div class="end" v-else>活动已结束</div>
-						<div class="acea-row row-middle row-right">
-							<div class="bnt cancel" v-if="item.status === 1" @click="getBargainUserCancel(item.bargain_id)">
-								取消活动
-							</div>
-							<div class="bnt bg-color-red" v-if="item.status === 1" @click="goDetail(item.bargain_id)">
-								继续砍价
-							</div>
-							<!-- <div class="bnt bg-color-red" v-else @click="goList">重开一个</div> -->
-						</div>
-					</div>
-				</div>
-				<Loading :loaded="status" :loading="loadingList"></Loading>
-			</div>
-		</block>
-		<block v-if="bargain.length == 0">
-			<emptyPage title="暂无砍价记录～"></emptyPage>
-		</block>
-	</view>
-</template>
-<script>
-	import CountDown from "@/components/countDown";
-	import emptyPage from '@/components/emptyPage.vue'
-	import {
-		getBargainUserList,
-		getBargainUserCancel
-	} from "@/api/activity";
-	import {
-		userinfos
-	} from '@/api/user.js';
-	import Loading from "@/components/Loading";
-
-	export default {
-		name: "BargainRecord",
-		components: {
-			CountDown,
-			Loading,
-			emptyPage
-		},
-		props: {},
-		data: function() {
-			return {
-				bargain: [],
-				status: false, //砍价列表是否获取完成 false 未完成 true 完成
-				loadingList: false, //当前接口是否请求完成 false 完成 true 未完成
-				page: 1, //页码
-				limit: 20, //数量
-				userInfo: {}
-			};
-		},
-		onLoad: function() {
-			this.getBargainUserList();
-			this.getUserInfo();
-			// this.$scroll(this.$refs.container, () => {
-			//   !this.loadingList && this.getBargainUserList();
-			// });
-		},
-		methods: {
-			goDetail: function(id) {
-				// this.$router.push({
-				// 	path: "/activity/dargain_detail/" + id +'&bargain='+ userInfo.uid
-				// });
-				uni.navigateTo({
-					url: `/pages/activity/goods_bargain_details/index?id=${id}&bargain=${this.userInfo.uid}`
-				})
-			},
-			// 砍价列表
-			goList: function() {
-				uni.navigateTo({
-					url: '/pages/activity/goods_bargain/index'
-				})
-			},
-			getBargainUserList: function() {
-				var that = this;
-				if (that.loadingList) return;
-				if (that.status) return;
-				getBargainUserList({
-						page: that.page,
-						limit: that.limit
-					})
-					.then(res => {
-						that.status = res.data.length < that.limit;
-						that.bargain.push.apply(that.bargain, res.data);
-						that.page++;
-						that.loadingList = false;
-					})
-					.catch(res => {
-						that.$dialog.error(res.msg);
-					});
-			},
-			getBargainUserCancel: function(bargainId) {
-				var that = this;
-				uni.showModal({
-				    title: '提示',
-				    content: '确定取消砍价商品吗',
-				    success: function (res) {
-				        if (res.confirm) {
-				            console.log('用户点击确定');
-							getBargainUserCancel({
-									bargainId: bargainId
-								})
-								.then(res => {
-									that.status = false;
-									that.loadingList = false;
-									that.page = 1;
-									that.bargain = [];
-									that.getBargainUserList();
-									uni.showToast({
-										title:res.msg
-									});
-								})
-								.catch(res => {
-									uni.showToast({
-										title:res
-									});
-								});
-				        } else if (res.cancel) {
-				            console.log('用户点击取消');
-				        }
-				    }
-				});
-			},
-			/**
-			 * 获取个人用户信息
-			 */
-			getUserInfo: function() {
-				let that = this;
-				userinfos().then(res => {
-					that.userInfo = res.data;
-				});
-			},
-		},
-		onReachBottom() {
-			this.getBargainUserList();
-		}
-	};
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #f5f5f5;
-	}
-	/*砍价记录*/
-	.bargain-record .item .picTxt .text .time .styleAll {
-		color: #fc4141;
-		font-size:24rpx;
-	}
-	.bargain-record .item .picTxt .text .time .red {
-		color: #999;
-		font-size:24rpx;
-	}
-	.bargain-record .item {
-		background-color: #fff;
-		margin-bottom: 12upx;
-	}
-
-	.bargain-record .item .picTxt {
-		height: 210upx;
-		border-bottom: 1px solid #f0f0f0;
-		padding: 0 30upx;
-	}
-
-	.bargain-record .item .picTxt .pictrue {
-		width: 150upx;
-		height: 150upx;
-	}
-
-	.bargain-record .item .picTxt .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 6upx;
-	}
-
-	.bargain-record .item .picTxt .text {
-		width: 515upx;
-		font-size: 30upx;
-		color: #282828;
-		height: 150upx;
-	}
-
-	.bargain-record .item .picTxt .text .time {
-		font-size: 24upx;
-		color: #868686;
-		justify-content: left !important;
-	}
-	
-	.bargain-record .item .picTxt .text .successTxt{
-		font-size:24rpx;
-	}
-	
-	.bargain-record .item .picTxt .text .endTxt{
-		font-size:24rpx;
-		color: #999;
-	}
-	.bargain-record .item .picTxt .text .money {
-		font-size: 24upx;
-	}
-
-	.bargain-record .item .picTxt .text .money .num {
-		font-size: 32upx;
-		font-weight: bold;
-	}
-
-	.bargain-record .item .picTxt .text .money .symbol {
-		font-weight: bold;
-	}
-
-	.bargain-record .item .bottom {
-		height: 100upx;
-		padding: 0 30upx;
-		font-size: 27upx;
-	}
-
-	.bargain-record .item .bottom .purple {
-		color: #f78513;
-	}
-
-	.bargain-record .item .bottom .end {
-		color: #999;
-	}
-
-	.bargain-record .item .bottom .success {
-		color: #e93323;
-	}
-
-	.bargain-record .item .bottom .bnt {
-		font-size: 27upx;
-		color: #fff;
-		width: 176upx;
-		height: 60upx;
-		border-radius: 32upx;
-		text-align: center;
-		line-height: 60upx;
-	}
-
-	.bargain-record .item .bottom .bnt.cancel {
-		color: #aaa;
-		border: 1px solid #ddd;
-	}
-
-	.bargain-record .item .bottom .bnt~.bnt {
-		margin-left: 18upx;
-	}
-</style>

pages/category/articleList.vue

@@ -0,0 +1,117 @@
+<template>
+	<view class="content">
+		<view class="main">
+			<view v-for="(item, index) in 10">
+				<view class="item flex" @click="navToList()">
+					<view class="item-left"></view>
+					<view class="item-right">
+						<view class="item-font clamp">信愿行如三足鼎立，缺一不可</view>
+						<view class="item-time">更新时间:2021-12-06</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { getCategoryList } from '@/api/product.js';
+export default {
+	data() {
+		return {
+			list: []
+		};
+	},
+	onLoad() {
+		this.loadData();
+	},
+	methods: {
+		// 载入数据
+		async loadData() {
+			let obj = this;
+		},
+		navToList() {
+			uni.navigateTo({
+				url: '/pages/category/detail'
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	height: auto;
+	min-height: 100%;
+	background: #f5f5f5;
+}
+.main {
+	margin-top: 20rpx;
+	background: #ffffff;
+	.first {
+		padding: 50rpx 0 18rpx;
+		margin: 0 22rpx;
+		border-bottom: 1px solid #e0e0e0;
+		.title {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+		}
+		.image {
+			width: 710rpx;
+			height: 400rpx;
+			background: #4cd964;
+			margin-top: 20rpx;
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+		.time {
+			margin-top: 20rpx;
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666666;
+		}
+	}
+	.item {
+		padding: 26rpx 0 18rpx;
+		margin: 0 22rpx;
+		justify-content: flex-start;
+		align-items: flex-start;
+		border-bottom: 1px solid #e0e0e0;
+		.item-left {
+			width: 224rpx;
+			height: 160rpx;
+			background: #DC4D46;
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+		.item-right {
+			height: 160rpx;
+			margin-left: 24rpx;
+			padding: 18rpx 0;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			.item-font {
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+			.item-time {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+			}
+		}
+	}
+}
+</style>

pages/category/category.vue

@@ -2,12 +2,12 @@
 	<view class="content">
 		<view class="main">
 			<view v-for="(item, index) in 10">
-				<view class="first" v-if="index == 0">
+				<view class="first" v-if="index == 0" @click="navToList()">
 					<view class="title">【鼎立足行】鼎立足行足垫走姿矫正器研发相关 纪录大揭秘</view>
 					<view class="image"></view>
 					<view class="time">更新时间:2021-12-06</view>
 				</view>
-				<view class="item flex" v-else>
+				<view class="item flex" @click="navToList()" v-else>
 					<view class="item-left"></view>
 					<view class="item-right">
 						<view class="item-font clamp">信愿行如三足鼎立，缺一不可</view>
@@ -35,10 +35,9 @@ export default {
 		async loadData() {
 			let obj = this;
 		},
-		navToList(sid, tid) {
-			// 点击导航跳转到详细页面
+		navToList() {
 			uni.navigateTo({
-				url: '/pages/product/list?fid=' + this.currentId + '&sid=' + sid + '&tid=' + tid
+				url: '/pages/category/detail'
 			});
 		}
 	}

pages/category/detail.vue

@@ -0,0 +1,46 @@
+<template>
+	<view class="center">
+		<view class="title clamp">鼎立足行足垫走姿矫正器研发相关纪录大揭秘</view>
+		<view class="time">2019-08-20 12:00</view>
+		<view class="main">
+			记得在搜索引擎上，给出区块链的定义，“是分布式数据存储、点对点传输、共识机制、加密算法等计算机技术的新型应用模式。所谓共识机制是区块链系统中实现不同节点之间建立信任、获取权益的数学算法”。如今区块链从学术象牙塔进入普通大众的视眼。
+			
+			从2008年比特币白皮书问世，第一枚比特币诞生，过去近十年了，从表现看区块链它本质上是一个去中心化的数据库，同时也是作为比特币的底层技术。而现在区块链技术不仅仅只用在加密数字货币点对点交易，早已经被用在各行各业当中，甲骨文、谷歌、Facebook等国际知名企业，早已布局针对行业的一些痛点或者发展瓶颈，利用区块链技术找出解决办法的研究，涉及保险、食品、零售、医疗、数据储存等等。
+
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {};
+	},
+	methods: {}
+};
+</script>
+
+<style lang="scss">
+.center {
+	min-height: 100%;
+	height: auto;
+	background: #ffffff;
+	padding: 30rpx 24rpx 0;
+}
+.title {
+	font-size: 32rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #333333;
+}
+.time {
+	font-size: 24rpx;
+	font-family: PingFangSC;
+	font-weight: 500;
+	color: #999999;
+	margin-top: 40rpx;
+}
+.main {
+	margin-top: 60rpx;
+}
+</style>

pages/index/index.vue

@@ -22,20 +22,20 @@
 			</template>
 		</view>
 		<view class="cate-section">
-			<view class="cate-item">
+			<view class="cate-item" @click="nav('/pages/category/category')">
 				<image src="/static/icon/c3.png"></image>
 				<view class="cate-font">品牌介绍</view>
 			</view>
-			<view class="cate-item">
+			<view class="cate-item" @click="nav('/pages/category/articleList')">
 				<image src="/static/icon/c5.png"></image>
 				<view class="cate-font">产品百科</view>
 			</view>
-			<view class="cate-item">
+			<view class="cate-item" @click="showPopup()">
 				<image src="/static/icon/c7.png"></image>
 				<view class="cate-font">免费咨询</view>
 			</view>
 			<view class="cate-item">
-				<image src="/static/icon/c8.png"></image>
+				<image src="/static/icon/c8.png"  @click="nav('/pages/user/shareQrCode')"></image>
 				<view class="cate-font">邀请有礼</view>
 			</view>
 		</view>
@@ -66,6 +66,22 @@
 				</view>
 			</view>
 		</view>
+		<uni-popup ref="popup" type="center">
+			<view class="popup-box">
+				<view class="img"><image src="../../static/img/img009.png" mode=""></image></view>
+				<view class="mian">
+					<view class="delivery">
+						<view class="title">已经为您定制专属客服</view>
+						<image src="../../static/img/img010.png" mode=""></image>
+					</view>
+					<view class="nocancel">客服微信: {{ text }}</view>
+					<view class="comfirm-box">
+						<view class="cancel" @click="cancel">取消</view>
+						<view class="comfirm" @click="comfirm(text)">复制微信</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -76,6 +92,9 @@ export default {
 	data() {
 		return {
 			carouselList: [''], //轮播图
+			swiperCurrent: 0,
+			dataList:[],
+			text: 'Zjxwcm',//客服微信
 			swiperLength: 1 //图片数量
 		};
 	},
@@ -132,6 +151,72 @@ export default {
 				url: '/pages/product/search'
 			});
 		},
+		nav(url){
+			uni.navigateTo({
+				url,
+				fail: () => {
+					console.log(1)
+					uni.switchTab({
+						url
+					})
+				}
+			})
+		},
+		showPopup() {
+			this.$refs.popup.open();
+		},
+		cancel() {
+			this.$refs.popup.close();
+		},
+		uniCopy(content) {
+			/**
+			 * 小程序端 和 app端的复制逻辑
+			 */
+			//#ifndef H5
+			uni.setClipboardData({
+				data: content,
+				success: function() {
+					console.log('success');
+					return true;
+				}
+			});
+			//#endif
+		
+			/**
+			 * H5端的复制逻辑
+			 */
+			// #ifdef H5
+			if (!document.queryCommandSupported('copy')) {
+				//为了兼容有些浏览器 queryCommandSupported 的判断
+				// 不支持
+				return false;
+			}
+			let textarea = document.createElement('textarea');
+			textarea.value = content;
+			textarea.readOnly = 'readOnly';
+			document.body.appendChild(textarea);
+			textarea.select(); // 选择对象
+			textarea.setSelectionRange(0, content.length); //核心
+			let result = document.execCommand('copy'); // 执行浏览器复制命令
+			textarea.remove();
+			return result;
+			// #endif
+		},
+		comfirm(text) {
+			console.log(text);
+			const result = this.uniCopy(text);
+			if (result === false) {
+				uni.showToast({
+					title: '不支持'
+				});
+			} else {
+				uni.showToast({
+					title: '复制成功',
+					icon: 'none'
+				});
+			}
+			this.$refs.popup.close();
+		},
 		// 请求载入数据
 		async loadData() {
 			loadIndexs({})
@@ -432,5 +517,94 @@ page,
 		}
 	}
 }
+.popup-box {
+		width: 522rpx;
+		height: 605rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		position: relative;
+
+		.img {
+			position: relative;
+			top: -56rpx;
+			left: 0;
+			width: 522rpx;
+			height: 132rpx;
+			display: flex;
+			justify-content: center;
+
+			image {
+				border-radius: 20rpx 20rpx 0 0;
+				width: 450rpx;
+				height: 132rpx;
+			}
+		}
+
+		.mian {
+			margin-top: -44rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			// padding: 32rpx 32rpx;
+			background-color: #ffffff;
+			border-radius: 0 0 20rpx 20rpx;
+			text-align: center;
+
+			.delivery {
+				font-size: 40rpx;
+				color: #333333;
+				display: flex;
+				align-items: center;
+				flex-direction: column;
+
+				.title {}
+
+				image {
+					margin-top: 48rpx;
+					width: 172rpx;
+					height: 160rpx;
+				}
+			}
+
+			.nocancel {
+				font-size: 32rpx;
+				color: #333333;
+				margin-top: 14rpx;
+			}
+
+			.comfirm-box {
+				margin-top: 52rpx;
+				display: flex;
+				// margin-bottom: 32rpx;
+
+				// justify-content: space-around;
+				.cancel {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 197rpx;
+					height: 74rpx;
+					border: 1px solid #dcc786;
+					border-radius: 38rpx;
+
+					font-size: 32rpx;
+					color: #605128;
+				}
+
+				.comfirm {
+					margin-left: 32rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 197rpx;
+					height: 74rpx;
+					background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
+					border-radius: 38px;
+					font-size: 32rpx;
+					color: #605128;
+				}
+			}
+		}
+	}
 
 </style>

pages/money/account.vue

@@ -211,7 +211,6 @@ page,
 				transform: translateX(-50%);
 				width: 44px;
 				height: 0;
-				border-bottom: 2px solid $base-color;
 			}
 		}
 	}
@@ -219,7 +218,7 @@ page,
 
 .add-btn {
 	&.up {
-		background-color: $base-color;
+		background: linear-gradient(90deg, #08c4e6, #50ead2);
 		color: #fff;
 	}
 	display: flex;

pages/money/recharge.vue

@@ -1,66 +1,95 @@
 <template>
 	<view class="content">
-		<view class="row-box">
+		<view class="top_box">
+			<text class="yue-tit">当前余额：</text>
+			<text class="yue-num">￥{{ userInfo.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"><image src="https://37shop.liuniu946.com/front/img/weixin.png" mode=""></image></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';
 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'
+			],
+			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 +99,55 @@ 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() {
+			// rechargeIndex().then(({data}) => {
+			// 	console.log(data);
+			// 	this.zhuyi = data.recharge_attention;
+			// 	this.money = data.recharge_quota[0].price;
+			// 	this.quota = data.recharge_quota[0].quota;
+			// 	this.list = data.recharge_quota;
+			// })
+		},
+
 		// 提交
 		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 +159,10 @@ export default {
 							uni.showToast({
 								title: '充值成功',
 								duration: 2000,
-								position: 'top'
+								position: 'top',
+								success: function(res) {
+									uni.navigateBack()
+								}
 							});
 						}
 					});
@@ -114,13 +184,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 +204,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 +211,186 @@ 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: linear-gradient(180deg, #08c4e6, #50ead2);
+			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: 48rpx;
+			image {
+				width: 48rpx;
+				height: 48rpx;
+			}
+		}
+		.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: linear-gradient(90deg, #08C4E6, #50EAD2);
+	box-shadow: 0px 12rpx 45rpx 5rpx rgba(36, 17, 2, 0.04);
+	border-radius: 8rpx;
 }
 .row-box {
 	margin-top: 30rpx;
@@ -229,9 +437,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/wallet.vue

@@ -2,54 +2,49 @@
 	<view class="content">
 		<view class="content-money">
 			<view class="money-box">
-				<view class="text">可提现金额（元）</view>
+				<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">{{ money | getMoneyStyle }}</view>
 			</view>
-			<view class="moneyTx" @click="navto('/pages/money/recharge')">充值</view>
-			<view class="flex buttom-box">
-				<view class="buttom" @click="navto('/pages/money/recharge')">
-					<view class="icon"><image class="icon-img" src="/static/icon/i5.png" mode="aspectFit"></image></view>
-					<text>充值</text>
-				</view>
-				<view class="interval"></view>
-				<view class="buttom" @click="navto('/pages/money/withdrawal')">
-					<view class="icon"><image class="icon-img" src="/static/icon/i1.png" mode="aspectFit"></image></view>
-					<text>提现</text>
-				</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+'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 class="list-scroll-content" scroll-y @scrolltolower="loadData">
 					<!-- 空白页 -->
 					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
 					<!-- 订单列表 -->
-					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
-						<view class="title-box">
-							<view class="title">
-								<text>{{ item.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/withdrawal')">立即提现</view>
 	</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';
@@ -70,11 +65,8 @@ export default {
 					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);
+					this.maxheight = data.height - Math.floor((data.width / 750) * 330) - 40 - 40;
 				}
 			)
 			.exec();
@@ -82,12 +74,12 @@ export default {
 	data() {
 		return {
 			// 头部图高度
-			maxheight:'',
+			maxheight: '',
 			tabCurrentIndex: 0,
 			navList: [
 				{
-					state: 0,
-					text: '全部',
+					state: 2,
+					text: '收入',
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
@@ -100,22 +92,15 @@ export default {
 					orderList: [],
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
-				},
-				{
-					state: 2,
-					text: '收入',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
 				}
 			],
 			money: ''
 		};
 	},
-	onLoad(options) {},
-	onShow() {
+	onLoad(options) {
 		this.loadData();
+	},
+	onShow() {
 		// 获取用户余额
 		userBalance({}).then(({ data }) => {
 			this.money = data.now_money;
@@ -138,13 +123,12 @@ export default {
 				//tab切换只有第一次需要加载数据
 				return;
 			}
-			if (navItem.loadingType === 'loading') {
+			if (navItem.loadingType === 'noMore') {
 				//防止重复加载
 				return;
 			}
 			// 修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
-
 			spreadCommission(
 				{
 					page: navItem.page,
@@ -153,11 +137,8 @@ export default {
 				state
 			)
 				.then(({ data }) => {
-					if (data.length > 0) {
-						navItem.orderList = navItem.orderList.concat(data[0].list);
-						console.log(navItem.orderList);
-						navItem.page++;
-					}
+					navItem.orderList = navItem.orderList.concat(data);
+					navItem.page++;
 					if (navItem.limit == data.length) {
 						//判断是否还有数据， 有改为 more， 没有改为noMore
 						navItem.loadingType = 'more';
@@ -182,6 +163,12 @@ export default {
 		//顶部tab点击
 		tabClick(index) {
 			this.tabCurrentIndex = index;
+		},
+		// 点击返回 我的页面
+		toBack() {
+			uni.switchTab({
+				url: '/pages/user/user'
+			});
 		}
 	}
 };
@@ -192,21 +179,28 @@ page {
 	background: #ffffff;
 	height: 100%;
 }
+// .header{
+// 	width: 100%;
+// 	height: 54px;
+// 	background-color: #FF0000;
+// }
 .content-money {
 	padding-bottom: 30rpx;
 	background: $page-color-base;
+	// border: 2px solid #ffffff;
+	// padding-top: var(--status-bar-height);
 	.moneyTx {
 		position: absolute;
-		top: 150rpx;
+		top: 120rpx;
 		right: 0rpx;
-		width: 150rpx;
-		padding: 10rpx 30rpx;
+		// width: 150rpx;
+		padding: 10rpx 10rpx;
 		border: 2px solid #ffffff;
-		border-top-left-radius: 99rpx;
-		border-bottom-left-radius: 99rpx;
-		color: #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;
@@ -225,8 +219,8 @@ page {
 			background-color: #eeeeee;
 		}
 		.icon {
-			height: 50rpx;
-			width: 48rpx;
+			height: 36rpx;
+			width: 36rpx;
 			margin: 0 auto;
 			.icon-img {
 				width: 100%;
@@ -236,17 +230,91 @@ 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;
+	.header {
+		// margin-top: var(--status-bar-height);
+		// background-color: pink;
+		width: 100%;
+		height: 68rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 26rpx;
+		// font-family: PingFang SC;
+		font-weight: 400;
+		color: #ffffff;
+		position: relative;
+		left: 0;
+		top: 0;
+
+		// 	.toback {
+		// 		// background-color: red;
+		// 		display: flex;
+		// 		align-items: center;
+		// 		width: 44rpx;
+		// 		height: 68rpx;
+		// 		margin-left: 16rpx;
+		// 		position: absolute;
+		// 		left: 0rpx;
+		// 		top: 0rpx;
+
+		// 		image {
+		// 			width: 34rpx;
+		// 			height: 38rpx;
+		// 		}
+		// 	}
+	}
+	.header {
+		margin-top: var(--status-bar-height);
+		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 {
+		margin-top: var(--status-bar-height);
+		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;
+		}
 	}
 }
 
@@ -265,10 +333,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;
@@ -277,7 +345,7 @@ page {
 				transform: translateX(-50%);
 				width: 44px;
 				height: 0;
-				border-bottom: 2px solid $base-color;
+				border-bottom: 2px solid #27d4dd;
 			}
 		}
 	}
@@ -300,7 +368,7 @@ page {
 			}
 		}
 		.money {
-			color: #fd5b23;
+			color: #ff0000;
 			font-size: $font-lg;
 		}
 	}
@@ -308,6 +376,22 @@ page {
 .list-scroll-content {
 	height: 100%;
 }
+.wallet-btn {
+	width: 674rpx;
+	height: 88rpx;
+	background: linear-gradient(90deg, #08c4e6, #50ead2);
+	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/money/withdrawal.vue

@@ -1,29 +1,29 @@
 <template>
 	<view class="content">
-		<uni-notice-bar single="true" text="每月25号到月底可提现上月结算余额"></uni-notice-bar>
 		<view class="content-money">
-			<view class="flex ">
-				<view class="buttom">
-					<view class="icon">{{ money | getMoneyStyle }}</view>
-					<text class="text">可提现金额</text>
+			<view class="buttom">
+				<text class="text">可提现金额</text>
+				<view class="icon">
+					<text>￥</text>
+					{{ money }}
 				</view>
-				<view class="interval"></view>
-				<view class="buttom">
-					<view class=" icon">{{ freeze | getMoneyStyle }}</view>
-					<text class="text">待审核提现金额</text>
+			</view>
+			<view class="interval"></view>
+			<view class="buttom">
+				<text class="text">申请提现金额</text>
+				<view class=" icon">
+					<input class="input" type="number" v-model="withdrawal" :placeholder="'最低提现金额' + minPrice + '元'" placeholder-class="placeholder" />
 				</view>
 			</view>
-		</view>
-		<view class="row-box">
-			<view class="title">提现金额</view>
-			<view class="row">
-				<text class="tit">￥</text>
-				<input class="input" type="number" v-model="withdrawal" :placeholder="'最低提现金额' + minPrice + '元'" placeholder-class="placeholder" />
-				<view class="buttom" @click="withdrawal = money">全部提现</view>
+			<view class="interval"></view>
+			<view class="tip">
+				<text class="tip-text">申请提现金额</text>
+				<view class=" tip-icon" @click="all()">全部提现</view>
 			</view>
 		</view>
+
 		<!-- #ifndef MP-WEIXIN -->
-		<view class="list" v-if="!weichatBsrowser">
+		<view class="list">
 			<radio-group @change="tabRadio">
 				<label>
 					<view class="box">
@@ -34,31 +34,16 @@
 						<view class="right"><radio value="weixin" color="#5dbc7c" :checked="type == 'weixin'" /></view>
 					</view>
 				</label>
-				<label>
-					<view class="box">
-						<view class="icon iconfont iconzhifubao"></view>
-						<view class="title-box">
-							<view class="title">
-								<text v-if="aliData.fullname">提现至支付宝</text>
-								<text v-else>请创建支付宝账号</text>
-							</view>
-							<view class="node">
-								<text v-if="aliData.fullname">真实姓名({{ aliData.fullname }})</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"><image class="icon-img" src="/static/icon/i8.png" mode="aspectFit"></image></view>
 						<view class="title-box">
 							<view class="title">
-								<text v-if="bankData.bankno">{{ bankData.bank + ' ' + bankData.bankno }}</text>
+								<text v-if="bankData.bankno != null">{{ bankData.bank + ' ' + bankData.bankno }}</text>
 								<text v-else>请创建银行账号</text>
 							</view>
 							<view class="node">
-								<text v-if="bankData.fullname">真实姓名({{ bankData.fullname }})</text>
+								<text v-if="bankData.fullname != null">真实姓名({{ bankData.fullname }})</text>
 							</view>
 						</view>
 						<view class="right"><radio value="bank" color="#5dbc7c" :checked="type == 'bank'" /></view>
@@ -68,51 +53,55 @@
 		</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" @click="navTo('/pages/money/account')">账号管理</button>
 	</view>
 </template>
 
 <script>
 import { getMoneyStyle } from '@/utils/rocessor.js';
 import { extractCash, extractBank, aliInfo, bankInfo } from '@/api/wallet.js';
-import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue';
+import { mapState, mapMutations } from 'vuex';
 export default {
-	filters: {
-		getMoneyStyle
-	},
-	components: {
-		uniNoticeBar
-	},
 	data() {
 		return {
-			type: 'weixin', //提现方式
-			money: '0.00', //可提现金额
-			freeze: '0.0', //冻结金额
+			type: 'alipay', //提现方式
+			money: '', //可提现金额
 			withdrawal: '', //提现金额
 			minPrice: '', //最少提现金额
-			aliData: {},
-			bankData: {},
+			coldMoney: '', //冻结中的金额
+			aliData: { fullname: '', alino: '' },
+			bankData: { fullname: '', bank: '', bankno: '' },
 			// #ifdef H5
 			weichatBsrowser: false
 			// #endif
 		};
 	},
-	onLoad(options) {
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
+		moneyMin() {
+			return '最低提现金额' + this.minPrice + '元';
+		}
+	},
+	onShow(options) {
 		// #ifdef H5
 		this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
 		// #endif
 		//加载提现信息
 		this.loadData();
 		// 加载提款账号信息
-		this.loadAli();
-		this.loadBank();
+		this.aliData.fullname = this.userInfo.alipay_name;
+		console.log(this.aliData.fullname);
+		this.aliData.alino = this.userInfo.alipay_code;
+		this.bankData.fullname = this.userInfo.bank_user_name;
+		this.bankData.bank = this.userInfo.bank_name;
+		this.bankData.bankno = this.userInfo.bank_code;
 	},
 	methods: {
 		// 更新数据
-		dataUp(){
-			this.loadAli();
-			this.loadBank();
-		},
+		// dataUp() {
+		// 	this.loadAli();
+		// 	this.loadBank();
+		// },
 		//加载数据
 		async loadAli(source) {
 			aliInfo({}).then(e => {
@@ -128,9 +117,11 @@ export default {
 		// 加载余额信息
 		async loadData() {
 			extractBank({}).then(({ data }) => {
-				this.money = data.moneyCount;//可提现余额
-				this.minPrice = data.minPrice;//最小提现
-				this.freeze =data.inmoneyCount//提现中的余额
+				console.log(data);
+				this.coldMoney = data.brokerage_price; //冻结中金额
+				this.money = data.commissionCount * 1; //可提现余额
+				this.minPrice = data.minPrice; //最小提现
+				this.freeze = data.inmoneyCount; //提现中的余额
 			});
 		},
 		// 跳转
@@ -139,35 +130,53 @@ export default {
 				url: url
 			});
 		},
+		all() {
+			this.withdrawal = this.money;
+		},
 		// 切换选中对象
 		tabRadio(e) {
 			this.type = e.detail.value;
 		},
 		// 提交
 		confirm() {
+			console.log(this.withdrawal);
+			if (this.withdrawal === '') {
+				this.$api.msg('请填写需要提现的佣金');
+				return;
+			}
+			if (this.withdrawal == 0) {
+				this.$api.msg('提现佣金不能为0');
+				return;
+			}
+			if (this.withdrawal < this.minPrice) {
+				this.$api.msg('提现金额不能低于最小金额');
+				return;
+			}
 			let data = {
 				extract_type: this.type, //bank -银行卡 alipay-支付宝 weixin-微信
 				money: this.withdrawal, //金额
-				money_type: 1//0佣金1余额
-			}
-			if (this.type=='alipay') {
+				money_type: 'brokerage' //0佣金1余额
+			};
+			if (this.type == 'alipay') {
 				data.name = this.aliData.fullname;
 				data.alipay_code = this.aliData.alino;
 			}
-			if (this.type=='bank') {
+			if (this.type == 'bank') {
 				data.name = this.bankData.fullname;
 				data.bankname = this.bankData.bank;
 				data.cardnum = this.bankData.bankno;
 			}
-			
-			
+
 			extractCash(data)
 				.then(e => {
-					uni.showToast({
-						title: '提交成功',
-						duration: 2000,
-						position: 'top'
+					uni.navigateTo({
+						url: '/pages/money/success?type=1'
 					});
+					// uni.showToast({
+					// 	title: '提交成功',
+					// 	duration: 2000,
+					// 	position: 'top'
+					// });
 				})
 				.catch(e => {
 					console.log();
@@ -182,77 +191,72 @@ page {
 	height: 100%;
 }
 .content-money {
-	padding: 30rpx 0;
-	background: #ffffff;
-}
-.flex {
+	padding: 0 20rpx;
 	background-color: #ffffff;
-	text-align: center;
-	margin: 0 30rpx;
-	border-radius: $border-radius-sm;
 	.buttom {
-		font-size: $font-lg;
-		width: 50%;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		height: 110rpx;
 	}
 	.interval {
-		width: 2px;
-		height: 60rpx;
-		background-color: #eeeeee;
+		width: 100%;
+		height: 1px;
+		background: #e6e6e6;
 	}
 	.icon {
-		background-size: 100%;
-		font-size: 42rpx;
-		color: $font-color-dark;
-		font-weight: bold;
-		background-repeat: no-repeat;
-		background-position: center;
-	}
-	.text {
-		color: $font-color-light;
-	}
-}
-
-.row-box {
-	margin-top: 30rpx;
-	padding: 20rpx 30rpx;
-	background: #fff;
-	.title {
-		font-size: $font-base + 2rpx;
-		color: $font-color-dark;
-	}
-	.row {
-		display: flex;
-		align-items: center;
-		position: relative;
-		height: 80rpx;
-		.tit {
-			flex-shrink: 0;
-			width: 40rpx;
-			font-size: 30rpx;
-			color: $font-color-dark;
+		font-size: 48rpx;
+		font-family: SourceHanSansCN;
+		font-weight: 500;
+		color: #333333;
+		text {
+			font-size: 32rpx;
 		}
 		.input {
+			text-align: right;
 			flex: 1;
 			font-size: 30rpx;
 			color: $font-color-dark;
 		}
 		.iconlocation {
+			text-align: right;
 			font-size: 36rpx;
 			color: $font-color-light;
 		}
-
-		.buttom {
-			color: $font-color-spec;
-			font-size: $font-base;
+	}
+	.text {
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #333333;
+	}
+	.tip {
+		height: 74rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		.tip-text {
+			font-size: 24rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #999999;
+		}
+		.tip-icon {
+			font-size: 26rpx;
+			font-family: SourceHanSansCN;
+			font-weight: 400;
+			color: #438bed;
 		}
 	}
 }
+
 .add-btn {
 	&.modified {
-		color: $base-color;
+		color: #2ed8db;
+		border:1px solid  #2ed8db;
 	}
 	&.up {
-		background-color: $base-color;
+		background: linear-gradient(90deg, #08c4e6, #50ead2);
 		color: #fff;
 	}
 	display: flex;

pages/set/address.vue

@@ -202,7 +202,7 @@ page {
 	height: 80rpx;
 	font-size: $font-lg;
 	color: #fff;
-	background-color: $base-color;
+	background: linear-gradient(90deg, #08C4E6, #50EAD2);
 	border-radius: 10rpx;
 }
 </style>

pages/set/addressManage.vue

@@ -24,7 +24,7 @@
 				:switch-checked="addressData.default"
 				:show-switch="true"
 				:show-arrow="false"
-				switch-color="#5dbc7c"
+				switch-color="#5ad5ee"
 				@switchChange="switchChange"
 			></uni-list-item>
 		</uni-list>
@@ -208,7 +208,7 @@ page {
 	margin: 60rpx auto;
 	font-size: $font-lg;
 	color: #fff;
-	background-color: $base-color;
+	background: linear-gradient(90deg, #08C4E6, #50EAD2);
 	border-radius: 10rpx;
 	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
 }

pages/user/award.vue

@@ -2,49 +2,43 @@
 	<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>
+				<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/anchor11.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 +57,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 +74,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 +90,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 +137,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 +154,7 @@ export default {
 					console.log(e);
 				});
 		},
+
 		//swiper 切换
 		changeTab(e) {
 			this.tabCurrentIndex = e.target.current;
@@ -170,9 +163,15 @@ export default {
 		//顶部tab点击
 		tabClick(index) {
 			this.tabCurrentIndex = index;
+		},
+		// 点击返回 我的页面
+		toBack() {
+			uni.switchTab({
+				url: '/pages/user/user'
+			});
 		}
 	}
-}
+};
 </script>
 
 <style lang="scss">
@@ -180,21 +179,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 +219,8 @@ page {
 			background-color: #eeeeee;
 		}
 		.icon {
-			height: 50rpx;
-			width: 48rpx;
+			height: 36rpx;
+			width: 36rpx;
 			margin: 0 auto;
 			.icon-img {
 				width: 100%;
@@ -224,17 +230,91 @@ 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;
+	.header {
+		// margin-top: var(--status-bar-height);
+		// background-color: pink;
+		width: 100%;
+		height: 68rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 26rpx;
+		// font-family: PingFang SC;
+		font-weight: 400;
+		color: #ffffff;
+		position: relative;
+		left: 0;
+		top: 0;
+
+		// 	.toback {
+		// 		// background-color: red;
+		// 		display: flex;
+		// 		align-items: center;
+		// 		width: 44rpx;
+		// 		height: 68rpx;
+		// 		margin-left: 16rpx;
+		// 		position: absolute;
+		// 		left: 0rpx;
+		// 		top: 0rpx;
+
+		// 		image {
+		// 			width: 34rpx;
+		// 			height: 38rpx;
+		// 		}
+		// 	}
+	}
+	.header {
+		margin-top: var(--status-bar-height);
+		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 {
+		margin-top: var(--status-bar-height);
+		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 +333,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 +345,12 @@ page {
 				transform: translateX(-50%);
 				width: 44px;
 				height: 0;
-				border-bottom: 2px solid $base-color;
+				border-bottom: 2px solid #27d4dd;
 			}
 		}
 	}
 }
-//列表
+// 列表
 
 .swiper-box {
 	padding-top: 10rpx;
@@ -288,7 +368,7 @@ page {
 			}
 		}
 		.money {
-			color: #fd5b23;
+			color: #ff0000;
 			font-size: $font-lg;
 		}
 	}
@@ -296,6 +376,22 @@ page {
 .list-scroll-content {
 	height: 100%;
 }
+.wallet-btn {
+	width: 674rpx;
+	height: 88rpx;
+	background: linear-gradient(90deg, #08c4e6, #50ead2);
+	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/scoreAccumulate.vue

@@ -1,200 +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">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
-						<view class="title-box">
-							<view class="title">
-								<text>{{ item.mark }}</text>
-							</view>
-							<view class="time">
-								<text>{{ item.add_time }}</text>
-							</view>
-						</view>
-						<view class="money">
-							<text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-	
-import { integrallist } from '@/api/functionalUnit.js';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
-export default {
-	components: {
-		empty,
-		uniLoadMore
-	},
-	onReady() {
-		
-	},
-	data() {
-		return {
-			tabCurrentIndex: 0,
-			navList: [
-				{
-					state: 0,
-					text: '全部',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
-			],
-		};
-	},
-	onShow() {
-		// 载入积分数据
-		this.loadData();
-	},
-	methods: {
-		// 页面跳转
-		navto(e) {
-			uni.navigateTo({
-				url: 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';
-
-			integrallist(
-				{
-					page: navItem.page,
-					limit: navItem.limit
-				},
-				state
-			)
-				.then(({ data }) => {
-					if (data.length > 0) {
-						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;
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: #ffffff;
-	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: $base-color;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid $base-color;
-			}
-		}
-	}
-}
-// 列表
-
-.swiper-box {
-	height: calc(100% - 44px);
-	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: #fd5b23;
-			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,463 @@
+<template>
+	<view class="content">
+		<view class="content-money">
+			<view class="status_bar"><!-- 这里是状态栏 --></view>
+				<image class="tuiguang_bg" src="../../static/img/share.png"></image>
+			<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>
+				<view class="money-frame">
+					<!-- <view class="money_name">我的推广</view> -->
+					<view class="money_num">
+						<text class="money_ren">共</text>
+						{{ all || '0' }}
+						<text class="money_ren">人</text>
+					</view>
+				</view>
+			</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> -->
+
+					<!-- 订单列表 -->
+					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
+						<view class="title-box flex_item">
+							<view class="title-avatar"><image :src="item.avatar"></image></view>
+							<view class="list_tpl">
+								<view class="title">
+									<view class="title-name clamp">{{ item.nickname }}</view>
+								</view>
+								<view class="time">
+									<text>{{ item.account }}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<!-- <uni-load-more :status="tabItem.loadingType"></uni-load-more> -->
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+<script>
+import { spread } from '@/api/user.js';
+import { mapState, mapMutations } from 'vuex';
+export default {
+	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 //每次信息条数
+				}
+			],
+			all: '',
+			list: ''
+		};
+	},
+	onLoad(options) {},
+	onShow() {
+		this.loadData();
+	},
+	methods: {
+		// 页面跳转
+		navto(e) {
+			uni.navigateTo({
+				url: 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;
+			}
+			if (navItem.loadingType === 'noMore') {
+				//防止重复加载
+				return;
+			}
+			// 修改当前对象状态为加载中
+			navItem.loadingType = 'loading';
+			spread({
+				page: navItem.page,
+				limit: navItem.limit
+			})
+				.then(({ data }) => {
+					console.log(data)
+					this.total = data.total;
+					this.totalLevel = data.totalLevel;
+					this.all = this.total + this.totalLevel;
+					if (data.list.length > 0) {
+						this.list = data.list;
+						navItem.orderList = navItem.orderList.concat(data.list);
+						navItem.page++;
+					}
+					this.$nextTick(function() {
+						if (navItem.limit == data.list.length) {
+							//判断是否还有数据， 有改为 more， 没有改为noMore
+							navItem.loadingType = 'more';
+							return;
+						} else {
+							//判断是否还有数据， 有改为 more， 没有改为noMore
+							navItem.loadingType = 'noMore';
+						}
+					});
+					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">
+.status_bar {
+	height: var(--status-bar-height);
+	width: 100%;
+}
+page {
+	background: #f8f8f8;
+	height: 100%;
+}
+
+.content-money {
+	background: $page-color-base;
+	position: relative;
+	.tuiguang_bg {
+		width: 750rpx;
+		height: 484rpx;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+	}
+	.buttom-box {
+		position: relative;
+		background-color: #ffffff;
+		text-align: center;
+		margin: 0 30rpx;
+		padding: 30rpx 0;
+		border-radius: $border-radius-sm;
+		margin-top: -80rpx;
+
+		.buttom {
+			font-size: $font-lg;
+			flex-grow: 1;
+
+			.money {
+				font-weight: bold;
+				font-size: 32rpx;
+				color: #ff0000;
+			}
+		}
+
+		.text {
+			color: #666666;
+		}
+
+		.interval {
+			width: 2rpx;
+			height: 60rpx;
+			background-color: #eeeeee;
+		}
+
+		.icon {
+			height: 50rpx;
+			width: 48rpx;
+			margin: 0 auto;
+
+			.icon-img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+}
+
+.money-box {
+	// background: $base-color;
+	height: 484rpx;
+	color: #ffffff;
+	text-align: center;
+	font-size: 35rpx;
+	position: relative;
+
+	// padding-top: 60rpx;
+	.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;
+	}
+	.right {
+		position: absolute;
+		top: 140rpx;
+		right: 40rpx;
+		text-align: right;
+		line-height: 1;
+		.right-num {
+			font-size: 50rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+
+			color: #ffffff;
+		}
+		.right-font {
+			margin-top: 10rpx;
+			font-size: 24rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #ffffff;
+		}
+		.time {
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #ffffff;
+			line-height: 35px;
+		}
+	}
+	.user {
+		position: absolute;
+		top: 140rpx;
+		left: 34rpx;
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+		z-index: 10;
+		.avtor {
+			width: 102rpx;
+			height: 102rpx;
+			border-radius: 50%;
+			position: relative;
+			.portrait {
+				width: 100%;
+				height: 100%;
+				border-radius: 50%;
+			}
+			.he {
+				position: absolute;
+				height: 30rpx;
+				bottom: -4rpx;
+				left: 0;
+				.image {
+					width: 102rpx;
+					height: 30rpx;
+				}
+			}
+		}
+		.name {
+			margin-left: 30rpx;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #ffffff;
+			display: flex;
+			justify-content: start;
+			.name-left {
+				width: 220rpx;
+			}
+			.name-right {
+				margin-left: 20rpx;
+				width: 50rpx;
+				height: 60rpx;
+				position: relative;
+				image {
+					width: 100%;
+					height: 100%;
+				}
+				.level {
+					position: absolute;
+					top: 35%;
+					left: 50%;
+					margin-left: -12rpx;
+					font-size: 20rpx;
+				}
+			}
+		}
+		.id {
+			margin-left: 30rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #ffffff;
+		}
+	}
+
+	.money_img {
+		width: 100%;
+		height: 120rpx;
+		text-align: center;
+		padding-top: 50rpx;
+		padding-bottom: 135rpx;
+
+		image {
+			width: 120rpx;
+			height: 120rpx;
+			border: 4rpx solid #fd5f6f;
+			border-radius: 50%;
+		}
+	}
+
+	.money-frame {
+		position: absolute;
+		top: 0;
+		width: 100%;
+		padding-top: 200rpx;
+	}
+	.money_num {
+		font-size: 72rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #ffffff;
+
+		.money_ren {
+			font-size: 36rpx;
+		}
+	}
+}
+
+.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 {
+				display: flex;
+				justify-content: flex-start;
+				font-size: $font-lg;
+				color: $font-color-base;
+				overflow: hidden; //超出的文本隐藏
+				text-overflow: ellipsis; //溢出用省略号显示
+				white-space: nowrap;
+				line-height: 1;
+				text-align: center;
+				.title-name {
+					max-width: 40%;
+				}
+				.dl {
+					margin-left: 10rpx;
+					width: 93rpx;
+					height: 32rpx;
+					border-radius: 16rpx;
+					image {
+						width: 93rpx;
+						height: 32rpx;
+						border-radius: 16rpx;
+					}
+				}
+				.class {
+					display: inline-block;
+					margin-left: 10rpx;
+					padding: 6rpx;
+					text-align: center;
+					border: 1px solid #2e58ff;
+					border-radius: 16rpx;
+					font-size: 20rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #2e58ff;
+				}
+			}
+
+			.time {
+				font-size: $font-base;
+				color: $font-color-light;
+			}
+		}
+	}
+
+	.money {
+		color: #db1935;
+		font-size: $font-lg;
+	}
+}
+</style>

pages/user/user.vue

@@ -26,24 +26,11 @@
 									<image src="../../static/img/lv04.png" mode=""></image>
 								</view>
 							</view> -->
-							<view class="" v-if="hasLogin && (!Array.isArray(userInfo.agent))"
-								style="padding-top: 5rpx; font-size: 30rpx; font-weight: 500;"
-								@click="navTo('/pages/set/userinfo')">
-								代理区域
-							</view>
 						</view>
 						<view class="info-box" v-else>
 							<view class="username-t">{{ userInfo.nickname || '游客' }}
 								<image  mode=""></image>
 							</view>
-							<view class="user-get">
-								本月业绩：￥<text style="font-weight: bold;">{{userInfo.store_sum | 0}}</text>
-							</view>
-							<view class="" v-if="!Array.isArray(userInfo.agent)"
-								style="padding-top: 5rpx; font-size: 30rpx; font-weight: 500;"
-								@click="navTo('/pages/set/userinfo')">
-								代理区域 >
-							</view>
 						</view>
 
 					</view>
@@ -95,78 +82,36 @@
 						:hover-stay-time="50">
 						<view class="icon position-relative">
 							<image class="icon-img" src="/static/user/order4.png" mode="aspectFit"></image>
-							<!-- <view class="corner" v-if="orderInfo.complete_count > 0">
-								<text>{{ orderInfo.complete_count }}</text>
-							</view> -->
 						</view>
 						<text>已完成</text>
 					</view>
 				</view>
 			</view>
-			<!-- 升级店长 -->
-			
-			<!-- <navigator url="/pages/store/apply" v-if=" userInfo.level<=1">
-				<view class="up-box">
-					<image src="/static/img/img10.png" mode=""></image>
-				</view>
-			</navigator> -->
 			<view>
-			
-				<!-- <view class="tj-sction">
-					<view class="tj-item" @click="navTo('/pages/money/wallet')">
-						<text class="num">{{ userInfo.now_money || '0.00' }}</text>
-						<text>余额</text>
-					</view>
-					<view class="tj-item" @click="navTo('/pages/user/award')">
-						<text class="num">{{ userInfo.brokerage_price || '0.00' }}</text>
-						<text>佣金</text>
-					</view>
-					<view class="tj-item" @click="navTo('/pages/user/scoreAccumulate')">
-						<text class="num">{{ userInfo.integral || '0.00' }}</text>
-						<text>积分</text>
-					</view>
-				</view> -->
-
 				<view class="item-box item-box-a">
 					<view class="order-section">
-						<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover"
+						<view class="order-item" @click="navTo('/pages/money/wallet')" hover-class="common-hover"
 							:hover-stay-time="50">
 							<view class="icon icon-b">
 								<image class="icon-img" src="/static/user/yue.png" mode="aspectFit"></image>
 							</view>
 							<text>收益中心</text>
 						</view>
-						<view class="order-item" @click="navTo('/pages/money/wallet')" hover-class="common-hover"
+						<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover"
 							:hover-stay-time="50">
 							<view class="icon icon-b">
 								<image class="icon-img" src="/static/user/yongjin.png" mode="aspectFit"></image>
 							</view>
 							<text>我的钱包</text>
 						</view>
-						<!-- <view class="order-item" @click="navTo('/pages/user/minMember')" hover-class="common-hover"
-							:hover-stay-time="50" v-if="userInfo.level > 2">
-							<view class="icon icon-b">
-								<image class="icon-img" src="/static/icon/u3.png" mode="aspectFit"></image>
-							</view>
-							<text>邀请</text>
-						</view> -->
-						<view class="order-item" @click="navTo('/pages/user/extension')" hover-class="common-hover"
+						<view class="order-item" @click="navTo('/pages/user/shareQrCode')" 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>
 							<text>邀请有礼</text>
 						</view>
-						<!-- <view class="order-item" @click="navTo('/pages/user/applyMember')" hover-class="common-hover"
-							:hover-stay-time="50" v-if="userInfo.level < 2">
-							<view class="icon icon-b">
-								<image class="icon-img" src="/static/icon/u3.png" mode="aspectFit"></image>
-							</view>
-							<text>申请会员</text>
-						</view> -->
-						 
-						
-						<view class="order-item" @click="navTo('/pages/user/shareQrCode')" hover-class="common-hover"
+						<view class="order-item" @click="navTo('/pages/user/team')" hover-class="common-hover"
 							:hover-stay-time="50">
 							<view class="icon icon-b">
 								<image class="icon-img" src="/static/user/tuiguang.png" mode="aspectFit"></image>
@@ -177,39 +122,31 @@
 				</view>
 				<view class="history-section icon">
 					<uni-list>
-						<!-- <uni-list-item title="我的实体店" @click="navTo('/pages/store/storeDetail')"
-							thumb="/static/icon/img13.png" ></uni-list-item> -->
-						<uni-list-item title="我的推广" @click="navTo('/pages/user/extension')"
+						<uni-list-item title="我的推广" @click="navTo('/pages/user/team')"
 							thumb="/static/user/shoucang.png" ></uni-list-item>
-						<!-- <uni-list-item title="交易密码" @click="navTo('/pages/money/moneyPwd')"
-							thumb="/static/icon/i8.png" ></uni-list-item> -->
 						<uni-list-item title="收货地址" @click="navTo('/pages/set/address')" thumb="/static/user/dizhi.png">
 						</uni-list-item>
 						<uni-list-item title="联系客服" @click="showPopup" thumb="/static/user/kefu.png"></uni-list-item>
-						<!-- <uni-list-item title="关于我们" @click="navTo('/pages/shareQrCode/index')" thumb="/static/icon/img09.png"></uni-list-item> -->
 					</uni-list>
 				</view>
-				<!-- <uni-popup ref="popup" type="center">
-					<view class="popup-box">
-						<view class="img">
-							<image src="../../static/img/img009.png" mode=""></image>
-						</view>
-						<view class="mian">
-							<view class="delivery">
-								<view class="title">已经为您定制专属客服</view>
-								<image src="../../static/img/img010.png" mode=""></image>
-							</view>
-							<view class="nocancel">客服VX:{{ text }}</view>
-							<view class="comfirm-box">
-								<view class="cancel" @click="cancel">取消</view>
-								<view class="comfirm" @click="comfirm(text)">复制微信</view>
-							</view>
-						</view>
-					</view>
-				</uni-popup> -->
-				<!-- <view class="outlogin" @click="outlogin" v-if="hasLogin">退出登录</view> -->
 			</view>
 		</scroll-view>
+		<uni-popup ref="popup" type="center">
+			<view class="popup-box">
+				<view class="img"><image src="../../static/img/img009.png" mode=""></image></view>
+				<view class="mian">
+					<view class="delivery">
+						<view class="title">已经为您定制专属客服</view>
+						<image src="../../static/img/img010.png" mode=""></image>
+					</view>
+					<view class="nocancel">客服微信: {{ text }}</view>
+					<view class="comfirm-box">
+						<view class="cancel" @click="cancel">取消</view>
+						<view class="comfirm" @click="comfirm(text)">复制微信</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 <script>
@@ -247,7 +184,7 @@
 				moving: false,
 				userDowm: 0, //卡片升级专属高度
 				userMaxDowm: 0, //卡片最高高度
-				text: 'Zjxwcm'
+				text: 'Zjxwcm',
 			};
 		},
 		onShow() {
@@ -389,16 +326,16 @@
 			 * navigator标签现在默认没有转场动画，所以用view
 			 */
 			navTo(url) {
-				if (!this.hasLogin) {
-					// 保存地址
-					saveUrl();
-					// 登录拦截
-					interceptor();
-				} else {
+				// if (!this.hasLogin) {
+				// 	// 保存地址
+				// 	saveUrl();
+				// 	// 登录拦截
+				// 	interceptor();
+				// } else {
 					uni.navigateTo({
 						url
 					});
-				}
+				// }
 			},
 
 			/**

uni.scss

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