From 7d2057a041e73c10bf04fd31bed50849416c837e Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Tue, 19 Dec 2023 18:58:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=EF=BC=8Cbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/carEntry/examineAppointment/comp/step2.vue   |  3 +-
 .../examineAppointment/examineAppointment.vue      |  2 ++
 .../carEntry/simulateAppointment/comp/pickDate.vue |  3 +-
 pages/carEntry/simulateAppointment/comp/step1.vue  |  2 +-
 pages/carEntry/simulateAppointment/comp/step2.vue  |  2 +-
 .../simulateAppointment/simulateAppointment.vue    |  4 +--
 pages/indexEntry/examines/detail/detail.vue        |  4 ++-
 .../findShcool/shcoolDetail/comp/tab1.vue          |  4 ++-
 pages/mineEntry/myContract/myContract.vue          |  1 +
 pages/mineEntry/myEvaluate/myEvaluate.vue          |  3 ++
 pages/mineEntry/myOrder/detail/detail.vue          | 32 ++++++++++++++++++----
 pages/tabbar/index/index.vue                       | 20 ++++++++++++--
 pages/tabbar/learnCar/index.vue                    |  3 +-
 pages/tabbar/mine/index.vue                        | 17 ++++++------
 store/modules/user.js                              | 11 ++++++++
 15 files changed, 86 insertions(+), 25 deletions(-)

diff --git a/pages/carEntry/examineAppointment/comp/step2.vue b/pages/carEntry/examineAppointment/comp/step2.vue
index 9ab5d9a..2233cdd 100644
--- a/pages/carEntry/examineAppointment/comp/step2.vue
+++ b/pages/carEntry/examineAppointment/comp/step2.vue
@@ -1,12 +1,13 @@
 <template>
 	<view class="step3">
 		<view class="card">
-			<view class="list">
+			<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>
 			</view>
+			<nodata v-else></nodata>
 		</view>
 
 		<view class="btn_row" style="margin-top: 108rpx;">
diff --git a/pages/carEntry/examineAppointment/examineAppointment.vue b/pages/carEntry/examineAppointment/examineAppointment.vue
index 0e3815f..52e5d9c 100644
--- a/pages/carEntry/examineAppointment/examineAppointment.vue
+++ b/pages/carEntry/examineAppointment/examineAppointment.vue
@@ -103,12 +103,14 @@
 				this.FormData.examSiteId = item.id
 				this.FormData.siteName = item.name
 				this.carParams.pageNo = 1
+				this.carList = []
 				this.examCarPageFn()
 			},
 			// 获得考场
 			async examSitePageFn() {
 				const {data: res} = await examSitePage(this.siteParams)
 				this.siteList = res
+				
 			},
 			// 获得车辆
 			async examCarPageFn() {
diff --git a/pages/carEntry/simulateAppointment/comp/pickDate.vue b/pages/carEntry/simulateAppointment/comp/pickDate.vue
index 3c6eedc..ffb341a 100644
--- a/pages/carEntry/simulateAppointment/comp/pickDate.vue
+++ b/pages/carEntry/simulateAppointment/comp/pickDate.vue
@@ -89,6 +89,7 @@
 				radioVal: '',
 			}
 		},
+
 		mounted() {
 			this.initDate()
 		},
@@ -172,7 +173,7 @@
 			},
 			// 选择日期
 			chooseDate(item) {
-				this.FormData.courseIds = []
+				this.FormData.courseIds = ''
 				this.chooseDay = item.date
 				this.simulationClassFn()
 				this.$emit('updatedForm', this.FormData)
diff --git a/pages/carEntry/simulateAppointment/comp/step1.vue b/pages/carEntry/simulateAppointment/comp/step1.vue
index fe80bab..4748cdd 100644
--- a/pages/carEntry/simulateAppointment/comp/step1.vue
+++ b/pages/carEntry/simulateAppointment/comp/step1.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="step2">
-		<view class="card" v-for="(item,index) in list" :key="index" :class="{active: FormData.pointId==item.id}" @click="choosePoint(item)">
+		<view class="card" v-for="(item,index) in list" :key="index" :class="{active: FormData.pointId==item.id}" @click="choosePoint(item)"> 
 			<view class="leftTxt">
 				<view class="name oneRowText">{{ item.pointName }}</view>
 				<view class="adr">{{item.pointAddress}}</view>
diff --git a/pages/carEntry/simulateAppointment/comp/step2.vue b/pages/carEntry/simulateAppointment/comp/step2.vue
index 88b6542..60b19f1 100644
--- a/pages/carEntry/simulateAppointment/comp/step2.vue
+++ b/pages/carEntry/simulateAppointment/comp/step2.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="step1">
 		
-		<pickDate :FormData="FormData" @updatedForm="updatedForm"/>
+		<pickDate :FormData="FormData" @updatedForm="updatedForm"  />
 		
 		<view class="poz_btn">
 			<view class="btn_row" >
diff --git a/pages/carEntry/simulateAppointment/simulateAppointment.vue b/pages/carEntry/simulateAppointment/simulateAppointment.vue
index f01e3e6..4cf8d16 100644
--- a/pages/carEntry/simulateAppointment/simulateAppointment.vue
+++ b/pages/carEntry/simulateAppointment/simulateAppointment.vue
@@ -24,7 +24,7 @@
 			</view>
 			
 			<step1 v-if="currentStep==1" @changeStep="changeStep" :list="list1" :FormData="FormData" @choosePoint="choosePoint"></step1>
-			<step2 v-if="currentStep==2" @changeStep="changeStep" :FormData="FormData" @updatedForm="updatedForm"></step2>
+			<step2 v-if="currentStep==2" @changeStep="changeStep" :FormData="FormData" @updatedForm="updatedForm"  ></step2>
 			<step3 v-if="currentStep==3" @changeStep="changeStep" :FormData="FormData" @updatedForm="updatedForm"></step3>
 		</view>
 	</view>
@@ -83,7 +83,7 @@
 				 const {data: res} = await simulationClass(obj)
 			 },
 			 async simulationDevicesFn() {
-			 				 const {data: res} = await simulationDevices()
+			 	 const {data: res} = await simulationDevices()
 			 }
 		}
 	}
diff --git a/pages/indexEntry/examines/detail/detail.vue b/pages/indexEntry/examines/detail/detail.vue
index ff4bb25..415b685 100644
--- a/pages/indexEntry/examines/detail/detail.vue
+++ b/pages/indexEntry/examines/detail/detail.vue
@@ -1,7 +1,7 @@
 <template>
 	<!-- 考场详情 -->
 	<view class="pageBg">
-		<view class="swiper-box"  :style="{ backgroundImage: `url(${detailInfo.images})`, backgroundSize: '100% 100%' }">
+		<view class="swiper-box"  :style="{ backgroundImage: `url(${detailInfo.images})`, backgroundSize: '100% ' }">
 			<view class="navPoz">
 				<topNavbar title=" "></topNavbar>
 			</view>
@@ -91,6 +91,8 @@
 				this.infoList = res.list
 			},
 			async goExamine() {
+				const res = await this.$store.dispatch('checkLogin')
+				if(!res) return
 				// uni.navigateTo({
 				// 	url: '/pages/indexEntry/enroll/enroll?tit=学员信息'
 				// })
diff --git a/pages/indexEntry/findShcool/shcoolDetail/comp/tab1.vue b/pages/indexEntry/findShcool/shcoolDetail/comp/tab1.vue
index 5788445..bf89104 100644
--- a/pages/indexEntry/findShcool/shcoolDetail/comp/tab1.vue
+++ b/pages/indexEntry/findShcool/shcoolDetail/comp/tab1.vue
@@ -16,7 +16,9 @@
 	export default {
 		props: ['classList'],
 		methods: {
-			goSign(item) {
+			async goSign(item) {
+				const res = await this.$store.dispatch('checkLogin')
+				if(!res) return
 				this.$store.commit('upDateSchoolCoach', {})
 				this.$store.commit('upDateSchoolClass', item)
 				this.$goPage('/pages/indexEntry/enroll/enroll')
diff --git a/pages/mineEntry/myContract/myContract.vue b/pages/mineEntry/myContract/myContract.vue
index a762e92..096c2cf 100644
--- a/pages/mineEntry/myContract/myContract.vue
+++ b/pages/mineEntry/myContract/myContract.vue
@@ -6,6 +6,7 @@
 				<image  :src="pdfUrl"   mode="widthFix"></image>
 				<!-- <web-view :src="pdfUrl"></web-view> -->
 				<!-- <mumu-previewOffce :fileUrl='pdfUrl' v-model='showPreview' @change="change"></mumu-previewOffce> -->
+				<nodata v-if="!pdfUrl" style="margin-bottom: 40rpx;">暂无合同</nodata>
 			</view>
 		</view>
 	</view>
diff --git a/pages/mineEntry/myEvaluate/myEvaluate.vue b/pages/mineEntry/myEvaluate/myEvaluate.vue
index 404ac7c..e0e2e65 100644
--- a/pages/mineEntry/myEvaluate/myEvaluate.vue
+++ b/pages/mineEntry/myEvaluate/myEvaluate.vue
@@ -5,6 +5,9 @@
 			<view class="card" v-for="(item,index) in list" :key="index">
 				<commentItem :item="item"/>
 			</view>
+			<view class="card" v-if="!list.length">
+				<nodata>暂无评价</nodata>
+			</view>
 		</view>
 		<view style="padding-bottom: 20rpx;" v-if="list.length>4">
 			<u-loadmore :status="status" />
diff --git a/pages/mineEntry/myOrder/detail/detail.vue b/pages/mineEntry/myOrder/detail/detail.vue
index 6ed3599..1d9b441 100644
--- a/pages/mineEntry/myOrder/detail/detail.vue
+++ b/pages/mineEntry/myOrder/detail/detail.vue
@@ -88,15 +88,23 @@
 							<view class="label hui">实际支付</view>
 							<view class="value hui">￥{{$u.utils.priceTo(info.payActual)}}</view>
 						</view>
-						<view class="rows">
+						<view class="rows" v-if="info.payMent">
 							<view class="label hui">已支付定金</view>
-							<view class="value blue">￥没字段</view>
+							<view class="value blue">￥{{$u.utils.priceTo(info.payMent)}}</view>
 						</view>
-						<view class="rows">
+						<view class="rows" v-if="info.payTail">
 							<view class="label hui">待支付尾款</view>
-							<view class="value blue">￥没字段</view>
+							<view class="value blue">￥{{$u.utils.priceTo(info.payTail)}}</view>
+						</view>
+						<view class="btn_row">
+							<view class="" style="min-width: 120rpx;">
+								<view class="refundBtn" @click="goFund" v-if="!info.refundId">申请退款</view>
+							</view>
+							<view class="rightBtn">
+								<view class="btnBorder">下载发票</view>
+								<view class="btnBorder">培训缴费电子凭证</view>
+							</view>
 						</view>
-						<view class="refundBtn" @click="goFund" v-if="!info.refundId">申请退款</view>
 					</view>
 				</view>
 			</view>
@@ -189,7 +197,19 @@
 
 <style lang="scss" scoped>
 	@import '../comp/comp.scss';
-
+	.btn_row {
+		display: flex;
+		justify-content: space-between;
+		.rightBtn {
+			display: flex;
+			justify-content: flex-end;
+			.btnBorder {
+				margin-left: 14rpx;
+				padding: 0 16rpx;
+				font-size: 24rpx;
+			}
+		}
+	}
 	.feeIcon {
 		width: 28rpx;
 		height: 28rpx;
diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue
index 32c46b9..784794b 100644
--- a/pages/tabbar/index/index.vue
+++ b/pages/tabbar/index/index.vue
@@ -97,7 +97,7 @@
 			<view class="card serviceCon">
 				<view class="h1">服务专区</view>
 				<view class="ul2">
-					<view class="li2" v-for="(item,index) in serviceSector" :key="index" :class="'li2Bg' + index" @click="$goPage(item.url)">
+					<view class="li2" v-for="(item,index) in serviceSector" :key="index" :class="'li2Bg' + index" @click="goServiceSector(item)">
 						<view class="icon">
 							<image :src="item.icon" mode=""></image>
 						</view>
@@ -291,8 +291,13 @@
 			
 		},
 		methods: {
-			entrySectionClick(item) {
+			async entrySectionClick(item) {
 				if(item.text=='我要报名') {
+					let token = this.$store.state.user.vuex_loginInfo.accessToken
+					if(!token) {
+						this.$store.commit('goLogin')
+						return
+					}
 					// this.$goPage(item.url)
 					this.$store.commit('updateNonPlatformStudent', false)
 					
@@ -308,6 +313,17 @@
 						return	this.$goPage('/pages/indexEntry/enroll/payment/payment')
 					}
 				}
+				if(item.text=='找驾驶馆') {
+					const res = await this.$store.dispatch('checkLogin')
+					if(!res) return
+				}
+				this.$goPage(item.url)
+			},
+			async goServiceSector(item) {
+				if(item.text=='咨询投诉') {
+					const res = this.$store.dispatch('checkLogin')
+					if(!res) return
+				}
 				this.$goPage(item.url)
 			},
 			async getarticleListFn() {
diff --git a/pages/tabbar/learnCar/index.vue b/pages/tabbar/learnCar/index.vue
index 6a48b12..88d73f5 100644
--- a/pages/tabbar/learnCar/index.vue
+++ b/pages/tabbar/learnCar/index.vue
@@ -68,7 +68,8 @@
 		onLoad() {
 		},
 		onShow() {
-			// uni.hideTabBar();
+			// console.log('没发生？')
+			this.$store.dispatch('checkLogin')
 		},
 		methods: {
 			changeNav(id) {
diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue
index c2d052f..54973ff 100644
--- a/pages/tabbar/mine/index.vue
+++ b/pages/tabbar/mine/index.vue
@@ -51,7 +51,7 @@
 			<view class="business ">
 				<view class="h1">业务办理</view>
 				<view class="card">
-					<view class="item" v-for="(item,index) in businessEntry" :key="index"  @click="$goPage(item.url)">
+					<view class="item" v-for="(item,index) in businessEntry" :key="index"  @click="goBusinessEntry(item)">
 						<view class="icon">
 							<image :src="item.icon" mode=""></image>
 						</view>
@@ -151,14 +151,15 @@
 				console.log('this.pdfUrl')
 				console.log(this.pdfUrl)
 			},
+			 async goBusinessEntry(item) {
+				const res = await this.$store.dispatch('checkLogin')
+				console.log('res')
+				console.log(res)
+				if(!res) return
+				this.$goPage(item.url)
+			},
 			async myPageEntryClick(item) {
-				// if(item.text=='我的合同') {
-				// 	this.showPreview = false
-				// 	this.pdfUrl = ''
-				// 	await this.selectContractPdfBase64Fn()
-				// 	this.showPreview = true
-				// 	return
-				// }
+				await this.$store.dispatch('checkLogin')
 				this.$goPage(item.url)
 			}
 		}
diff --git a/store/modules/user.js b/store/modules/user.js
index b940828..aad2419 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -34,6 +34,7 @@ const user = {
 				url: '/pages/userCenter/login/loginByPhone'
 			})
 		},
+		
 		// 为非平台学员开一条路
 		updateNonPlatformStudent(state, val) {
 			state.NonPlatformStudent = val
@@ -73,8 +74,18 @@ const user = {
 				// #endif
 			})
 		},
+		checkLogin({state, commit}) {
+			let token = state.vuex_loginInfo.accessToken
+			if(!token) {
+				commit('goLogin')
+				return false
+			}
+			return true
+		},
 		// 获取用户信息
 		async getUserInfo({state, commit}) {
+			let token = state.vuex_loginInfo.accessToken
+			if(!token) return
 			const http = uni.$u.http
 			let config =  { custom: { auth: false }, header: {'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'} }
 			const res = await http.get('app/student-record/get')