Merge branch 'master' of http://git.sjzkeji.com/panghu/school_webUser

common/css/common.css

@@ -79,6 +79,10 @@ image {
 	display: flex;
 	flex-direction: column;
 }
+.flex-direction {
+  display: flex;
+  flex-direction: column;
+}
 .display-flex {
 	display: flex;
 }
@@ -151,14 +155,12 @@ image {
 .fs-22{
 	font-size: 22rpx;
 }
-.fs-24{
-	font-size: 24rpx;
+.fs-26{
+	font-size: 26rpx;
 }
-
 .fs-32{
 	font-size: 32rpx;
 }
-
 .fs-34{
 	font-size: 34rpx;
 }
@@ -206,6 +208,11 @@ image {
 	background-color: #999;
 }
 
+/* 圆角 */
+.b-rad-20{
+	border-radius: 20rpx;
+}
+
 
 /* 内边距 */
 .p-24{
@@ -229,6 +236,9 @@ image {
 	margin-right: 24rpx;
 }
 
+.mb-24{
+	margin-bottom: 24rpx;
+}
 
 
 /* 宽度 */

pages/me/index.vue

@@ -7,10 +7,41 @@
 				<image class="user-img" src="@/static/img/my/user-img.png" mode=""></image>
 				<image class="set-iimg" src="@/static/img/my/pen.png" mode=""></image>
 			</view>
-			<view class="user-name text-overflow-ellipsis-one">
+			<view class="user-name text-overflow-ellipsis-one fs-34">
 				{{ name }}
 			</view>
 		</view>
+		<view class="function-one-box box-border-box">
+			<view class="function-one b-rad-20 bgc-f box-border-box mb-24 align-items-center flex-justify-space">
+				<view class="my-function-box flex-direction align-items-center">
+					<image class="my-img" src="@/static/img/my/wdkq.png" mode=""></image>
+					<view class="fs-26">
+						我的卡券
+					</view>
+				</view>
+				<view class="my-function-box flex-direction align-items-center">
+					<image class="my-img" src="@/static/img/my/wdfb.png" mode=""></image>
+					<view class="fs-26">
+						我的发布
+					</view>
+				</view>
+				<view class="my-function-box flex-direction align-items-center">
+					<image class="my-img" src="@/static/img/my/wdpj.png" mode=""></image>
+					<view class="fs-26">
+						我的评价
+					</view>
+				</view>
+				<view class="my-function-box flex-direction align-items-center">
+					<image class="my-img" src="@/static/img/my/dzgl.png" mode=""></image>
+					<view class="fs-26">
+						地址管理
+					</view>
+				</view>
+			</view>
+			<view class="function-two b-rad-20 box-border-box flex-justify-space">
+				
+			</view>
+		</view>
 		<scroll-view :scroll-y="true" class="scroll-view-css" @scrolltolower="scrolltolower">
 		</scroll-view>
 	</view>
@@ -49,7 +80,7 @@
 	position: relative;
 }
 .user-box{
-	padding: 54rpx 32rpx 52rpx;
+	padding: 54rpx 32rpx;
 }
 .user-img{
 	width: 100%;
@@ -65,4 +96,19 @@
 .user-name{
 	max-width: 388rpx;
 }
+.function-one-box{
+	padding: 0 24rpx;
+}
+.function-one{
+	padding: 24rpx 34rpx;
+}
+.function-two{
+	padding: 22rpx 40rpx 22rpx 32rpx;
+	background: linear-gradient( 90deg, #FFFFFF 47%, #FFF7E5 100%);
+}
+.my-img{
+	width: 80rpx;
+	height: 80rpx;
+	margin: 0 0 8rpx 0;
+}
 </style>