From ce58a330054859c91833cd2bf02ca8bf6a67ffd1 Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Mon, 22 Jan 2024 18:51:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/carEntry/examineAppointment/comp/step1.vue  |  2 ++
 pages/carEntry/examineAppointment/comp/step2.vue  | 19 ++++++++++++-------
 pages/indexEntry/enroll/registInfo/registInfo.vue |  1 +
 pages/mineEntry/myForecastName/myForecastName.vue |  3 +++
 pages/tabbar/mine/index.vue                       |  2 +-
 pages/userCenter/login/comp/privacyRadion.vue     |  5 +++--
 pages/userCenter/login/login.vue                  | 21 +++------------------
 pages/userCenter/login/loginByPhone.vue           | 12 ++++--------
 8 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/pages/carEntry/examineAppointment/comp/step1.vue b/pages/carEntry/examineAppointment/comp/step1.vue
index 6534d83..48a94ce 100644
--- a/pages/carEntry/examineAppointment/comp/step1.vue
+++ b/pages/carEntry/examineAppointment/comp/step1.vue
@@ -73,6 +73,8 @@
 			.icon {
 				width: 72rpx;
 				height: 72rpx;
+				border-radius: 50%;
+				overflow: hidden;
 			}
 		}
 	}
diff --git a/pages/carEntry/examineAppointment/comp/step2.vue b/pages/carEntry/examineAppointment/comp/step2.vue
index 2233cdd..9dffd5f 100644
--- a/pages/carEntry/examineAppointment/comp/step2.vue
+++ b/pages/carEntry/examineAppointment/comp/step2.vue
@@ -2,9 +2,11 @@
 	<view class="step3">
 		<view class="card">
 			<view class="list"  v-if="list.length">
-				<view class="listItem" v-for="(item,index) in list" :key="index" :class="{active: carId==item.id}" @click="chooseCar(item)">
-					<view class="num">{{item.carNumber}}号车</view>
-					<view class="text">{{ item.licnum }}</view>
+				<view class="itemW" v-for="(item,index) in list" :key="index" @click="chooseCar(item)">
+					<view class="listItem"  :class="{active: carId==item.id}" >
+						<view class="num">{{item.carNumber}}号车</view>
+						<view class="text">{{ item.licnum }}</view>
+					</view>
 				</view>
 			</view>
 			<nodata v-else></nodata>
@@ -53,17 +55,19 @@
 
 <style lang="scss" scoped>
 	.card {
-		padding: 28rpx 24rpx;
+		padding: 20rpx 18rpx;
 	}
 
 	.list {
 		display: flex;
 		flex-wrap: wrap;
 		display: flex;
-		justify-content: space-between;
-
+		.itemW {
+			width: 33.33%;
+			padding: 10rpx 0;
+		}
 		.listItem {
-			width: 32.4%;
+			width: 94%;
 			height: 120rpx;
 			background: #F8F8F8;
 			border-radius: 12rpx;
@@ -74,6 +78,7 @@
 			flex-direction: column;
 			align-items: center;
 			justify-content: center;
+			margin: 0 auto;
 			.num {
 				font-size: 28rpx;
 				font-weight: 600;
diff --git a/pages/indexEntry/enroll/registInfo/registInfo.vue b/pages/indexEntry/enroll/registInfo/registInfo.vue
index 47e2736..8fdf0e0 100644
--- a/pages/indexEntry/enroll/registInfo/registInfo.vue
+++ b/pages/indexEntry/enroll/registInfo/registInfo.vue
@@ -354,6 +354,7 @@
 				this.form.schoolId = schoolClass.schoolId
 				this.form.trainType = schoolClass.carType
 				this.form.schoolClassId = schoolClass.id
+				this.form.totalAmount= schoolClass.totalAmount
 			}
 			// 如果是选择了驾校教练来报名的/扫二维码
 			let schoolCoach = this.$store.state.school.schoolCoach
diff --git a/pages/mineEntry/myForecastName/myForecastName.vue b/pages/mineEntry/myForecastName/myForecastName.vue
index bd253d5..3ed514d 100644
--- a/pages/mineEntry/myForecastName/myForecastName.vue
+++ b/pages/mineEntry/myForecastName/myForecastName.vue
@@ -36,6 +36,9 @@
 		onLoad() {
 			this.trainingApplyListFn()
 		},
+		onPullDownRefresh() {
+			this.trainingApplyListFn()
+		},
 		methods: {
 			async trainingApplyListFn() {
 				const {data: res} = await trainingApplyList({studentId: this.studentId})
diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue
index 9c630ea..d408406 100644
--- a/pages/tabbar/mine/index.vue
+++ b/pages/tabbar/mine/index.vue
@@ -165,7 +165,7 @@
 			async myPageEntryClick(item) {
 				const res = await this.$store.dispatch('checkLogin')
 				if(!res) return
-				let arr = ['我的收藏','本地生活']
+				let arr = ['我的收藏','本地生活', '我的报名']
 				console.log(arr.includes(item.text))
 				if(!this.vuex_userInfo.schoolId&&!arr.includes(item.text)) return this.$u.toast('您不是平台学员')
 				this.$goPage(item.url)
diff --git a/pages/userCenter/login/comp/privacyRadion.vue b/pages/userCenter/login/comp/privacyRadion.vue
index 6119cd4..698e015 100644
--- a/pages/userCenter/login/comp/privacyRadion.vue
+++ b/pages/userCenter/login/comp/privacyRadion.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="radioWrap">
-		<u-checkbox-group @change="changeRadio">
-			<u-checkbox v-model="isCheck" shape="circle" label="已阅读并同意" :labelSize="12" ></u-checkbox>
+		<u-checkbox-group >
+			<u-checkbox  :checked="isCheck" shape="circle" label="已阅读并同意" :labelSize="12"  @change="changeRadio">已阅读并同意</u-checkbox>
 		</u-checkbox-group>
 		<view class="privacyText">
 			<text @click="goPage(2)">《用户协议》</text>和 <text @click="goPage(1)">《隐私协议》</text>
@@ -14,6 +14,7 @@
 		props: ['isCheck'],
 		methods: {
 			changeRadio(val) {
+				console.log(val)
 				this.$emit('changeRadio', val)
 			},
 			async goPage(type) {
diff --git a/pages/userCenter/login/login.vue b/pages/userCenter/login/login.vue
index f63e4eb..ba39bc5 100644
--- a/pages/userCenter/login/login.vue
+++ b/pages/userCenter/login/login.vue
@@ -7,13 +7,13 @@
 			<!-- #ifdef MP-WEIXIN -->
 			<view class="btn" @click="getPhoneNumber">手机号快捷登录  <button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" class="hide" v-if="isCheck">手机号</button> </view>
 			<!-- #endif -->
-			<view class="btn border" @click="$goPage('/pages/userCenter/login/loginByPhone');">手机号登录/注册</view>
+			<view class="btn border" @click="$goPage('/pages/userCenter/login/loginByPhone?isCheck='+isCheck);">手机号登录/注册</view>
 		</view>
 		<view style="margin-top: 40rpx;">
 			<privacyRadion :isCheck="isCheck" @changeRadio="changeRadio"></privacyRadion>
 		</view>
 		
-		<u-popup :show="show" :round="10" mode="center" >
+		<!-- <u-popup :show="show" :round="10" mode="center" >
 			<view class="">
 				<view class="popupCon">
 					<view class="h1">提 示</view>
@@ -21,7 +21,7 @@
 					<view class="oneBtn">我知道了</view>
 				</view>
 			</view>
-		</u-popup>
+		</u-popup> -->
 	</view>
 </template>
 
@@ -35,13 +35,11 @@
 			return {
 				isCheck: false,
 				show: false,
-				decodePhoneParams: {},
 				imgUrl: imgUrl+'loginTopBg.png',
 				backgroundSize: '100% 360rpx',
 			}
 		},
 		onLoad() {
-			this.getCode()
 			// uni.getLocation({
 			// 	type: 'wgs84',
 			// 	success: function (res) {
@@ -53,7 +51,6 @@
 		},
 		methods: {
 			async getPhoneNumber (e) {
-				console.log(111)
 				if(!this.isCheck) return this.$u.toast('请勾选产品协议与隐私政策');
 				let phoneCode = e.detail.code
 			    console.log(e.detail.errMsg) // 回调信息（成功失败都会返回）
@@ -118,18 +115,6 @@
 			      // 在这里发送 code 和用户信息到后台进行登录操作
 			      // 可以使用 uni.request 或其他 HTTP 库发送请求
 			    },
-				
-			// 获取code
-			getCode() {
-			        uni.login({
-			                provider: 'weixin',
-			                success: loginRes => {
-			                        this.decodePhoneParams.code = loginRes.code
-									console.log('loginRes')
-									console.log(loginRes)
-			                }
-			        });
-			},
 			 
 			// 是否选择协议
 			changeRadio(val) {
diff --git a/pages/userCenter/login/loginByPhone.vue b/pages/userCenter/login/loginByPhone.vue
index 8bc67f0..21dc72f 100644
--- a/pages/userCenter/login/loginByPhone.vue
+++ b/pages/userCenter/login/loginByPhone.vue
@@ -5,7 +5,7 @@
 				<u-icon name="arrow-left" color="#333" size="28"></u-icon>
 			</view>
 		</view> -->
-		<u-navbar title=" " @leftClick="leftClick" :bgColor="bgColor" :autoBack="true"></u-navbar>
+		<u-navbar title=" " :bgColor="bgColor" :autoBack="true"></u-navbar>
 		<view class="title">短信验证码登录</view>
 		<view class="form">
 			<view class="form-item">
@@ -45,16 +45,15 @@
 			return {
 				imgUrl: imgUrl+'loginTopBg.png',
 				backgroundSize: '100% 360rpx',
-				isCheck: false,
+				isCheck:false,
 				codeText: '获取验证码',
 				FormData: {},
 				codeOn: false,
 				bgColor: 'transparent'
 			}
 		},
-		onLoad() {
-			// this.$store.dispatch('getUserInfo')
-			
+		onLoad(options) {
+			this.isCheck = options.isCheck=='true'?true:false
 		},
 		computed: {
 			isPhone() {
@@ -65,9 +64,6 @@
 			}
 		},
 		methods: {
-			leftClick() {
-			            console.log('leftClick');
-			        },
 			// 是否选择协议
 			changeRadio(val) {
 				this.isCheck = val