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

# Conflicts:
#	common/css/common.css

common/css/common.css

@@ -227,6 +227,10 @@ image {
 .p-b-20 {
 	padding-bottom: 20rpx;
 }
+.plr-24{
+	padding: 0 24rpx;
+}
+
 
 /* 外边距 */
 .m-24{

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

@@ -154,7 +154,7 @@
       // display: flex;
 	  // align-items: center;
       // justify-content: space-between;
-      padding: 0 20px 20rpx;
+      padding: 0 24rpx 20rpx;
       .iconfont{
         color: #333333;
 		font-size: 34rpx;

pages/index/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="index-box">
-		<Nav :leftShow='false' :customNav='true' bgckgroundBox='transparent'>
+		<Nav :leftShow='false' :customNav='true' :bgckgroundBox='bgckgroundBox'>
 			<template>
 				<view slot="custom" class="align-items-center">
 					<uni-icons type="location-filled" size="20"></uni-icons>
@@ -11,26 +11,29 @@
 		</Nav>
 		
 		<image class="bg-img" src="@/static/img/index/index-bg.png" mode="aspectFit"></image>
-
+		
+		
+		<view class="index-box-1 box-border-box plr-24">
+			11111111111111
+		</view>
 	</view>
 
 </template>
 <script>
 
   export default {
-		components: {
-
-		},
 		data() {
 			return {
-
+				bgckgroundBox:'transparent',
 			}
 		},
-		watch: {
-
-
+		onPageScroll(e) {
+			if(e.scrollTop>1){
+				this.bgckgroundBox = '#fff';
+			}else{
+				this.bgckgroundBox = 'transparent';
+			}
 		},
-
 		mounted() {
       
 		},
@@ -41,14 +44,23 @@
 </script>
 <style lang="scss" scoped>
 	.index-box{
+		position: relative;
 		.bg-img{
 			width: 100%;
 			height: 1220rpx;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: -1;
 		}
 		.nav-icon{
 			width: 32rpx;
 			height: 32rpx;
 		}
+		.index-box-1{
+			width: 100%;
+			height: 3000rpx;
+		}
 	}
 
 </style>