pagebgimg修改

6 months ago · 2224e0c5ae
23 changed files with 66 additions and 84 deletions
--- a/common/css/app.scss
+++ b/common/css/app.scss
@ -38,15 +38,40 @@ view {
 	color: #333;
 	font-size: 28rpx;
 	min-height: 100vh;
+	position: relative;
+	width: 100%;
+	padding-bottom: 50rpx;
 }
 .pageBgImg {
 	font-size: 28rpx;;
 	color: #333;
 	background: #F6F6F6;
-	background-color: #1989fa;
+	position: relative;
 	width: 100%;
-	height: 324rpx;
+	z-index: 0;
+	min-height: 100vh;
+	padding-bottom: 50rpx;
+	&::before {
+		content: '';
+		position: absolute;
+		left: 0;
+		top: 0;
+		z-index: -2;
+		height: 324rpx;
+		width: 100%;
+		background-color: #1989fa;
+	}
 }
+
+.bgImg {
+	height: auto;
+	width: 100%;
+	background-color: #1989fa;
+}
+.poz2 {
+		position: relative;
+		z-index: 2;
+	}
 .pad {
 	padding: 0 28rpx;
 }
--- a/components/scrollNav/scrollNav.vue
+++ b/components/scrollNav/scrollNav.vue
@ -21,7 +21,7 @@
 <style lang="scss" scoped>
 	.scroll-view_w {
 		width: 100%;
-		margin: 30rpx  0 40rpx 0;
+		margin: 30rpx  0 20rpx 0;
 		.tabs {
 			display: flex;
 			flex-wrap: nowrap;
--- a/pages/indexEntry/settlement/detail/detail.vue
+++ b/pages/indexEntry/settlement/detail/detail.vue
@ -1,7 +1,5 @@
 <template>
-	<view class="pageBg">
-		
-	<view class="pageBgImg ">
+	<view class="pageBgImg">
 		<topNavbar title="结算明细"></topNavbar>
 		<view class="pad">
 			<view class="card">
@ -51,7 +49,6 @@
 			</view>
 		</view>
 	</view>
-	</view>
 </template>

 <script>
--- a/pages/indexEntry/settlement/settlement.vue
+++ b/pages/indexEntry/settlement/settlement.vue
@ -1,7 +1,7 @@
 <template>
 	<!-- 结算明细 -->
 	<view class="pageBg">
-		<view class="pageBgImg">
+		<view class="bgImg">
 			<topNavbar title="结算明细"></topNavbar>
 			<view class="pad">
 				<searchRow placeholder="搜索学员姓名/学员手机号"  @searchFn="searchFn"/>
@ -36,7 +36,7 @@
 		</view>
 		
 		<u-datetime-picker :show="showDatePicker" v-model="searchMonth" mode="year-month" :visibleItemCount="4"
-			:closeOnClickOverlay="false" @confirm="confirmDatePicker" @cancel="cancelDatePicker"></u-datetime-picker>
+			:closeOnClickOverlay="false" @confirm="confirmDatePicker" @cancel="showDatePicker=false"></u-datetime-picker>
 	</view>
 </template>

@ -155,7 +155,7 @@
 </script>

 <style lang="scss" scoped>
-	.pageBgImg {
+	.bgImg {
 		height: 100%;
 	}

--- a/pages/recordEntry/operate/todayStudent/todayStudent.vue
+++ b/pages/recordEntry/operate/todayStudent/todayStudent.vue
@ -1,5 +1,4 @@
 <template>
-	<view class="pageBg">
 		
 	<view class="pageBgImg">
 		<topNavbar title="上课学员"></topNavbar>
@ -60,7 +59,6 @@
 		</view>
 		<nodata v-else style="margin-top: 320rpx;"></nodata>
 	</view>
-	</view>
 </template>

 <script>
--- a/pages/recordEntry/student/addStudent/addStudent.vue
+++ b/pages/recordEntry/student/addStudent/addStudent.vue
@ -1,6 +1,4 @@
 <template>
-	<view class="pageBg">
-		
 	<view class="pageBgImg">
 		<topNavbar title="选择学员"></topNavbar>
 		<view class="pad">
@ -27,9 +25,7 @@
 				<view class="btnBg" @click="studentBindCoachFn">确认学员</view>
 			</view>
 		</view>
-		</view>
-		
-	</view>
+	 </view>
 </template>

 <script>
--- a/pages/recordEntry/student/addStudent/searchStudent.vue
+++ b/pages/recordEntry/student/addStudent/searchStudent.vue
@ -1,6 +1,4 @@
 <template>
-	<view class="pageBg">
-		
 	<view class="pageBgImg">
 		<topNavbar title="选择学员"></topNavbar>
 		<view class="pad">
@ -26,8 +24,6 @@
 				<view class="btnBg" @click="addSearchSudent">确认学员</view>
 			</view>
 		</view>
-		</view>
-		
 	</view>
 </template>

--- a/pages/recordEntry/student/studentDetail/studentDetail.vue
+++ b/pages/recordEntry/student/studentDetail/studentDetail.vue
@ -1,14 +1,13 @@
 <template>
 	<view class="pageBg">
-		
-	<view class="pageBgImg">
-		<topNavbar title="学员详情"></topNavbar>
-		<view class="pad" >
-			<cardNav :navData="navData" :currentNav="currentNav" @changeNav="changeNav"></cardNav>
+		<view class="bgImg">
+			<topNavbar title="学员详情"></topNavbar>
+			<view class="pad" >
+				<cardNav :navData="navData" :currentNav="currentNav" @changeNav="changeNav"></cardNav>
+			</view>
+			<scrollNav @changeTab="changeTab" :currentTab="currentTab" :tabData="tabData" v-if="currentNav==1"/>
 		</view>

-		<scrollNav @changeTab="changeTab" :currentTab="currentTab" :tabData="tabData" v-if="currentNav==1"/>
-
 		<view class="pad">
 			<view class="con" v-if="currentNav==1">
 				<list :list="list"></list>
@ -18,7 +17,6 @@
 			</view>
 		</view>
 	</view>
-	</view>
 </template>

 <script>
@ -34,7 +32,7 @@
 		},
 		data() {
 			return {
-				currentTab: 1,
+				currentTab: 0,
 				currentNav: 1,
 				tabData: [{
 						text: '全部',
@ -100,7 +98,10 @@
 </script>

 <style lang="scss" scoped>
-
-
-
+.bgImg  {
+	padding-bottom: 1rpx;
+}
+.con {
+	margin-top: 20rpx;
+}
 </style>
--- a/pages/tabbar/mine/index.vue
+++ b/pages/tabbar/mine/index.vue
@ -1,6 +1,4 @@
 <template>
-	<view class="pageBg">
-		
 	<view class="pageBgImg">
 		<view class="status_bar"></view>
 		<view class="" style="height: 44rpx;"></view>
@ -35,7 +33,6 @@
 		
 		<UserTab name ='我的'></UserTab>
 	</view>
-	</view>
 </template>

 <script>
--- a/pages/tabbar/operateTrain/index.vue
+++ b/pages/tabbar/operateTrain/index.vue
@ -1,13 +1,12 @@
 <template>
-	<view class="pageBg">
-		
-	<view class="pageBgImg pad">
+	<view class="pageBgImg">
+	<view class=" pad">
 		<view class="status_bar"></view>
 		<view class="" style="height: 44rpx;"></view>
 		<view class="searchBox">
 			<searchRow placeholder="搜索学员姓名、学员手机号" @searchFn="searchFn"></searchRow>
 		</view>
-		<view class="card">
+		<view class="card" style="margin-bottom: 20px;">
 			<view class="myClass">
 				<view class="leftTxt">我的排课</view>
 				<view class="leftBtn" @click="$goPage('/pages/recordEntry/operate/mySchedule/mySchedule')">去管理</view>
@ -229,12 +228,8 @@
 </script>

 <style lang="scss" scoped>
-	.pageBg {
-		padding-bottom: 100rpx;
-		.pageBgImg {
-			height: 100%;
-			padding-bottom: 30rpx;
-		}
+	.pageBgImg {
+		padding-bottom: 130rpx;
 		.searchBox {
 			padding:  24rpx 0;
 		}
--- a/pages/tabbar/student/index.vue
+++ b/pages/tabbar/student/index.vue
@ -1,9 +1,9 @@
 <template>
-	<view class="pageBg">
-		
-	<view class="pageBgImg pad" >
+	<view class="pageBgImg">
+	<!-- <view class="pageBgImg"></view> -->
+	<view class="pad" >
 	<!-- <view class="pad"  :style="{ background: `url(${imgUrl}) #f6f6f6 no-repeat`, backgroundSize: backgroundSize }" > -->
-		<view class="status_bar"></view>
+		<view class="status_bar "></view>
 		<view class="" style="height: 30rpx;"></view>
 		<!-- <view class="searchBox">
 			<searchRow placeholder="搜索学员姓名、学员手机号"></searchRow>
@ -31,12 +31,12 @@
 				</view>
 			</view>
 		</view> -->
-			<view class="searchBox" v-if="identity=='校长'">
+			<view class="searchBox " >
 				<searchRow placeholder="搜索学员姓名、学员手机号" @searchFn="searchFn"></searchRow>
 			</view>
 			<!-- <topUserInfo v-if="identity=='实操教练'"/> -->
 			
-			<view class="card">
+			<view class="card ">
 				<view class="h2" v-if="identity=='实操教练'">我的学员</view>
 				<view class="statistics">
 					<view class="statisticsItem">
@ -257,9 +257,11 @@
 	.pad {
 		padding-bottom: 110rpx;
 	}
+	
 	.card {
 		padding: 0 28rpx;
 		margin-bottom: 24rpx;
+		
 	}
 	.searchBox {
 		padding:  0rpx 0 24rpx 0;
--- a/pages/userCenter/forgetPwd/forgetPwd.vue
+++ b/pages/userCenter/forgetPwd/forgetPwd.vue
@ -1,5 +1,4 @@
 <template>
-	<view class="pageBg">
 		
 	<view class="pageBgImg">
 		<topNavbar title="修改密码"></topNavbar>
@ -31,7 +30,6 @@
 			<view class="btnBg" :class="{hui: !highlight}" @click="updatePasswordFn">确认修改</view>
 		</view>
 	</view>
-	</view>
 </template>

 <script>
--- a/pages/userCenter/myCar/myCar.vue
+++ b/pages/userCenter/myCar/myCar.vue
@ -1,5 +1,4 @@
 <template>
-	<view class="pageBg">
 		
 	<view class="pageBgImg">
 		<topNavbar title="我的车辆"></topNavbar>
@ -33,7 +32,6 @@
 		</view>
 		<nodata v-if="!list.length&&status=='nomore'"></nodata>
 	</view>
-	</view>
 </template>

 <script>
--- a/pages/userCenter/myCar/notBound/notBound.vue
+++ b/pages/userCenter/myCar/notBound/notBound.vue
@ -1,6 +1,4 @@
 <template>
-	<view class="pageBg">
-		
 	<view class="pageBgImg">
 		<topNavbar title="未绑定的车辆"></topNavbar>
 		<view class="pad">
@ -24,7 +22,6 @@
 			<nodata v-if="!list.length&&status=='nomore'"></nodata>
 		</view>
 	</view>
-	</view>
 </template>

 <script>
--- a/pages/userCenter/personaInfo/personaInfo.vue
+++ b/pages/userCenter/personaInfo/personaInfo.vue
@ -1,6 +1,4 @@
 <template>
-	<view class="pageBg">
-		
 	<view class="pageBgImg">
 		<topNavbar title="人个中心"></topNavbar>
 		<view class="pad">
@ -51,7 +49,6 @@
 			
 		</view>
 	</view>
-	</view>
 </template>

 <script>
--- a/pages/userCenter/refund/refund.vue
+++ b/pages/userCenter/refund/refund.vue
@ -1,6 +1,6 @@
 <template>
 	<view class="pageBg">
-		<view class="pageBgImg">
+		<view class="bgImg">
 			<view class="status_bar"></view>
 			<topNavbar title="学员退款"></topNavbar>
 			<view class="pad">
@ -153,7 +153,7 @@
 </script>

 <style lang="scss" scoped>
-	.pageBgImg {
+	.pageBg {
 		height: auto;
 		padding-bottom: 110rpx;
 	}
--- a/pages/userCenter/scanCode/scanCode.vue
+++ b/pages/userCenter/scanCode/scanCode.vue
@ -1,6 +1,4 @@
 <template>
-	<view class="pageBg">
-		
 	<view class="pageBgImg">
 		<topNavbar title="个人二维码"></topNavbar>
 		<view class="pad">
@ -25,7 +23,6 @@
 			</view> -->
 		</view>
 	</view>
-	</view>
 </template>

 <script>
--- a/pages/userCenter/scanCode/scanCodeSchool.vue
+++ b/pages/userCenter/scanCode/scanCodeSchool.vue
@ -1,6 +1,4 @@
 <template>
-	<view class="pageBg">
-		
 	<view class="pageBgImg">
 		<topNavbar title="驾校二维码"></topNavbar>
 		<view class="pad">
@ -20,7 +18,6 @@
 			</view>
 		</view>
 	</view>
-	</view>
 </template>

 <script>
--- a/pages/userCenter/schoolCoach/coachComment/coachComment.vue
+++ b/pages/userCenter/schoolCoach/coachComment/coachComment.vue
@ -1,6 +1,4 @@
 <template>
-	<view class="pageBg">
-		
 	<view class="pageBgImg">
 		<topNavbar title="教练详情"></topNavbar>
 		<view class="pad">
@ -13,7 +11,6 @@
 			</view>
 			<nodata v-if="!list.length&&status=='nomore'"></nodata>
 		</view>
-		</view>
 	</view>
 </template>

--- a/pages/userCenter/schoolCoach/schoolCoach.vue
+++ b/pages/userCenter/schoolCoach/schoolCoach.vue
@ -1,6 +1,4 @@
 <template>
-	<view class="pageBg">
-		
 	<view class="pageBgImg">
 		<topNavbar title="驾校教练"></topNavbar>
 		<view class="pad">
@ -30,7 +28,6 @@
 		</view>
 		<nodata v-if="!list.length&&status=='nomore'"></nodata>
 	</view>
-	</view>
 </template>


--- a/pages/userCenter/schoolSite/schoolSite.vue
+++ b/pages/userCenter/schoolSite/schoolSite.vue
@ -1,6 +1,4 @@
 <template>
-	<view class="pageBg">
-		
 	<view class="pageBgImg">
 		<topNavbar title="驾校场地"></topNavbar>
 		<view class="pad">
@ -32,7 +30,6 @@
 		</view>
 		<nodata v-if="!list.length&&status=='nomore'"></nodata>
 	</view>
-	</view>
 </template>


--- a/pages/userCenter/settled/settled.vue
+++ b/pages/userCenter/settled/settled.vue
@ -1,6 +1,4 @@
 <template>
-	<view class="pageBg">
-		
 	<view class="pageBgImg">
 		<view class="searchBox">
 			<topNavbar title="待结算记录"></topNavbar>
@ -56,7 +54,6 @@
 			
 		</view>
 	</view>
-	</view>
 </template>

 <script>
--- a/pages/userCenter/studentComment/studentComment.vue
+++ b/pages/userCenter/studentComment/studentComment.vue
@ -1,7 +1,7 @@
 <template>
 	<view class="pageBg">
 		
-	<view class="pageBgImg">
+	<view class="bgImg">
 		<topNavbar title="学员评价"></topNavbar>
 		<view class="pad">
 			<view class="searchBox">
@ -142,7 +142,7 @@


 <style lang="scss" scoped>
-	.pageBgImg {
+	.bgImg {
 		height: auto;
 		padding-bottom: 10rpx;
 	}
@ -150,6 +150,9 @@
 		padding: 28rpx;
 		margin-bottom: 20rpx;
 	}
+	.list {
+		margin-top: 20rpx;
+	}
 	.tabs {
 		display: flex;
 		justify-content: space-between;