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

common/css/common.css

@@ -155,6 +155,9 @@ image {
 .fs-22{
 	font-size: 22rpx;
 }
+.fs-24{
+	font-size: 24rpx;
+}
 .fs-26{
 	font-size: 26rpx;
 }
@@ -218,6 +221,12 @@ image {
 .p-24{
 	padding: 24rpx;
 }
+.p-t-10 {
+	padding-top: 10rpx;
+}
+.p-b-20 {
+	padding-bottom: 20rpx;
+}
 .plr-24{
 	padding: 0 24rpx;
 }
@@ -236,9 +245,18 @@ image {
 	margin-right: 24rpx;
 }
 
+.mb-12{
+	margin-bottom: 12rpx;
+}
+.mb-22{
+	margin-bottom: 22rpx;
+}
 .mb-24{
 	margin-bottom: 24rpx;
 }
+.mb-64{
+	margin-bottom: 64rpx;
+}
 
 
 /* 宽度 */

pages/me/index.vue

@@ -38,12 +38,95 @@
 					</view>
 				</view>
 			</view>
-			<view class="function-two b-rad-20 box-border-box flex-justify-space">
-				
+			<view class="function-two b-rad-20 box-border-box flex-justify-space mb-22">
+				<view class="function-two-left">
+					<view class="align-items-center mb-12 p-t-10">
+						<image class="lqzx-img" src="@/static/img/my/lqzx.png" mode=""></image>
+						<image class="to-right" src="@/static/img/toRight.png" mode=""></image>
+					</view>
+					<view class="fs-26 fc-9">
+						领券下单更优惠
+					</view>
+				</view>
+				<image class="function-two-right" src="@/static/img/my/q.png" mode=""></image>
 			</view>
 		</view>
-		<scroll-view :scroll-y="true" class="scroll-view-css" @scrolltolower="scrolltolower">
+		<scroll-view class="" :scroll-y="true" class="scroll-view-css" @scrolltolower="scrolltolower">
+			<view class="list-box function-one-box box-border-box">
+				<view class="list bgc-f b-rad-20">
+					<view class="item-box align-items-center flex-justify-space mb-64">
+						<view class="item-left align-items-center">
+							<image class="item-img" src="@/static/img/my/xxzx.png" mode=""></image>
+							<view class="fs-32 fc-3">
+								消息中心
+							</view>
+						</view>
+						<view class="item-right align-items-center">
+							<view class="fs-24 fc-9">
+								{{newsNum}}条未读消息
+							</view>
+							<image class="to-right" src="@/static/img/toRight.png" mode=""></image>
+						</view>
+					</view>
+					<view class="item-box align-items-center flex-justify-space mb-64">
+						<view class="item-left align-items-center">
+							<image class="item-img" src="@/static/img/my/lxkf.png" mode=""></image>
+							<view class="fs-32 fc-3">
+								联系客服
+							</view>
+						</view>
+						<view class="item-right align-items-center">
+							<image class="to-right" src="@/static/img/toRight.png" mode=""></image>
+						</view>
+					</view>
+					<view class="item-box align-items-center flex-justify-space mb-64">
+						<view class="item-left align-items-center">
+							<image class="item-img" src="@/static/img/my/swhz.png" mode=""></image>
+							<view class="fs-32 fc-3">
+								商务合作
+							</view>
+						</view>
+						<view class="item-right align-items-center">
+							<image class="to-right" src="@/static/img/toRight.png" mode=""></image>
+						</view>
+					</view>
+					<view class="item-box align-items-center flex-justify-space mb-64">
+						<view class="item-left align-items-center">
+							<image class="item-img" src="@/static/img/my/qszp.png" mode=""></image>
+							<view class="fs-32 fc-3">
+								骑手招聘
+							</view>
+						</view>
+						<view class="item-right align-items-center">
+							<image class="to-right" src="@/static/img/toRight.png" mode=""></image>
+						</view>
+					</view>
+					<view class="item-box align-items-center flex-justify-space mb-64">
+						<view class="item-left align-items-center">
+							<image class="item-img" src="@/static/img/my/wtfk.png" mode=""></image>
+							<view class="fs-32 fc-3">
+								问题反馈
+							</view>
+						</view>
+						<view class="item-right align-items-center">
+							<image class="to-right" src="@/static/img/toRight.png" mode=""></image>
+						</view>
+					</view>
+					<view class="item-box align-items-center flex-justify-space">
+						<view class="item-left align-items-center">
+							<image class="item-img" src="@/static/img/my/gywm.png" mode=""></image>
+							<view class="fs-32 fc-3">
+								关于我们
+							</view>
+						</view>
+						<view class="item-right align-items-center">
+							<image class="to-right" src="@/static/img/toRight.png" mode=""></image>
+						</view>
+					</view>
+				</view>
+			</view>
 		</scroll-view>
+		<view class="p-b-20 b-rad-20"></view>
 	</view>
 </template>
 
@@ -52,7 +135,8 @@
 		components: {},
 		data() {
 			return {
-				name:'仰看辉煌煌煌煌煌1111煌...仰看辉煌煌煌煌煌1111煌...仰看辉煌煌煌煌煌1111煌...'
+				name:'仰看辉煌煌煌煌煌1111煌...仰看辉煌煌煌煌煌1111煌...仰看辉煌煌煌煌煌1111煌...',
+				newsNum: 24
 			};
 		},
 		onLoad(data) {},
@@ -111,4 +195,28 @@
 	height: 80rpx;
 	margin: 0 0 8rpx 0;
 }
+.function-two-right{
+	width: 96rpx;
+	height: 96rpx;
+}
+.lqzx-img{
+	width: 137rpx;
+	height: 30rpx;
+	margin: 0 8rpx 0 0;
+}
+.to-right {
+	width: 32rpx;
+	height: 32rpx;
+}
+// .list-box{
+// 	padding: 0 24rpx 20rpx;
+// }
+.list{
+	padding: 32rpx 28rpx 32rpx 32rpx;
+}
+.item-img{
+	width: 48rpx;
+	height: 48rpx;
+	margin: 0 20rpx 0 0;
+}
 </style>