From 69e623d5d81c1e34b7909968bd54b5702d30fb8a Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Wed, 22 Nov 2023 14:36:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=AD=A6=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/commentItem/commentItem.vue             |  17 ++-
 config/api.js                                      |   5 +
 pages.json                                         |  12 +-
 .../recordEntry/student/addStudent/addStudent.vue  |  69 +++++++++--
 .../student/addStudent/searchStudent.vue           | 138 +++++++++++++++++++++
 pages/tabbar/operateTrain/index.vue                |   2 +-
 pages/tabbar/statistics/comp/comp.scss             |   1 +
 pages/tabbar/statistics/comp/examinCoach.vue       |   6 +-
 pages/tabbar/statistics/comp/topUserInfo.vue       |   4 +-
 pages/tabbar/student/index.vue                     |  16 ++-
 10 files changed, 248 insertions(+), 22 deletions(-)
 create mode 100644 pages/recordEntry/student/addStudent/searchStudent.vue

diff --git a/components/commentItem/commentItem.vue b/components/commentItem/commentItem.vue
index 04ea11f..3799ce0 100644
--- a/components/commentItem/commentItem.vue
+++ b/components/commentItem/commentItem.vue
@@ -7,7 +7,7 @@
 				<view class="date">{{ $u.timeFormat(item.createTime, 'yyyy-mm-dd')}}</view>
 			</view>
 			<view class="starBox">
-				<u-rate active-color="#1989FA" inactive-color="#1989FA" gutter="1" :size="16" :value="4" :readonly="true"></u-rate>
+				<u-rate active-color="#1989FA" inactive-color="#1989FA" gutter="1" :size="16" :value="item.stars" :readonly="true"></u-rate>
 				<view class="num">{{item.stars}}分</view>
 			</view>
 			<view class="text">{{item.description}}</view>
@@ -19,6 +19,10 @@
 			<view class="imgBox" v-if="item.images&&item.images.length">
 				<u-album :urls="item.images"  :multipleSize="'160rpx'"></u-album>
 			</view>
+			<view class="vdo" v-if="item.videoUrl">
+				<video :src="item.videoUrl" objectFit="fill"></video>
+			</view>
+			
 		</view>
 		
 	</view>
@@ -76,4 +80,15 @@
 		margin-right: 24rpx;
 	  }
 	}
+	.vdo {
+		margin-top: 12rpx;
+		width: 360rpx;
+		height: 296rpx;
+		border-radius: 8rpx;
+		overflow: hidden;
+		video {
+			width: 100%;
+			height: 100%;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/config/api.js b/config/api.js
index 979635c..cd15b0a 100644
--- a/config/api.js
+++ b/config/api.js
@@ -78,6 +78,11 @@ export const siteCarPage = (params) => http.get('business/site-car/page', {param
 export const studentOwner = (params) => http.get('business/student-record/owner', {params}) 
 // 获得学员档案记录列表
 export const studentList = (params) => http.get('business/student-record/page', {params}) 
+// 绑定教练
+export const studentBindCoach = (data) => http.post('business/student-record/bindCoach', data) 
+
+
+
 
 
 
diff --git a/pages.json b/pages.json
index 7fce8b7..bd06ff4 100644
--- a/pages.json
+++ b/pages.json
@@ -179,11 +179,19 @@
 					"style": {
 						"navigationBarTitleText": "添加学员",
 						"navigationStyle": "custom",
-						"enablePullDownRefresh": false,
+						"enablePullDownRefresh": true,
+						"backgroundTextStyle": "dark" 
+					}
+				},
+				{
+					"path": "student/addStudent/searchStudent",
+					"style": {
+						"navigationBarTitleText": "搜索学员",
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": true,
 						"backgroundTextStyle": "dark" 
 					}
 				}
-				
 			]
 		},
 		{
diff --git a/pages/recordEntry/student/addStudent/addStudent.vue b/pages/recordEntry/student/addStudent/addStudent.vue
index 8a67825..10118a7 100644
--- a/pages/recordEntry/student/addStudent/addStudent.vue
+++ b/pages/recordEntry/student/addStudent/addStudent.vue
@@ -3,21 +3,26 @@
 		<topNavbar title="选择学员"></topNavbar>
 		<view class="pad">
 			<view class="searchBox">
-				<searchRow placeholder="搜索学员姓名、学员手机号"></searchRow>
+				<searchRow placeholder="搜索学员姓名、学员手机号" @click.native="$goPage('/pages/recordEntry/student/addStudent/searchStudent')"></searchRow>
 			</view>
 			<view class="ul">
-				<view class="li" v-for="(item,index) in list" :key="index">
+				<view class="li" v-for="(item,index) in list" :key="index" @click="chooseSudent(item)">
 					<view class="icon">
-						<image src="@/static/images/index/radio_cli.png" mode=""></image>
-						<!-- <image src="@/static/images/index/radio.png" mode=""></image> -->
+						<image src="@/static/images/index/radio_cli.png" mode="" v-if="studentIds.indexOf(item.id)!=-1"></image>
+						<image src="@/static/images/index/radio_nor.png" mode="" v-else></image>
 					</view>
 					<view class="name">{{item.name}}</view>
 				</view>
 			</view>
 			
+			<view style="padding-bottom: 100rpx;" v-if="list.length>6">
+				<u-loadmore :status="status" />
+			</view>
+			<nodata v-if="!list.length&&status=='nomore'"></nodata>
+			
 			<view class="btn_row">
-				<view class="btnBorder">已选学员（4）</view>
-				<view class="btnBg">确认学员</view>
+				<view class="btnBorder">已选学员（{{studentIds.length}}）</view>
+				<view class="btnBg" @click="studentBindCoachFn">确认学员</view>
 			</view>
 		</view>
 		
@@ -26,7 +31,7 @@
 </template>
 
 <script>
-	import { studentList } from '@/config/api.js'
+	import { studentList, studentBindCoach } from '@/config/api.js'
 	export default {
 		data() {
 			return {
@@ -38,20 +43,65 @@
 					status: 0,
 				},
 				total:  40,
-				list: []
+				list: [],
+				status: 'loading',
+				studentIds: []
 			}
 		},
 		onLoad() {
+			uni.$on('addSearchSudent',(ids)=>{
+				console.log('监听不到？')
+				this.studentIds = [...new Set([...this.studentIds,...ids])]
+			})
 			this.params.schoolId = this.vuex_schoolId
-			// this.params.coachId = this.vuex_coachId
 			this.studentListFn()
 		},
+		onPullDownRefresh() {
+			this.initList()
+		},
+		onReachBottom() {
+			if(this.total>this.list.length) {
+				this.studentListFn()
+			}
+		},
 		methods: {
+			initList() {
+				this.params.pageNo = 1
+				this.list = []
+				this.studentListFn()
+			},
 			async studentListFn() {
 				const {data: res} = await studentList(this.params)
 				this.params.pageNo ++
 				this.total = res.total
 				this.list.push(...res.list)
+				if(this.list.length>=this.total) this.status = 'nomore'
+			},
+			
+			chooseSudent(item) {
+				let index = this.studentIds.indexOf(item.id)
+				if(index==-1) {
+					this.studentIds.push(item.id)
+				}else {
+					this.studentIds.splice(index,1)
+				}
+			},
+			async studentBindCoachFn() {
+				if(!this.studentIds.length) return this.$u.toast('请搜索并选择学员')
+				let obj = {
+				  "studentIds": this.studentIds,
+				  "coachId": this.vuex_coachId,
+				  // "coachName": this.vuex_
+				}
+				const res = await studentBindCoach(obj)
+				if(res.code==0) {
+					this.$u.toast('绑定学员成功')
+					setTimeout(()=>{
+						uni.switchTab({
+							url: '/pages/tabbar/student/index'
+						})
+					},1500)
+				}
 			}
 		}
 	}
@@ -72,7 +122,6 @@
 	}
 	.ul {
 		width: 100%;
-		padding-bottom: 120rpx;
 		.li {
 			display: flex;
 			align-items: center;
diff --git a/pages/recordEntry/student/addStudent/searchStudent.vue b/pages/recordEntry/student/addStudent/searchStudent.vue
new file mode 100644
index 0000000..96eddf6
--- /dev/null
+++ b/pages/recordEntry/student/addStudent/searchStudent.vue
@@ -0,0 +1,138 @@
+<template>
+	<view class="pageBgImg">
+		<topNavbar title="选择学员"></topNavbar>
+		<view class="pad">
+			<view class="searchBox">
+				<searchRow placeholder="搜索学员姓名、学员手机号" @searchFn="searchFn"></searchRow>
+			</view>
+			<view class="ul">
+				<view class="li" v-for="(item,index) in list" :key="index" @click="chooseSudent(item)">
+					<view class="icon">
+						<image src="@/static/images/index/radio_cli.png" mode="" v-if="studentIds.indexOf(item.id)!=-1"></image>
+						<image src="@/static/images/index/radio_nor.png" mode="" v-else></image>
+					</view>
+					<view class="name">{{item.name}}</view>
+				</view>
+			</view>
+			
+			<view style="padding-bottom: 100rpx;" v-if="list.length>6">
+				<u-loadmore :status="status" />
+			</view>
+			<nodata v-if="!list.length&&status=='nomore'"></nodata>
+			
+			<view class="btn_row">
+				<view class="btnBg" @click="addSearchSudent">确认学员</view>
+			</view>
+		</view>
+		
+		
+	</view>
+</template>
+
+<script>
+	import { studentList, studentBindCoach } from '@/config/api.js'
+	export default {
+		data() {
+			return {
+				params: {
+					pageNo: 1,
+					pageSize: 40,
+					schoolId: '',
+					coachId: '',
+					status: 0,
+				},
+				total:  40,
+				list: [],
+				status: 'loading',
+				studentIds: []
+			}
+		},
+		onLoad() {
+			this.params.schoolId = this.vuex_schoolId
+		},
+		onPullDownRefresh() {
+			this.initList()
+		},
+		onReachBottom() {
+			if(this.total>this.list.length) {
+				this.studentListFn()
+			}
+		},
+		methods: {
+			initList() {
+				this.params.pageNo = 1
+				this.list = []
+				this.studentListFn()
+			},
+			async studentListFn() {
+				const {data: res} = await studentList(this.params)
+				this.params.pageNo ++
+				this.total = res.total
+				this.list.push(...res.list)
+				if(this.list.length>=this.total) this.status = 'nomore'
+			},
+			searchFn(val) {
+				this.params.keyWord = val
+				this.initList()
+			},
+			chooseSudent(item) {
+				let index = this.studentIds.indexOf(item.id)
+				if(index==-1) {
+					this.studentIds.push(item.id)
+				}else {
+					this.studentIds.splice(index,1)
+				}
+			},
+			addSearchSudent() {
+				if(!this.studentIds.length) return this.$u.toast('请搜索并选择学员')
+				uni.$emit('addSearchSudent',this.studentIds )
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.btn_row {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		padding: 10rpx 0 40rpx 0rpx;
+		z-index: 9;
+		width: 100%;
+		
+	}
+	.searchBox {
+		padding: 20rpx 0;
+	}
+	.ul {
+		width: 100%;
+		.li {
+			display: flex;
+			align-items: center;
+			height: 108rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			border: 2rpx solid rgba(25,137,250,0.2);
+			margin-bottom: 20rpx;
+			padding: 0 20rpx;
+			.icon {
+				width: 32rpx;
+				height: 32rpx;
+			}
+			.name {
+				padding: 0 20rpx;
+			}
+		}
+	}
+	.btn_row {
+		display: flex;
+		justify-content: center;
+		.btnBorder {
+			width: 40%;
+		}
+		.btnBg {
+			width: 56%;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/operateTrain/index.vue b/pages/tabbar/operateTrain/index.vue
index 1070a4a..b548b1a 100644
--- a/pages/tabbar/operateTrain/index.vue
+++ b/pages/tabbar/operateTrain/index.vue
@@ -55,7 +55,7 @@
 				:minDate="1587524800000"
 				@confirm="confirmDatePicker"
 				 @cancel="cancelDate"
-				 cancelText="所有日期"
+				 cancelText="不限日期"
 				 @close="showDatePicker=false"
 		></u-datetime-picker>
 		
diff --git a/pages/tabbar/statistics/comp/comp.scss b/pages/tabbar/statistics/comp/comp.scss
index 48d46f3..1c89859 100644
--- a/pages/tabbar/statistics/comp/comp.scss
+++ b/pages/tabbar/statistics/comp/comp.scss
@@ -31,6 +31,7 @@
 	      .tag {
 			min-width: 112rpx;
 			height: 44rpx;
+			padding: 0 20rpx;
 			background: #82AFDD;
 			border-radius: 22rpx;
 			font-size: 20rpx;
diff --git a/pages/tabbar/statistics/comp/examinCoach.vue b/pages/tabbar/statistics/comp/examinCoach.vue
index 9f5f17d..a2e8865 100644
--- a/pages/tabbar/statistics/comp/examinCoach.vue
+++ b/pages/tabbar/statistics/comp/examinCoach.vue
@@ -1,13 +1,13 @@
 <template>
 	<view class="content">
 		<view class="userInfo">
-			<view class="tit">Hi,大乔教练</view>
+			<view class="tit">Hi,{{ vuex_userInfo.user.nickname }}</view>
 			<view class="flex userRow">
 				<view class="schoolIcon">
 					<image src="@/static/images/index/ic_jiaxiao.png" mode=""></image>
 				</view>
-				<view class="schoolName oneRowText">翔力驾校</view>
-				<view class="tag">考场教练</view>
+				<view class="schoolName oneRowText">缺字段</view>
+				<view class="tag">{{identity}}</view>
 			</view>
 		</view>
 		<view class="card priceBox">
diff --git a/pages/tabbar/statistics/comp/topUserInfo.vue b/pages/tabbar/statistics/comp/topUserInfo.vue
index ea7fd8f..b1e9d72 100644
--- a/pages/tabbar/statistics/comp/topUserInfo.vue
+++ b/pages/tabbar/statistics/comp/topUserInfo.vue
@@ -5,8 +5,8 @@
 			<view class="schoolIcon">
 				<image src="@/static/images/index/ic_jiaxiao.png" mode=""></image>
 			</view>
-			<view class="schoolName oneRowText">翔力驾校</view>
-			<view class="tag">合作教练</view>
+			<view class="schoolName oneRowText">没字段</view>
+			<view class="tag">{{identity}}</view>
 		</view>
 	</view>
 </template>
diff --git a/pages/tabbar/student/index.vue b/pages/tabbar/student/index.vue
index c736ac6..8399761 100644
--- a/pages/tabbar/student/index.vue
+++ b/pages/tabbar/student/index.vue
@@ -89,11 +89,12 @@
 				:visibleItemCount="4"
 				:closeOnClickOverlay="false"
 				@confirm="confirmDatePicker"
-				@cancel="showDatePicker=false"
+				@cancel="cancelDate"
+				cancelText="不限日期"
 		></u-datetime-picker>
 		
 		<u-picker :show="showCar" :columns="carArr" keyName="lab" @confirm="confirmCar" @cancel="showCar=false"></u-picker>
-		<u-picker :show="showClass" :columns="classArr" keyName="lab" @confirm="confirmClass" @cancel="showClass=false"></u-picker>
+		<u-picker :show="showClass" :columns="classArr" keyName="name" @confirm="confirmClass" @cancel="showClass=false"></u-picker>
 	</view>
 </template>
 
@@ -142,6 +143,7 @@
 			this.params.schoolId = this.vuex_schoolId
 			this.studentRecordPageFn()
 			this.studentOwnerFn()
+			this.schoolClass()
 		},
 		methods: {
 			searchFn(val) {
@@ -153,6 +155,13 @@
 				this.count = res
 				console.log(res)
 			},
+			cancelDate() {
+				this.showDatePicker=false
+				this.params.startTime = ''
+				this.params.endTime = ''
+				this.screen.timer = '预约时间'
+				this.listInit()
+			},
 			confirmDatePicker(val) {
 				this.showDatePicker = false
 				
@@ -182,7 +191,8 @@
 			},
 			// 获取班型
 			async schoolClass() {
-				const {data: res} = await schoolClass({id: this.vuex_userInfo.shoolId})
+				const {data: res} = await schoolClass({id: this.vuex_schoolId,pageNo: 1,pageSize: 100})
+				this.classArr = res.list
 			},
 			listInit() {
 				this.params.pageNo = 1