Merge branch 'master' of http://git.liuniu946.com/xiemingyang/zhengyi

api/user.js

@@ -13,7 +13,7 @@ export function orderData(data) {
 // 获取用户信息
 export function getUserInfo(data) {
 	return request({
-		url: '/api/userinfo',
+		url: '/api/user',
 		method: 'get',
 		data
 	});

pages.json

@@ -62,25 +62,102 @@
 			{
 				"path": "pages/user/accounts",
 				"style": {
-					"navigationBarTitleText": "我的佣金"
+						"navigationBarTextStyle": "black",
-				}
+						"navigationBarBackgroundColor": "transparent",
-			},
+						"app-plus": {
+								"titleNView": {
+										"type": "float",
+										"titleText": "我的佣金"
+									}
+							}
+					}
+				},
+				{
+					"path": "pages/user/balance",
+					"style": {
+							"navigationBarTextStyle": "black",
+							"navigationBarBackgroundColor": "transparent",
+							"app-plus": {
+									"titleNView": {
+											"type": "float",
+											"titleText": "我的钱包"
+										}
+								}
+						}
+					},
+					{
+						"path": "pages/user/integral",
+						"style": {
+								"navigationBarTextStyle": "black",
+								"navigationBarBackgroundColor": "transparent",
+								"app-plus": {
+										"titleNView": {
+												"type": "float",
+												"titleText": "我的积分"
+											}
+									}
+							}
+						},
+						{
+							"path": "pages/user/extend",
+							"style": {
+									"navigationBarTextStyle": "black",
+									"navigationBarBackgroundColor": "transparent",
+									"app-plus": {
+											"titleNView": {
+													"type": "float",
+													"titleText": "我的推广"
+												}
+										}
+								}
+							},
 			{
 				"path": "pages/user/transfer",
 				"style": {
-					"navigationBarTitleText": "佣金转账"
+					"navigationBarTitleText": "佣金转账",
+					"navigationBarBackgroundColor": "#fff",
+					"navigationBarTextStyle": "black"
+			
 				}
 			},
 			{
 				"path": "pages/user/submit",
 				"style": {
-					"navigationBarTitleText": "提交成功"
+					"navigationBarTitleText": "提交成功",
+					"navigationBarBackgroundColor": "#fff",
+					"navigationBarTextStyle": "black"
+			
+				}
+			},
+			{
+				"path": "pages/user/jiedian",
+				"style": {
+					"navigationBarTitleText": "我的接点"
 				}
 			},
 			{
 				"path": "pages/user/withdraw",
 				"style": {
-					"navigationBarTitleText": "提现"
+					"navigationBarTitleText": "提现",
+					"navigationBarBackgroundColor": "#fff",
+					"navigationBarTextStyle": "black"
+			
+				}
+			},
+			{
+				"path": "pages/user/refer",
+				"style": {
+					"navigationBarTitleText": "提交申请",
+					"navigationBarBackgroundColor": "#fff",
+					"navigationBarTextStyle": "black"
+				}
+			},
+			{
+				"path": "pages/user/shezhi",
+				"style": {
+					"navigationBarTitleText": "设置",
+					"navigationBarBackgroundColor": "#fff",
+					"navigationBarTextStyle": "black"
 				}
 			},
 			{
@@ -89,7 +166,7 @@
 					"navigationBarTitleText": "品牌故事",
 					"navigationBarBackgroundColor": "#fff",
 					"navigationBarTextStyle": "black"
-
+			
 				}
 			},
 			{
@@ -102,9 +179,13 @@
 			{
 				"path": "pages/order/order",
 				"style": {
-					"navigationBarTitleText": "我的订单",
+					"navigationBarTextStyle": "black",
+					"navigationBarBackgroundColor": "transparent",
 					"app-plus": {
-						"bounce": "none"
+						"titleNView": {
+								"type": "float",
+								"titleText": "我的订单"
+							}
 					}
 				}
 			},
@@ -293,4 +374,4 @@
 				}
 			]
 		}
-	}
+		}

pages/order/order.vue

@@ -84,7 +84,7 @@ export default {
 			navList: [
 				{
 					state: 0,
-					text: '待付款',
+					text: '全部',
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
@@ -92,7 +92,7 @@ export default {
 				},
 				{
 					state: 1,
-					text: '待发货',
+					text: '待付款',
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
@@ -100,7 +100,7 @@ export default {
 				},
 				{
 					state: 2,
-					text: '待收货',
+					text: '待发货',
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
@@ -108,7 +108,7 @@ export default {
 				},
 				{
 					state: 3,
-					text: '待评价',
+					text: '待收货',
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
@@ -301,16 +301,16 @@ export default {
 				stateTipColor = '#fa436a';
 			switch (+state) {
 				case 0:
-					stateTip = '待付款';
+					stateTip = '全部';
 					break;
 				case 1:
-					stateTip = '待发货';
+					stateTip = '待付款';
 					break;
 				case 2:
-					stateTip = '待收货';
+					stateTip = '待发货';
 					break;
 				case 3:
-					stateTip = '待评价';
+					stateTip = '待收货';
 					break;
 				case 4:
 					stateTip = '已完成';
@@ -346,7 +346,6 @@ page,
 .navbar {
 	display: flex;
 	height: 40px;
-	padding: 0 5px;
 	background: #fff;
 	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
 	position: relative;
@@ -359,7 +358,10 @@ page,
 		height: 100%;
 		font-size: 15px;
 		color: $font-color-dark;
-		position: relative;
+		position: relative;
+		margin-top: 80rpx;
+		background-color: #fff;
+		border-top: 1rpx solid #F8F6F6;
 		&.current {
 			color: $base-color;
 			&:after {

pages/user/accounts.vue

@@ -3,11 +3,6 @@
 		<!-- 头部 -->
 		<view class="header">
 			<image src="../../static/img/img33.png" mode="scaleToFill"></image>
-			<!-- 我的佣金 -->
-			<view class="yongjin">
-				<image src="../../static/img/xiangzuo.png" mode="scaleToFill" @click.stop="back()"></image>
-				<view class="text">我的佣金</view>
-			</view>
 			<!-- 佣金转账 -->
 			<view class="accounts" @click="nav('/pages/user/transfer')">
 				<view class="text">佣金转账</view>
@@ -83,14 +78,14 @@
 					url
 				})
 			},
-			back(){
+			// back(){
-				uni.navigateBack({
+			// 	uni.navigateBack({
-					delta:1
+			// 		delta:1
-				})
+			// 	})
-			},
+			// },
-			handclick () {
+			// handclick () {
-				console.log(123)
+			// 	console.log(123)
-			},
+			// },
 			//swiper 切换
 			changeTab(e) {
 				this.tabCurrentIndex = e.target.current;
@@ -112,37 +107,11 @@
 
 		.header {
 			position: relative;
-
 			image {
 				width: 750rpx;
 				height: 400rpx;
 			}
 
-			.yongjin {
-				// background-color: pink;
-				padding-top: 50rpx;
-				width: 100%;
-				position: absolute;
-				z-index: 10;
-				top: 0;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-
-				image {
-					width: 20rpx;
-					height: 37rpx;
-					margin-left: 30rpx;
-				}
-				
-				.text {
-					font-size: 36rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #333333;
-					margin-right: 300rpx;
-				}
-			}
 		}
 		
 		.accounts {

pages/user/balance.vue

@@ -0,0 +1,261 @@
+<template>
+	<view class="container">
+		<!-- 头部 -->
+		<view class="header">
+			<image src="../../static/img/img33.png" mode="scaleToFill"></image>
+			<!-- 钱 -->
+			<view class="money">
+				<view class="fuhao">￥</view>
+				<view class="counts">3852</view>
+			</view>
+		</view>
+		<!-- 收入和支出 -->
+		<view class="navbar">
+			<view class="nav-item" v-for="(item, index) in navList" :key="index"
+				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+
+		</view>
+		<swiper class="swiper-box" :current="tabCurrentIndex" 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> -->
+				<!-- 推广奖励 -->
+				<scroll-view class="scorll" scroll-y="true" >
+					<view class="cost">
+						<view class="award" v-for="item in 10">
+							<view class="award-left">
+								<view class="text">充值到账</view>
+								<view class="time">2021-8-26 09:30</view>
+							</view>
+							<view class="award-right">+200</view>
+						</view>
+					</view>
+				</scroll-view>
+
+			</swiper-item>
+		</swiper>
+		<view class="btm">
+			<view class="btn" @click="nav('/pages/user/withdraw')">立即提现</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				height: '',
+				tabCurrentIndex: 0,
+				navList: [{
+						state: 1,
+						text: '收入',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					},
+					{
+						state: 2,
+						text: '支出',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					}
+				],
+				list: [],
+				money: ''
+			}
+		},
+		methods: {
+			nav (url) {
+				uni.navigateTo({
+					url
+				})
+			},
+			// back(){
+			// 	uni.navigateBack({
+			// 		delta:1
+			// 	})
+			// },
+			// handclick () {
+			// 	console.log(123)
+			// },
+			//swiper 切换
+			changeTab(e) {
+				this.tabCurrentIndex = e.target.current;
+				this.loadData('tabChange')
+			},
+			//顶部tab点击
+			tabClick(index) {
+				this.tabCurrentIndex = index;
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.container {
+		width: 750rpx;
+		height: 1334rpx;
+		background-color: #f1f1f1;
+
+		.header {
+			position: relative;
+			image {
+				width: 750rpx;
+				height: 400rpx;
+			}
+		}
+		
+			.text {
+				width: 112rpx;
+				height: 27rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FF0000;
+				padding-top: 8rpx;
+				margin-left: 18rpx;
+			}
+
+		.money {
+			top: 0;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			position: absolute;
+			padding-left: 246rpx;
+			padding-top: 200rpx;
+
+			.fuhao {
+				font-size: 45rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #3F7C1F;
+				padding-top: 25rpx;
+			}
+
+			.counts {
+				font-size: 70rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #3F7C1F;
+			}
+		}
+
+		.swiper-box {
+			height: calc(100% - 700rpx);
+			background-color: #FFFFFF;
+		}
+		.scorll {
+			height: 100%;
+		}
+		.navbar {
+			display: flex;
+			height: 100rpx;
+			padding: 0 5rpx;
+			background: #fff;
+			box-shadow: 0 1rpx 5rpx rgba(0, 0, 0, 0.06);
+			position: relative;
+			z-index: 10;
+			margin-top: 25rpx;
+
+			.nav-item {
+				flex: 1;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				height: 100%;
+				font-size: 15px;
+				color: #999999;
+				position: relative;
+
+				&.current {
+					color: #333333;
+
+					&:after {
+						content: '';
+						position: absolute;
+						left: 50%;
+						bottom: 0;
+						transform: translateX(-50%);
+						width: 44px;
+						height: 0;
+						border-bottom: 2px solid #3F7C1F;
+					}
+				}
+			}
+		}
+
+		.cost {
+			width: 750rpx;
+			height: auto;
+			background-color: #fff;
+
+			.award {
+				width: 701rpx;
+				height: 132rpx;
+				border-bottom: 1px solid #F0F4F8;
+				margin-left: 25rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				.award-left {
+					width: 221rpx;
+					height: 40rpx;
+					margin-left: 30rpx;
+					margin-bottom: 35rpx;
+
+					.text {
+						width: 182rpx;
+						height: 30rpx;
+						font-size: 30rpx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #666666;
+						margin-bottom: 16rpx;
+					}
+
+					.time {
+						width: 221rpx;
+						height: 20rpx;
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #AEAEAE;
+					}
+				}
+
+				.award-right {
+					width: 82rpx;
+					height: 27rpx;
+					font-size: 36rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #FF0000;
+					margin-right: 30rpx;
+				}
+			}
+		}
+		.btm {
+			background-color: #fff;
+			height: 190rpx;
+			padding-top: 40rpx;
+			display: flex;
+			justify-content: center;
+			.btn {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 674rpx;
+				height: 88rpx;
+				background: linear-gradient(-35deg, #F8DD4F, #FBEB77);
+				border-radius: 44rpx;
+			}
+		}
+	}
+</style>
+	

pages/user/extend.vue

@@ -0,0 +1,235 @@
+<template>
+	<view class="container">
+		<view class="header">
+			<image src="../../static/img/img39.png" mode="scaleToFill"></image>
+				<view class="counts">385<text>人</text></view>
+				<view class="people">我的推广人数</view>
+		</view>
+		<!-- 推广 -->
+		<view class="navbar">
+			<view class="one">5</view>
+			<view class="line"></view>
+			<view class="two">120</view>
+			<view class="nav-item" v-for="(item, index) in navList" :key="index"
+				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+		<swiper class="swiper-box" :current="tabCurrentIndex" 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> -->
+				<!-- 推广奖励 -->
+				<scroll-view class="scorll" scroll-y="true" >
+					<view class="cost">
+						<view class="award" v-for="item in 10">
+							<image src="../../static/tabBar/tab-my-current.png" mode="scaleToFill"></image>
+							<view class="award-left">
+								<view class="text">xxx</view>
+								<view class="time">2021-8-26 09:30</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+		
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+export default {
+	data () {
+		return {
+			height: '',
+				tabCurrentIndex: 0,
+				navList: [{
+						state: 1,
+						text: '一级推广',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					},
+					{
+						state: 2,
+						text: '二级推广',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					}
+				],
+				list: [],
+				money: ''
+		}
+	},
+	methods: {
+		//swiper 切换
+		changeTab (e) {
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('tabChange')
+		},
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+	.container {
+		width: 750rpx;
+		height: 1334rpx;
+		background-color: #fff;
+	
+		.header {
+			position: relative;
+			image {
+				width: 750rpx;
+				height: 460rpx;
+			}
+			.counts {
+				font-size: 72rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #3F7C1F;
+				position: absolute;
+				top: 35%;
+				margin-left: 310rpx;
+				text {
+					font-size: 12rpx;
+				}
+			}
+			.people {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #3F7C1F;
+				position: absolute;
+				top: 55%;
+				margin-left: 286rpx;
+			}
+		}
+	
+		.swiper-box {
+			height: calc(100% - 700rpx);
+			background-color: #FFFFFF;
+		}
+		.scorll {
+			height: 100%;
+		}
+		.navbar {
+			display: flex;
+			padding: 0 5rpx;
+			background: #fff;
+			position: relative;
+			z-index: 10;
+			width: 702rpx;
+			height: 120rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
+			border-radius: 10rpx;
+			margin-top: -70rpx;
+			margin-left: 25rpx;
+			.one {
+				position: absolute;
+				top: 10%;
+				left: 25%;
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FF0000;
+			}
+			.two {
+				position: absolute;
+				top: 10%;
+				left: 70%;
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FF0000;
+			}
+			.line {
+				width: 2rpx;
+				height: 54rpx;
+				background: #EEEEEE;
+				position: absolute;
+				top: 30%;
+				left: 50%;
+			}
+	
+			.nav-item {
+				flex: 1;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				height: 100%;
+				font-size: 30rpx;
+				color: #999999;
+				position: relative;
+				padding-top: 40rpx;
+	
+				&.current {
+					color: #333333;
+	
+					&:after {
+						content: '';
+						position: absolute;
+						left: 50%;
+						bottom: 0;
+						transform: translateX(-50%);
+						width: 44px;
+						height: 0;
+						border-bottom: 2px solid #3F7C1F;
+					}
+				}
+			}
+		}
+	
+		.cost {
+			width: 750rpx;
+			height: auto;
+			background-color: #fff;
+	
+			.award {
+				width: 701rpx;
+				height: 132rpx;
+				border-bottom: 1px solid #F0F4F8;
+				margin-left: 25rpx;
+				display: flex;
+				align-items: center;
+				image {
+					width: 80rpx;
+					height: 80rpx;
+				}
+	
+				.award-left {
+					width: 221rpx;
+					height: 40rpx;
+					margin-left: 30rpx;
+					margin-bottom: 35rpx;
+	
+					.text {
+						width: 58rpx;
+						height: 28rpx;
+						font-size: 30rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #3F454B;
+						margin-bottom: 16rpx;
+					}
+	
+					.time {
+						width: 221rpx;
+						height: 20rpx;
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #AEAEAE;
+					}
+				}
+			}
+		}
+	}
+</style>

pages/user/integral.vue

@@ -0,0 +1,192 @@
+<template>
+	<view class="container">
+		<!-- 头部 -->
+		<view class="header">
+			<image src="../../static/img/img38.png" mode="scaleToFill"></image>
+			<view class="money">3852</view>
+		</view>
+		<!-- 收入和支出 -->
+		<view class="navbar">
+			<view class="nav-item" v-for="(item, index) in navList" :key="index"
+				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		
+		</view>
+		<swiper class="swiper-box" :current="tabCurrentIndex" 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> -->
+				<!-- 推广奖励 -->
+				<scroll-view class="scorll" scroll-y="true" >
+					<view class="cost">
+						<view class="award" v-for="item in 10">
+							<view class="award-left">
+								<view class="text">消费赠送</view>
+								<view class="time">2021-8-26 09:30</view>
+							</view>
+							<view class="award-right">+200</view>
+						</view>
+					</view>
+				</scroll-view>
+		
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+export default {
+	data () {
+		return {
+			height: '',
+				tabCurrentIndex: 0,
+				navList: [{
+						state: 1,
+						text: '收入',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					},
+					{
+						state: 2,
+						text: '支出',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					}
+				],
+				list: [],
+				money: ''
+		}
+	},
+	methods: {
+		//swiper 切换
+		changeTab (e) {
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('tabChange')
+		},
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+	.container {
+		width: 750rpx;
+		height: 1334rpx;
+		background-color: #f1f1f1;
+		.header {
+			image {
+				width: 750rpx;
+				height: 400rpx;
+			}
+			.money {
+				font-size: 72rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #3F7C1F;
+				top: 15%;
+				position: absolute;
+				left: 50%;
+				transform: translate(-50%);
+			}
+		}
+		.swiper-box {
+			height: calc(100% - 500rpx);
+			background-color: #FFFFFF;
+		}
+		.scorll {
+			height: 90%;
+		}
+		.navbar {
+			display: flex;
+			height: 100rpx;
+			padding: 0 5rpx;
+			background: #fff;
+			box-shadow: 0 1rpx 5rpx rgba(0, 0, 0, 0.06);
+			position: relative;
+			z-index: 10;
+			margin-top: 25rpx;
+		
+			.nav-item {
+				flex: 1;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				height: 100%;
+				font-size: 15px;
+				color: #999999;
+				position: relative;
+		
+				&.current {
+					color: #333333;
+		
+					&:after {
+						content: '';
+						position: absolute;
+						left: 50%;
+						bottom: 0;
+						transform: translateX(-50%);
+						width: 44px;
+						height: 0;
+						border-bottom: 2px solid #3F7C1F;
+					}
+				}
+			}
+		}
+		.cost {
+			width: 750rpx;
+			height: auto;
+			background-color: #fff;
+		
+			.award {
+				width: 701rpx;
+				height: 132rpx;
+				border-bottom: 1px solid #F0F4F8;
+				margin-left: 25rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+		
+				.award-left {
+					width: 221rpx;
+					height: 40rpx;
+					margin-left: 30rpx;
+					margin-bottom: 35rpx;
+		
+					.text {
+						width: 182rpx;
+						height: 30rpx;
+						font-size: 30rpx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #666666;
+						margin-bottom: 16rpx;
+					}
+		
+					.time {
+						width: 221rpx;
+						height: 20rpx;
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #AEAEAE;
+					}
+				}
+		
+				.award-right {
+					font-size: 36rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #FF0000;
+					margin-right: 30rpx;
+				}
+			}
+		}
+	}
+</style>

pages/user/jiedian.vue

@@ -1,34 +1,356 @@
 <template>
-	<view class="container">
+	<view class="content">
-		<view class="jiedianbackground">
+		<view class="container">
-			<image src="../../static/image/jiedian.png" mode=""></image>
+			<view class="jiedianbackground">
+				<image src="../../static/image/jiedian.png" mode=""></image>
+			</view>
+			<view class="number-box">
+				<view class="number">
+					<text>{{people}}</text>人
+				</view>
+				<view class="renshu">
+					我的接点人数
+				</view>
+			</view>
+		</view>
+		<view class="message">
+			<view class="yeji">
+				<view class="yeji-a">
+					<view class="yeji-top">
+						A区业绩
+					</view>
+					<view class="yeji-buttom">￥{{a}}</view>
+				</view>
+				<view class="border"></view>
+				<view class="yeji-a">
+					<view class="yeji-top">
+						B区业绩
+					</view>
+					<view class="yeji-buttom">￥{{b}}</view>
+				</view>
+				<view class="border"></view>
+				<view class="yeji-a">
+					<view class="yeji-top">
+						C区业绩
+					</view>
+					<view class="yeji-buttom">￥{{c}}</view>
+				</view>
+			</view>
+			<view class="relation-box">
+				<view class="relation">
+					<view class="headbox">
+						<view class="head">
+							<view class="photo">
+								<image src="../../static/image/photo.jpg" mode=""></image>
+							</view>
+						</view>
+						<view class="head-title">
+							<image src="../../static/image/jiedian1.png" mode=""></image>
+						</view>
+					</view>
+					<view class="information">
+						<view class="name">
+							徐浩岚
+						</view>
+						<view class="cell">
+							18252757278
+						</view>
+					</view>
+				</view>
+				<view class="sanchaji">
+					<image src="../../static/image/sanchaji.png" mode=""></image>
+				</view>
+				<view class="subordinate">
+					<view class="headbox" >
+						<view class="head">
+							<view class="photo">
+								<image src="../../static/image/photo.jpg" mode=""></image>
+							</view>
+						</view>
+						<view class="head-title">
+							<image src="../../static/image/jiedian1.png" mode=""></image>
+						</view>
+					</view>
+					<view class="headbox" >
+						<view class="head">
+							<view class="photo">
+								<image src="../../static/image/photo.jpg" mode=""></image>
+							</view>
+						</view>
+						<view class="head-title">
+							<image src="../../static/image/jiedian1.png" mode=""></image>
+						</view>
+					</view>
+					<view class="headbox" >
+						<view class="head">
+							<view class="photo">
+								<image src="../../static/image/photo.jpg" mode=""></image>
+							</view>
+						</view>
+						<view class="head-title">
+							<image src="../../static/image/jiedian1.png" mode=""></image>
+						</view>
+					</view>
+				</view>
+			</view>
+
 		</view>
-		
 	</view>
 </template>
 
 <script>
-	export default{
+	export default {
-		data(){
+		data() {
-			return{}
+			return {
+				a: 1,
+				b: 2,
+				c: 3,
+				people: 255,
+				//'12345678901'.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+			}
 		},
-		methods:{}
+		methods: {}
 	}
 </script>
 
 <style lang="scss">
-	page{
+	page {
 		padding: 0;
 		margin: 0;
+		height: 100%;
 		background-color: #FFFFFF;
 	}
-	.container{
+
-		height: 100%;
+	.content {}
+
+	.container {
+		width: 750rpx;
+		height: 400rpx;
+		position: relative;
+
+		.jiedianbackground {
+			position: absolute;
+			width: 750rpx;
+			height: 400rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.number-box {
+			width: 750rpx;
+			height: 400rpx;
+			position: absolute;
+			display: flex;
+			justify-content: center;
+			flex-direction: column;
+			align-items: center;
+
+			.number {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #3F7C1F;
+
+				text {
+					font-size: 72rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #3F7C1F;
+					line-height: 86rpx;
+				}
+			}
+
+			.renshu {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #3F7C1F;
+			}
+		}
 	}
-	.jiedianbackground{
+
-		image{
+	.message {
-			width: 100%;
+		padding: 0 30rpx;
-			height: 100%;
+
+		.relation-box {
+			margin-top: 100rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.relation {
+				position: relative;
+				display: flex;
+				align-items: center;
+				
+
+				.headbox {
+
+					position: absolute;
+					width: 154rpx;
+					height: 154rpx;
+
+					.head {
+						width: 154rpx;
+						height: 154rpx;
+						background: #EF9E20;
+						box-shadow: 5rpx 0rpx 5rpx 0rpx rgba(110, 171, 78, 0.26);
+						border-radius: 50%;
+						overflow: hidden;
+
+						.photo {
+							width: 154rpx;
+							height: 154rpx;
+
+							image {
+								width: 100%;
+								height: 100%;
+							}
+						}
+					}
+
+					.head-title {
+						margin: -30rpx 30rpx 0 30rpx;
+						width: 94rpx;
+						height: 32rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+
+				.information {
+					margin-left: 77rpx;
+					display: flex;
+					justify-content: center;
+					flex-direction: column;
+					width: 297rpx;
+					height: 137rpx;
+					align-items: center;
+					background: #FFFFFF;
+					border: 4rpx solid #6EAB4E;
+					border-radius: 10rpx;
+
+					.name {
+						font-size: 32rpx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #3F7C1F;
+						line-height: 48rpx;
+					}
+
+					.cell {
+						margin-left: 70rpx;
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #ABD56F;
+						line-height: 48rpx;
+					}
+				}
+
+
+			}
+
+			.sanchaji {
+				margin: 30rpx 0;
+				width: 530rpx;
+				height: 91rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.subordinate {
+				width: 750rpx;
+				display: flex;
+				justify-content: space-around;
+					.headbox {
+						
+						width: 154rpx;
+						height: 154rpx;
+
+						.head {
+							width: 154rpx;
+							height: 154rpx;
+							background: #EF9E20;
+							box-shadow: 5rpx 0rpx 5rpx 0rpx rgba(110, 171, 78, 0.26);
+							border-radius: 50%;
+							overflow: hidden;
+
+							.photo {
+								width: 154rpx;
+								height: 154rpx;
+
+								image {
+									width: 100%;
+									height: 100%;
+								}
+							}
+						}
+
+						.head-title {
+							margin: -30rpx 30rpx 0 30rpx;
+							width: 94rpx;
+							height: 32rpx;
+
+							image {
+								width: 100%;
+								height: 100%;
+							}
+						}
+					
+				}
+			}
+		}
+
+		.yeji {
+			position: relative;
+			margin-top: -72rpx;
+			width: 690rpx;
+			height: 143rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
+			border-radius: 10rpx;
+			display: flex;
+			justify-content: space-around;
+			align-items: center;
+
+			.yeji-a {
+				display: flex;
+				flex-direction: column;
+				justify-content: space-around;
+				align-items: center;
+
+				.yeji-top {
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+					line-height: 35px;
+				}
+
+				.yeji-buttom {
+					font-size: 34rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+					line-height: 35px;
+				}
+			}
+
+			.border {
+				width: 1rpx;
+				height: 51rpx;
+				background: #DDDDDD;
+			}
 		}
 	}
 </style>

pages/user/refer.vue

@@ -0,0 +1,72 @@
+<template>
+	<view class="container">
+			<image src="../../static/img/img34.png" mode="scaleToFill"></image>
+			<view class="text">提交成功</view>
+			<view class="shenhe">请耐心等待审核</view>
+			<view class="btm">
+				<view class="btn">返回首页</view>
+			</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data () {
+		return {}
+	},
+	methods: {}
+}
+</script>
+
+<style lang="scss">
+	.container {
+		background-color: #fff;
+		width: 750rpx;
+		height: 1334rpx;
+		
+		image {
+			width: 300rpx;
+			height: 250rpx;
+			margin-top: 200rpx;
+			margin-left: 210rpx;
+		}
+		
+		.text {
+			font-size: 40rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #333333;
+			line-height: 40rpx;
+			padding-left: 300rpx;
+		}
+		
+		.shenhe {
+			font-size: 27rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #B3B3B3;
+			margin-top: 20rpx;
+			display: flex;
+			justify-content: center;
+		}
+		
+		.btm {
+			width: 350rpx;
+			height: 80rpx;
+			background: #6EAB4E;
+			border-radius: 40rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			margin-left: 200rpx;
+			margin-top: 50rpx;
+			
+			.btn {
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+		}
+	}
+</style>

pages/user/shezhi.vue

@@ -0,0 +1,162 @@
+<template>
+	<view class="container">
+		<!-- 头像 -->
+		<view class="touxiang">
+			<view class="tou">头像</view>
+			<view class="avatar"><image :src=" userInfo.avatar || '../../static/error/missing-face.png' "></image></view>
+		</view>
+		<!-- 昵称 -->
+		<view class="nicheng">
+			<view class="text">昵称</view>
+				<view class="username">{{ userInfo.nickname || '游客' }}</view>
+		</view>
+		<view class="yaoqing">
+			<view class="ma">邀请码</view>
+			<view class="shu">102320</view>
+			</view>
+			<view class="zhanghu">
+				<view class="qq">账户</view>
+				<view class="number">13911111111</view>
+				</view>
+			<view class="btn"><text>退出登录</text></view>
+	</view>
+</template>
+
+<script>
+import { edit } from '@/api/user'
+export default {
+	data () {
+		return {
+			userInfo: {}
+		}
+	},
+	created () {
+		this.loadUser ()
+	},
+	methods: {
+		nav (url) {
+			uni.navigateTo({
+				url
+			})
+		},
+		
+		async loadUser () {
+			const { data } = await edit ()
+			console.log(data)
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+	.container {
+		background-color: #F2F3F5;
+		width: 750rpx;
+		height: 1334rpx;
+		.touxiang {
+			height: 120rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			background-color: #fff;
+			.tou {
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				margin-left: 25rpx;
+			}
+			.avatar {
+				image {
+					width: 80rpx;
+					height: 80rpx;
+					border-radius: 50%;
+					margin-right: 25rpx;
+				}
+			}
+		}
+		.nicheng {
+			height: 100rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			background-color: #fff;
+			border-bottom: 1rpx solid #F0F0F0;
+			margin-top: 20rpx;
+			.text {
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				margin-left: 25rpx;
+			}
+			.username {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				margin-right: 25rpx;
+			}
+		}
+		.yaoqing {
+			height: 100rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			background-color: #fff;
+			border-bottom: 1rpx solid #F0F0F0;
+			.ma {
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				margin-left: 25rpx;
+			}
+			.shu {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				margin-right: 25rpx;
+			}
+		}
+		.zhanghu {
+			height: 100rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			background-color: #fff;
+			.qq {
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				margin-left: 25rpx;
+			}
+			.number {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				margin-right: 25rpx;
+			}
+		}
+		.btn {
+			width: 560rpx;
+			height: 80rpx;
+			background: #6EAB4E;
+			border-radius: 40rpx;
+			margin-top: 157rpx;
+			margin-left: 95rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			text {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+		}
+	}
+</style>

pages/user/submit.vue

@@ -3,7 +3,7 @@
 			<image class="img" src="../../static/img/img34.png" mode="scaleToFill"></image>
 			<view class="text">提交成功</view>
 			<view class="btm">
-				<view class="btn">返回首页</view>
+				<view class="btn" @click="nav('pages/index/index')">返回首页</view>
 			</view>
 	</view>
 </template>
@@ -13,7 +13,13 @@ export default {
 	data () {
 		return {}
 	},
-	methods: {}
+	methods: {
+		nav (url) {
+			uni.navigateTo({
+				url
+			})
+		} 
+	}
 }
 </script>
 

pages/user/user.vue

@@ -15,32 +15,32 @@
 					</view>
 				</view>
 				<!-- 设置 -->
-				<view class="infor-right">
+				<view class="infor-right" @click="nav('/pages/user/shezhi')">
 					<image src="../../static/img/img18.png" mode="scaleToFill"></image>
 					<view class="setting">设置</view>
 				</view>
 			</view>
 			<!-- 我的订单 -->
 			<view class="order-box">
-				<view class="my-order">
+				<view class="my-order" @click="nav('/pages/order/order')">
 					<view class="order">我的订单</view>
 					<image src="../../static/img/xiangxia.png" mode="scaleToFill"></image>
 				</view>
 				<!-- 订单栏 -->
 				<view class="order-section">
-					<view class="order-item">
+					<view class="order-item" @click="nav('/pages/order/')">
 						<image src="../../static/img/img19.png" mode="scaleToFill"></image>
 						<view class="text">待付款</view>
 					</view>
-					<view class="order-item">
+					<view class="order-item" @click="nav('/pages/order/')">
 						<image src="../../static/img/img20.png" mode="scaleToFill"></image>
 						<view class="text">待发货</view>
 					</view>
-					<view class="order-item">
+					<view class="order-item" @click="nav('/pages/order/')">
 						<image src="../../static/img/img21.png" mode="scaleToFill"></image>
-						<view class="text">待收获</view>
+						<view class="text">待收货</view>
 					</view>
-					<view class="order-item">
+					<view class="order-item" @click="nav('/pages/order/')">
 						<image src="../../static/img/img22.png" mode="scaleToFill"></image>
 						<view class="text">已完成</view>
 					</view>
@@ -51,7 +51,7 @@
 		<view class="item-box">
 			<!-- 我的余额 -->
 			<view class="order-section">
-				<view class="order-item">
+				<view class="order-item" @click="nav('/pages/user/balance')">
 					<image src="../../static/img/img26.png" mode="scaleToFill"></image>
 					<view class="text">我的余额</view>
 				</view>
@@ -59,11 +59,11 @@
 					<image src="../../static/img/img23.png" mode="scaleToFill"></image>
 					<view class="text">我的佣金</view>
 				</view>
-				<view class="order-item">
+				<view class="order-item" @click="nav('/pages/user/integral')">
 					<image src="../../static/img/img24.png" mode="scaleToFill"></image>
 					<view class="text">我的积分</view>
 				</view>
-				<view class="order-item">
+				<view class="order-item" @click="nav('/pages/user/extend')">
 					<image src="../../static/img/img25.png" mode="scaleToFill"></image>
 					<view class="text">我的推广</view>
 				</view>

pages/user/withdraw.vue

@@ -2,68 +2,124 @@
 	<view class="container">
 		<view class="header">
 			<view class="row-box">
-			<view class="title">可提现金额</view>
+				<view class="title">可提现金额</view>
 				<view class="row">
-					<view class="tit">￥</view>
+					<view class="tit">￥{{money}}</view>
-					<view class="counts">1000.10</view>
+					
 				</view>
 			</view>
 			<view class="row-box">
-			<view class="title">申请提现金额</view>
+				<view class="title">申请提现金额</view>
 				<view class="row">
-					<view class="tit">￥</view>
+					<input class="counts" type="number" v-model="withdrawal" placeholder="请输入金额"/>
-					<view class="counts">1000</view>
 				</view>
 			</view>
-			<view class="buttom" @click="">全部提现</view>
+			<view class="buttom" @click="withdrawal = money">全部提现</view>
 		</view>
 		<view class="conent">
 			<view class="text">提现到</view>
-			<view class="conent-box"></view>
+			<radio-group @change="tabRadio">
+				<label>
+					<view class="box">
+						<image src="../../static/img/img35.png" mode="scaleToFill"></image>
+						<view class="title-box">
+							<view class="title"><text>微信支付</text></view>
+						</view>
+						<view class="right">
+							<radio value="weixin" color="#FF4C4C" :checked="type == 'weixin'" />
+						</view>
+					</view>
+				</label>
+				<label>
+					<view class="box">
+						<image src="../../static/img/img36.png" mode="scaleToFill"></image>
+						<view class="title-box">
+							<view class="title"><text>银行账户</text></view>
+						</view>
+						<view class="right">
+							<radio value="bank" color="#FF4C4C" :checked="type == 'bank'" />
+						</view>
+					</view>
+				</label>
+			</radio-group>
+			<view class="btn" @click="nav('/pages/user/refer')">
+				<view class="title" >提交申请</view>
+			</view>
 		</view>
-		</view>
+	</view>
-</template>
+</template>
-
+
 <script>
-export default {
+	export default {
-	data () {
+		data() {
-		return {}
+			return {
-	},
+				type: 'weixin',
-	methods: {}
+				money: '0.00', //可提现金额
-}
+				withdrawal: '' //提现金额
-</script>
+			}
-
+		},
+		methods: {
+			tabRadio(e) {
+				console.log(e)
+				this.type = e.detail.value;
+			},
+			nav (url) {
+				uni.navigateTo({
+					url
+				})
+			}
+		}
+	}
+</script>
+
 <style lang="scss">
 	.header {
 		height: 330rpx;
 		background-color: #fff;
+
 		.row-box {
 			height: 130rpx;
 			width: 700rpx;
 			background-color: #fff;
 			display: flex;
 			align-items: center;
-			justify-content: space-between;
 			border-bottom: 1rpx solid #E6E6E6;
 			margin: 0 auto;
+
 			.title {
 				font-size: 32rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
 				color: #333333;
+				width: 100%;
 			}
+
 			.row {
 				display: flex;
-				justify-content: center;
+				justify-content: space-between;
 				align-items: center;
+
+				.tit {
+					width: 300rpx;
+
+				}
+
 				.counts {
+					// text-align: right;
+					// width: 100rpx;
 					font-size: 50rpx;
 					font-family: Source Han Sans CN;
 					font-weight: 500;
 					color: #333333;
+
+					// &::before {
+					// 	content: '￥';
+						
+					// }
 				}
 			}
 		}
+
 		.buttom {
 			margin-top: 10rpx;
 			margin-left: 620rpx;
@@ -77,24 +133,59 @@ export default {
 			line-height: 42rpx;
 		}
 	}
+
 	.conent {
 		margin-top: 20rpx;
 		height: 890rpx;
 		background-color: #fff;
+
 		.text {
 			font-size: 30rpx;
 			font-family: Source Han Sans CN;
 			font-weight: 400;
 			color: #333333;
-			padding-top: 20rpx;
 			margin-left: 20rpx;
+			padding-top: 20rpx;
 		}
-		.conent-box {
+
-			height: 130rpx;
+		.box {
-			width: 700rpx;
+			display: flex;
+			align-items: center;
+			width: 710rpx;
+			height: 100rpx;
 			border-bottom: 1rpx solid #E6E6E6;
-			margin: 0 auto;
+			margin-left: 20rpx;
+
+			image {
+				width: 40rpx;
+				height: 40rpx;
+				margin-left: 20rpx;
+				margin-right: 20rpx;
+			}
+
+			.title-box {
+				margin-right: 440rpx;
+			}
+		}
+
+		.btn {
+			margin-top: 120rpx;
+			width: 670rpx;
+			height: 100rpx;
+			background: #6EAB4E;
+			border-radius: 10rpx;
+			display: flex;
+			justify-content: center;
+			margin-left: 40rpx;
+
+			.title {
+				display: flex;
+				align-items: center;
+				font-size: 32rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
 		}
 	}
-	
 </style>