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

common/css/common.css

@@ -2,7 +2,7 @@ body {
   background-color: #F5F5F5;
 }
 view,text {
-  font-size: 14rpx;
+  font-size: 24rpx;
   color: #333;
 }
 image {
@@ -154,10 +154,16 @@ image {
 .fs-24{
 	font-size: 24rpx;
 }
+
+.fs-32{
+	font-size: 32rpx;
+}
+
 .fs-34{
 	font-size: 34rpx;
 }
 
+
 /* 字体粗细 */
 .fw-b{
 	font-weight: bold;
@@ -211,11 +217,17 @@ image {
 .m-24{
 	margin: 24rpx;
 }
+
+.ml-10{
+	margin-left: 10rpx;
+}
+
 .mr-24{
 	margin-right: 24rpx;
 }
 
 
+
 /* 宽度 */
 .w-100{
 	width: 100rpx;

components/en-utils/en-nav/en-nav.vue

@@ -1,7 +1,12 @@
 <template>
   <view class="">
     <view class="header" :style="style">
-      <view class="flexbox" :class="{'flexbox-xcx':(isXcx && rightShow)}"
+      <view class="flexbox" 
+		  :class="{
+		  'flexbox-xcx':(isXcx && rightShow),
+		  'flex-justify-space':!customNav,
+		  'align-items-center':!customNav,
+		  }"
         :style="[{'height': customBarH + 'px', 'padding-top': statusBarH + 'px','background':bgckgroundBox}]">
         <view @tap="goBack">
           <text  class="iconfont" v-if="leftShow">
@@ -144,10 +149,11 @@
     left: 0;
     top: 0;
     z-index: 999999;
+	
     .flexbox {
-      display: flex;
-	  align-items: center;
-      justify-content: space-between;
+      // display: flex;
+	  // align-items: center;
+      // justify-content: space-between;
       padding: 0 20px 20rpx;
       .iconfont{
         color: #333333;

pages/index/index.vue

@@ -2,13 +2,16 @@
 	<view class="index-box">
 		<Nav :leftShow='false' :customNav='true' bgckgroundBox='transparent'>
 			<template>
-				<view slot="custom">11</view>
+				<view slot="custom" class="align-items-center">
+					<uni-icons type="location-filled" size="20"></uni-icons>
+					<view class="fs-32 fw-600 ml-10">重庆邮电大学...</view>
+					<image class="nav-icon ml-10" src="@/static/img/index/index-right.png" mode=""></image>
+				</view>
 			</template>
 		</Nav>
 		
-		<view class="bg-img">
-			
-		</view>
+		<image class="bg-img" src="@/static/img/index/index-bg.png" mode="aspectFit"></image>
+
 	</view>
 
 </template>
@@ -40,8 +43,11 @@
 	.index-box{
 		.bg-img{
 			width: 100%;
-			height: 300rpx;
-			background-color: skyblue;
+			height: 1220rpx;
+		}
+		.nav-icon{
+			width: 32rpx;
+			height: 32rpx;
 		}
 	}