From d3be08363312a7ddb9298d12c6e8cb250ba892ee Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Mon, 6 Nov 2023 19:14:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/mixins.js                                |  1 +
 components/user-info/user-info.vue                 |  5 +++--
 config/api.js                                      |  6 ++++++
 manifest.json                                      |  4 ++--
 pages/tabbar/student/index.vue                     | 14 ++++++++----
 pages/userCenter/forgetPwd/forgetPwd.vue           | 25 +++++++++++++++++++++-
 pages/userCenter/myCar/myCar.vue                   |  3 +++
 pages/userCenter/personaInfo/personaInfo.vue       |  6 +++---
 pages/userCenter/schoolCoach/schoolCoach.vue       |  1 +
 pages/userCenter/schoolSite/schoolSite.vue         |  1 +
 pages/userCenter/studentComment/studentComment.vue |  9 ++++++--
 11 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/common/js/mixins.js b/common/js/mixins.js
index 6241e7a..1e41859 100644
--- a/common/js/mixins.js
+++ b/common/js/mixins.js
@@ -9,6 +9,7 @@ export default {
 			vuex_userInfo: state=>state.user.vuex_userInfo,
 			vuex_deptId: state=>state.user.vuex_userInfo.user.deptId,
 			vuex_coachId: state=>state.user.vuex_userInfo.user.coachId,
+			vuex_schoolId: state=>state.user.vuex_userInfo.user.schoolId,
 			vuex_loginInfo: state=>state.user.vuex_loginInfo,
 			
 		}),
diff --git a/components/user-info/user-info.vue b/components/user-info/user-info.vue
index ddc06e8..de3b92f 100644
--- a/components/user-info/user-info.vue
+++ b/components/user-info/user-info.vue
@@ -5,7 +5,7 @@
 		</view>
 		<view class="info" @click="$goPage('/pages/userCenter/personaInfo/personaInfo')">
 			<view class="name_row">
-				<view class="name">{{ vuex_userInfo.user.nickname}}</view>
+				<view class="name oneRowText">{{ vuex_userInfo.user.nickname}}</view>
 				<view class="icon">
 					<image src="@/static/images/coach/ic_gengduo.png" mode=""></image>
 				</view>
@@ -48,6 +48,7 @@
 				.name {
 					font-size: 48rpx;
 					font-weight: 500;
+					width: 300rpx;
 				}
 
 				.icon {
@@ -72,8 +73,8 @@
 				}
 
 				.tag {
-					width: 112rpx;
 					height: 44rpx;
+					padding: 0 10rpx;
 					background: rgba(25, 137, 250, 0.1);
 					border-radius: 22rpx;
 					font-size: 20rpx;
diff --git a/config/api.js b/config/api.js
index 7ad7bed..c8e24ac 100644
--- a/config/api.js
+++ b/config/api.js
@@ -60,6 +60,12 @@ export const coachDetail = (params) => http.get('business/coach/get', {params})
 export const coachCommentPage = (params) => http.get('app/coach-comment/page', {params})
 // 获得驾校评价
 export const schoolCommentPage = (params) => http.get('business/school-comment/page', {params})
+// 修改用户密码
+export const updatePassword = (data) => http.put('system/user/profile/update-password', data)
+// 获得考场分页
+// export const sitePage = (data) => http.get('business/site/page', data)
+
+
 
 
 
diff --git a/manifest.json b/manifest.json
index de2d416..0cb253b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx2d71605af3b620e6",
+        "appid" : "wxae509f512c11c039",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,
@@ -82,7 +82,7 @@
             "disableHostCheck" : true,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://192.168.1.36:48080/",
+                    "target" : "http://192.168.1.39:48080/",
                     "changeOrigin" : true,
                     "secure" : true,
                     "pathRewrite" : {
diff --git a/pages/tabbar/student/index.vue b/pages/tabbar/student/index.vue
index 871da79..1a6e4a4 100644
--- a/pages/tabbar/student/index.vue
+++ b/pages/tabbar/student/index.vue
@@ -30,7 +30,7 @@
 			</view>
 		</view> -->
 			<view class="searchBox" v-if="identity=='校长'">
-				<searchRow placeholder="搜索学员姓名、学员手机号"></searchRow>
+				<searchRow placeholder="搜索学员姓名、学员手机号" @searchFn="searchFn"></searchRow>
 			</view>
 			<topUserInfo v-if="identity=='实操教练'"/>
 			
@@ -128,7 +128,7 @@
 					]
 				],
 				params: {
-					 "pageNo": 1,  "pageSize": 10,  status: 1, trainType: ''
+					 "pageNo": 1,  "pageSize": 10,  status: 1, name: ''
 				},
 				total: 20,
 				list: []
@@ -138,9 +138,14 @@
 			uni.hideTabBar();
 		},
 		onLoad() {
+			this.params.schoolId = this.vuex_schoolId
 			this.studentRecordPageFn()
 		},
 		methods: {
+			searchFn(val) {
+				this.params.name = val
+				this.listInit()
+			},
 			confirmDatePicker(val) {
 				this.showDatePicker = false
 				
@@ -149,8 +154,9 @@
 				let startTimer = this.screen.timer + '00:00:00'
 				let endTimer = this.screen.timer+ '23:59:59'
 				console.log(endTimer)
-				this.params.applyDate = [startTimer, endTimer]
-				// this.params['applyDate[0]'] = encodeURI(startTimer)
+				// this.params.applyDate = [startTimer, endTimer]
+				this.params.startTime = startTimer
+				this.params.endTime = endTimer
 				// this.params['applyDate[1]'] =  encodeURI(endTimer)
 				this.listInit()
 			},
diff --git a/pages/userCenter/forgetPwd/forgetPwd.vue b/pages/userCenter/forgetPwd/forgetPwd.vue
index b809a46..d662190 100644
--- a/pages/userCenter/forgetPwd/forgetPwd.vue
+++ b/pages/userCenter/forgetPwd/forgetPwd.vue
@@ -26,12 +26,13 @@
 				</view>
 			</view>
 			
-			<view class="btnBg" :class="{hui: !highlight}">确认修改</view>
+			<view class="btnBg" :class="{hui: !highlight}" @click="updatePasswordFn">确认修改</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import { updatePassword } from '@/config/api.js'
 	export default {
 		data() {
 			return {
@@ -51,6 +52,28 @@
 					return false
 				}
 			}
+		},
+		methods: {
+			async updatePasswordFn() {
+				let obj = {
+					newPassword: this.FormData.pwd1,
+					oldPassword: this.FormData.oldPwd
+				}
+				const res = await updatePassword(obj)
+				if(res.code==0) {
+					this.$u.toast('密码修改成功')
+					setTimeout(()=>{
+						uni.switchTab({
+							url: '/pages/tabbar/mine/index'
+						})
+					},1500)
+					this.FormData = {
+						oldPwd: '',
+						pwd1: '',
+						pwd2: '',
+					}
+				}
+			}
 		}
 	}
 </script>
diff --git a/pages/userCenter/myCar/myCar.vue b/pages/userCenter/myCar/myCar.vue
index fa8d59c..475a0f4 100644
--- a/pages/userCenter/myCar/myCar.vue
+++ b/pages/userCenter/myCar/myCar.vue
@@ -42,6 +42,9 @@
 			}
 		},
 		onLoad() {
+			this.params.schoolId = this.vuex_schoolId
+			this.params.coachId = this.vuex_coachId
+			
 			this.carPageFn()
 		},
 		onPullDownRefresh() {
diff --git a/pages/userCenter/personaInfo/personaInfo.vue b/pages/userCenter/personaInfo/personaInfo.vue
index ebb3a57..ecc77c5 100644
--- a/pages/userCenter/personaInfo/personaInfo.vue
+++ b/pages/userCenter/personaInfo/personaInfo.vue
@@ -5,7 +5,7 @@
 			<view class="card">
 				<view class="row">
 					<view class="lab">手机号</view>
-					<view class="val">18267103167</view>
+					<view class="val"> {{ vuex_userInfo.user.phone}}  </view>
 				</view>
 			</view>
 			
@@ -28,12 +28,12 @@
 				</view>
 			</view> -->
 			
-			<view class="card">
+			<!-- <view class="card">
 				<view class="row">
 					<view class="lab">收款银行卡</view>
 					<view class="val">48372*****03928</view>
 				</view>
-			</view>
+			</view> -->
 			
 			<view class="btnBox">
 				<view class="logout" @click="$goPage('/pages/login/login')">退出登录</view>
diff --git a/pages/userCenter/schoolCoach/schoolCoach.vue b/pages/userCenter/schoolCoach/schoolCoach.vue
index a0a9302..fa90756 100644
--- a/pages/userCenter/schoolCoach/schoolCoach.vue
+++ b/pages/userCenter/schoolCoach/schoolCoach.vue
@@ -46,6 +46,7 @@
 			}
 		},
 		onLoad() {
+			this.params.schoolId = this.vuex_schoolId
 			this.coachPageFn()
 		},
 		onPullDownRefresh() {
diff --git a/pages/userCenter/schoolSite/schoolSite.vue b/pages/userCenter/schoolSite/schoolSite.vue
index 6fad57c..f8c8156 100644
--- a/pages/userCenter/schoolSite/schoolSite.vue
+++ b/pages/userCenter/schoolSite/schoolSite.vue
@@ -48,6 +48,7 @@
 			}
 		},
 		onLoad() {
+			this.params.schoolId = this.vuex_schoolId
 			this.sitePageFn()
 		},
 		onPullDownRefresh() {
diff --git a/pages/userCenter/studentComment/studentComment.vue b/pages/userCenter/studentComment/studentComment.vue
index 6b14e81..e570631 100644
--- a/pages/userCenter/studentComment/studentComment.vue
+++ b/pages/userCenter/studentComment/studentComment.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-	import { schoolCommentPage } from '@/config/api.js'
+	import { schoolCommentPage, coachCommentPage } from '@/config/api.js'
 	export default {
 		data() {
 			return {
@@ -44,6 +44,7 @@
 			}
 		},
 		onLoad() {
+			this.params.schoolId = this.vuex_schoolId
 			this.schoolCommentPageFn()
 		},
 		onPullDownRefresh() {
@@ -67,7 +68,11 @@
 				this.schoolCommentPageFn()
 			},
 			async schoolCommentPageFn() {
-				const {data: res} = await schoolCommentPage(this.params)
+				if(this.identity=='校长') {
+					var {data: res} = await schoolCommentPage(this.params)
+				}else {
+					var {data: res} = await coachCommentPage(this.params)
+				}
 				this.params.pageNo ++
 				let arr = res.list.map(item=>{
 					if(item.images) {