1

pages.json

@@ -89,6 +89,22 @@
 			"style": {
 				"navigationBarTitleText": "我的团队"
 			}
+		}
+		,
+		{
+			"path": "pages/merchant/merchant",
+			"style": {
+				"navigationBarTextStyle":"#FFFFFF",
+				"navigationBarBackgroundColor":"#75E5B6",
+				"navigationBarTitleText": "商家中心",
+				"app-plus": {
+					"titleNView": {
+						//隐藏title
+						// "type": "transparent"
+						
+					}
+				}
+			}
 		},
 		{
 			"path": "pages/product/product",
@@ -596,7 +612,30 @@
 				}
 			}
 		}
-	],
+	    
+        ,{
+            "path" : "pages/merchant/commodity",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "商品管理",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+		
+		
+        ,{
+            "path" : "pages/merchant/vipDetail",
+            "style" :                                                                                    
+            {
+				"navigationBarBackgroundColor":"#72E3B4",
+				"navigationBarTextStyle":"#ffffff",
+                "navigationBarTitleText": "店铺会员",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

pages/merchant/commodity.vue

@@ -0,0 +1,236 @@
+<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 class="commodity-box">
+						<view class="commodity">
+							<view class="commodity-detail">
+								<view class="commodity-img">
+									<image src="../../static/user/ground.png" mode=""></image>
+								</view>
+								<view class="commodity-content">
+									<view class="top">
+										满园春11111111111111111111111111111111111
+									</view>
+									<view class="bottom">
+										<view class="price">
+											<text class="text">￥</text>999
+										</view>
+										<view class="status">
+											已上架
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+						<view class="input">
+							添加商品
+						</view>
+					</view>
+					
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+
+	export default {
+		data() {
+			return {
+				tabCurrentIndex: 0,
+				navList: [{
+						state: 0,
+						text: '全部',
+						orderList: [],
+						page: 1, //当前页面
+						limit: 10 //每次信息条数
+					},
+					{
+						state: 0,
+						text: '已上架',
+						orderList: [],
+						page: 1, //当前页面
+						limit: 10 //每次信息条数
+					},
+					{
+						state: 0,
+						text: '已下架',
+						orderList: [],
+						page: 1, //当前页面
+						limit: 10 //每次信息条数
+					}
+				]
+			};
+		},
+		methods: {
+			//顶部tab点击
+			tabClick(index) {
+				this.tabCurrentIndex = index;
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		background: $page-color-base;
+		height: 100%;
+	}
+
+	.swiper-box {
+		height: calc(100% - 40px);
+	}
+
+	.list-scroll-content {
+		height: 100%;
+	}
+
+	.commodity-box {
+		width: 750rpx;
+		margin: 20rpx 0;
+		background-color: #FFFFFF;
+
+		.commodity {
+			.checkbox1 {
+
+				font-size: 44rpx;
+				line-height: 1;
+				padding: 4rpx;
+				color: $font-color-disabled;
+				background: red;
+				border-radius: 50rpx;
+			}
+
+			.commodity-detail {
+				padding: 30rpx 0;
+				display: flex;
+
+				.commodity-img {
+					margin: 0 30rpx;
+					width: 147rpx;
+					height: 146rpx;
+					border-radius: 10rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.commodity-content {
+					width: 500rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+
+					.top {
+
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						font-size: 28rpx;
+						font-family: PingFangSC;
+						font-weight: 500;
+						color: #333333;
+					}
+
+					.bottom {
+
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+
+						.price {
+							font-size: 36rpx;
+							font-family: PingFang SC;
+							font-weight: bold;
+							color: #FD5B23;
+							.text{
+								font-size: 24rpx;
+								font-family: PingFang SC;
+								font-weight: bold;
+								color: #FD5B23;
+							}
+						}
+
+						.status {
+							
+							width: 80rpx;
+							height: 34rpx;
+							background: #FEE1D7;
+							border-radius: 5rpx;
+							font-size: 20rpx;
+							font-family: PingFangSC;
+							font-weight: 500;
+							color: #FD5B23;
+						}
+					}
+				}
+			}
+		}
+		.input{
+			margin: 30rpx;
+			text-align: center;
+			position: absolute;
+			bottom: 0;
+			width: 674rpx;
+			height: 88rpx;
+			background: #52C696;
+			border-radius: 44rpx;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			line-height: 88rpx;
+			color: #FFFFFF;
+		}
+	}
+
+	.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: 12px;
+			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;
+				}
+			}
+		}
+	}
+</style>

pages/merchant/merchant.vue

@@ -0,0 +1,236 @@
+<template>
+	<view class="body">
+		<view class="background"></view>
+		<view class="content">
+			<view class="userInfo">
+				<view class="userInfo-box">
+					<view class="userInfo-img">
+						<image class="portrait" src="../../static/error/missing-face.png"></image>
+					</view>
+					<view class="userInfo-xinxi">
+						<view class="title">
+							<text>满园春泰州店</text>
+						</view>
+						<view class="phone">
+							<text>19999999999</text>
+						</view>
+					</view>
+					<view class="balance">
+						可用余额￥20000
+					</view>
+				</view>
+			</view>
+			<view class="userInfoList">
+				<view class="userInfoList-top">
+					<view class="top">
+						<image src="../../static/merchant/saoma.png" mode=""></image>
+					</view>
+					扫码核销
+				</view>
+				<view class="userInfoList-top">
+					<view class="top">
+						<image src="../../static/merchant/erweima.png" mode=""></image>
+					</view>
+					店铺二维码
+				</view>
+				<view class="userInfoList-bottom">
+					<view class="bottom">
+						<image src="../../static/merchant/money.png" mode=""></image>
+					</view>
+					店铺财务
+				</view>
+				<view class="userInfoList-bottom">
+					<view class="bottom">
+						<image src="../../static/merchant/order.png" mode=""></image>
+					</view>
+					订单管理
+				</view>
+				<view class="userInfoList-bottom" @click="navTo('/pages/merchant/commodity')">
+					<view class="bottom">
+						<image src="../../static/merchant/shop.png" mode=""></image>
+					</view>
+					商品管理
+				</view>
+				<view class="userInfoList-bottom">
+					<view class="bottom">
+						<image src="../../static/merchant/xiadan.png" mode=""></image>
+					</view>
+					在线下单
+				</view>
+				<view class="userInfoList-bottom" @click="navTo('/pages/merchant/vipDetail')">
+					<view class="bottom">
+						<image src="../../static/merchant/vip.png" mode=""></image>
+					</view>
+					店铺会员
+				</view>
+				<view class="userInfoList-bottom">
+					<view class="bottom">
+						<image src="../../static/merchant/dianpu.png" mode=""></image>
+					</view>
+					店铺数据
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		methods:{
+			//跳转
+			navTo(url){
+				uni.navigateTo({
+					url
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		height: 100%;
+		background-color: #EEEDED;
+		padding: 0;
+		margin: 0;
+	}
+
+	.content {
+		background-color: #EEEDED;
+		margin: 0 30rpx;
+		display: flex;
+		flex-direction: column;
+
+	}
+
+	.background {
+		width: 100%;
+		height: 220rpx;
+		background-color: #75E5B6;
+	}
+
+	.userInfo {
+		margin-top: -110rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		background-color: #F9F9F9;
+		border-radius: 19rpx;
+		width: 100%;
+		height: 300rpx;
+
+		.userInfo-box {
+
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.userInfo-img {
+				margin: -65rpx 0 0 0;
+				width: 130rpx;
+				height: 130rpx;
+				border: 5rpx solid #fff;
+				border-radius: 50%;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.userInfo-xinxi {
+				.title {
+					margin: 20rpx 0;
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+					line-height: 21rpx;
+				}
+
+				.phone {
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+					line-height: 21rpx;
+					margin-bottom: 40rpx;
+				}
+			}
+
+			.balance {
+				text-align: center;
+				width: 500rpx;
+				height: 60rpx;
+				background: #52C696;
+				border-radius: 30rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+				line-height: 60rpx;
+			}
+		}
+
+	}
+
+	.userInfoList {
+		display: flex;
+		flex-wrap:wrap;
+		justify-content: space-between;
+		.userInfoList-top {
+			position: relative;
+			margin: 15rpx 0 ;
+			display: flex;
+			
+			justify-content: center;
+			align-items: center;
+			width: 340rpx;
+			height: 100rpx;
+			background: #FFFFFF;
+			border-radius: 20rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #4D4D4D;
+			line-height: 21rpx;
+
+			.top {
+				position: absolute;
+				margin-left: -230rpx;
+				width: 50rpx;
+				height: 50rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+		.userInfoList-bottom{
+			margin-bottom: 15rpx;
+			width: 340rpx;
+			height: 250rpx;
+			background: #F9F9F9;
+			border-radius: 20rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			.bottom{
+				margin-bottom: 20rpx;
+				width: 68rpx;
+				height: 68rpx;
+				image{
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+	}
+</style>

pages/merchant/vipDetail.vue

@@ -0,0 +1,170 @@
+<template>
+	<view class="content">
+		<view class="background">
+			<image src="../../static/merchant/vipbackground.png" mode=""></image>
+			<view class="title">
+				{{number}}
+				<text class="ren">人</text>
+			</view>
+		</view>
+		<view class="vip-box">
+			<view class="vip" v-for="item in vipList">
+				<view class="img">
+					<image :src="item.image" mode=""></image>
+				</view>
+				<view class="vip-content">
+					<view class="left">
+						<view class="top">
+							<view class="name">
+								{{item.name}}
+							</view>
+							<view class="nameplate">
+							</view>
+						</view>
+						<view class="bottom">
+							{{item.phone}}
+						</view>
+					</view>
+					<view class="right">
+						消费:￥{{item.money}}
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				number: 199, //人数
+				vipList: [
+					{
+					image: "../../static/error/missing-face.png",
+					name: "强爹",
+					phone: 19211111111,
+					money: 1200
+				},
+				{
+					image: "../../static/error/missing-face.png",
+					name: "强爹",
+					phone: 19211111111,
+					money: 1200
+				},
+				{
+					image: "../../static/error/missing-face.png",
+					name: "强爹",
+					phone: 19211111111,
+					money: 1200
+				}
+				]
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.background {
+		display: flex;
+		justify-content: center;
+		position: absolute;
+		width: 100%;
+		height: 360rpx;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.title {
+		position: absolute;
+		text-align: center;
+		line-height: 360rpx;
+		font-size: 72rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
+
+		.ren {
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #FFFFFF;
+			line-height: 43rpx;
+		}
+	}
+
+
+	.vip-box {
+		background-color: #FFFFFF;
+		display: flex;
+		flex-direction: column;
+		position: absolute;
+		width: 100%;
+		margin: 360rpx 0 0 ;
+
+		.vip {
+			border-top: 1rpx solid #E3E3E3;
+			display: flex;
+			align-items: center;
+
+			.img {
+				margin: 0 20rpx;
+				width: 80rpx;
+				height: 80rpx;
+				border-radius: 50%;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.vip-content {
+				margin: 30rpx 0;
+				display: flex;
+				justify-content: space-between;
+				width: 580rpx;
+				display: flex;
+				align-items: center;
+
+				.left {
+					display: flex;
+					flex-direction: column;
+
+					.top {
+						display: flex;
+
+						.name {
+							font-size: 30rpx;
+							font-family: PingFangSC;
+							font-weight: 500;
+							color: #3F454B;
+						}
+
+						.nameplate {}
+					}
+
+					.bottom {
+
+						font-size: 22rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #999999;
+					}
+				}
+
+				.right {
+
+					font-size: 30rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #FF6F0F;
+				}
+
+			}
+		}
+	}
+</style>

pages/user/user.vue

@@ -5,139 +5,131 @@
 		<!-- #endif -->
 		<!-- <scroll-view class="content-box" scroll-y="true"> -->
 		<view class="user-section">
-			<view class="bg"></view>
+			<view class="bg">
+				<image src="../../static/user/ground.png" mode=""></image>
+			</view>
+			
+			<!-- top -->
 			<view class="user-info-box ">
 				<view class="detail flex" @click="navTo('/pages/userinfo/userinfo')">
 					<view class="portrait-box"><image class="portrait" :src="userInfo.avatar || '/static/error/missing-face.png'"></image></view>
 					<view class="info-box">
 						<view class="username">{{ userInfo.nickname || '游客' }}</view>
-						<view class="font-size-sm" v-if="userInfo.uid">邀请码:{{ userInfo.uid }}</view>
+						<view class="font-size-sm" v-if="userInfo.uid">19999999999</view>
 					</view>
 				</view>
-				<view class="config iconfont">
-					<text class="setting iconsetting" @click="navTo('/pages/set/set')"></text>
-					<!-- <text class="message iconmessage" @click="navTo('/pages/notice/notice')"></text> -->
+				<view class="config">
+					<text class="setting " @click="navTo('/pages/set/set')">
+						<image src="../../static/user/set.png" mode=""></image>
+						</text>
+						设置
 				</view>
 			</view>
 			<!-- 会员卡功能 -->
-			<view class="vip-card-box">
-				<view @click="navTo('/pages/product/giftBag')" class="b-btn" v-if="userInfo.level == 0">我要升级</view>
-				<view class="tit">
-					<text class="iconfont iconintegral"></text>
-					<text v-if="userInfo.level == 0">升级专享优惠权益</text>
-					<text v-if="userInfo.level == 1">VIP会员</text>
-					<text v-if="userInfo.level == 2">店长</text>
-					<text v-if="userInfo.level == 3">总经理</text>
-					<text v-if="userInfo.level == 4">分公司</text>
-					<text v-if="userInfo.level == 5">大公司</text>
-				</view>
-			</view>
+			
 		</view>
-		<view class="cover-container">
-			<image class="arc" v-if="isShowIllegality" src="/static/img/arc.png"></image>
-			<view class="tj-sction" v-if="isShowIllegality">
-				<view class="tj-item" @click="navTo('/pages/wallet/wallet')">
-					<text class="num">{{ userInfo.now_money || '0.00' }}</text>
-					<text>余额</text>
-				</view>
-				<view class="tj-item" @click="navTo('/pages/award/award')">
-					<text class="num">{{ userInfo.brokerage_price || '0.00' }}</text>
-					<text>佣金</text>
-				</view>
-				<view class="tj-item" @click="navTo('/pages/scoreAccumulate/scoreAccumulate')">
-					<text class="num">{{ userInfo.integral || '0.00' }}</text>
-					<text>积分</text>
-				</view>
-				<view class="tj-item" @click="navTo('/pages/coupon/consumer')">
-					<text class="num">{{ userInfo.consumer || '0.00' }}</text>
-					<text>消费券</text>
+		<view class="item-box">
+			<view class="box-title flex borde-b">
+				<view class="title"><text>我的订单</text></view>
+				<view class="link" @click="navTo('/pages/order/order?state=5')" hover-class="common-hover">
+					
+					<text class="iconfont iconenter"></text>
 				</view>
 			</view>
-			<!-- 订单 -->
-			<view class="item-box">
-				<view class="box-title flex borde-b">
-					<view class="title"><text>我的订单</text></view>
-					<view class="link" @click="navTo('/pages/order/order?state=5')" hover-class="common-hover">
-						<text>全部订单</text>
-						<text class="iconfont iconenter"></text>
-					</view>
-				</view>
-				<view class="order-section">
-					<view class="order-item" @click="navTo('/pages/order/order?state=1')" hover-class="common-hover" :hover-stay-time="50">
-						<view class=" icon position-relative">
-							<image class="icon-img" src="/static/icon/i2.png" mode="aspectFit"></image>
-							<view class="corner" v-if="orderInfo.unshipped_count > 0">
-								<text>{{ orderInfo.unshipped_count }}</text>
-							</view>
+			<view class="order-section">
+				<view class="order-item" @click="navTo('/pages/order/order?state=1')" hover-class="common-hover" :hover-stay-time="50">
+					<view class=" icon1 position-relative">
+						<image class="icon-img" src="/static/icon/i2.png" mode="aspectFit"></image>
+						<view class="corner" v-if="orderInfo.unshipped_count > 0">
+							<text>{{ orderInfo.unshipped_count }}</text>
 						</view>
-						<text>待发货</text>
 					</view>
-					<view class="order-item" @click="navTo('/pages/order/order?state=2')" hover-class="common-hover" :hover-stay-time="50">
-						<view class="icon position-relative">
-							<image class="icon-img" src="/static/icon/i3.png" mode="aspectFit"></image>
-							<view class="corner" v-if="orderInfo.received_count > 0">
-								<text>{{ orderInfo.received_count }}</text>
-							</view>
+					<text>待发货</text>
+				</view>
+				<view class="order-item" @click="navTo('/pages/order/order?state=2')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="icon1 position-relative">
+						<image class="icon-img" src="/static/icon/i3.png" mode="aspectFit"></image>
+						<view class="corner" v-if="orderInfo.received_count > 0">
+							<text>{{ orderInfo.received_count }}</text>
 						</view>
-						<text>待收货</text>
 					</view>
-					<view class="order-item" @click="navTo('/pages/order/order?state=3')" hover-class="common-hover" :hover-stay-time="50">
-						<view class="icon position-relative">
-							<image class="icon-img" src="/static/icon/i4.png" mode="aspectFit"></image>
-							<view class="corner" v-if="orderInfo.evaluated_count > 0">
-								<text>{{ orderInfo.evaluated_count }}</text>
-							</view>
+					<text>待收货</text>
+				</view>
+				<view class="order-item" @click="navTo('/pages/order/order?state=3')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="icon1 position-relative">
+						<image class="icon-img" src="/static/icon/i4.png" mode="aspectFit"></image>
+						<view class="corner" v-if="orderInfo.evaluated_count > 0">
+							<text>{{ orderInfo.evaluated_count }}</text>
 						</view>
-						<text>待评价</text>
 					</view>
-					<view class="order-item" @click="navTo('/pages/order/refundOrder?state=0')" hover-class="common-hover" :hover-stay-time="50">
-						<view class=" icon position-relative">
-							<image class="icon-img" src="/static/icon/i1.png" mode="aspectFit"></image>
-							<!-- <view class="corner" v-if="orderInfo.unpaid_count > 0">
-									<text>{{ orderInfo.unpaid_count }}</text>
-								</view> -->
-						</view>
-						<text>退款</text>
+					<text>待评价</text>
+				</view>
+				<view class="order-item" @click="navTo('/pages/order/refundOrder?state=0')" hover-class="common-hover" :hover-stay-time="50">
+					<view class=" icon1 position-relative">
+						<image class="icon-img" src="/static/icon/i1.png" mode="aspectFit"></image>
 					</view>
+					<text>退款</text>
 				</view>
 			</view>
-			<view class="item-box" v-if="isShowIllegality">
-				<!-- <view class="box-title flex borde-b">
-						<view class="title"><text>我的资产</text></view>
-					</view> -->
-				<view class="order-section">
+		</view>
+		<!-- <view class="cover-container"> -->
+			<view class="vip">
+				<image src="../../static/user/upgrade.png" mode=""></image>
+			</view>
+		
+			<!-- 订单 -->
+			
+			<view class="item-box " v-if="isShowIllegality">
+				<view class="order-section  order">
 					<view class="order-item" @click="navTo('/pages/wallet/wallet')" hover-class="common-hover" :hover-stay-time="50">
-						<view class=" icon position-relative"><image class="icon-img" src="/static/icon/u1.png" mode="aspectFit"></image></view>
-						<text>我的钱包</text>
+						<view class=" icon position-relative"><image class="icon-img" src="../../static/user/balance.png" mode="aspectFit"></image></view>
+						<text>我的余额</text>
 					</view>
 					<view class="order-item" @click="navTo('/pages/award/award')" hover-class="common-hover" :hover-stay-time="50">
-						<view class=" icon position-relative"><image class="icon-img" src="/static/icon/u2.png" mode="aspectFit"></image></view>
-						<text>奖励明细</text>
+						<view class=" icon position-relative"><image class="icon-img" src="../../static/user/commission.png" mode="aspectFit"></image></view>
+						<text>我的佣金</text>
 					</view>
 					<view class="order-item" @click="navTo('/pages/scoreAccumulate/scoreAccumulate')" hover-class="common-hover" :hover-stay-time="50">
-						<view class=" icon position-relative"><image class="icon-img" src="/static/icon/u3.png" mode="aspectFit"></image></view>
-						<text>积分明细</text>
+						<view class=" icon position-relative"><image class="icon-img" src="../../static/user/integral.png" mode="aspectFit"></image></view>
+						<text>我的积分</text>
 					</view>
 					<view class="order-item" @click="navTo('/pages/coupon/consumer')" hover-class="common-hover" :hover-stay-time="50">
-						<view class=" icon position-relative"><image class="icon-img" src="/static/icon/u5.png" mode="aspectFit"></image></view>
-						<text>消费券明细</text>
+						<view class=" icon position-relative"><image class="icon-img" src="../../static/user/coupon.png" mode="aspectFit"></image></view>
+						<text>我的消费券</text>
 					</view>
-					<view v-if="userInfo.is_store == 1" class="order-item" @click="openQr" hover-class="common-hover" :hover-stay-time="50">
+					<!-- <view v-if="userInfo.is_store == 1" class="order-item" @click="openQr" hover-class="common-hover" :hover-stay-time="50">
 						<view class=" icon position-relative"><image class="icon-img" src="/static/icon/u4.png" mode="aspectFit"></image></view>
 						<text>核销</text>
-					</view>
+					</view> -->
 				</view>
-			</view>
+			
+			<!-- <image class="arc" v-if="isShowIllegality" src="/static/img/arc.png"></image> -->
+			<!-- <view class="tj-sction" v-if="isShowIllegality">
+				<view class="tj-item" @click="navTo('/pages/wallet/wallet')">
+					<text class="num">{{ userInfo.now_money || '0.00' }}</text>
+					<text>余额</text>
+				</view>
+				<view class="tj-item" @click="navTo('/pages/award/award')">
+					<text class="num">{{ userInfo.brokerage_price || '0.00' }}</text>
+					<text>佣金</text>
+				</view>
+				<view class="tj-item" @click="navTo('/pages/scoreAccumulate/scoreAccumulate')">
+					<text class="num">{{ userInfo.integral || '0.00' }}</text>
+					<text>积分</text>
+				</view>
+				<view class="tj-item" @click="navTo('/pages/coupon/consumer')">
+					<text class="num">{{ userInfo.consumer || '0.00' }}</text>
+					<text>消费券</text>
+				</view>
+			</view> -->
 			<!-- 浏览历史 -->
-			<view class="history-section icon">
+			<view class="history-section ">
 				<uni-list>
-					<uni-list-item v-if="isShowIllegality" title="我的钱包" @click="navTo('/pages/wallet/wallet')" thumb="/static/icon/img11.png"></uni-list-item>
-					<!-- <uni-list-item title="地址管理" @click="navTo('/pages/address/address')" thumb="/static/icon/img01.png"></uni-list-item> -->
-					<uni-list-item title="我的团队" @click="navTo('/pages/myteam/myteam')" thumb="/static/icon/myteam_1.png"></uni-list-item>
-					<uni-list-item title="我的收藏" @click="navTo('/pages/favorites/favorites')" thumb="/static/icon/img02.png"></uni-list-item>
-					<!--<uni-list-item title="商户入驻" @click="navTo('/pages/address/address')" thumb="/static/icon/img05.png"></uni-list-item>-->
-					<uni-list-item title="邀请好友" @click="navTo('/pages/shareQrCode/index')" thumb="/static/icon/img10.png"></uni-list-item>
-					<uni-list-item title="关于我们" @click="navTo('/pages/set/about')" thumb="/static/icon/img09.png"></uni-list-item>
+					<uni-list-item v-if="isShowIllegality" title="我的推广" @click="navTo('/pages/wallet/wallet')" thumb="/static/user/tuiguang.png"></uni-list-item>
+					<uni-list-item title="邀请海报" @click="navTo('/pages/myteam/myteam')" thumb="/static/user/haibao.png"></uni-list-item>
+					<uni-list-item title="我的收藏" @click="navTo('/pages/favorites/favorites')" thumb="/static/user/collect.png"></uni-list-item>
+					<uni-list-item title="收货地址" @click="navTo('/pages/shareQrCode/index')" thumb="/static/user/address.png"></uni-list-item>
+					<uni-list-item title="商家入口" @click="navTo('/pages/merchant/merchant')" thumb="/static/user/shopping.png"></uni-list-item>
 				</uni-list>
 			</view>
 		</view>
@@ -374,7 +366,7 @@ export default {
 }
 .container {
 	height: 100%;
-	background-color: $page-color-base;
+	background-color: #FFFFFF;
 	/* #ifdef APP-PLUS */
 	.bar-height {
 		height: var(--status-bar-height);
@@ -388,15 +380,19 @@ export default {
 
 .user-section {
 	height: 435rpx;
-	padding: 15rpx 30rpx 0;
+	padding: 60rpx 0  0 30rpx;
 	position: relative;
 	.bg {
 		position: absolute;
+		height: 480rpx;
+		width: 100%;
 		left: 0;
 		top: 0;
-		width: 100%;
-		height: 100%;
-		background-color: $base-color;
+		image{
+			width: 100%;
+			height: 100%;
+		}
+		// background-color: $base-color;
 	}
 }
 .user-info-box {
@@ -428,9 +424,25 @@ export default {
 		}
 	}
 	.config {
-		font-size: 48rpx;
-		height: 130rpx;
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #52C696;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 165rpx;
+		height: 64rpx;
+		background: #FFFFFF;
+		border-radius: 32px 0px 0px 32px;
 		.setting {
+			width: 32rpx;
+			height: 32rpx;
+			image{
+				width: 100%;
+				height: 100%;
+			}
+			
 			// margin-right: 51rpx;
 		}
 	}
@@ -483,13 +495,25 @@ export default {
 		margin-top: 10rpx;
 	}
 }
+	.vip{
+		margin-top: -110rpx;
+		padding: 0 30rpx;
+		height: 170rpx;
+		image{
+			height: 100%;
+			width: 100%;
+		}
+	}
 .cover-container {
+	display: flex;
+	flex-direction: column;
 	background: $page-color-base;
-	margin-top: -160rpx;
 	padding: 0 30rpx;
 	position: relative;
 	background: #f5f5f5;
 	padding-bottom: 20rpx;
+	margin-top: -110rpx;
+
 	.arc {
 		position: absolute;
 		left: 0;
@@ -515,9 +539,11 @@ export default {
 }
 
 .item-box {
+	position: relative;
 	border-radius: 10rpx;
 	background-color: white;
-	margin-top: 20rpx;
+	top: -130rpx;
+	margin: 0 30rpx;
 	.box-title {
 		line-height: 1;
 		padding: 30rpx;
@@ -530,7 +556,11 @@ export default {
 			color: $font-color-light;
 		}
 	}
+	.order{
+		margin-top: 70rpx;
+	}
 	.order-section {
+		
 		@extend %section;
 		padding: 28rpx 0;
 		.order-item {
@@ -550,6 +580,18 @@ export default {
 			font-size: 44rpx;
 		}
 		.icon {
+			height: 88rpx;
+			width: 90rpx;
+			margin-bottom: 18rpx;
+			background-size: 100%;
+			background-repeat: no-repeat;
+			background-position: center;
+			.icon-img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+		.icon1 {
 			height: 50rpx;
 			width: 48rpx;
 			margin-bottom: 18rpx;