Merge branch 'master' of http://git.qiniu1314.com/cmy/xc

pages/user/user.vue

@@ -15,12 +15,12 @@
 					<view class="val">
 						236322
 					</view>
-					<image src="../../static/icon/copy.png" mode="" class="copy"></image>
+					<image src="../../static/user/copy.png" mode="" class="copy"></image>
 				</view>
 			</view>
 		</view>
 		<view class="ks flex">
-			<image src="../../static/icon/ks.png" mode=""></image>
+			<image src="../../static/user/ks.png" mode=""></image>
 			<view class="value">
 				<view class="val">
 					7772032.30
@@ -38,12 +38,12 @@
 				<view class="">
 					邀请好友
 				</view>
-				<image src="../../static/icon/djl.png" mode=""></image>
+				<image src="../../static/user/djl.png" mode=""></image>
 				<view class="tc">
 					
 				</view>
 				<view class="xq">
-					详情<image src="../../static/img/back.png" mode=""></image>
+					详情<image src="../../static/user/back.png" mode=""></image>
 				</view>
 			</view>
 			<view class="tit">
@@ -71,6 +71,38 @@
 				</view>
 			</view>
 		</view>
+		<view class="main-box">
+			<view class="title flex">
+				<view class="title-left">
+					<view class="title-font">常用功能</view>
+				</view>
+				<!-- <image class="title-right" src="../../static/icon/back.png" mode=""></image> -->
+			</view>
+			<view class="main flex">
+				<view class="oitem" @click="navTo('/pages/order/order?state=0')">
+					<image class="oitem-image" src="../../static/user/u1.png" mode=""></image>
+					<view class="oitem-font">我的好友</view>
+				</view>
+				<view class="oitem" @click="navTo('/pages/order/order?state=1')">
+					<image class="oitem-image" src="../../static/user/u2.png" mode=""></image>
+					<view class="oitem-font">联系客服</view>
+				</view>
+				<view class="oitem" @click="navTo('/pages/order/order?state=2')">
+					<image class="oitem-image" src="../../static/user/u3.png" mode=""></image>
+					<view class="oitem-font">我的邀请人</view>
+				</view>
+				<view class="oitem" @click="navTo('/pages/order/order?state=3')">
+					<image class="oitem-image" src="../../static/user/u5.png" mode=""></image>
+					<view class="oitem-font">开通联盟</view>
+				</view>
+				<view class="oitem" @click="navTo('/pages/order/order?state=3')">
+					<image class="oitem-image" src="../../static/user/u4.png" mode=""></image>
+					<view class="oitem-font">设置</view>
+				</view>
+				
+			</view>
+		</view>
+		
 	</view>
 </template>
 <script>
@@ -466,12 +498,14 @@
 </script>
 <style lang="scss">
 	.container {
-		background-image: url('../../static/img/user-bg.png');
+		background-image: url('../../static/user/user-bg.png');
 		background-size: 100% 100%;
-		min-height: 1600rpx;
+		min-height: 1200rpx;
 	}
 	.userinfo {
+		width: 709rpx;
 		height: 316rpx;
+		margin: auto;
 		justify-content: flex-start;
 		.avt {
 			border-radius: 50%;
@@ -638,4 +672,94 @@
 			}
 		}
 	}
+	.main-box {
+		margin: 20rpx auto 0;
+		width: 710rpx;
+		background: #ffffff;
+		box-shadow: 0px 4rpx 14rpx 0px rgba(229, 229, 229, 0.46);
+		border-radius: 20rpx;
+	
+		.title {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 24rpx;
+	
+			.title-left {
+				display: flex;
+				align-items: center;
+	
+				.title-icon {
+					width: 32rpx;
+					height: 32rpx;
+				}
+	
+				.title-font {
+					margin-left: 20rpx;
+					font-size: 30rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
+			}
+	
+			.title-right {
+				width: 14rpx;
+				height: 24rpx;
+			}
+		}
+	
+		.main {
+			padding: 30rpx 0 30rpx;
+			flex-wrap: wrap;
+			justify-content: flex-start;
+			.jg {
+				width: 1px;
+				height: 100rpx;
+				background: #eeeeee;
+			}
+	
+			.item {
+				padding-bottom: 20rpx;
+				width: 25%;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+	
+				.item-num {
+					font-size: 36rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
+	
+				.item-font {
+					margin-top: 18rpx;
+					font-size: 22rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+				}
+			}
+	
+			.oitem {
+				width: 25%;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				margin-bottom: 50rpx;
+				.oitem-image {
+					height: 50rpx;
+					width: 58rpx;
+				}
+	
+				.oitem-font {
+					font-weight: 500;
+					font-size: 25rpx;
+					color: #212121;
+					padding-top: 15rpx;
+				}
+			}
+		}
+	}
 </style>