2021-9-4 样式

components/mchart.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<qiun-data-charts type="area" :chart-data="chartData" echartsApp />
+		<qiun-data-charts type="line" :chart-data="chartData" echartsApp />
 	</view>
 </template>
 

pages.json

@@ -11,7 +11,7 @@
 				// #endif
 				"navigationBarTitleText": "商城首页",
 				"app-plus": {
-					"titleNView":false
+					"titleNView": false
 				}
 			}
 		},
@@ -20,7 +20,7 @@
 			"style": {
 				"navigationBarTitleText": "节点",
 				"app-plus": {
-					"titleNView":false
+					"titleNView": false
 				}
 			}
 		},
@@ -130,7 +130,7 @@
 					}
 				}
 			}
-		}, 
+		},
 		{
 			"path": "pages/set/cropper",
 			"style": {
@@ -141,14 +141,14 @@
 					}
 				}
 			}
-		}, 
+		},
 		{
 			"path": "pages/index/appointment",
 			"style": {
 				"navigationBarTitleText": "自动预约",
 				"app-plus": {
 					"titleNView": {
-						
+
 					}
 				}
 			}
@@ -159,7 +159,7 @@
 				"navigationBarTitleText": "自动预约",
 				"app-plus": {
 					"titleNView": {
-						
+
 					}
 				}
 			}
@@ -196,24 +196,24 @@
 			"path": "pages/public/forget",
 			"style": {
 				"navigationBarTitleText": "忘记密码"
-				
+
 			}
 		},
 		{
 			"path": "pages/user/fuli",
 			"style": {
 				"navigationBarTitleText": "拼购福利"
-				
+
 			}
 		},
 		{
 			"path": "pages/user/fulilist",
 			"style": {
 				"navigationBarTitleText": "拼购福利"
-				
+
 			}
 		},
-		
+
 		{
 			"path": "pages/assets/myPing",
 			"style": {
@@ -239,7 +239,7 @@
 			"path": "pages/assets/recharge",
 			"style": {
 				"navigationBarTitleText": "充币"
-				
+
 			}
 		},
 		{
@@ -251,7 +251,7 @@
 				}
 			}
 		},
-		
+
 		{
 			"path": "pages/user/extension",
 			"style": {
@@ -261,7 +261,7 @@
 				}
 			}
 		},
-		
+
 		{
 			"path": "pages/set/password",
 			"style": {
@@ -274,7 +274,12 @@
 				"navigationBarTitleText": "修改资料"
 			}
 		},
-
+		{
+			"path": "pages/set/set",
+			"style": {
+				"navigationBarTitleText": "设置"
+			}
+		},
 		{
 			"path": "pages/user/user",
 			"style": {

pages/assets/myPing.vue

@@ -2,29 +2,39 @@
 	<view class="center">
 		<view class="bg"></view>
 		<view class="zong flex">
-			<!-- <view class="info">
-				<view class="info-num">{{happy || '0.00' }}</view>
-				<view class="info-font">福气值</view>
-			</view> -->
 			<view class="info" v-for="ls in listType">
 				<view class="info-num">{{ ls.num || '0.00' }}</view>
 				<view class="info-font">奖金池</view>
 			</view>
-			<!-- <view class="info">
-				<view class="info-num">{{honor || '0.00' }}</view>
-				<view class="info-font">荣誉值</view>
-			</view> -->
 		</view>
-		<!-- <view class="money flex">
-			<view class="money-box">
-				<view class="money-num">{{usdt || '0.00' }}</view>
-				<view class="money-font">昨日USDT分红池</view>
+		<view class="zongbox flex">
+			<view class="info">
+				<view class="num">30</view>
+				<view class="info-font">昨日拼购数</view>
 			</view>
-			<view class="money-box" >
-				<view class="money-num" style="text-align: right;">{{fil || '0.00' }}</view>
-				<view class="money-font">昨日FIL分红池</view>
+			<view class="info">
+				<view class="num">20</view>
+				<view class="info-font">月度拼购数</view>
 			</view>
-		</view> -->
+			<view class="info">
+				<view class="num">50</view>
+				<view class="info-font">累计总拼购数</view>
+			</view>
+		</view>
+		<view class="zongbox flex">
+			<view class="info">
+				<view class="num">30</view>
+				<view class="info-font">昨日拼中数</view>
+			</view>
+			<view class="info">
+				<view class="num">20</view>
+				<view class="info-font">月度拼中数</view>
+			</view>
+			<view class="info">
+				<view class="num">50</view>
+				<view class="info-font">累计总拼中数</view>
+			</view>
+		</view>
 		<view class="join">
 			<view class="xian"></view>
 			<view class="join-font">参与记录</view>
@@ -230,6 +240,48 @@ page {
 		}
 	}
 }
+.zongbox {
+	width: 690rpx;
+	height: auto;
+	background: #ffffff;
+	box-shadow: 0px 0px 17rpx 0px rgba(0, 0, 0, 0.05);
+	border-radius: 20rpx;
+	margin: 10rpx auto 0;
+	justify-content: space-around;
+	padding: 36rpx 10rpx;
+	position: relative;
+	.zongbox-left {
+		padding-top: 30rpx;
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 50rpx;
+		text-align: center;
+		height: 100%;
+		color: #fff;
+		line-height: 1.5;
+		background: linear-gradient(90deg, #60bab0, #60bab0, #45969b);
+		border-top-left-radius: 20rpx;
+		border-bottom-left-radius: 20rpx;
+	}
+}
+.info {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	.info-num {
+		font-size: 50rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #0f253a;
+	}
+	.info-font {
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #6d7c88;
+	}
+}
 .join {
 	margin-top: 44rpx;
 	padding-left: 30rpx;

pages/set/set.vue

@@ -0,0 +1,121 @@
+<template>
+	<view class="center">
+		<view class="tt">
+			<view class="tt-box" @click="nav('/pages/user/approve')">
+				<image src="../../static/img/real_name.png" class="tt-icon1" mode=""></image>
+				<view class="tt-txt">实名认证</view>
+				<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
+			</view>
+			<view class="tt-box" @click="nav('/pages/set/password')">
+				<image src="../../static/img/pwd.png" class="tt-icon1" mode=""></image>
+				<view class="tt-txt">登录密码</view>
+				<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
+			</view>
+			<view class="tt-box" @click="nav('/pages/money/payment')">
+				<image src="../../static/img/zfpwd.png" class="tt-icon4" mode=""></image>
+				<view class="tt-txt">交易密码</view>
+				<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
+			</view>
+		</view>
+		<view class="out" @click="toLogout">退出登录</view>
+	</view>
+</template>
+
+<script>
+export default {
+	methods: {
+		toLogout(){
+			let obj = this;
+			uni.showModal({
+			    content: '确定要退出登录么',
+			    success: (e)=>{
+			    	if(e.confirm){
+						logout({}).then((e) => {
+							uni.navigateBack();
+						}).catch((e) => {
+							console.log(e);
+						})
+			    		obj.logout();
+			    	}
+			    }
+			});
+		},
+		nav(url) {
+			uni.navigateTo({
+				url
+			})
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.center,
+page {
+	background: #f7f7fb;
+}
+.tt {
+	width: 750rpx;
+	padding: 40rpx 70rpx 0;
+	border-radius: 10rpx;
+	background-color: #ffffff;
+	.tt-box:last-child {
+		border-bottom: none;
+	}
+	.tt-box {
+		height: 100rpx;
+		display: flex;
+		align-items: center;
+		border-bottom: 1px solid #f0f0f0;
+		.tt-icon1 {
+			width: 42rpx;
+			height: 42rpx;
+		}
+		.tt-icon2 {
+			width: 49rpx;
+			height: 38rpx;
+		}
+		.tt-icon3 {
+			width: 46rpx;
+			height: 40rpx;
+		}
+		.tt-icon4 {
+			width: 40rpx;
+			height: 42rpx;
+		}
+		.tt-icon5 {
+			width: 44rpx;
+			height: 40rpx;
+		}
+
+		.tt-txt {
+			margin-left: 36rpx;
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #333333;
+			flex: 1;
+		}
+
+		.next-icon {
+			width: 16rpx;
+			height: 25rpx;
+		}
+	}
+
+	.border-b {
+		border-bottom: 1px solid #f1f1f1;
+	}
+}
+.out {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin: 158rpx auto 30rpx;
+	width: 560rpx;
+	height: 80rpx;
+	background: linear-gradient(90deg, #58BAB0, #60BAB0, #45969B);
+	border-radius: 40px;
+	color: #FFFFFF;
+}
+</style>

pages/user/extension.vue

@@ -7,20 +7,38 @@
 				<view class="header">我的推广</view>
 				<image class="tuiguang_bg" src="../../static/img/share-bg.png"></image>
 				<!--  <view class="money_img"><image :src="list.avatar || img"></image></view> -->
-				<view class="money-frame">
-					<!-- <view class="money_name">我的推广</view> -->
-					<view class="money_num">
-						{{ team || '0' }}
-						<text class="money_ren">人</text>
+				<view class="user">
+					<view class="avtor">
+						<image class="portrait" :src="userInfo.avatar || '/static/img/missing-face.png'"></image>
+						<view class="he"><image class="image" v-if="userInfo.point" src="../../static/img/hehuoren.png"></image></view>
+					</view>
+					<view class="">
+						<view class="name">
+							<view class="name-left">{{ userInfo.phone || userInfo.email || '游客' }}</view>
+							<view class="name-right">
+								<image class="image" src="../../static/img/img28.png"></image>
+								<view class="level" v-if="userInfo.level">{{ userInfo.level_info.name }}</view>
+								<view class="level" v-else>V0</view>
+							</view>
+						</view>
+						<!-- <view class="id">uid:{{ userInfo.uid }}</view> -->
+					</view>
+				</view>
+				<view class="right">
+					<view class="right-num">
+						{{team}}
+					</view>
+					<view class="right-font ">
+						团队总人数
+					</view>
+					<view class="time ">
+						{{today}}
 					</view>
 				</view>
 			</view>
 		</view>
 		
 		<view class="main flex">
-			<view class="today" >
-				{{ today }}
-			</view>
 			<view class="main-box flex">
 				<view class="item">
 					<view class="num">{{myPerformance || 0}}</view>
@@ -65,6 +83,10 @@
 				<view class="box-left">昨日团队奖励</view>
 				<view class="box-right">{{yesterday.group || 0}}USDT</view>
 			</view>
+			<view class="box-item flex">
+				<view class="box-left" style="color:#44969D;">昨日累计奖励</view>
+				<view class="box-right" style="color:#44969D;">{{yesterday.group || 0}}USDT</view>
+			</view>
 		</view>
 		<view class="box">
 			<view class="box-item flex">
@@ -79,6 +101,10 @@
 				<view class="box-left">累计团队奖励</view>
 				<view class="box-right">{{all.group || 0}}USDT</view>
 			</view>
+			<view class="box-item flex">
+				<view class="box-left" style="color:#44969D;">历史累计奖励</view>
+				<view class="box-right" style="color:#44969D;">{{all.group || 0}}USDT</view>
+			</view>
 		</view>
 		<view class="liebiao flex" @click="navto('/pages/user/extensionList')">
 			<view class="left flex">
@@ -112,6 +138,9 @@ export default {
 			)
 			.exec();
 	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
 	data() {
 		return {
 			// 头部图高度
@@ -268,11 +297,102 @@ page {
 	}
 
 	.tuiguang_bg {
-		width: 100%;
+		width: 750rpx;
 		height: 424rpx;
 		position: relative;
+		
 	}
-
+	.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-right {
+					margin-left: 20rpx;
+					width: 50rpx;
+					height: 60rpx;
+					position: relative;
+					image {
+						width: 100%;
+						height: 100%;
+					}
+					.level {
+						position: absolute;
+						top: 20rpx;
+						left: 10rpx;
+						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;

pages/user/myNote.vue

@@ -6,35 +6,87 @@
 				<view class="info-num">{{ yesterday || '0.00' }}</view>
 				<view class="info-font">昨天释放</view>
 			</view>
-			<!-- <view class="info" v-for="ls in listType">
-				<view class="info-num">{{ all || '0.00' }}</view>
-				<view class="info-font">总释放数量</view>
-			</view> -->
 			<view class="info">
 				<view class="info-num">{{ all || '0.00' }}</view>
 				<view class="info-font">累计释放</view>
 			</view>
 		</view>
+		<view class="zongbox flex">
+			<view class="zongbox-left">昨日</view>
+			<view class="info">
+				<view class="num">30</view>
+				<view class="info-font">昨日门票分红</view>
+			</view>
+			<view class="info">
+				<view class="num">20</view>
+				<view class="info-font">手续费分红</view>
+			</view>
+			<view class="info">
+				<view class="num">50</view>
+				<view class="info-font">其他分红</view>
+			</view>
+		</view>
+		<view class="zongbox flex">
+			<view class="zongbox-left">历史</view>
+			<view class="info">
+				<view class="num">30</view>
+				<view class="info-font">历史门票分红</view>
+			</view>
+			<view class="info">
+				<view class="num">20</view>
+				<view class="info-font">手续费分红</view>
+			</view>
+			<view class="info">
+				<view class="num">50</view>
+				<view class="info-font">其他分红</view>
+			</view>
+		</view>
+		<view class="join">
+			<view class="xian"></view>
+			<view class="join-font">我的节点</view>
+		</view>
 		<view class="tabSwiper">
 			<view class="swiper-item">
 				<scroll-view scroll-y @scrolltolower="onreachBottom">
 					<view class="boxItem flex" style=" flex-wrap: wrap;">
 						<view class="item1" v-for="ls in tabList">
-							<!-- <view class="rightTip">进行中</view> -->
 							<view class="ls1">
 								<view class="name1">{{ ls.plan.plan_name }}</view>
-								<!-- <view class="title1">{{ ls.mask }}</view> -->
-								<view class="title1">认购份额:{{ ls.buy_num * 1 }}</view>
-								<view class="title1">总天数:{{ ls.release_time_all * 1 }}</view>
-								<view class="title1">当前释放天数:{{ ls.release_time_now * 1 }}</view>
+							</view>
+							<view class="item-main">
+								<view class="main-top flex">
+									<view class="top-left">认购份数：{{ ls.buy_num * 1 }}</view>
+									<view class="top-right">累计释放：20</view>
+								</view>
+								<view class="main-top flex">
+									<view class="top-left">释放天数：{{ ls.release_time_now }}</view>
+									<view class="top-right">累计分红：20</view>
+								</view>
 							</view>
 						</view>
 					</view>
-					<u-loadmore :status="loding"></u-loadmore>
+					<!-- <u-loadmore :status="loding"></u-loadmore> -->
 				</scroll-view>
 			</view>
 		</view>
-
+		<view class="join">
+			<view class="xian"></view>
+			<view class="join-font">其他节点</view>
+		</view>
+		<view class="box">
+			<view class="boxItem flex" style=" flex-wrap: wrap; width: 50%;">
+				<view class="item1" v-for="ls in pointList">
+					<view class="ls1">
+						<view class="name1">{{ ls.plan_name }}</view>
+					</view>
+					<view class="item-main">
+						<view class="main-top">合伙人数：{{ls.request_num}}</view>
+						<view class="main-top">累计分红：{{ls.release_money*1}}</view>
+						<view class="main-top">时间：2021年9月2日</view>
+					</view>
+				</view>
+			</view>
+		</view>
 		<!-- </swiper-item>
 		</swiper> -->
 		<u-popup v-model="show" mode="center" width="548rpx" border-radius="14">
@@ -51,6 +103,7 @@
 </template>
 <script>
 import { myPiont } from '@/api/user.js';
+import { getPoint } from '@/api/set.js';
 export default {
 	data() {
 		return {
@@ -58,9 +111,10 @@ export default {
 			password: '',
 			current: 0, //当前选中的标签
 			tabList: [],
+			pointList: [],
 			loding: 'more',
-			all:'',
-			yesterday:''
+			all: '',
+			yesterday: ''
 		};
 	},
 	//页面加载即刻发生
@@ -73,12 +127,14 @@ export default {
 			uni.showLoading({
 				title: '加载中'
 			});
-			myPiont().then(({ data }) => {
+			myPiont({ page: 1, limit: 10000 }).then(({ data }) => {
 				this.yesterday = data.yesterday * 1;
 				this.all = data.all * 1;
 				this.tabList = data.list;
-				console.log(data);
-				uni.hideLoading();
+				getPoint().then(({ data }) => {
+					this.pointList = data;
+					uni.hideLoading();
+				});
 			});
 		},
 		// 下拉到底部加载事件
@@ -115,22 +171,47 @@ page {
 	margin: -150rpx auto 0;
 	justify-content: space-around;
 	padding: 0rpx 36rpx;
-	.info {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		.info-num {
-			font-size: 50rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #0f253a;
-		}
-		.info-font {
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #6d7c88;
-		}
+}
+.info {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	.info-num {
+		font-size: 50rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #0f253a;
+	}
+	.info-font {
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #6d7c88;
+	}
+}
+.zongbox {
+	width: 690rpx;
+	height: auto;
+	background: #ffffff;
+	box-shadow: 0px 0px 17rpx 0px rgba(0, 0, 0, 0.05);
+	border-radius: 20rpx;
+	margin: 10rpx auto 0;
+	justify-content: space-around;
+	padding: 36rpx 10rpx 36rpx 60rpx;
+	position: relative;
+	.zongbox-left {
+		padding-top: 30rpx;
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 50rpx;
+		text-align: center;
+		height: 100%;
+		color: #fff;
+		line-height: 1.5;
+		background: linear-gradient(90deg, #60bab0, #60bab0, #45969b);
+		border-top-left-radius: 20rpx;
+		border-bottom-left-radius: 20rpx;
 	}
 }
 .tab {
@@ -145,87 +226,97 @@ page {
 	height: calc(100% - 70rpx);
 	.swiper-item {
 		padding: 30rpx;
-		.boxItem {
-			.item {
-				background-color: #ffffff;
-				line-height: 1;
-				padding: 30rpx;
-				margin-bottom: 30rpx;
-				.title {
-					justify-content: flex-start;
-					padding-bottom: 30rpx;
-					align-items: stretch;
-					.tip {
-						width: 7rpx;
-						border-radius: 99rpx;
-						background-color: $base-color;
-					}
-					.name {
-						margin-left: 20rpx;
-						font-size: 30rpx;
-						font-weight: bold;
-						color: $font-color-dark;
-					}
-				}
-				.itemConetnt {
-					padding: 20rpx 0;
-					font-weight: bold;
-					font-size: 28rpx;
-					border-bottom: 1px solid $border-color-light;
-					border-top: 1px solid $border-color-light;
-					.ls {
-						padding: 10rpx 0;
-						color: $font-color-light;
-						.textInterval {
-							width: 0.5em;
-						}
-						.text {
-							color: $font-color-dark;
-						}
-					}
+	}
+}
+.box {
+	width: 100%;
+	padding: 30rpx;
+}
+.boxItem {
+	.item {
+		background-color: #ffffff;
+		line-height: 1;
+		padding: 30rpx;
+		margin-bottom: 30rpx;
+		.title {
+			justify-content: flex-start;
+			padding-bottom: 30rpx;
+			align-items: stretch;
+			.tip {
+				width: 7rpx;
+				border-radius: 99rpx;
+				background-color: $base-color;
+			}
+			.name {
+				margin-left: 20rpx;
+				font-size: 30rpx;
+				font-weight: bold;
+				color: $font-color-dark;
+			}
+		}
+		.itemConetnt {
+			padding: 20rpx 0;
+			font-weight: bold;
+			font-size: 28rpx;
+			border-bottom: 1px solid $border-color-light;
+			border-top: 1px solid $border-color-light;
+			.ls {
+				padding: 10rpx 0;
+				color: $font-color-light;
+				.textInterval {
+					width: 0.5em;
 				}
-				.lsButtom {
-					font-size: 30rpx;
-					background-image: $bg-green-gradual;
-					text-align: center;
-					color: $font-color-white;
-					padding: 30rpx 0;
-					border-radius: 99rpx;
-					margin: 20rpx 30rpx 0rpx 30rpx;
+				.text {
+					color: $font-color-dark;
 				}
 			}
-			// .item1:nth-child(odd) {
-			// 	margin-right: 30rpx;
-			// }
-			.item1 {
-				line-height: 1;
-				background: url(../../static/img/rengouBg.png) no-repeat;
-				background-position: right bottom;
-				background-size: 140rpx 115rpx;
-				flex-grow: 1;
-				width: 100%;
-				margin-bottom: 30rpx;
-				border-radius: 15rpx;
-				background-color: #ffffff;
-				border: 1px solid $uni-color-primary;
-				padding: 15rpx 10rpx 35rpx 30rpx;
-				.ls1 {
-					font-weight: bold;
-					.name1 {
-						color: $font-color-dark;
-						font-size: $font-base + 2rpx;
-						margin-top: 10rpx;
-					}
-					.title1 {
-						margin-top: 15rpx;
-						color: $font-color-light;
-						font-size: 22rpx;
-					}
+		}
+		.lsButtom {
+			font-size: 30rpx;
+			background-image: $bg-green-gradual;
+			text-align: center;
+			color: $font-color-white;
+			padding: 30rpx 0;
+			border-radius: 99rpx;
+			margin: 20rpx 30rpx 0rpx 30rpx;
+		}
+	}
+	// .item1:nth-child(odd) {
+	// 	margin-right: 30rpx;
+	// }
+	.item1 {
+		line-height: 1;
+		background: url(../../static/img/rengouBg.png) no-repeat;
+		background-position: right bottom;
+		background-size: 140rpx 115rpx;
+		flex-grow: 1;
+		width: 100%;
+		margin-bottom: 30rpx;
+		border-radius: 15rpx;
+		background-color: #ffffff;
+		border: 1px solid $uni-color-primary;
+		padding: 15rpx 10rpx 35rpx 30rpx;
+		.ls1 {
+			font-weight: bold;
+			.name1 {
+				color: $font-color-dark;
+				font-size: $font-base + 2rpx;
+				margin-top: 10rpx;
+			}
+		}
+		.item-main {
+			padding-top: 10rpx;
+			.main-top {
+				margin-top: 10rpx;
+				font-size: 22rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #6d7c88;
+				.top-left {
+					flex: 1;
 				}
-				.rightTip {
-					color: $uni-color-primary;
-					text-align: right;
-					font-size: 24rpx;
+				.top-right {
+					flex: 1;
 				}
 			}
 		}
@@ -262,4 +353,24 @@ page {
 		color: #45969b;
 	}
 }
+.join {
+	margin-top: 44rpx;
+	padding-left: 30rpx;
+	display: flex;
+	justify-content: flex-start;
+	align-items: center;
+	.xian {
+		width: 6rpx;
+		height: 30rpx;
+		background: #0f253a;
+		border-radius: 4rpx;
+	}
+	.join-font {
+		padding-left: 16rpx;
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #0f253a;
+	}
+}
 </style>

pages/user/user.vue

@@ -3,25 +3,26 @@
 		<view class="top">
 			<view class="bg"><image class="imgBg" src="../../static/img/user-bg.png" mode=""></image></view>
 			<view class="user">
-				<view class="avtor"><image class="portrait" :src="userInfo.avatar || '/static/img/missing-face.png'"></image></view>
+				<view class="avtor">
+					<image class="portrait" :src="userInfo.avatar || '/static/img/missing-face.png'"></image>
+					<view class="he"><image class="image" v-if="userInfo.point.length != 0" src="../../static/img/hehuoren.png"></image></view>
+				</view>
 				<view class="">
-					<view class="name">{{ userInfo.phone || userInfo.email || '游客' }}</view>
-					<view class="id">uid:{{ userInfo.uid }}</view>
-					<view class="id-box flex">
-						
-						<view class="level-box">
+					<view class="name">
+						<view class="name-left">{{ userInfo.phone || userInfo.email || '游客' }}</view>
+						<view class="name-right">
 							<image class="image" src="../../static/img/img28.png"></image>
 							<view class="level" v-if="userInfo.level">{{ userInfo.level_info.name }}</view>
-							<view class="level" v-else>
-								V0
-							</view>
-						</view>
-						<view class="level-box" v-if="userInfo.point.length !=0">
-							<image class="image" src="../../static/img/hehuoren.png"></image>
+							<view class="level" v-else>V0</view>
 						</view>
 					</view>
+					<view class="id">uid:{{ userInfo.uid }}</view>
 				</view>
 			</view>
+			<view class="config" @click="nav('/pages/set/userinfo')">
+				<view class="myself"><image src="../../static/img/myself.png" mode=""></image></view>
+				我的资料
+			</view>
 		</view>
 		<view class="main">
 			<view class="title">我的工具</view>
@@ -32,7 +33,7 @@
 					<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
 				</view>
 				<view class="userInfo.point">
-					<view class="tt-box" v-if="userInfo.point.length !=0" @click="nav('/pages/user/myNote')">
+					<view class="tt-box" v-if="userInfo.point.length != 0" @click="nav('/pages/user/myNote')">
 						<image src="../../static/img/myPoint.png" class="tt-icon1" mode=""></image>
 						<view class="tt-txt">我的节点</view>
 						<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
@@ -43,7 +44,7 @@
 					<view class="tt-txt">我的矿机</view>
 					<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
 				</view>
-				<view class="tt-box" @click="nav('/pages/index/info')" v-if="userInfo.level >=4"> 
+				<view class="tt-box" @click="nav('/pages/index/info')" v-if="userInfo.level >= 4">
 					<image src="../../static/img/data.png" class="tt-icon1" mode=""></image>
 					<view class="tt-txt">汇总数据</view>
 					<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
@@ -63,35 +64,18 @@
 					<view class="tt-txt">团队邀请</view>
 					<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
 				</view>
-				<view class="tt-box" @click="nav('/pages/money/payment')">
-					<image src="../../static/img/zfpwd.png" class="tt-icon4" mode=""></image>
-					<view class="tt-txt">交易密码</view>
-					<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
-				</view>
-				<view class="tt-box" @click="nav('/pages/set/password')">
-					<image src="../../static/img/pwd.png" class="tt-icon1" mode=""></image>
-					<view class="tt-txt">登录密码</view>
-					<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
-				</view>
-				<view class="tt-box" @click="nav('/pages/user/approve')">
-					<image src="../../static/img/real_name.png" class="tt-icon1" mode=""></image>
-					<view class="tt-txt">实名认证</view>
-					<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
-				</view>
 				<view class="tt-box" @click="server()">
 					<image src="../../static/img/kefu.png" class="tt-icon1" mode=""></image>
 					<view class="tt-txt">联系客服</view>
 					<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
 				</view>
-				<view class="tt-box" @click="nav('/pages/set/userinfo')">
+				<view class="tt-box" @click="nav('/pages/set/set')">
 					<image src="../../static/img/set.png" class="tt-icon5" mode=""></image>
 					<view class="tt-txt">设置</view>
 					<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
 				</view>
 			</view>
-			<view class="kb">
-				
-			</view>
+			<view class="kb"></view>
 		</view>
 
 		<uni-popup ref="popup" type="center">
@@ -99,7 +83,7 @@
 				<view class="popup-dox">
 					<image class="popup-logo" src="../../static/img/lianxi.png"></image>
 					<view class="pop-title">已为您定制专属客服</view>
-					<view >{{ weixin }}</view>
+					<view>{{ weixin }}</view>
 					<image class="popup-text" @longtap="bc_code" :src="erweima"></image>
 					<view class="btn" @click="copy(weixin)">复制微信号</view>
 					<view class="pop-tip flex">
@@ -117,7 +101,7 @@ import uniCopy from '@/components/js_sdk/xb-copy/uni-copy.js';
 import { mapState, mapMutations } from 'vuex';
 import uniList from '@/components/uni-list/uni-list.vue';
 import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
-import { orderData, getUserInfo,service } from '@/api/user.js';
+import { orderData, getUserInfo, service } from '@/api/user.js';
 import { saveUrl, interceptor } from '@/utils/loginUtils.js';
 import uniPopup from '@/components/uni-popup/uni-popup.vue';
 export default {
@@ -128,8 +112,8 @@ export default {
 	},
 	data() {
 		return {
-			erweima:'',
-			weixin:''
+			erweima: '',
+			weixin: ''
 		};
 	},
 	onShow() {
@@ -161,10 +145,10 @@ export default {
 			getUserInfo({}).then(({ data }) => {
 				this.setUserInfo(data);
 			});
-			service({}).then(({data}) =>{
+			service({}).then(({ data }) => {
 				this.erweima = data.service_qr;
 				this.weixin = data.service_wechat;
-			})
+			});
 		},
 		server() {
 			this.$refs.popup.open();
@@ -199,26 +183,27 @@ export default {
 			// 	});
 			// }
 		},
-		bc_code(){
+		bc_code() {
 			let that = this;
-			console.log('保存二维码',this.erweima)
-			uni.downloadFile({           //获得二维码的临时地址
-				url:this.erweima,
-				success:(res)=>{
+			console.log('保存二维码', this.erweima);
+			uni.downloadFile({
+				//获得二维码的临时地址
+				url: this.erweima,
+				success: res => {
 					//console.log('获取url',res)
-					if(res.statusCode == 200){
+					if (res.statusCode == 200) {
 						uni.saveImageToPhotosAlbum({
-							filePath:res.tempFilePath,//传入临时地址
+							filePath: res.tempFilePath, //传入临时地址
 							success() {
-								that.$api.msg('保存成功')//封装的提示
+								that.$api.msg('保存成功'); //封装的提示
 							},
 							fail() {
-								that.$api.msg('保存失败')
+								that.$api.msg('保存失败');
 							}
-						})
+						});
 					}
 				}
-			})
+			});
 		},
 		copy(value) {
 			let obj = this;
@@ -280,11 +265,22 @@ page {
 			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;
@@ -292,6 +288,24 @@ page {
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #ffffff;
+			display: flex;
+			justify-content: start;
+			.name-right {
+				margin-left: 20rpx;
+				width: 50rpx;
+				height: 60rpx;
+				position: relative;
+				image {
+					width: 100%;
+					height: 100%;
+				}
+				.level {
+					position: absolute;
+					top: 20rpx;
+					left: 10rpx;
+					font-size: 20rpx;
+				}
+			}
 		}
 		.id {
 			margin-left: 30rpx;
@@ -300,26 +314,6 @@ page {
 			font-weight: 500;
 			color: #ffffff;
 		}
-		.level-box {
-			
-			margin-left: 30rpx;
-			margin-top: 10rpx;
-			position: relative;
-			.image {
-				width: 128rpx;
-				height: 45rpx;
-			}
-			.level {
-				position: absolute;
-				top: 0;
-				left: 62rpx;
-				height: 44rpx;
-				line-height: 48rpx;
-				font-size: 24rpx;
-				color: #826740;
-				font-weight: bold;
-			}
-		}
 	}
 }
 .main {
@@ -416,13 +410,13 @@ page {
 			height: 400rpx;
 			margin-bottom: 50rpx;
 		}
-		.btn{
+		.btn {
 			width: 300rpx;
 			height: 50rpx;
 			line-height: 50rpx;
-			background: linear-gradient(90deg, #60BAB0, #60BAB0, #45969B);
+			background: linear-gradient(90deg, #60bab0, #60bab0, #45969b);
 			margin: 0 auto;
-			color: #FFFFFF;
+			color: #ffffff;
 			border-radius: 25rpx;
 		}
 		.pop-tip {
@@ -452,4 +446,32 @@ page {
 		height: 100%;
 	}
 }
+.config {
+	background: #fff;
+	text-align: right;
+	font-size: 26rpx !important;
+	border-radius: 34px 0px 0px 34px;
+	position: absolute;
+	top: 120rpx;
+	right: 0;
+	font-size: 20rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #60bab0;
+	line-height: 58rpx;
+	padding:2rpx 8rpx;
+	display: flex;
+	.myself {
+		padding-top: 9rpx;
+		padding-left: 5rpx;
+		height: 30rpx;
+		width: 30rpx;
+		margin-right: 6rpx;
+		image {
+			height: 30rpx;
+			width: 30rpx;
+		}
+	}
+	
+}
 </style>