From 4f365d70767407c76d25689a347071c4b51d7ed1 Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Wed, 20 Sep 2023 20:30:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=BE=E6=A0=A1=E5=88=97=E8=A1=A8=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/mixins.js                                |   8 +-
 components/callPhone/callPhone.vue                 |  25 ++++-
 config/api.js                                      |   5 +
 config/request.js                                  |   9 +-
 config/utils.js                                    |  46 +++++++-
 pages.json                                         |   2 +-
 pages/carEntry/operaAppointment/comp/step2.vue     |   2 +-
 pages/carEntry/operaAppointment/comp/step3.vue     |   6 +-
 pages/carEntry/operaAppointment/comp/step4.vue     |  24 +++--
 .../carEntry/operaAppointment/operaAppointment.vue |  30 ++++--
 pages/carEntry/simulateAppointment/comp/step1.vue  | 116 ++++++++++-----------
 pages/indexEntry/enroll/registInfo/registInfo.vue  |   8 --
 pages/indexEntry/findShcool/comp/schoolItem.vue    |  20 ++--
 pages/indexEntry/findShcool/findShcool.vue         |  48 +++++++--
 .../findShcool/shcoolDetail/comp/tab3.vue          |  31 ++++--
 .../findShcool/shcoolDetail/shcoolDetail.vue       |  31 +++++-
 pages/tabbar/index/index.vue                       |   2 +-
 pages/tabbar/learnCar/comp/subject1.vue            |   2 +-
 static/images/index/avatar.png                     | Bin 0 -> 4563 bytes
 19 files changed, 283 insertions(+), 132 deletions(-)
 create mode 100644 static/images/index/avatar.png

diff --git a/common/js/mixins.js b/common/js/mixins.js
index 07e9e85..8338488 100644
--- a/common/js/mixins.js
+++ b/common/js/mixins.js
@@ -12,5 +12,11 @@ export default {
 	data() {
 		return {
 		}
-	}
+	},
+	onPullDownRefresh() {
+		setTimeout(()=>{
+			uni.stopPullDownRefresh()
+		},1500)
+	},
+	
 }
\ No newline at end of file
diff --git a/components/callPhone/callPhone.vue b/components/callPhone/callPhone.vue
index f0e0094..81e6c62 100644
--- a/components/callPhone/callPhone.vue
+++ b/components/callPhone/callPhone.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="box">
-		<view class="phoneIcon" @click.stop="show=true">
+		<view class="phoneIcon" @click.stop="phoneClick">
 			<slot></slot>
 		</view>
 		<u-action-sheet :actions="servicePhone" :show="show" @select="callPhoneClick" :closeOnClickOverlay="true" @close="show=false" cancelText="取消"></u-action-sheet>
@@ -10,16 +10,31 @@
 
 <script>
 	export default {
+		// props: {
+		// 	servicePhone: {
+		// 		type: Array,
+		// 		default: []
+		// 	}
+		// },
+		props: ['servicePhone'],
 		data() {
 			return {
-				servicePhone: [
-					{name: '18267103167'},
-					{name: '18267103168'},
-				],
+				// servicePhone: [
+				// 	{name: '18267103167'},
+				// 	{name: '18267103168'},
+				// ],
 				show: false
 			}
 		},
 		methods: {
+			phoneClick() {
+				if(!this.servicePhone) return false
+				if(this.servicePhone.length==1) {
+					this.callPhoneClick(this.servicePhone[0])
+				}else {
+					show=true
+				}
+			},
 			callPhoneClick(item) {
 				
 				let phone = item.name
diff --git a/config/api.js b/config/api.js
index 5d72ef9..016d73b 100644
--- a/config/api.js
+++ b/config/api.js
@@ -12,6 +12,11 @@ export const getLoginCode = (data) => http.post('member/auth/send-sms-code', dat
 export const getUserInfo = (data) => http.post('member/user/get', {header: {'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'}})
 // 退出登录
 export const logOut = (data={}) => http.post('member/auth/logout', data, { custom: { noToken: true }})
+// 驾校列表分页
+export const schoolPage = (params) => http.get('business/school/page', {params: params})
+// 教练列表分页
+export const coachPage = (params) => http.get('business/coach/page', {params: params})
+
 
 
 
diff --git a/config/request.js b/config/request.js
index 567f460..6ee202b 100644
--- a/config/request.js
+++ b/config/request.js
@@ -33,14 +33,10 @@ module.exports = (vm) => {
 		if(token) {
 			config.header.Authorization = 'Bearer ' + token
 		}
-		// 如果不需要token就把header里的token删除,并且不需要去刷新token
 		let noToken = config.custom?.noToken
 		if(noToken&&config.header.Authorization) {
 			delete config.header.Authorization
 		}
-		if(!noToken) {
-			checkToken(vm)
-		}
 	    return config 
 	}, config => { // 可使用async await 做异步操作
 	    return Promise.reject(config)
@@ -79,6 +75,11 @@ module.exports = (vm) => {
 				return new Promise(() => { })
 			}
 		}
+		// 如果不需要token就把header里的token删除,并且不需要去刷新token
+		let noToken = response.config.custom?.noToken
+		if(!noToken) {
+			checkToken(vm)
+		}
 		return data === undefined ? {} : data
 	}, (response) => { 
 		// 对响应错误做点什么 （statusCode !== 200）
diff --git a/config/utils.js b/config/utils.js
index ee71161..7674692 100644
--- a/config/utils.js
+++ b/config/utils.js
@@ -1,13 +1,51 @@
-
-export function checkToken (vm) {
+export function checkToken(vm) {
 	let expiresTime = vm.$store.state.user.vuex_loginInfo.expiresTime
 	let nowTime = new Date() * 1
 	console.log('超时了')
 	console.log(expiresTime)
-	if(nowTime>expiresTime*1) {
+	if (nowTime > expiresTime * 1) {
 		vm.$store.commit('goLogin')
 		// 如果小于20分钟就刷新一下token && 
-	}else if((expiresTime*1 - nowTime) / 60000 < 10  ) {
+	} else if ((expiresTime * 1 - nowTime) / 60000 < 30) {
 		vm.$store.dispatch('refreshToken')
 	}
+}
+
+function dateRangeFn(dateRange) {
+	let tmp = []
+	let dateArr = []
+	dateRange.forEach((date) => {
+		let dateStr = date.toISOString().split('T')[0]
+		let dd = dateStr.split('-')[2]
+		const daysOfWeek = ['日', '一', '二', '三', '四', '五', '六'];
+		const dayOfWeek = date.getDay();
+		const weekName = daysOfWeek[dayOfWeek];
+		console.log(dateStr)
+		console.log(weekName)
+		if (tmp.length == 0) {
+			dateArr.push(tmp)
+		}
+		let obj = {
+			week: weekName,
+			num: dd,
+			date: dateStr
+		}
+		tmp.push(obj)
+		if (tmp.length == 5) {
+			tmp = []
+		}
+	});
+	console.log(dateArr)
+	return dateArr
+}
+
+export function getDates(startDate, endDate) {
+	const dates = [];
+	let currentDate = new Date(startDate);
+
+	while (currentDate <= endDate) {
+		dates.push(new Date(currentDate));
+		currentDate.setDate(currentDate.getDate() + 1);
+	}
+	return dateRangeFn(dates)
 }
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 17d49cd..5b274a6 100644
--- a/pages.json
+++ b/pages.json
@@ -129,7 +129,7 @@
 					"style": {
 						"navigationBarTitleText": "找驾校",
 						"navigationStyle": "custom",
-						"enablePullDownRefresh": false,
+						"enablePullDownRefresh": true,
 						"backgroundTextStyle": "dark" 
 					}
 				},
diff --git a/pages/carEntry/operaAppointment/comp/step2.vue b/pages/carEntry/operaAppointment/comp/step2.vue
index 08af994..976100d 100644
--- a/pages/carEntry/operaAppointment/comp/step2.vue
+++ b/pages/carEntry/operaAppointment/comp/step2.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="step2">
-		<searchBox placeholder="搜索场地名称"></searchBox>
+		<searchBox placeholder="搜索场地名称"  key="step3"></searchBox>
 		<view class="card" v-for="(item,index) in 10" :key="index" :class="{active: index==2}">
 			<view class="leftTxt">
 				<view class="name oneRowText">某某模拟驾驶馆</view>
diff --git a/pages/carEntry/operaAppointment/comp/step3.vue b/pages/carEntry/operaAppointment/comp/step3.vue
index adc9d33..b49da8c 100644
--- a/pages/carEntry/operaAppointment/comp/step3.vue
+++ b/pages/carEntry/operaAppointment/comp/step3.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="step3">
-		<searchBox placeholder="搜索车辆编号或车牌号"></searchBox>
+		<searchBox placeholder="搜索车辆编号或车牌号" key="step3"></searchBox>
 		<view class="card">
 			<view class="list">
 				<view class="listItem" v-for="(item,index) in list" :key="index" :class="{active: index==1}">
@@ -19,8 +19,10 @@
 	</view>
 </template>
 
-<script>
+<script> 
+	import searchBox from './searchBox'
 	export default {
+		components: { searchBox },
 		data() {
 			return {
 				list: [{
diff --git a/pages/carEntry/operaAppointment/comp/step4.vue b/pages/carEntry/operaAppointment/comp/step4.vue
index 373e65d..e8656d6 100644
--- a/pages/carEntry/operaAppointment/comp/step4.vue
+++ b/pages/carEntry/operaAppointment/comp/step4.vue
@@ -63,7 +63,7 @@
 		<view class="poz_btn">
 			<view class="btn_row" >
 				<view class="border btn" @click="changeStep(3)">返回上一步</view>
-				<view class="btn" >确认预约</view>
+				<view class="btn" @click="show = true">确认预约</view>
 			</view>
 		</view>
 		
@@ -73,20 +73,25 @@
 				<view class="content">
 					<view class="row">
 						<view class="lab">预约类型</view>
-						<view class="val">模拟器训练预约</view>
+						<view class="val">实操训练预约</view>
 					</view>
 					<view class="row">
-						<view class="lab">预约时间</view>
-						<view class="val">2023/08/08 08:00—9:00</view>
+						<view class="lab">预约科目</view>
+						<view class="val">科目二</view>
+					</view>
+					<view class="row">
+						<view class="lab">预约场地</view>
+						<view class="val">xxx场地</view>
 					</view>
 					<view class="row">
-						<view class="lab">模拟驾驶馆</view>
-						<view class="val">某某模拟驾驶馆</view>
+						<view class="lab">预约车辆</view>
+						<view class="val">02号车</view>
 					</view>
 					<view class="row">
-						<view class="lab">预约模拟器</view>
-						<view class="val">00002</view>
+						<view class="lab">预约时间</view>
+						<view class="val">2023/08/08 08:00—9:00</view>
 					</view>
+					
 				</view>
 				<view class="btn_row">
 					<view class="border btn" @click="show = false">返回修改</view>
@@ -108,7 +113,7 @@
 					{week: '四', num: '11'},
 					{week: '五', num: '12'},
 				],
-				show: true
+				show: false
 			}
 		},
 		methods: {
@@ -279,6 +284,7 @@
 			line-height: 70rpx;
 			font-size: 36rpx;
 			text-align: center;
+			margin-bottom: 20rpx;
 		}
 	
 		.content {
diff --git a/pages/carEntry/operaAppointment/operaAppointment.vue b/pages/carEntry/operaAppointment/operaAppointment.vue
index 9bc6412..e18ea49 100644
--- a/pages/carEntry/operaAppointment/operaAppointment.vue
+++ b/pages/carEntry/operaAppointment/operaAppointment.vue
@@ -1,27 +1,27 @@
 <template>
 	<view class="pageBgImg">
-		<topNavbar title="实操训练预约"></topNavbar>
+		<topNavbar :title="title"></topNavbar>
 		<view class="pad">
 			<view class="top_row">
 				<view class="step_row">
-					<view class="dian"  @click="changeStep(1)">
+					<!-- <view class="dian"  @click="changeStep(1)">
 						<view class="num" :class="{active: currentStep==1}">1</view>
-					</view>
-					<view class="line"></view>
+					</view> -->
+					<!-- <view class="line"></view> -->
 					<view class="dian"  @click="changeStep(2)">
-						<view class="num" :class="{active: currentStep==2}">2</view>
+						<view class="num" :class="{active: currentStep==2}">1</view>
 					</view>
 					<view class="line"></view>
 					<view class="dian"  @click="changeStep(3)">
-						<view class="num" :class="{active: currentStep==3}">3</view>
+						<view class="num" :class="{active: currentStep==3}">2</view>
 					</view>
 					<view class="line"></view>
 					<view class="dian"  @click="changeStep(4)">
-						<view class="num" :class="{active: currentStep==4}">4</view>
+						<view class="num" :class="{active: currentStep==4}">3</view>
 					</view>
 				</view>
 				<view class="step_text">
-					<view class="txt">选择科目</view>
+					<!-- <view class="txt">选择科目</view> -->
 					<view class="txt">选择场地</view>
 					<view class="txt">选择车辆</view>
 					<view class="txt">预约时间</view>
@@ -45,7 +45,19 @@
 		components: { step1, step2, step3, step4 },
 		data() {
 			return {
-				currentStep: 1
+				currentStep: 2,
+				subject: 2,
+				title: '实操训练预约'
+			}
+		},
+		onLoad(options) {
+			this.subject = options.subject
+			if(this.subject==2) {
+				this.title = '实操训练科目二预约'
+				this.currentStep = 2
+			}else if(this.subject==3) {
+				this.title = '实操训练科目三预约'
+				this.currentStep = 2
 			}
 		},
 		methods: {
diff --git a/pages/carEntry/simulateAppointment/comp/step1.vue b/pages/carEntry/simulateAppointment/comp/step1.vue
index 9257271..eba39fc 100644
--- a/pages/carEntry/simulateAppointment/comp/step1.vue
+++ b/pages/carEntry/simulateAppointment/comp/step1.vue
@@ -12,10 +12,12 @@
 					<view class="icon left" @click="changeDateIndex(-1)">
 						<u-icon name="arrow-left" :size="12" :color="'#fff'"></u-icon>
 					</view>
-					<view class="dateArr">
-						<view class="date" v-for="(item,index) in dateArr[currentDay]" :key="index" :class="{active: index==1}">
-							<view class="week">{{ item.week }}</view>
-							<view class="num">{{ item.num }}</view>
+					<view class="dateArr" >
+						<view class="dateWidth"  v-for="(item,index) in dateArr[currentDay]" :key="index"  @click="chooseDate(item)" >
+							<view class="date" :class="{active: chooseDay==item.date}">
+								<view class="week">{{ item.week }}</view>
+								<view class="num">{{ item.num }}</view>
+							</view>
 						</view>
 					</view>
 					<view class="icon right"  @click="changeDateIndex(1)">
@@ -29,32 +31,20 @@
 			<view class="timeCon">
 				<view class="h2">上午</view>
 				<view class="time_box">
-					<view class="time_item">
-						<view class="lab">已过期</view>
-						<view class="time">06:00-07:00</view>
-					</view>
-					<view class="time_item">
-						<view class="lab">已约满</view>
-						<view class="time">06:00-07:00</view>
-					</view>
-					<view class="time_item">
-						<view class="lab">可预约</view>
-						<view class="time">06:00-07:00</view>
+					<view class="time_item" v-for="(item,index) in timerArr" :key="index" @click="chooseTimerClick(item)" :class="{active: item.id==chooseTimerId, disable: item.status!==1}">
+						<view class="lab" v-if="item.status==3">已过期</view>
+						<view class="lab" v-if="item.status==2">已约满</view>
+						<view class="lab" v-if="item.status==1">可预约</view>
+						<view class="time">{{ item.timer }}</view>
 					</view>
 				</view>
 				<view class="h2">下午</view>
 				<view class="time_box">
-					<view class="time_item">
-						<view class="lab">已过期</view>
-						<view class="time">06:00-07:00</view>
-					</view>
-					<view class="time_item">
-						<view class="lab">已约满</view>
-						<view class="time">06:00-07:00</view>
-					</view>
-					<view class="time_item">
-						<view class="lab">可预约</view>
-						<view class="time">06:00-07:00</view>
+					<view class="time_item" v-for="(item,index) in timerArr2" :key="index" @click="chooseTimerClick(item)"  :class="{active: item.id==chooseTimerId,disable: item.status!==1}">
+						<view class="lab" v-if="item.status==3">已过期</view>
+						<view class="lab" v-if="item.status==2">已约满</view>
+						<view class="lab" v-if="item.status==1">可预约</view>
+						<view class="time">{{ item.timer }}</view>
 					</view>
 				</view>
 			</view>
@@ -65,42 +55,44 @@
 </template>
 
 <script>
+	import { getDates } from '@/config/utils.js'
 	export default {
 		data() {
 			return {
 				dateArr: [],
-				currentDay: 0
+				currentDay: 0,
+				chooseDay: '',
+				timerArr: [
+					{status: 1, timer: '06:00-07:00', id: 1},
+					{status: 2, timer: '06:00-07:00', id: 2},
+					{status: 3, timer: '06:00-07:00', id: 3},
+				],
+				timerArr2: [
+					{status: 1, timer: '06:00-07:00', id: 4},
+					{status: 2, timer: '06:00-07:00', id: 5},
+					{status: 3, timer: '06:00-07:00', id: 6},
+				],
+				chooseTimerId: ''
 			}
 		},
 		mounted() {
 			const startDate = new Date('2023-09-06');
-			const endDate = new Date('2023-09-19');
-			const dateRange = this.getDates(startDate, endDate);
-			console.log(dateRange)
-			let tmp = []
-			dateRange.forEach((date) => {
-			   let dateStr = date.toISOString().split('T')[0]
-			   let dd = dateStr.split('-')[2]
-			   const daysOfWeek = ['日', '一', '二', '三', '四', '五', '六'];
-			   const dayOfWeek = date.getDay();
-			   const weekName = daysOfWeek[dayOfWeek];
-			   console.log(dateStr)
-			   console.log(weekName)
-			   if(tmp.length==0) {
-				   this.dateArr.push(tmp)
-			   }
-			   let obj = {
-				   week: weekName,
-				   num: dd
-			   }
-			   tmp.push(obj)
-			   if(tmp.length==5) {
-				   tmp = []
-			   }
-			});
-			console.log(this.dateArr)
+			const endDate = new Date();
+			this.dateArr = getDates(startDate, endDate);
+			
+			
 		},
 		methods: {
+			// 选择时间
+			chooseTimerClick(item) {
+				if(item.status!=1) return this.$u.toast('请选择可预约时间')
+				this.chooseTimerId = item.id
+			},
+			// 选择日期
+			chooseDate(item) {
+				this.chooseDay = item.date
+				console.log(this.chooseDay)
+			},
 			changeDateIndex(num) {
 				if(this.currentDay==0&&num==-1) return
 				if(this.currentDay==this.dateArr.length-1&&num==1) return
@@ -110,17 +102,7 @@
 			changeStep(val) {
 				this.$emit('changeStep', val)
 			},
-			getDates(startDate, endDate) {
-			  const dates = [];
-			  let currentDate = new Date(startDate);
-			
-			  while (currentDate <= endDate) {
-			    dates.push(new Date(currentDate));
-			    currentDate.setDate(currentDate.getDate() + 1);
-			  }
 			
-			  return dates;
-			}
 		}
 	}
 </script>
@@ -174,7 +156,15 @@
 	      .dateArr {
 			  display: flex;
 			  padding: 0 70rpx;
-			  justify-content: space-between;
+			  // justify-content: space-between;
+			  &.oneDate {
+				  justify-content: center;
+			  }
+			  .dateWidth {
+				  width: 20%;
+				  display: flex;
+				  justify-content: center;
+			  }
 	        .date {
 				width: 74rpx;
 				height: 100rpx;
diff --git a/pages/indexEntry/enroll/registInfo/registInfo.vue b/pages/indexEntry/enroll/registInfo/registInfo.vue
index 64a5860..4006408 100644
--- a/pages/indexEntry/enroll/registInfo/registInfo.vue
+++ b/pages/indexEntry/enroll/registInfo/registInfo.vue
@@ -198,14 +198,6 @@
 					</view>
 				</view>
 				<view class="row">
-					<view class="lab">代收费</view>
-					<view class="rightCon">
-						<view class="row">
-							<view class="val">￥100</view>
-						</view>
-					</view>
-				</view>
-				<view class="row">
 					<view class="lab">合计</view>
 					<view class="rightCon">
 						<view class="row">
diff --git a/pages/indexEntry/findShcool/comp/schoolItem.vue b/pages/indexEntry/findShcool/comp/schoolItem.vue
index 86aad85..d02b6ed 100644
--- a/pages/indexEntry/findShcool/comp/schoolItem.vue
+++ b/pages/indexEntry/findShcool/comp/schoolItem.vue
@@ -1,18 +1,18 @@
 <template>
-	<view class="box">
+	<view class="box" >
 		<view class="img">
 			<image src="@/static/images/logo.png" mode=""></image>
 		</view>
 		<view class="textCon">
-			<view class="name">江西海正驾校</view>
+			<view class="name">{{ item.shortName }}</view>
 			<view class="starBox">
-				<u-rate active-color="#1989FA" inactive-color="#1989FA" gutter="1" :size="16" :value="4" disabled></u-rate>
-				<view class="num">4.9分</view>
+				<u-rate active-color="#1989FA" inactive-color="#1989FA" gutter="1" :size="16"  :value="item.stars" :readonly="true" style="pointer-events: none;"></u-rate>
+				<view class="num">{{item.stars}}分</view>
 			</view>
-			<view class="credit">行业信用AA</view>
+			<view class="credit">行业信用{{item.creditrating}}</view>
 			<view class="adr">距您1000.99公里</view>
 		</view>
-		<callPhone v-if="showPhone">
+		<callPhone v-if="showPhone" :servicePhone="[{name: item.phone}]">
 			<view class="pozPhone">
 				<image src="@/static/images/index/telephone.png" mode=""></image>
 			</view>
@@ -26,14 +26,20 @@
 			showPhone: {
 				type: Boolean,
 				default: true
+			},
+			item: {
+				type: Object,
+				default: {}
 			}
+		},
+		methods: {
+			
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
 	.box {
-		height: 208rpx;
 		background: #FFFFFF;
 		border-radius: 16rpx;
 		padding: 24rpx;
diff --git a/pages/indexEntry/findShcool/findShcool.vue b/pages/indexEntry/findShcool/findShcool.vue
index 66741ac..e91c1d6 100644
--- a/pages/indexEntry/findShcool/findShcool.vue
+++ b/pages/indexEntry/findShcool/findShcool.vue
@@ -17,16 +17,20 @@
 			</view>
 
 			<view class="ul">
-				<view class="li" v-for="(item,index) in 10" :key="index"  @click="goPage">
-					<schoolItme/>
+				<view class="li" v-for="(item,index) in listData" :key="index" >
+					<schoolItme :item="item"  @click.native="goPage(item)"/>
 				</view>
 			</view>
 		</view>
+		<view style="padding-bottom: 20rpx;">
+			<u-loadmore :status="status" />
+		</view>
 	</view>
 </template>
 
 <script>
 	import schoolItme from './comp/schoolItem.vue'
+	import { schoolPage } from '@/config/api.js'
 	export default {
 		components: { schoolItme },
 		data() {
@@ -48,16 +52,48 @@
 						text: '好评优先',
 						id: 3
 					},
-				]
+				],
+				params: {
+					pageNo: 1,
+					pageSize: 20,
+					lat: 30.27419537786047,
+					lng: 120.20633397715788,
+				},
+				total: 20,
+				listData: [],
+				status: 'loading'
+			}
+		},
+		onLoad() {
+			this.schoolPageFn()
+		},
+		onPullDownRefresh() {
+			this.listInit()
+		},
+		onReachBottom() {
+			if(this.total>this.listData.length) {
+				this.schoolPageFn()
 			}
 		},
 		methods: {
-			goPage() {
-				console.log(this.$goPage)
-				this.$goPage('/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail')
+			goPage(item) {
+				this.$goPage('/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail?schoolId='+ item.id)
 			},
 			tabClick(item) {
 				this.currentTab = item.id
+			},
+			async listInit() {
+				await this.schoolPageFn()
+				uni.stopPullDownRefresh()
+			},
+			// 获取驾校列表
+			async schoolPageFn() {
+				const {data: res} = await schoolPage(this.params)
+				this.params.pageNo ++
+				this.listData.push(...res.list)
+				this.total = res.total
+				if(this.listData.length>=this.total) this.status = 'nomore'
+				console.log(res)
 			}
 		}
 	}
diff --git a/pages/indexEntry/findShcool/shcoolDetail/comp/tab3.vue b/pages/indexEntry/findShcool/shcoolDetail/comp/tab3.vue
index c6fc0ac..e5bd9d5 100644
--- a/pages/indexEntry/findShcool/shcoolDetail/comp/tab3.vue
+++ b/pages/indexEntry/findShcool/shcoolDetail/comp/tab3.vue
@@ -1,19 +1,19 @@
 <template>
 	<view class="tabCon">
 		<view class="tab1">
-			<view class="card"  @click="$goPage('/pages/indexEntry/findShcool/coachComment/coachComment')">
+			<view class="card"  @click="goPage(item)" v-for="(item,index) in coachList" :key="index">
 				<view class="avatar">
-					<image src="@/static/images/logo.png" mode=""></image>
+					<image :src="item.photoPath" mode="" @error="handleImageError(item)"></image>
 				</view>
 				<view class="rightCon">
 					<view class="flex">
-						<view class="name">王一宝</view>
-						<view class="age">10年教龄</view>
+						<view class="name">{{ item.name }}</view>
+						<!-- <view class="age">10年教龄</view> -->
 					</view>
 					<view class="flex-b">
 						<view class="starBox">
-							<u-rate active-color="#1989FA" inactive-color="#1989FA" gutter="1" :size="16" :value="4" disabled></u-rate>
-							<view class="num">4.9分</view>
+							<u-rate active-color="#1989FA" inactive-color="#1989FA" gutter="1" :size="16" :value="item.stars" disabled style="pointer-events: none;"></u-rate>
+							<view class="num">{{item.stars}}分</view>
 						</view>
 						<view class="btn"  v-if="showSign">报名</view>
 						<view class="more" v-else>
@@ -24,12 +24,28 @@
 				</view>
 			</view>
 		</view>
+		<view style="padding-bottom: 20rpx;">
+			<u-loadmore :status="status" />
+		</view>
 	</view>
 </template>
 
 <script>
+	
 	export default {
-		props: ['showSign']
+		props: ['showSign', 'coachList', 'status'],
+		methods: {
+			goPage(item) {
+				if(this.showSign) {
+					
+				}else {
+					this.$goPage('/pages/indexEntry/findShcool/coachComment/coachComment?coachId='+ item.id)
+				}
+			},
+			handleImageError(item) {
+				item.photoPath = require('@/static/images/index/avatar.png')
+			}
+		}
 	}
 </script>
 
@@ -49,6 +65,7 @@
 	        height: 98rpx;
 			border-radius: 50%;
 			margin-right: 34rpx;
+			background-color: #f6f6f6;
 	      }
 		.rightCon {
 			flex: 1;
diff --git a/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue b/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
index 186f3a6..f4f0ef6 100644
--- a/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
+++ b/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
@@ -48,7 +48,7 @@
 			</view>
 			<tab1 v-show="currentNav==1"></tab1>
 			<tab2 v-show="currentNav==2"></tab2>
-			<tab3 v-show="currentNav==3"></tab3>
+			<tab3 v-show="currentNav==3" :coachList="coachList" :status="tab3Status"></tab3>
 			<tab4 v-show="currentNav==4"></tab4>
 		</view>
 	</view>
@@ -59,6 +59,7 @@
 	import tab2 from './comp/tab2.vue'
 	import tab3 from './comp/tab3.vue'
 	import tab4 from './comp/tab4.vue'
+	import { coachPage } from '@/config/api.js'
 	export default {
 		components: { tab1, tab2, tab3, tab4},
 		data() {
@@ -76,16 +77,40 @@
 					{text: '教练车', id: 4},
 				],
 				currentNav: 1,
-				
+				coachParams: {
+					pageNo: 1,
+					pageSize: 20
+				},
+				schoolId: '',
+				coachList: [],
+				tab3Status: 'loading',
+				tab3Total: 20
 			}
 		},
-		onLoad() {
+		onLoad(options) {
+			this.schoolId = options.schoolId
+			this.coachParams.schoolId = this.schoolId
+			this.coachPageFn()
+		},
+		onPullDownRefresh() {
 			
 		},
+		onReachBottom() {
+			if(this.currentNav==3&&this.coachList.length<this.tab3Total) {
+				this.coachPageFn()
+			}
+		},
 		methods: {
 			changeNav(item) {
 				this.currentNav = item.id
 			},
+			async coachPageFn() {
+				const {data: res} = await coachPage(this.coachParams)
+				this.coachParams.pageNo ++
+				this.coachList.push(...res.list)
+				this.tab3Total = res.total
+				if(this.coachList.length>=this.tab3Total) this.tab3Status = 'nomore'
+			}
 		}
 	}
 </script>
diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue
index f7813dc..074766b 100644
--- a/pages/tabbar/index/index.vue
+++ b/pages/tabbar/index/index.vue
@@ -147,7 +147,7 @@
 					},
 					{
 						text: '找驾驶馆',
-						icon: require('../../../static/images/index/ic_peilian.png'),
+						icon: require('../../../static/images/index/ic_jsg.png'),
 						url: '/pages/carEntry/simulateAppointment/simulateAppointment',
 						click: (item)=>{
 							this.$goPage(item.url)
diff --git a/pages/tabbar/learnCar/comp/subject1.vue b/pages/tabbar/learnCar/comp/subject1.vue
index bc88b3f..e1fd628 100644
--- a/pages/tabbar/learnCar/comp/subject1.vue
+++ b/pages/tabbar/learnCar/comp/subject1.vue
@@ -67,7 +67,7 @@
 				<view class="flex-b bg">
 					<view class="row">
 						<view class="text">前往“12123”APP预约考试</view>
-						<view class="btn" @click="$goPage('/pages/carEntry/operaAppointment/operaAppointment')">去预约</view>
+						<view class="btn" @click="$goPage('/pages/carEntry/operaAppointment/operaAppointment?subject=2')">去预约</view>
 					</view>
 				</view>
 			</view>
diff --git a/static/images/index/avatar.png b/static/images/index/avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3aa55cbf60f9c579ba9dd3e1b375ba2211d5fdf
GIT binary patch
literal 4563
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

literal 0
HcmV?d00001