hwq há 3 anos atrás
pai
commit
efa732f703

+ 305 - 13
pages/category/business.vue

@@ -1,5 +1,69 @@
 <template>
 	<view class="center">
+		<!-- <view class="search-top">
+			<view class="search flex">
+				<view class="shop-name clamp">椒江区</view>
+				<image class="shop-jt" src="../../static/icon/dsjh.png" mode=""></image>
+				<view class="input-box flex">
+					<view class=" input-content flex">
+						<image src="../../static/icon/search-h.png" mode="" class="" style="width: 32rpx;height: 32rpx;">
+						</image>
+						<view class="input"><input type="text" value="输入关键字搜索" /></view>
+					</view>
+				</view>
+				<view class="search-tit" @click.stop="clickSearch">
+					搜索
+				</view>
+			</view>
+			<view class="shop">
+				<view class="shop-title">
+					<view class="shop-item">
+						<view class="sitem-font">智能排序</view>
+						<image class="jt-down" src="../../static/index/index06.png" mode=""></image>
+					</view>
+					<view class="shop-item">
+						<view class="sitem-font">位置距离</view>
+						<image class="jt-down" src="../../static/index/index06.png" mode=""></image>
+					</view>
+					<view class="shop-item">
+						<view class="sitem-font">折扣优惠</view>
+						<image class="jt-down" src="../../static/index/index06.png" mode=""></image>
+					</view>
+					<view class="shop-item">
+						<view class="sitem-font">筛选</view>
+						<image class="jt-down" src="../../static/index/index06.png" mode=""></image>
+					</view>
+				</view>
+			</view>
+		</view> -->
+		<!-- <view class="jg" style="height: 180rpx;">
+			
+		</view>
+		<view class="shop">
+			<view class="shop-main flex" v-for="(item, index) in 100" :key="index">
+				<image class="main-left" src="../../static/index/index13.png" mode=""></image>
+				<view class="main-right flex">
+					<view class="shopm-info">
+						<view class="shopm-title">
+							<view class="shopmt-font clamp">李家烤肉11111111111111111111111111111111111111111111</view>
+							<view class="shopmt-good">荐</view>
+						</view>
+						<view class="address">椒江区市府大道200号</view>
+						<view class="shopmt-tip">消费最高可得10%积分</view>
+					</view>
+					<view class="right">
+						<view class="mright-top">
+							<image class="mrt-image" src="../../static/index/index10.png" mode=""></image>
+							<view class="mrt-font">距离0.3KM</view>
+						</view>
+						<view class="mright-bottom">
+							<image class="mrb-item" src="../../static/index/index14.png" mode=""></image>
+							<image class="mrb-item" src="../../static/index/index11.png" mode=""></image>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view> -->
 		<view class="kong">
 			<u-empty mode="data" text="敬请期待"></u-empty>
 		</view>
@@ -8,20 +72,248 @@
 </template>
 
 <script>
-import { tabbar } from '@/utils/tabbar.js';
-export default {
-	data() {
-		return {
-			tabbar: tabbar,
-			current: 1
-		};
-	}
-};
+	import {
+		tabbar
+	} from '@/utils/tabbar.js';
+	export default {
+		data() {
+			return {
+				tabbar: tabbar,
+				current: 1
+			};
+		},
+	};
 </script>
 
 <style lang="less">
-.kong {
-	height: 100vh;
-	width: 750rpx;
-}
+	.kong {
+		height: 100vh;
+	}
+	.search-top {
+		position: fixed;
+		top: 0;
+		z-index: 99;
+	}
+	.search {
+		justify-content: flex-start;
+		padding: 10rpx 32rpx 20rpx;
+		align-items: center;
+		background-color: #fff;
+
+		.address {
+			width: 32rpx;
+			height: 38rpx;
+		}
+
+		.shop-name {
+			height: 38rpx;
+			position: relative;
+			top: -4rpx;
+			z-index: 100;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666;
+			padding-left: 10rpx;
+		}
+
+		.shop-jt {
+			margin-left: 8rpx;
+			width: 16rpx;
+			height: 10rpx;
+		}
+
+		.input-box {
+			margin-left: 10rpx;
+			position: relative;
+			z-index: 99;
+			width: 520rpx;
+			height: 60rpx;
+			// background: rgba(255, 255, 255, 0.4);
+			border-radius: 30rpx;
+
+			.input-content {
+				position: relative;
+				z-index: 11;
+				// border-radius: 99rpx;
+				flex-grow: 1;
+				padding: 5rpx 30rpx;
+				background: #F6F6F6;
+
+				.iconsearch {
+					font-size: 50rpx;
+					color: #ffffff;
+				}
+
+				.input {
+					margin-left: 19rpx;
+					flex-grow: 1;
+					color: #666;
+					background: #F6F6F6;
+
+					input {
+						font-size: 28rpx;
+					}
+				}
+			}
+
+			.input-button {
+				padding-left: 20rpx;
+				// font-size: $font-base;
+				height: 100%;
+			}
+		}
+
+		.search-tit {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666666;
+			flex-shrink: 0;
+			padding-left: 10rpx;
+		}
+	}
+
+	.shop {
+		// margin-top: 20rpx;
+		background: #ffffff;
+		padding: 0 12rpx;
+
+		.shop-title {
+			padding: 30rpx 0 20rpx;
+			display: flex;
+			align-items: center;
+			border-bottom: 1px solid #e3e6e7;
+
+			.shop-item {
+				width: 25%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				.sitem-font {
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
+
+				.jt-down {
+					width: 10rpx;
+					height: 8rpx;
+					margin-left: 12rpx;
+				}
+			}
+		}
+
+		.shop-main {
+			padding: 32rpx 18rpx 0 12rpx;
+			align-items: flex-start;
+			justify-content: flex-start;
+
+			.main-left {
+				width: 180rpx;
+				height: 180rpx;
+				border-radius: 10rpx;
+			}
+
+			.main-right {
+				width: 500rpx;
+				justify-content: space-between;
+				align-items: flex-start;
+				margin-left: 20rpx;
+				padding: 13rpx 0 35rpx;
+				border-bottom: 1px solid #eaeced;
+
+				.shopm-info {
+					max-width: 60%;
+					line-height: 1;
+
+					.shopm-title {
+						display: flex;
+						justify-content: flex-start;
+
+						.shopmt-font {
+							font-size: 34rpx;
+							font-family: PingFang SC;
+							font-weight: bold;
+							color: #333333;
+						}
+
+						.shopmt-good {
+							margin-left: 6rpx;
+							width: 30rpx;
+							height: 30rpx;
+							border: 1px solid #ff4c4c;
+							border-radius: 5rpx;
+							font-size: 20rpx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #ff4c4c;
+							text-align: center;
+							line-height: 30rpx;
+						}
+					}
+
+					.address {
+						margin-top: 16rpx;
+						font-size: 24rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #666666;
+					}
+
+					.shopmt-tip {
+						position: relative;
+						margin-top: 52rpx;
+						padding: 8rpx;
+						background: #fcf3f0;
+						border-radius: 16rpx 16rpx 16rpx 0px;
+						font-size: 20rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #ff440d;
+					}
+				}
+
+				.right {
+					height: 100%;
+					margin-top: 5rpx;
+					display: flex;
+					flex-direction: column;
+
+					.mright-top {
+						display: flex;
+						justify-content: flex-end;
+						align-items: center;
+
+						.mrt-image {
+							width: 20rpx;
+							height: 28rpx;
+						}
+
+						.mrt-font {
+							margin-left: 8rpx;
+							font-size: 22rpx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #666666;
+						}
+					}
+
+					.mright-bottom {
+						margin-top: 80rpx;
+						display: flex;
+						justify-content: flex-end;
+
+						.mrb-item {
+							width: 46rpx;
+							height: 46rpx;
+							margin-left: 14rpx;
+						}
+					}
+				}
+			}
+		}
+	}
 </style>

+ 30 - 26
pages/index/index.vue

@@ -89,29 +89,30 @@
 					<image class="jt-down" src="../../static/index/index06.png" mode=""></image>
 				</view>
 			</view>
-			<view class="shop-main flex" v-for="(item, index) in shoplist" :key="index">
-				<image class="main-left" src="../../static/index/index13.png" mode=""></image>
-				<view class="main-right flex">
-					<view class="shopm-info">
-						<view class="shopm-title">
-							<view class="shopmt-font clamp">李家烤肉11111111111111111111111111111111111111111111</view>
-							<view class="shopmt-good">荐</view>
-						</view>
-						<view class="address">椒江区市府大道200号</view>
-						<view class="shopmt-tip">消费最高可得10%积分</view>
-					</view>
-					<view class="right">
-						<view class="mright-top">
-							<image class="mrt-image" src="../../static/index/index10.png" mode=""></image>
-							<view class="mrt-font">距离0.3KM</view>
-						</view>
-						<view class="mright-bottom">
-							<image class="mrb-item" src="../../static/index/index14.png" mode=""></image>
-							<image class="mrb-item" src="../../static/index/index11.png" mode=""></image>
-						</view>
-					</view>
-				</view>
-			</view>
+			
+		</view>
+		<view class="shop-main flex" v-for="(item, index) in shoplist" :key="index">
+			<image class="main-left" src="../../static/index/index13.png" mode=""></image>
+			<view class="main-right flex">
+				<view class="shopm-info">
+					<view class="shopm-title">
+						<view class="shopmt-font clamp">李家烤肉11111111111111111111111111111111111111111111</view>
+						<view class="shopmt-good">荐</view>
+					</view>
+					<view class="address">椒江区市府大道200号</view>
+					<view class="shopmt-tip">消费最高可得10%积分</view>
+				</view>
+				<view class="right">
+					<view class="mright-top">
+						<image class="mrt-image" src="../../static/index/index10.png" mode=""></image>
+						<view class="mrt-font">距离0.3KM</view>
+					</view>
+					<view class="mright-bottom">
+						<image class="mrb-item" src="../../static/index/index14.png" mode=""></image>
+						<image class="mrb-item" src="../../static/index/index11.png" mode=""></image>
+					</view>
+				</view>
+			</view>
 		</view>
 		<u-tabbar activeColor="#EE0979" v-model="current" :list="tabbar" :mid-button="true"></u-tabbar>
 	</view>
@@ -679,7 +680,9 @@ export default {
 			}
 		}
 	}
-	.shop-main {
+	
+}
+.shop-main {
 		padding: 32rpx 18rpx 0 12rpx;
 		align-items: flex-start;
 		justify-content: flex-start;
@@ -729,7 +732,9 @@ export default {
 					color: #666666;
 				}
 				.shopmt-tip {
-					position: relative;
+					position: relative;
+					display: inline-block;
+					flex-grow: 0;
 					margin-top: 52rpx;
 					padding: 8rpx;
 					background: #fcf3f0;
@@ -774,5 +779,4 @@ export default {
 			}
 		}
 	}
-}
 </style>

+ 21 - 12
pages/money/withdrawal.vue

@@ -4,24 +4,22 @@
 			<view class="flex ">
 				<view class="buttom">
 					<view class="icon">{{ money | getMoneyStyle }}</view>
-					<text class="text">可提现金额</text>
-				</view>
-				<view class="interval"></view>
-				<view class="buttom">
-					<view class=" icon">{{ freeze | getMoneyStyle }}</view>
-					<text class="text">待审核提现金额</text>
+					<text class="text">可转账金额</text>
 				</view>
 			</view>
 		</view>
 		<view class="row-box">
-			<view class="title">提现金额</view>
+			<view class="title">转化金额</view>
 			<view class="row">
 				<text class="tit">¥</text>
-				<input class="input" type="number" v-model="withdrawal" :placeholder="'最低提现金额' + minPrice + '元'" placeholder-class="placeholder" />
-				<view class="buttom" @click="withdrawal = money">全部提现</view>
+				<input class="input" type="number" v-model="withdrawal" placeholder="请输入佣金数量" placeholder-class="placeholder" />
+				<view class="buttom" @click="withdrawal = money">全部转化</view>
 			</view>
 		</view>
 		<button class="add-btn up" @click="confirm">提交申请</button>
+		<view class="tip" v-if="withdrawal != 0">
+			实际到账{{ realmoney }}现金,佣金流入{{ gy }}至公益池
+		</view>
 	</view>
 </template>
 
@@ -40,9 +38,7 @@ export default {
 		return {
 			type: 'weixin', //提现方式
 			money: '0.00', //可提现金额
-			freeze: '0.0', //冻结金额
 			withdrawal: '', //提现金额
-			minPrice: '', //最少提现金额
 			aliData: {},
 			bankData: {},
 			// #ifdef H5
@@ -60,6 +56,14 @@ export default {
 		this.loadAli();
 		this.loadBank();
 	},
+	computed:{
+		realmoney() {
+			return (this.withdrawal * 0.9).toFixed(2) * 1
+		},
+		gy() {
+			return (this.withdrawal * 0.08).toFixed(2) * 1
+		}
+	},
 	methods: {
 		// 更新数据
 		dataUp(){
@@ -144,8 +148,9 @@ page {
 	margin: 0 30rpx;
 	border-radius: $border-radius-sm;
 	.buttom {
+		width: 100%;
+		text-align: center;
 		font-size: $font-lg;
-		width: 50%;
 	}
 	.interval {
 		width: 2px;
@@ -258,6 +263,10 @@ page {
 		}
 	}
 }
+.tip {
+	padding: 20rpx 40rpx;
+	color: #FD3B39;
+}
 /deep/ .uni-radio-input {
 	width: 45rpx;
 	height: 45rpx;

+ 2 - 2
pages/user/award.vue

@@ -12,7 +12,7 @@
 				<view>我的佣金</view>
 			</view>
 			<view class="money-btn" @click="navto('/pages/money/withdrawal')">
-				佣金提现
+				佣金转现金
 				<text>></text>
 			</view>
 		</view>
@@ -23,7 +23,7 @@
 			</view>
 			<view class="shu"></view>
 			<view class="info-item">
-				<view class="info-font">累计收入</view>
+				<view class="info-font">累计提现</view>
 				<view class="info-num">300</view>
 			</view>
 		</view>

+ 248 - 154
pages/user/user.vue

@@ -1,170 +1,122 @@
 <template>
 	<view class="container">
 		<view class="vheigh"></view>
-		<scroll-view class="content-box" scroll-y="true">
-			<view class="user-section">
-				<view class="bg"></view>
-				<view class="user-info-box ">
-					<view class="detail flex" @click="navTo('/pages/set/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.lock_spread_user != null">邀请人:{{ userInfo.lock_spread_user.phone }}</view>
-							<view class="font-size-sm" v-if="userInfo.unlock_spread_user != null" @click.stop="navTo('/pages/index/index')">
-								已锁定邀请人:{{ userInfo.unlock_spread_user.phone }}购买会员礼包绑定关系
-							</view>
-						</view>
-					</view>
-					<view class="config iconfont">
-						<text class="setting iconsetting" @click="navTo('/pages/set/set')"></text>
-						<!-- <text class="message iconmessage" @click="navTo('/pages/user/notice')"></text> -->
-					</view>
+		<view class="user-top">
+			<image src="../../static/img/user-top-bg.png" mode="" class="user-top-bg"></image>
+			<view class="user-info" @click="navTo('/pages/set/set')">
+				<image class="avtar" :src="userInfo.avatar" mode=""></image>
+				<view class="name">{{ userInfo.nickname }}</view>
+				<view class="phone">{{ userInfo.phone }}</view>
+			</view>
+			<view class="sy-box flex">
+				<view class="sy-item" @click="navTo('/pages/money/wallet')">
+					<view class="sy-item-name">余额</view>
+					<view class="sy-item-val">{{ userInfo.now_money || '0.00' }}</view>
+				</view>
+				<view class="jg"></view>
+				<view class="sy-item" @click="navTo('/pages/user/scoreAccumulate')">
+					<view class="sy-item-name">响亮积分</view>
+					<view class="sy-item-val">{{ userInfo.integral || '0.00' }}</view>
+				</view>
+				<view class="jg"></view>
+				<view class="sy-item">
+					<view class="sy-item-name">现金</view>
+					<view class="sy-item-val">{{ userInfo.cash }}</view>
 				</view>
-				<!-- 会员卡功能 -->
-				<!-- <view class="vip-card-box">
-					<image class="card-bg" src="/static/img/vip-card-bg.png" mode=""></image>
-					<view class="b-btn">我要升级</view>
-					<view class="tit">
-						<text class="iconfont icon-iLinkapp-"></text>
-						升级专享优惠权益
-					</view>
-					<text class="e-m">DCloud Union</text>
-					<text class="e-b">开通会员开发无bug 一测就上线</text>
-				</view> -->
 			</view>
-
-			<!-- <view
-				class="cover-container"
-				:style="[
-					{
-						transform: coverTransform,
-						transition: coverTransition
-					}
-				]"
-				@touchstart="coverTouchstart"
-				@touchmove="coverTouchmove"
-				@touchend="coverTouchend"
-			> -->
-			<view class="cover-container">
-				<image class="arc" src="/static/img/arc.png"></image>
-
-				<view class="tj-sction">
-					<view class="tj-item" @click="navTo('/pages/money/wallet')">
-						<text class="num">{{ userInfo.now_money || '0.00' }}</text>
-						<text>余额</text>
-					</view>
-					<view class="tj-item" @click="navTo('/pages/user/award')">
-						<text class="num">{{ userInfo.brokerage_price || '0.00' }}</text>
-						<text>佣金</text>
-					</view>
-					<view class="tj-item" @click="navTo('/pages/user/scoreAccumulate')">
-						<text class="num">{{ userInfo.integral || '0.00' }}</text>
-						<text>响亮积分</text>
-					</view>
+		</view>
+		<view class="item-box">
+			<view class="order-section">
+				<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="icon"><image class="icon-img" src="/static/icon/myyj.png" mode="aspectFit"></image></view>
+					<text>我的佣金</text>
 				</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=0')" 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=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>
-						</view>
-						<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>
-							<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>
-							</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.complete_count > 0">
-									<text>{{ orderInfo.complete_count }}</text>
-								</view> -->
-							</view>
-							<text>已完成</text>
+				<view class="order-item" @click="navTo('/pages/money/wallet')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="icon"><image class="icon-img" src="/static/icon/myqb.png" mode="aspectFit"></image></view>
+					<text>我的钱包</text>
+				</view>
+				<view class="order-item" hover-class="common-hover" :hover-stay-time="50">
+					<view class="icon"><image class="icon-img" src="/static/icon/mygx.png" mode="aspectFit"></image></view>
+					<text>我的贡献值</text>
+				</view>
+				<view class="order-item" @click="navTo('/pages/user/jiedian')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="icon"><image class="icon-img" src="/static/icon/myjd.png" mode="aspectFit"></image></view>
+					<text>我的节点</text>
+				</view>
+			</view>
+		</view>
+		<!-- 订单 -->
+		<view class="item-box item-box-b">
+			<view class="box-title flex ">
+				<view class="title"><text>我的订单</text></view>
+				<view class="link" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover"><text class="iconfont iconenter"></text></view>
+			</view>
+			<view class="order-section">
+				<view class="order-item" @click="navTo('/pages/order/order?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>
 				</view>
-				<view class="item-box">
-					<!-- <view class="box-title flex borde-b">
-						<view class="title"><text>我的资产</text></view>
-					</view> -->
-					<view class="order-section">
-						<view class="order-item" @click="navTo('/pages/money/wallet')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon"><image class="icon-img" src="/static/icon/u1.png" mode="aspectFit"></image></view>
-							<text>我的钱包</text>
-						</view>
-						<view class="order-item" @click="navTo('/pages/user/jiedian')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon"><image class="icon-img" src="/static/icon/u1.png" mode="aspectFit"></image></view>
-							<text>我的节点</text>
-						</view>
-						<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon"><image class="icon-img" src="/static/icon/u2.png" mode="aspectFit"></image></view>
-							<text>奖励明细</text>
+				<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-item" @click="navTo('/pages/user/scoreAccumulate')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon"><image class="icon-img" src="/static/icon/u3.png" mode="aspectFit"></image></view>
-							<text>积分明细</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>
-						<!-- <view class="order-item" @click="navTo('/pages/order/order?state=4')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon"><image class="icon-img" src="/static/icon/u4.png" mode="aspectFit"></image></view>
-							<text>通用币</text>
-						</view> -->
 					</view>
+					<text>待收货</text>
 				</view>
-
-				<!-- 浏览历史 -->
-				<view class="history-section icon">
-					<!-- <view class="sec-header">
-						<text class="iconfont iconfavor"></text>
-						<text>浏览历史</text>
-					</view> -->
-					<!-- <scroll-view scroll-x class="h-list">
-						<image
-							class="h-list-image"
-							@click="navTo('/pages/product/product')"
-							src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1553105186633&di=c121a29beece4e14269948d990f9e720&imgtype=0&src=http%3A%2F%2Fimg004.hc360.cn%2Fm8%2FM04%2FDE%2FDE%2FwKhQplZ-QteEBvsbAAAAADUkobU751.jpg"
-							mode="aspectFill"
-						></image>
-					</scroll-view> -->
-					<uni-list>
-						<uni-list-item title="我的推广" @click="navTo('/pages/user/team')" thumb="/static/icon/img10.png"></uni-list-item>
-						<uni-list-item title="我的钱包" @click="navTo('/pages/money/wallet')" thumb="/static/icon/img11.png"></uni-list-item>
-						<uni-list-item title="我的卡卷" @click="navTo('/pages/user/coupon')" thumb="/static/icon/img12.png"></uni-list-item>
-						<uni-list-item title="我的收藏" @click="navTo('/pages/user/favorites')" thumb="/static/icon/img02.png"></uni-list-item>
-						<uni-list-item title="收货地址" @click="navTo('/pages/set/address')" thumb="/static/icon/img05.png"></uni-list-item>
-						<uni-list-item title="邀请好友" @click="navTo('/pages/user/shareQrCode')" thumb="/static/icon/img10.png"></uni-list-item>
-						<uni-list-item title="绑定手机" @click="navTo('/pages/set/phone')" thumb="/static/icon/img09.png"></uni-list-item>
-					</uni-list>
+				<view class="order-item" @click="navTo('/pages/order/order?state=4')" 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.complete_count > 0">
+							<text>{{ orderInfo.complete_count }}</text>
+						</view> -->
+					</view>
+					<text>已完成</text>
 				</view>
 			</view>
-		</scroll-view>
+		</view>
+		<!--  -->
+		<view class="btm-box flex" @click="navTo('/pages/user/team')">
+			<image src="../../static/icon/mytg.png" mode="widthFix" class="left-img"></image>
+			<view class="">我的推广</view>
+			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
+		</view>
+		<view class="btm-box flex" @click="navTo('/pages/user/shareQrCode')">
+			<image src="../../static/icon/tghb.png" mode="widthFix" class="left-img"></image>
+			<view class="">推广海报</view>
+			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
+		</view>
+		<view class="btm-box flex" @click="navTo('/pages/set/address')">
+			<image src="../../static/icon/shdz.png" mode="widthFix" class="left-img"></image>
+			<view class="">收货地址</view>
+			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
+		</view>
+		<view class="btm-box flex">
+			<image src="../../static/icon/kf.png" mode="widthFix" class="left-img"></image>
+			<view class="">客服</view>
+			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
+		</view>
+		<view class="btm-box flex" @click="navTo('/pages/set/phone')">
+			<image src="../../static/icon/bdsj.png" mode="widthFix" class="left-img"></image>
+			<view class="">绑定手机</view>
+			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
+		</view>
+		<view class="btm" style="height: 44px;"></view>
 		<u-tabbar activeColor="#EE0979" v-model="current" :list="tabbar" :mid-button="true"></u-tabbar>
 	</view>
 </template>
@@ -339,12 +291,14 @@ export default {
 page {
 	height: 100%;
 }
+
 %flex-center {
 	display: flex;
 	flex-direction: column;
 	justify-content: center;
 	align-items: center;
 }
+
 %section {
 	display: flex;
 	justify-content: space-around;
@@ -352,21 +306,26 @@ page {
 	background: #fff;
 	border-radius: 10rpx;
 }
+
 .container {
 	height: 100%;
 	background-color: $page-color-base;
 }
+
 .content-box {
 	height: 100%;
 }
+
 .vheigh {
 	height: var(--status-bar-height);
 	background-color: $base-color;
 }
+
 .user-section {
 	height: 435rpx;
 	padding: 15rpx 30rpx 0;
 	position: relative;
+
 	.bg {
 		position: absolute;
 		left: 0;
@@ -376,6 +335,7 @@ page {
 		background-color: $base-color;
 	}
 }
+
 .user-info-box {
 	height: 180rpx;
 	color: white;
@@ -384,10 +344,13 @@ page {
 	justify-content: space-between;
 	position: relative;
 	z-index: 1;
+
 	.detail {
 		height: 130rpx;
+
 		.portrait-box {
 			height: 100%;
+
 			.portrait {
 				width: 130rpx;
 				height: 100%;
@@ -395,18 +358,22 @@ page {
 				border-radius: 50%;
 			}
 		}
+
 		.info-box {
 			margin-left: 20rpx;
 			line-height: 1.5;
+
 			.username {
 				font-size: $font-lg + 6rpx;
 				height: 100%;
 			}
 		}
 	}
+
 	.config {
 		font-size: 48rpx;
 		height: 130rpx;
+
 		.setting {
 			margin-right: 51rpx;
 		}
@@ -423,6 +390,7 @@ page {
 	overflow: hidden;
 	position: relative;
 	padding: 20rpx 24rpx;
+
 	.card-bg {
 		position: absolute;
 		top: 20rpx;
@@ -430,6 +398,7 @@ page {
 		width: 380rpx;
 		height: 260rpx;
 	}
+
 	.b-btn {
 		position: absolute;
 		right: 20rpx;
@@ -444,21 +413,25 @@ page {
 		background: linear-gradient(left, #f9e6af, #ffd465);
 		z-index: 1;
 	}
+
 	.tit {
 		font-size: $font-base + 2rpx;
 		color: #f7d680;
 		margin-bottom: 28rpx;
+
 		.iconfont {
 			color: #f6e5a3;
 			margin-right: 16rpx;
 		}
 	}
+
 	.e-b {
 		font-size: $font-sm;
 		color: #d8cba9;
 		margin-top: 10rpx;
 	}
 }
+
 .cover-container {
 	background: $page-color-base;
 	margin-top: -150rpx;
@@ -466,6 +439,7 @@ page {
 	position: relative;
 	background: #f5f5f5;
 	padding-bottom: 20rpx;
+
 	.arc {
 		position: absolute;
 		left: 0;
@@ -474,8 +448,10 @@ page {
 		height: 36rpx;
 	}
 }
+
 .tj-sction {
 	@extend %section;
+
 	.tj-item {
 		@extend %flex-center;
 		flex-direction: column;
@@ -483,6 +459,7 @@ page {
 		font-size: $font-sm;
 		color: #75787d;
 	}
+
 	.num {
 		font-size: $font-lg;
 		color: $font-color-dark;
@@ -491,24 +468,34 @@ page {
 }
 
 .item-box {
-	border-radius: 10rpx;
+	width: 708rpx;
+	height: 163rpx;
+	background: #fff;
+	border-radius: 28rpx;
 	background-color: white;
-	margin-top: 20rpx;
+	margin: -40rpx auto 30rpx;
+	position: relative;
+
+	// margin-top: 20rpx;
 	.box-title {
 		line-height: 1;
 		padding: 30rpx;
+
 		.title {
 			font-size: $font-lg;
 			font-weight: bold;
 		}
+
 		.link {
 			font-size: $font-base - 2rpx;
 			color: $font-color-light;
 		}
 	}
+
 	.order-section {
 		@extend %section;
 		padding: 28rpx 0;
+
 		.order-item {
 			@extend %flex-center;
 			width: 120rpx;
@@ -517,14 +504,17 @@ page {
 			font-size: $font-sm;
 			color: $font-color-dark;
 		}
+
 		.iconfont {
 			font-size: 48rpx;
 			margin-bottom: 18rpx;
 			color: #fa436a;
 		}
+
 		.icon-shouhoutuikuan {
 			font-size: 44rpx;
 		}
+
 		.icon {
 			height: 50rpx;
 			width: 48rpx;
@@ -532,6 +522,7 @@ page {
 			background-size: 100%;
 			background-repeat: no-repeat;
 			background-position: center;
+
 			.icon-img {
 				width: 100%;
 				height: 100%;
@@ -545,6 +536,7 @@ page {
 	margin-top: 20rpx;
 	background: #fff;
 	border-radius: 10rpx;
+
 	.sec-header {
 		display: flex;
 		align-items: center;
@@ -553,6 +545,7 @@ page {
 		line-height: 40rpx;
 		margin-left: 30rpx;
 		padding-top: 30rpx;
+
 		.iconfont {
 			font-size: 44rpx;
 			color: $color-red;
@@ -560,9 +553,11 @@ page {
 			line-height: 40rpx;
 		}
 	}
+
 	.h-list {
 		white-space: nowrap;
 		padding: 30rpx 30rpx 0;
+
 		.h-list-image {
 			display: inline-block;
 			width: 160rpx;
@@ -572,4 +567,103 @@ page {
 		}
 	}
 }
+
+.user-top {
+	height: 564rpx;
+	position: relative;
+
+	.user-top-bg {
+		width: 750rpx;
+		height: 564rpx;
+		// width: 100%;
+		// position: absolute;
+	}
+	.user-info {
+		width: 750rpx;
+		position: absolute;
+		top: 66rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		.avtar {
+			width: 134rpx;
+			height: 134rpx;
+			border-radius: 50%;
+		}
+		.name {
+			margin-top: 20rpx;
+			font-size: 39rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #FFFFFF;
+		}
+		.phone {
+			margin-top: 13rpx;
+			font-size: 29rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+		}
+	}
+
+	.sy-box {
+		position: absolute;
+		bottom: 30rpx;
+		height: 148rpx;
+		width: 750rpx;
+
+		// background-color: #bfa;
+		.sy-item {
+			width: 30%;
+			flex-grow: 1;
+			text-align: center;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #ffffff;
+
+			.sy-item-val {
+				font-size: 39rpx;
+			}
+		}
+
+		.jg {
+			width: 2rpx;
+			height: 68rpx;
+			background-color: #fff;
+		}
+	}
+}
+
+.item-box-b {
+	width: 710rpx;
+	height: 221rpx;
+	background: #ffffff;
+	margin: 20rpx auto 60rpx;
+}
+
+.btm-box {
+	width: 706rpx;
+	height: 104rpx;
+	background: #ffffff;
+	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+	border-radius: 28rpx;
+	margin: 20rpx auto;
+	position: relative;
+	padding: 0 33rpx 0 24rpx;
+	font-size: 29rpx;
+	font-weight: bold;
+	color: #5d5d5d;
+	.left-img {
+		width: 40rpx;
+	}
+	.right-img {
+		width: 14rpx;
+	}
+	view {
+		flex-grow: 1;
+		padding-left: 12rpx;
+	}
+}
 </style>

BIN
static/icon/bdsj.png


BIN
static/icon/dsjh.png


BIN
static/icon/goto.png


BIN
static/icon/i1.png


BIN
static/icon/i2.png


BIN
static/icon/i3.png


BIN
static/icon/i4.png


BIN
static/icon/kf.png


BIN
static/icon/mygx.png


BIN
static/icon/myjd.png


BIN
static/icon/myqb.png


BIN
static/icon/mytg.png


BIN
static/icon/myyj.png


BIN
static/icon/search-h.png


BIN
static/icon/shdz.png


BIN
static/icon/tghb.png


BIN
static/img/user-top-bg.png