From e3d44ca899eefb7eef46e04e257d3c28b3914ead Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Wed, 31 Jan 2024 18:50:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=AD=A6=E8=BD=A6=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                         |   1 -
 .../findShcool/shcoolDetail/shcoolDetail.vue       |   4 +-
 .../mineEntry/carLearProgress/carLearProgress.vue  | 134 +++----
 pages/tabbar/index/comp/informaItem.vue            |   7 +-
 pages/tabbar/index/index.vue                       |  21 +-
 pages/tabbar/learnCar/comp/comp.scss               |  63 +++-
 pages/tabbar/learnCar/comp/subject0.vue            |  41 +--
 pages/tabbar/learnCar/comp/topInfo.vue             | 150 ++++++++
 pages/tabbar/learnCar/index - 副本.vue           | 172 +++++++++
 pages/tabbar/learnCar/index.vue                    | 167 +--------
 pages/tabbar/mine/index - 副本.vue               | 368 ++++++++++++++++++++
 pages/tabbar/mine/index.scss                       | 125 +++++++
 pages/tabbar/mine/index.vue                        | 385 +++------------------
 static/images/icon/arrowRightfff.png               | Bin 0 -> 516 bytes
 static/images/icon/箭头 拷贝 2(1).png          | Bin 0 -> 638 bytes
 static/images/mineIcon/sanCode.png                 | Bin 0 -> 626 bytes
 static/images/mineIcon/扫码.png                  | Bin 626 -> 0 bytes
 static/images/mineIcon/箭头 拷贝 2(1).png      | Bin 638 -> 0 bytes
 static/images/mineIcon/箭头 拷贝 2.png         | Bin 516 -> 0 bytes
 19 files changed, 1030 insertions(+), 608 deletions(-)
 create mode 100644 pages/tabbar/learnCar/comp/topInfo.vue
 create mode 100644 pages/tabbar/learnCar/index - 副本.vue
 create mode 100644 pages/tabbar/mine/index - 副本.vue
 create mode 100644 pages/tabbar/mine/index.scss
 create mode 100644 static/images/icon/arrowRightfff.png
 create mode 100644 static/images/icon/箭头 拷贝 2(1).png
 create mode 100644 static/images/mineIcon/sanCode.png
 delete mode 100644 static/images/mineIcon/扫码.png
 delete mode 100644 static/images/mineIcon/箭头 拷贝 2(1).png
 delete mode 100644 static/images/mineIcon/箭头 拷贝 2.png

diff --git a/pages.json b/pages.json
index 73ee41f..7b151af 100644
--- a/pages.json
+++ b/pages.json
@@ -496,7 +496,6 @@
 					"path": "carLearProgress/carLearProgress",
 					"style": {
 						"navigationBarTitleText": "学车进度",
-						"navigationStyle": "custom",
 						"enablePullDownRefresh": true,
 						"backgroundTextStyle": "dark" 
 					}
diff --git a/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue b/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
index 0ae0338..4d9b15e 100644
--- a/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
+++ b/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
@@ -14,8 +14,8 @@
 			<view class="card " v-if="Object.keys(schoolDetail).length">
 				<schoolItme :item="schoolDetail"/>
 				<view class="introduce" v-if=" schoolDetail.schoolIntroduceDO">
-					<u-read-more :showHeight="64" :toggle="true">
-						<rich-text :nodes="schoolDetail.schoolIntroduceDO.introduce"></rich-text>
+					<u-read-more :showHeight="64" :toggle="true" :fontSize="12">
+						<rich-text :nodes="schoolDetail.schoolIntroduceDO.introduce" style="font-size: 24rpx;"></rich-text>
 					</u-read-more>
 				</view>
 			</view>
diff --git a/pages/mineEntry/carLearProgress/carLearProgress.vue b/pages/mineEntry/carLearProgress/carLearProgress.vue
index e392273..5ba0749 100644
--- a/pages/mineEntry/carLearProgress/carLearProgress.vue
+++ b/pages/mineEntry/carLearProgress/carLearProgress.vue
@@ -1,42 +1,54 @@
 <template>
-	<view class="pageBgImg">
-		<topNavbar title="学车进度"></topNavbar>
-		<scroll-view class="scroll-view_w" scroll-x="true" @scroll="scroll"  scroll-with-animation :scroll-into-view="'tab'+currentTab" >
-			<view class="tabs">
-				<view class="tab" v-for="(item,index) in tabData" :key="index" @click="changeTab(item)" :class="{active: currentTab==item.id}" :id="'tab'+item.id">{{ item.text }}</view>
-				<view class="rightPad"></view>
-			</view>
-		</scroll-view>
+	<view class="pageBg">
+		<view class="tabs">
+			<view class="tab" v-for="(item,index) in tabData" :key="index" @click="changeTab(item)" :class="{active: currentTab==item.id}" :id="'tab'+item.id">{{ item.text }}</view>
+			<view class="rightPad"></view>
+		</view>
 		<view class="pad learnStatus">
 			<view class="card">
-				<view class="flex-b">
-					<view class="lab">模拟器训练学时报审</view>
-					<view class="date">2023/08/09 22:52:12</view>
+				<view class="flex-b top_row">
+					<view class="lab">科目一阶段</view>
+					<view class="btn status">已完成</view>
+				</view>
+				<view class="date-row">2023-08-09 22:52:12</view>
+			</view>
+			<!-- <view class="card">
+				<view class="flex-b top_row">
+					<view class="lab">科目一考试</view>
+					<view class="btn status">已预约</view>
 				</view>
+				<view class="date-row">2023-08-09 22:52:12</view>
 				<view class="flex-b bg">
 					<view class="row">
-						<view class="text">评价模拟器教学老师</view>
+						<view class="text">科目二</view>
 						<view class="btn" @click="$goPage('/pages/carEntry/evaluate/evaluate')">去评价</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<view class="card">
-				<view class="flex-b">
-					<view class="lab">模拟器训练已预约</view>
-					<view class="date">2023/08/09 22:52:12</view>
+				<view class="flex-b top_row">
+					<view class="lab">科目二考试</view>
+					<view class="btn">已预约</view>
 				</view>
+				<view class="date-row">2023-08-09 22:52:12</view>
 				<view class="bg">
 					<view class="row">
-						<view class="text">模拟驾驶馆：某某模拟驾驶馆</view>
+						<view class="text">考试场地：某某科目二考场</view>
 					</view>
 					<view class="row">
-						<view class="text">模拟器编号：00001</view>
-					</view>
-					<view class="row">
-						<view class="text">预约时间：2023/08/23 10:00:00</view>
+						<view class="text">考试时间：2023-08-23 10:00:00</view>
 					</view>
 				</view>
 			</view>
+			
+			<view class="card">
+				<view class="flex-b top_row">
+					<view class="lab">科目一考试</view>
+					<view class="btn red status">未通过</view>
+				</view>
+				<view class="date-row">2023-08-09 22:52:12</view>
+				
+			</view>
 		</view>
 	</view>
 </template>
@@ -50,10 +62,6 @@
 						id: 10
 					},
 					{
-						text: '模拟器',
-						id: 0
-					},
-					{
 						text: '科目一',
 						id: 1
 					},
@@ -70,7 +78,7 @@
 						id: 4
 					},
 				],
-				currentTab: -1,
+				currentTab: 10,
 			}
 		},
 		methods: {
@@ -86,42 +94,52 @@
 
 <style lang="scss" scoped>
 	@import '../../tabbar/learnCar/comp/comp.scss';
-	.scroll-view_w {
-		width: 100%;
-		.tabs {
-			display: flex;
-			flex-wrap: nowrap;
-			padding: 0 0rpx 0 32rpx;
-			width: auto;
-			.tab {
-				width: 108rpx;
-				height: 60rpx;
-				border-radius: 8rpx;
-				border: 2rpx solid #FFFFFF;
-				font-size: 28rpx;
-				color: #fff;
-				text-align: center;
-				line-height: 60rpx;
-				margin-right: 28rpx;
-				flex-shrink: 0;
-		
-				&.active {
-					background-color: #fff;
-					color: $themC;
-				}
-		
-				&.all {
-					width: 96rpx;
+	.date-row {
+		line-height: 88rpx;
+		color: #999;
+		border-top: 1px solid #F6F7FA;
+	}
+	.top_row {
+		height: 88rpx;
+	}
+	.red {
+		background-color: #FF7D7D !important;
+	}
+	.tabs {
+		display: flex;
+		justify-content: space-between;
+		.tab {
+			min-width: 108rpx;
+			height: 88rpx;
+			font-size: 28rpx;
+			color: #333;
+			text-align: center;
+			line-height: 88rpx;
+			margin-right: 28rpx;
+	
+			&.active {
+				color: $themC;
+				position: relative;
+				&::before {
+					position: absolute;
+					content: '';
+					width: 34rpx;
+					height: 4rpx;
+					background: #3776FF;
+					border-radius: 2rpx;
+					bottom: 10rpx;
+					left: 50%;
+					transform: translateX(-50%);
 				}
 			}
-			.rightPad {
-				min-width: 10rpx;
-				height: 60rpx;
-				
-			}
+			
+		}
+		.rightPad {
+			min-width: 10rpx;
+			height: 60rpx;
+			
 		}
 	}
-	
 	.learnStatus {
 		margin-top: 24rpx;
 	}
diff --git a/pages/tabbar/index/comp/informaItem.vue b/pages/tabbar/index/comp/informaItem.vue
index 98a0101..c12fdad 100644
--- a/pages/tabbar/index/comp/informaItem.vue
+++ b/pages/tabbar/index/comp/informaItem.vue
@@ -4,7 +4,7 @@
 			<image :src="item.picture" mode="aspectFill"></image>
 		</view>
 		<view class="rightText">
-			<view class="text towRowText">{{ item.title }}item.titleitem.titleitem.titleitem.titleitem.titleitem.titleitem.title</view>
+			<view class="text towRowText">{{ item.title }}</view>
 			<view class="date">{{ $u.timeFormat(item.createTime, 'yyyy/mm/dd') }}</view>
 		</view>
 	</view>
@@ -30,7 +30,6 @@
 <style lang="scss" scoped>
 	.flex-b {
 		justify-content: flex-start !important;
-		padding-top: 30rpx;
 		.imgBox {
 			width: 200rpx;
 			height: 135rpx;
@@ -42,8 +41,8 @@
 		.rightText {
 			flex: 1;
 			width: 0;
-			padding: 0rpx 0 0rpx 30rpx;
-			height: 168rpx;
+			padding: 30rpx 0 0rpx 30rpx;
+			height: 190rpx;
 			box-sizing: content;
 			display: flex;
 			flex-direction: column;
diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue
index 3fe7173..9dda226 100644
--- a/pages/tabbar/index/index.vue
+++ b/pages/tabbar/index/index.vue
@@ -82,8 +82,8 @@
 			<view class="card">
 				<view class="h1_row">
 					<view class="tabs">
-						<view class="h1 "><text class="active">行业资讯</text></view>
-						<view class="h1"><text>政策法规</text></view>
+						<view class="h1" @click="changeInforma(1)"><text :class="{active: informa==1}">行业资讯</text></view>
+						<view class="h1" @click="changeInforma(2)"><text :class="{active: informa==2}">政策法规</text></view>
 					</view>
 					<moreRight text="查看全部" @click.native="$goPage('/pages/indexEntry/industryPolicy/industryPolicy')"/>
 				</view>
@@ -127,7 +127,7 @@
 
 <script>
 	import { imgUrl } from '@/config/site.config'
-	import { getarticleList, getBannerList } from '@/config/api.js'
+	import { getarticleList, getBannerList, getarticlezcList } from '@/config/api.js'
 	import schoolItem from './comp/schoolItem'
 	import informaItem from './comp/informaItem'
 	import coachItem from './comp/coachItem'
@@ -243,6 +243,7 @@
 				},
 				bgColor: 'transparent',
 				informList: [],
+				informa: 1,
 			}
 		},
 		async onLoad() {
@@ -295,16 +296,16 @@
 				}
 				this.$goPage(item.url)
 			},
+			changeInforma(val) {
+				this.informa = val
+				this.getarticleListFn()
+			},
 			// 行业资讯
 			async getarticleListFn() {
-				const {data: res} = await getarticleList({pageSize: 4})
-				this.informList = res.list[0].articleManagementDO
+				const {data: res} = await getarticlezcList({pageSize: 3, type: this.informa})
+				this.informList = res.list
 			},
-			// 行业政策
-			// async getarticleListFn() {
-			// 	const {data: res} = await getarticleList(this.params)
-			// 	this.informList = res.list[0].articleManagementDO?.slice(0, 3)
-			// },
+			
 			async refereshFn() {
 				const res = await this.$store.dispatch('refreshToken')
 				console.log(res)
diff --git a/pages/tabbar/learnCar/comp/comp.scss b/pages/tabbar/learnCar/comp/comp.scss
index 6f3e03e..a802102 100644
--- a/pages/tabbar/learnCar/comp/comp.scss
+++ b/pages/tabbar/learnCar/comp/comp.scss
@@ -25,8 +25,15 @@
 	  .card {
 	  	background: #FFFFFF;
 	  	border-radius: 16rpx;
-	  	padding: 28rpx 32rpx;
+	  	padding: 0rpx 20rpx;
 		margin-bottom: 20rpx;
+		overflow: hidden;
+		.date {
+			font-size: 28rpx;
+			color: #999;
+			white-space: nowrap;
+			flex-shrink: 0;
+		}
 		&.mb0 {
 			margin-bottom: 0;
 		}
@@ -39,23 +46,23 @@
 	      }
 	  	
 	      .btn {
-	  		width: 144rpx;
-	  		height: 56rpx;
-	  		background: #1989FA;
+	  		height: 44rpx;
+			padding: 0 18rpx;
+	  		background: $themC;
 	  		border-radius: 8rpx;
 	  		font-size: 28rpx;
 	  		color: #fff;
 	  		text-align: center;
-	  		line-height: 56rpx;
+	  		line-height: 44rpx;
 			&.disable {
 				opacity: 0.3;
 			}
+			&.status {
+				border-radius: 10rpx 6rpx 6rpx 0px;
+			}
 	      }
 	    }
-		.date {
-			font-size: 28rpx;
-			color: #333;
-		}
+		
 	  }
 	
 	  .learnStatus {
@@ -72,16 +79,21 @@
 	      }
 	    }
 		.bg {
-			background: rgba(25,137,250,0.1);
+			background: #F6F7FA;
 			border-radius: 16rpx;
-			margin-top: 22rpx;
-			padding: 20rpx 20rpx 0 20rpx;
+			margin-bottom: 20rpx;
+			padding: 0rpx 20rpx 0 20rpx;
 			.row {
-				padding-bottom: 20rpx;
 				display: flex;
 				justify-content: space-between;
 				width: 100%;
 				align-items: center;
+				border-bottom: 1rpx solid #E3EAFB;
+				height: 88rpx;
+				
+				&:last-child {
+					border: none;
+				}
 				&.oneBtn {
 					justify-content: center;
 				}
@@ -106,4 +118,29 @@
 		  color: #ADADAD;
 		  margin-top: 22rpx;
 		  text-decoration: underline;
+	  }
+	  
+	  .padTb {
+		  padding: 30rpx 0;
+		  align-items: flex-start !important;
+		  .date {
+			  margin-top: 4rpx;
+			  padding-left: 20rpx;
+		  }
+	  }
+	  
+	  .link-arrow {
+		  display: flex;
+		  align-items: center;
+			font-size: 28rpx;
+			color: $themC;
+			height: 100rpx;
+			.txt {
+				margin-right: 4rpx;
+			}
+	  }
+	  
+	  .mt20 {
+		  margin-top: 20rpx;
+		  margin-bottom: 0;
 	  }
\ No newline at end of file
diff --git a/pages/tabbar/learnCar/comp/subject0.vue b/pages/tabbar/learnCar/comp/subject0.vue
index 004e926..54558ea 100644
--- a/pages/tabbar/learnCar/comp/subject0.vue
+++ b/pages/tabbar/learnCar/comp/subject0.vue
@@ -1,49 +1,38 @@
 <template>
 	<view class="comp">
-		<!-- 学习内容 -->
-		<view class="learnCon">
-			<view class="h1">学习内容</view>
-			<view class="card mb0">
-				<view class="flex-b">
-					<view class="lab">模拟器训练预约</view>
-					<view class="btn" @click="$goPage('/pages/carEntry/simulateAppointment/simulateAppointment')">去预约</view>
-				</view>
-			</view>
-		</view>
+		
 		<!-- 学习状态 -->
 		<view class="learnStatus">
-			<view class="flex-b">
-				<view class="h1">学习状态</view>
-				<view class="more">
-					<view class="txt">查看全部</view>
-					<view class="moreIcon">
-						<u-icon name="arrow-right" color="#686B73" size="12"></u-icon>
+			<view class="card mt20">
+				<view class="flex-b" >
+					<view class="lab">实操预约</view>
+					<view class="link-arrow">
+						<view class="txt">去预约</view>
+						<u-icon name="arrow-right" color="#3776FF" size="16"></u-icon>
 					</view>
 				</view>
 			</view>
+			<view class="h1"><text class="active">学习状态</text></view>
 			<view class="card">
-				<view class="flex-b">
-					<view class="lab">模拟器训练学时报审</view>
+				<view class="flex-b padTb">
+					<view class="lab">科目三安全文明常识成绩已通过</view>
 					<view class="date">2023/08/09 22:52:12</view>
 				</view>
 				<view class="flex-b bg">
 					<view class="row">
-						<view class="text">评价模拟器教学老师</view>
-						<view class="btn" @click="$goPage('/pages/carEntry/evaluate/evaluate?coachType=3&tit=模拟器老师&')">去评价</view>
+						<view class="text">考试成绩：97分</view>
+						<!-- <view class="btn" @click="$goPage('/pages/carEntry/evaluate/evaluate?coachType=3&tit=模拟器老师&')">去评价</view> -->
 					</view>
 				</view>
 			</view>
 			<view class="card">
-				<view class="flex-b">
-					<view class="lab">模拟器训练已预约</view>
+				<view class="flex-b padTb">
+					<view class="lab">科目三安全文明常识预约成功</view>
 					<view class="date">2023/08/09 22:52:12</view>
 				</view>
 				<view class="bg">
 					<view class="row">
-						<view class="text">模拟驾驶馆：某某模拟驾驶馆</view>
-					</view>
-					<view class="row">
-						<view class="text">模拟器编号：00001</view>
+						<view class="text">考试场地：某某场地</view>
 					</view>
 					<view class="row">
 						<view class="text">预约时间：2023/08/23 10:00:00</view>
diff --git a/pages/tabbar/learnCar/comp/topInfo.vue b/pages/tabbar/learnCar/comp/topInfo.vue
new file mode 100644
index 0000000..9da8951
--- /dev/null
+++ b/pages/tabbar/learnCar/comp/topInfo.vue
@@ -0,0 +1,150 @@
+<template>
+		<view class="topInfo card">
+			<view class="user_row">
+				<view class="avatar">
+					<image src="@/static/images/mineIcon/emtryIcon (1).png" mode=""></image>
+				</view>
+				<view class="rightTxt">
+					<view class="name">JOE宝宝</view>
+					<view class="btn_row">
+						<view class="txt">科目四</view>
+						<u-icon name="arrow-down-fill" color="#fff" size="10"></u-icon>
+					</view>
+				</view>
+			</view>
+			
+			<view class="bg">
+				<view class="row">
+					<view class="timeItem">
+						<view class="flex">
+							<view class="time">120</view>
+							<view class="uni">分钟</view>
+						</view>
+						<view class="lab">已完成学时</view>
+					</view>
+					<view class="timeItem">
+						<view class="flex">
+							<view class="time">120</view>
+							<view class="uni">分钟</view>
+						</view>
+						<view class="lab">应完成学时</view>
+					</view>
+				</view>
+				<view class="row">
+					<view class="timeItem">
+						<view class="flex ">
+							<view class="time">120</view>
+							<view class="uni">分钟</view>
+						</view>
+						<view class="lab">已完成学时</view>
+					</view>
+					<view class="timeItem">
+						<view class="flex ">
+							<view class="time ">120</view>
+							<view class="uni">分钟</view>
+						</view>
+						<view class="lab">应完成学时</view>
+					</view>
+				</view>
+			</view>
+		</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	  .topInfo.card {
+		  padding: 0rpx 20rpx 20rpx 20rpx;
+	    .user_row {
+			display: flex;
+	      .avatar {
+	        width: 120rpx;
+			height: 120rpx;
+			border-radius: 50%;
+			overflow: hidden;
+			// transform: translateY(-50rpx);
+			margin-top: -36rpx;
+			background: #F6F7FA;
+	      }
+	
+	      .rightTxt {
+			  display: flex;
+			  align-items: center;
+			  justify-content: space-between;
+			  flex: 1;
+			  width: 0;
+			  padding: 0 0 0 20rpx;
+	        .name {
+				font-size: 28rpx;
+				color: #333;
+	        }
+	
+	        .btn_row {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				background: $themC;
+				width: 150rpx;
+				height: 50rpx;
+				color: #fff;
+				border-radius: 10rpx;
+				font-size: 24rpx;
+				lighting-color: 50rpx;
+	          .txt {
+				margin-right: 10rpx;
+	          }
+	        }
+	      }
+	    }
+	
+	    .bg {
+			background: #F6F7FA;
+			border-radius: 20rpx;
+			padding: 20rpx;
+			margin-top: 30rpx;
+	      .row {
+			  border-top: 1rpx solid #EDEDED;
+			  display: flex;
+			  &:first-child {
+				  border: none;
+			  }
+	        .timeItem {
+				border-left: 1px solid #EDEDED;
+				flex: 1;
+				align-items: center;
+				justify-content: center;
+				color: #999;
+				font-size: 24rpx;
+				padding: 20rpx 0;
+				&:first-child {
+					border: none;
+				}
+	          .flex {
+				  justify-content: center;
+				  
+	            .time {
+					font-size: 36rpx;
+					color: #333;
+					font-weight: 700;
+	            }
+	            .uni {
+					margin-top: -6rpx;
+	            }
+	          }
+	
+	          .lab {
+				text-align: center;
+	          }
+	        }
+	      }
+	    }
+	  }
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/learnCar/index - 副本.vue b/pages/tabbar/learnCar/index - 副本.vue
new file mode 100644
index 0000000..08aaa0f
--- /dev/null
+++ b/pages/tabbar/learnCar/index - 副本.vue	
@@ -0,0 +1,172 @@
+<template>
+	<view class="content pageBgImg">
+		
+		<view  style="width: 100%;height: 40rpx;"></view>
+		<view class="status_bar"></view>
+		<view class="title">江西驾考公共服务平台</view>
+		<view class="navCard">
+			<view class="nav_row">
+				<view class="nav " v-for="(item,index) in navData" :key="index" :class="{active: item.id==currentNav}" @click="changeNav(item.id)">{{ item.text }}</view>
+			</view>
+			<view class="time_row">
+				<view class="time_item">
+					<view class="lab">应完成学时</view>
+					<view class="num">100分钟</view>
+				</view>
+				<view class="time_item">
+					<view class="lab">已完成学时</view>
+					<view class="num">30分钟</view>
+					<view class="shareTime">*与科目一学时共享</view>
+				</view>
+			</view>
+			<view class="subject3" v-if="currentNav==3">
+				<view class="chain left">
+					<image src="@/static/images/index/chain.png" mode=""></image>
+				</view>
+				<view class="chain right">
+					<image src="@/static/images/index/chain.png" mode=""></image>
+				</view>
+				<view class="time_row ">
+					<view class="time_item">
+						<view class="lab">应完成里程</view>
+						<view class="num">50km</view>
+					</view>
+					<view class="time_item">
+						<view class="lab">已完成里程</view>
+						<view class="num">0km</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="haveToken" v-if="studentId">
+			<subject0 v-show="currentNav==0"/>
+			<subject1 v-show="currentNav==1"/>
+			<subject2 v-show="currentNav==2"/>
+			<subject3 v-show="currentNav==3"/>
+			<subject4 v-show="currentNav==4"/>
+		</view>
+		<view class="noDate" v-else>
+			<nodata><text>暂无数据，您还未报名</text></nodata>
+		</view>
+	</view>
+</template>
+
+<script>
+	import subject0 from './comp/subject0'
+	import subject1 from './comp/subject1'
+	import subject2 from './comp/subject2'
+	import subject3 from './comp/subject3'
+	import subject4 from './comp/subject4'
+	export default {
+		components: { subject0, subject1, subject2, subject3, subject4 },
+		data() {
+			return {
+				navData: [
+					{text: '模拟器', id: 0},
+					{text: '科目一', id: 1},
+					{text: '科目二', id: 2},
+					{text: '科目三', id: 3},
+					{text: '科目四', id: 4},
+				],
+				currentNav: 0
+			}
+		},
+		onLoad() {
+		},
+		onShow() {
+			// console.log('没发生？')
+			// this.$store.dispatch('checkLogin')
+		},
+		methods: {
+			changeNav(id) {
+				this.currentNav = id
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		width: 100vw;
+		min-height: 100vh;
+		// background: url('../../../static/images/bigImg/topbg.png') #F6F6F6 no-repeat;
+		background-size: 100% 362rpx;
+		padding: 0 32rpx 32rpx 32rpx;
+		.title {
+			font-size: 36rpx;
+			font-weight: 600;
+			color: #fff;
+			padding: 10rpx 0 48rpx 0rpx;
+		}
+	  .navCard {
+	    .nav_row {
+			display: flex;
+			justify-content: space-between;
+	      .nav {
+			width: 19.4%;
+			height: 86rpx;
+			background: rgba(255,255,255,0.4);
+			border-radius: 8rpx 8rpx 0px 0px;
+			font-size: 28rpx;
+			color: #fff;
+			line-height: 86rpx;
+			text-align: center;
+			&.active {
+				background: #FFFFFF;
+				color: $themC;
+			}
+	      }
+	    }
+		.subject3 {
+			padding-top: 32rpx;
+			position: relative;
+			.chain {
+				width: 28rpx;
+				height: 100rpx;
+				position: absolute;
+				top: -34rpx;
+				&.left {
+					left: 60rpx;
+				}
+				&.right {
+					right: 60rpx !important;
+				}
+			}
+		}
+	    .time_row {
+			display: flex;
+			height: 240rpx;
+			padding: 32rpx;
+			align-items: center;
+			justify-content: center;
+			background: #fff;
+			border-radius: 0 0 8rpx 8rpx;
+	      .time_item {
+			  flex: 1;
+			  text-align: center;
+			  position: relative;
+	        .lab {
+				font-size: 28rpx;
+				color: #333;
+	        }
+	
+	        .num {
+				font-size: 40rpx;
+				font-weight: 600;
+				color: $themC;
+				margin-top: 20rpx;
+	        }
+			.shareTime {
+				font-size: 20rpx;
+				color: $themC;
+				position: absolute;
+				bottom: -40rpx;
+				left: 0;
+				width: 100%;
+			}
+	      }
+	    }
+	  }
+	
+	}
+</style>
diff --git a/pages/tabbar/learnCar/index.vue b/pages/tabbar/learnCar/index.vue
index 08aaa0f..506cb8d 100644
--- a/pages/tabbar/learnCar/index.vue
+++ b/pages/tabbar/learnCar/index.vue
@@ -1,172 +1,25 @@
 <template>
-	<view class="content pageBgImg">
-		
-		<view  style="width: 100%;height: 40rpx;"></view>
+	<view class="pageBgImg pad">
 		<view class="status_bar"></view>
-		<view class="title">江西驾考公共服务平台</view>
-		<view class="navCard">
-			<view class="nav_row">
-				<view class="nav " v-for="(item,index) in navData" :key="index" :class="{active: item.id==currentNav}" @click="changeNav(item.id)">{{ item.text }}</view>
-			</view>
-			<view class="time_row">
-				<view class="time_item">
-					<view class="lab">应完成学时</view>
-					<view class="num">100分钟</view>
-				</view>
-				<view class="time_item">
-					<view class="lab">已完成学时</view>
-					<view class="num">30分钟</view>
-					<view class="shareTime">*与科目一学时共享</view>
-				</view>
-			</view>
-			<view class="subject3" v-if="currentNav==3">
-				<view class="chain left">
-					<image src="@/static/images/index/chain.png" mode=""></image>
-				</view>
-				<view class="chain right">
-					<image src="@/static/images/index/chain.png" mode=""></image>
-				</view>
-				<view class="time_row ">
-					<view class="time_item">
-						<view class="lab">应完成里程</view>
-						<view class="num">50km</view>
-					</view>
-					<view class="time_item">
-						<view class="lab">已完成里程</view>
-						<view class="num">0km</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="haveToken" v-if="studentId">
-			<subject0 v-show="currentNav==0"/>
-			<subject1 v-show="currentNav==1"/>
-			<subject2 v-show="currentNav==2"/>
-			<subject3 v-show="currentNav==3"/>
-			<subject4 v-show="currentNav==4"/>
-		</view>
-		<view class="noDate" v-else>
-			<nodata><text>暂无数据，您还未报名</text></nodata>
-		</view>
+		<view class="" style="height: 100rpx;"></view>
+		<topInfo></topInfo>
+		<subject0></subject0>
 	</view>
 </template>
 
 <script>
-	import subject0 from './comp/subject0'
-	import subject1 from './comp/subject1'
-	import subject2 from './comp/subject2'
-	import subject3 from './comp/subject3'
-	import subject4 from './comp/subject4'
+	import topInfo from './comp/topInfo.vue'
+	import subject0 from './comp/subject0.vue'
 	export default {
-		components: { subject0, subject1, subject2, subject3, subject4 },
+		components: { topInfo, subject0 },
 		data() {
 			return {
-				navData: [
-					{text: '模拟器', id: 0},
-					{text: '科目一', id: 1},
-					{text: '科目二', id: 2},
-					{text: '科目三', id: 3},
-					{text: '科目四', id: 4},
-				],
-				currentNav: 0
-			}
-		},
-		onLoad() {
-		},
-		onShow() {
-			// console.log('没发生？')
-			// this.$store.dispatch('checkLogin')
-		},
-		methods: {
-			changeNav(id) {
-				this.currentNav = id
+				
 			}
 		}
 	}
 </script>
 
-<style lang="scss" scoped>
-	.content {
-		width: 100vw;
-		min-height: 100vh;
-		// background: url('../../../static/images/bigImg/topbg.png') #F6F6F6 no-repeat;
-		background-size: 100% 362rpx;
-		padding: 0 32rpx 32rpx 32rpx;
-		.title {
-			font-size: 36rpx;
-			font-weight: 600;
-			color: #fff;
-			padding: 10rpx 0 48rpx 0rpx;
-		}
-	  .navCard {
-	    .nav_row {
-			display: flex;
-			justify-content: space-between;
-	      .nav {
-			width: 19.4%;
-			height: 86rpx;
-			background: rgba(255,255,255,0.4);
-			border-radius: 8rpx 8rpx 0px 0px;
-			font-size: 28rpx;
-			color: #fff;
-			line-height: 86rpx;
-			text-align: center;
-			&.active {
-				background: #FFFFFF;
-				color: $themC;
-			}
-	      }
-	    }
-		.subject3 {
-			padding-top: 32rpx;
-			position: relative;
-			.chain {
-				width: 28rpx;
-				height: 100rpx;
-				position: absolute;
-				top: -34rpx;
-				&.left {
-					left: 60rpx;
-				}
-				&.right {
-					right: 60rpx !important;
-				}
-			}
-		}
-	    .time_row {
-			display: flex;
-			height: 240rpx;
-			padding: 32rpx;
-			align-items: center;
-			justify-content: center;
-			background: #fff;
-			border-radius: 0 0 8rpx 8rpx;
-	      .time_item {
-			  flex: 1;
-			  text-align: center;
-			  position: relative;
-	        .lab {
-				font-size: 28rpx;
-				color: #333;
-	        }
-	
-	        .num {
-				font-size: 40rpx;
-				font-weight: 600;
-				color: $themC;
-				margin-top: 20rpx;
-	        }
-			.shareTime {
-				font-size: 20rpx;
-				color: $themC;
-				position: absolute;
-				bottom: -40rpx;
-				left: 0;
-				width: 100%;
-			}
-	      }
-	    }
-	  }
+<style scoped lang="scss">
 	
-	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/mine/index - 副本.vue b/pages/tabbar/mine/index - 副本.vue
new file mode 100644
index 0000000..d408406
--- /dev/null
+++ b/pages/tabbar/mine/index - 副本.vue	
@@ -0,0 +1,368 @@
+<template>
+	<view class="pageBgImg">
+		<!-- 学员名字 -->
+		<view class="top_row flex-b" @click="topClick">
+			<view class="flex">
+				<view class="userName">Hi，{{ vuex_userInfo.name?vuex_userInfo.name:vuex_userInfo.phone?vuex_userInfo.phone:'请登录'}}</view>
+				<view class="arrowIcon">
+					<image src="../../../static/images/userCenter/ic_gengduo.png" mode=""></image>
+				</view>
+			</view>
+			<view class="scanCode">
+				<image src="../../../static/images/userCenter/ic_erweima.png" mode=""></image>
+			</view>
+		</view>
+		<view class="pad">
+			<!-- 学车进度 -->
+			<view class="userProgress">
+				<view class="progItme first flex">
+					<view class="dianBox">
+						<view class="dian"></view>
+					</view>
+					<view class="rightCon">报名成功</view>
+				</view>
+				<view class="progItme flex">
+					<view class="dianBox">
+						<view class="dian active"></view>
+					</view>
+					<view class="line"></view>
+					<view class="rightCon">
+						<view class="day">22天</view>
+						<view class="flex-b">
+							<view class="flex">
+								<view class="text">科目一考试通过</view>
+								<view class="tag">当前进度</view>
+							</view>
+							<view class="progBtn" @click="$goPage('/pages/mineEntry/carLearProgress/carLearProgress')">进度查询</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 我的相关入口 -->
+			<view class="ul">
+				<view class="li"  v-for="(item,index) in myPageEntry" :key="index" @click="myPageEntryClick(item)">
+					<view class="icon">
+						<image :src="item.icon" mode="" v-if="item.text=='我的报名'" ></image>
+						<image :src="item.icon" mode="" v-else></image>
+					</view>
+					<view class="text">{{ item.text }}</view>
+				</view>
+			</view>
+			<!-- 业务办理 -->
+			<view class="business ">
+				<view class="h1">业务办理</view>
+				<view class="card">
+					<view class="item" v-for="(item,index) in businessEntry" :key="index"  @click="goBusinessEntry(item)">
+						<view class="icon">
+							<image :src="item.icon" mode=""></image>
+						</view>
+						<view class="text">{{ item.text }}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { selectContractPdfBase64 } from '@/config/api.js'
+	export default {
+		data() {
+			return {
+				
+				myPageEntry: [
+					{
+						text: '我的报名',
+						icon: require('../../../static/images/userCenter/yubaoming.png'),
+						url: '/pages/mineEntry/myForecastName/myForecastName',
+					},
+					{
+						text: '我的预约',
+						icon: require('../../../static/images/userCenter/ic_yuyue.png'),
+						url: '/pages/mineEntry/myAppointment/myAppointment'
+					},
+					{
+						text: '我的订单',
+						icon: require('../../../static/images/userCenter/ic_dingdan.png'),
+						url: '/pages/mineEntry/myOrder/myOrder'
+					},
+					{
+						text: '学车数据',
+						icon: require('../../../static/images/userCenter/ic_shuju.png'),
+						url: '/pages/mineEntry/carData/carData'
+					},
+					{
+						text: '我的合同',
+						icon: require('../../../static/images/userCenter/ic_hetong.png'),
+						url: '/pages/mineEntry/myContract/myContract'
+					},
+					{
+						text: '我的评价',
+						icon: require('../../../static/images/userCenter/ic_pingjia.png'),
+						url: '/pages/mineEntry/myEvaluate/myEvaluate'
+					},
+					{
+						text: '我的收藏',
+						icon: require('../../../static/images/userCenter/ic_shoucang.png'),
+						url: '/pages/mineEntry/myCollect/myCollect'
+					},
+					{
+						text: '本地生活',
+						icon: require('../../../static/images/userCenter/ic_shenghuo.png'),
+					},
+				],
+				businessEntry: [
+					{
+						text: '学时查询',
+						icon: require('../../../static/images/userCenter/ic_chaxun.png'),
+						url: '/pages/mineEntry/carLearnHours/carLearnHours'
+					},
+					{
+						text: '同城转校',
+						icon: require('../../../static/images/userCenter/tgzhuanxiao.png'),
+						url: '/pages/mineEntry/schoolTransfer/schoolTransfer'
+					},
+					{
+						text: '车型变更',
+						icon: require('../../../static/images/userCenter/biangen.png'),
+						url: '/pages/mineEntry/modelChange/modelChange'
+					},
+					{
+						text: '申请退学',
+						icon: require('../../../static/images/userCenter/shenqingtuixue.png'),
+						url: '/pages/mineEntry/refund/refund'
+					},
+				]
+			}
+		},
+		onLoad() {
+			console.log('我的页面')
+			
+		},
+		onShow() {
+			// uni.hideTabBar();
+		},
+		methods: {
+			topClick() {
+				if(!this.vuex_userInfo.phone) {
+					this.$goPage('/pages/userCenter/login/login')
+				}else {
+					this.$goPage('/pages/mineEntry/personaInfo/personaInfo')
+				}
+			},
+			async selectContractPdfBase64Fn() {
+				const {data: res} = await selectContractPdfBase64({studentId: this.studentId})
+				this.pdfUrl = res
+				console.log('this.pdfUrl')
+				console.log(this.pdfUrl)
+			},
+			 async goBusinessEntry(item) {
+				const res = await this.$store.dispatch('checkLogin')
+				if(!res) return
+				if(!this.vuex_userInfo.schoolId) return this.$u.toast('您不是平台学员')
+				this.$goPage(item.url)
+			},
+			async myPageEntryClick(item) {
+				const res = await this.$store.dispatch('checkLogin')
+				if(!res) return
+				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)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+	.pageBgImg {
+	  .top_row {
+		  width: 100%;
+		  padding: 180rpx 62rpx 0 32rpx;
+	    .flex {
+			
+	      .userName {
+			font-size: 48rpx;
+			font-weight: 600;
+			color: #FFFFFF;
+	      }
+	
+	      .arrowIcon {
+	        margin-left: 24rpx;
+			width: 40rpx;
+			height: 40rpx;
+	      }
+	    }
+	
+	    .scanCode {
+	      width: 40rpx;
+		  height: 40rpx;
+	    }
+	  }
+	
+	  .userProgress {
+		  background: rgba(255,255,255,0.65);
+		  box-shadow: 2px 2px 8px 0px #C3D6E9, inset 0px 2px 4px 0px rgba(255,255,255,0.5);
+		  border-radius: 16rpx;
+		  padding: 22rpx 22rpx 22rpx 32rpx;
+		  margin-top: 32rpx;
+	    .progItme {
+			position: relative;
+			.dianBox {
+				width: 32rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				position: absolute;
+				left: 0rpx;
+				bottom: 14rpx;
+				z-index: 4;
+				.dian {
+						width: 12rpx;
+						height: 12rpx;
+						background: #1989FA;
+						border-radius: 50%;
+						&.active {
+							width: 32rpx;
+							height: 32rpx;
+							background: rgba(25,137,250,0.11);
+							position: relative;
+							&::before {
+								content: '' ;
+								width: 18rpx;
+								height: 18rpx;
+								position: absolute;
+								border-radius: 50%;
+								top: 50%;
+								left: 50%;
+								background: #1989FA;
+								transform: translate(-50%, -50%);
+							}
+						}
+				}
+			}
+			.line {
+			  position: absolute;
+			  left: 14rpx;
+			  bottom: 30rpx;
+			  width: 0rpx;
+			  height: 90rpx;
+			  border: 1rpx dashed rgba(25,137,250,0.7);
+			  z-index: 1;
+			}
+	      .rightCon {
+			  flex: 1;
+			  padding: 0 0 0 54rpx;
+	        .day {
+				font-size: 20rpx;
+				color: $themC;
+				margin: 12rpx 0 0rpx 0;
+	        }
+	  
+	        .flex-b {
+				
+	          .flex {
+	            .text {
+					font-size: 28rpx;
+					color: #333;
+					font-weight: 600;
+	            }
+	  
+	            .tag {
+					margin-left: 10rpx;
+					width: 110rpx;
+					height: 44rpx;
+					background: #FAF0E4;
+					border-radius: 8rpx;
+					font-size: 20rpx;
+					color: #FA7919;
+					line-height: 44rpx;
+					text-align: center;
+	            }
+	          }
+	  
+	          .progBtn {
+				width: 130rpx;
+				height: 60rpx;
+				background: rgba(25,137,250,0.1);
+				border-radius: 8rpx;
+				border: 2rpx solid #1989FA;
+				font-size: 28rpx;
+				color: $themC;
+				line-height: 60rpx;
+				text-align: center;
+	          }
+	        }
+	      }
+	    }
+	  }
+	
+	  .ul {
+		  padding: 38rpx 0;
+		  display: flex;
+		  flex-wrap: wrap;
+		  width: 100%;
+	    .li {
+			width: 25%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			margin: 24rpx 0;
+	      .icon {
+	        width: 68rpx;
+			height: 68rpx;
+	      }
+	
+	      .text {
+			font-size: 28rpx;
+			margin-top: 16rpx;
+			color: #333;
+	      }
+	    }
+	  }
+	
+	  .business {
+		  padding: 32rpx 0;
+	    .h1 {
+			margin-bottom: 24rpx;
+	    }
+	
+	    .card {
+			width: 100%;
+			height: 390rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			display: flex;
+			flex-wrap: wrap;
+			padding: 38rpx 0 0 0;
+	      .item {
+			  width: 33.33%;
+			  display: flex;
+			  flex-direction: column;
+			  align-items: center;
+			  height: 162rpx;
+	        .icon {
+	          width: 72rpx;
+			  height: 72rpx;
+			  background: #F6F7F8;
+			  border-radius: 50%;
+			  display: flex;
+			  align-items: center;
+			  justify-content: center;
+			  image {
+				  width: 48rpx;
+				  height: 48rpx;
+			  }
+	        }
+	
+	        .text {
+				margin-top: 16rpx;
+				font-size: 28rpx;
+				color: #333;
+	        }
+	      }
+	    }
+	  }
+	}
+</style>
diff --git a/pages/tabbar/mine/index.scss b/pages/tabbar/mine/index.scss
new file mode 100644
index 0000000..7eb8800
--- /dev/null
+++ b/pages/tabbar/mine/index.scss
@@ -0,0 +1,125 @@
+
+.pageBgImg {
+
+  .userInfo {
+	  width: 100%;
+	  padding: 30rpx 30rpx 100rpx 30rpx;
+	  display: flex;
+	  align-items: center;
+	  
+    .avatar {
+		width: 120rpx;
+		height: 120rpx;
+		border-radius: 50%;
+		overflow: hidden;
+		background: #f4f4f4;
+      image {
+
+      }
+    }
+	
+    .rightInfo {
+		flex: 1;
+		width: 0;
+		padding-left: 20rpx;
+      .name-row {
+		  display: flex;
+		  justify-content: space-between;
+        .leftTxt {
+			flex: 1;
+			width: 0;
+			display: flex;
+			align-items: center;
+          .name {
+				font-size: 30rpx;
+				color: #fff;
+				font-weight: 700;
+          }
+
+          .arrowIcon {
+			  width: 36rpx;
+			  height: 36rpx;
+			  margin-left: 4rpx;
+          }
+        }
+
+        .scanCode {
+			width: 36rpx;
+			height: 36rpx;
+        }
+      }
+
+      .phone {
+			font-size: 24rpx;
+			color: #fff;
+			margin-top: 20rpx;
+      }
+    }
+  }
+.pad {
+		border-radius: 20rpx 20rpx 0 0;
+		background-color: #f4f4f4;
+		transform: translateY(-22rpx);
+	}
+  .ul {
+	  display: flex;
+	  width: 100%;
+	  height: 154rpx;
+	  background: #FFFFFF;
+	  border-radius: 20rpx;
+	  padding: 20rpx;
+	  transform: translateY(-60rpx);
+    .li {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		justify-content: center;
+      .icon {
+		  width: 77rpx;
+		  height: 77rpx;
+      }
+
+      .text {
+		font-size: 24rpx;
+		color: #333;
+      }
+    }
+  }
+
+  .ul2 {
+	  background: #FFFFFF;
+	  border-radius: 20rpx;
+	  margin-top: -40rpx;
+	  padding: 4rpx 20rpx;
+    .li2 {
+		display: flex;
+		height: 88rpx;
+		display: flex;
+		align-items: center;
+		border-bottom: 1rpx solid #F6F7FA;
+		&:last-child {
+			border: none;
+		}
+      .icon {
+		  width: 54rpx;
+		  height: 52rpx;
+        image {
+
+        }
+      }
+
+      .text {
+		font-size: 28rpx;
+		color: #333;
+		margin-left: 20rpx;
+      }
+
+      .arrowRight {
+		  width: 36rpx;
+		  height: 36rpx;
+		  margin-left: auto;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue
index d408406..04fb75a 100644
--- a/pages/tabbar/mine/index.vue
+++ b/pages/tabbar/mine/index.vue
@@ -1,368 +1,79 @@
 <template>
 	<view class="pageBgImg">
-		<!-- 学员名字 -->
-		<view class="top_row flex-b" @click="topClick">
-			<view class="flex">
-				<view class="userName">Hi，{{ vuex_userInfo.name?vuex_userInfo.name:vuex_userInfo.phone?vuex_userInfo.phone:'请登录'}}</view>
-				<view class="arrowIcon">
-					<image src="../../../static/images/userCenter/ic_gengduo.png" mode=""></image>
-				</view>
-			</view>
-			<view class="scanCode">
-				<image src="../../../static/images/userCenter/ic_erweima.png" mode=""></image>
+		<view class="status_bar"></view>
+		<!-- 用户信息 -->
+		<view class="userInfo">
+			<view class="avatar">
+				<image src="@/static/images/mineIcon/emtryIcon (3).png" mode=""></image>
 			</view>
-		</view>
-		<view class="pad">
-			<!-- 学车进度 -->
-			<view class="userProgress">
-				<view class="progItme first flex">
-					<view class="dianBox">
-						<view class="dian"></view>
-					</view>
-					<view class="rightCon">报名成功</view>
-				</view>
-				<view class="progItme flex">
-					<view class="dianBox">
-						<view class="dian active"></view>
-					</view>
-					<view class="line"></view>
-					<view class="rightCon">
-						<view class="day">22天</view>
-						<view class="flex-b">
-							<view class="flex">
-								<view class="text">科目一考试通过</view>
-								<view class="tag">当前进度</view>
-							</view>
-							<view class="progBtn" @click="$goPage('/pages/mineEntry/carLearProgress/carLearProgress')">进度查询</view>
+			<view class="rightInfo">
+				<view class="name-row">
+					<view class="leftTxt">
+						<view class="name">JOE宝宝</view>
+						<view class="arrowIcon">
+							<image src="@/static/images/icon/arrowRightfff.png" mode=""></image>
 						</view>
 					</view>
+					<view class="scanCode">
+						<image src="@/static/images/mineIcon/sanCode.png" mode=""></image>
+					</view>
 				</view>
+				<view class="phone">18267103167</view>
 			</view>
-			<!-- 我的相关入口 -->
+		</view>
+		
+		<view class="pad">
 			<view class="ul">
-				<view class="li"  v-for="(item,index) in myPageEntry" :key="index" @click="myPageEntryClick(item)">
+				<view class="li" v-for="(item,index) in ulData" :key="index"  @click="$goPage(item.url)">
 					<view class="icon">
-						<image :src="item.icon" mode="" v-if="item.text=='我的报名'" ></image>
-						<image :src="item.icon" mode="" v-else></image>
+						<image :src="item.icon" mode=""></image>
 					</view>
-					<view class="text">{{ item.text }}</view>
+					<view class="text">{{ item.name }}</view>
 				</view>
 			</view>
-			<!-- 业务办理 -->
-			<view class="business ">
-				<view class="h1">业务办理</view>
-				<view class="card">
-					<view class="item" v-for="(item,index) in businessEntry" :key="index"  @click="goBusinessEntry(item)">
-						<view class="icon">
-							<image :src="item.icon" mode=""></image>
-						</view>
-						<view class="text">{{ item.text }}</view>
+			
+			<view class="ul2">
+				<view class="li2" v-for="(item,index) in ulData2" :key="index">
+					<view class="icon">
+						<image :src="item.icon" mode=""></image>
+					</view>
+					<view class="text">{{ item.name }}</view>
+					<view class="arrowRight">
+						<u-icon name="arrow-right" color="#ccc" size="16"></u-icon>
 					</view>
 				</view>
 			</view>
 		</view>
+		
+		
+		
 	</view>
 </template>
 
 <script>
-	import { selectContractPdfBase64 } from '@/config/api.js'
 	export default {
 		data() {
 			return {
-				
-				myPageEntry: [
-					{
-						text: '我的报名',
-						icon: require('../../../static/images/userCenter/yubaoming.png'),
-						url: '/pages/mineEntry/myForecastName/myForecastName',
-					},
-					{
-						text: '我的预约',
-						icon: require('../../../static/images/userCenter/ic_yuyue.png'),
-						url: '/pages/mineEntry/myAppointment/myAppointment'
-					},
-					{
-						text: '我的订单',
-						icon: require('../../../static/images/userCenter/ic_dingdan.png'),
-						url: '/pages/mineEntry/myOrder/myOrder'
-					},
-					{
-						text: '学车数据',
-						icon: require('../../../static/images/userCenter/ic_shuju.png'),
-						url: '/pages/mineEntry/carData/carData'
-					},
-					{
-						text: '我的合同',
-						icon: require('../../../static/images/userCenter/ic_hetong.png'),
-						url: '/pages/mineEntry/myContract/myContract'
-					},
-					{
-						text: '我的评价',
-						icon: require('../../../static/images/userCenter/ic_pingjia.png'),
-						url: '/pages/mineEntry/myEvaluate/myEvaluate'
-					},
-					{
-						text: '我的收藏',
-						icon: require('../../../static/images/userCenter/ic_shoucang.png'),
-						url: '/pages/mineEntry/myCollect/myCollect'
-					},
-					{
-						text: '本地生活',
-						icon: require('../../../static/images/userCenter/ic_shenghuo.png'),
-					},
+				ulData: [
+					{name: '学车进度', icon: require('@/static/images/mineIcon/emtryIcon (4).png'),url: '/pages/mineEntry/carLearProgress/carLearProgress'},
+					{name: '我的预约', icon: require('@/static/images/mineIcon/emtryIcon (1).png'),url: ''},
+					{name: '我的订单', icon: require('@/static/images/mineIcon/emtryIcon (2).png'),url: ''},
+					{name: '我的合同', icon: require('@/static/images/mineIcon/emtryIcon (3).png'),url: ''},
 				],
-				businessEntry: [
-					{
-						text: '学时查询',
-						icon: require('../../../static/images/userCenter/ic_chaxun.png'),
-						url: '/pages/mineEntry/carLearnHours/carLearnHours'
-					},
-					{
-						text: '同城转校',
-						icon: require('../../../static/images/userCenter/tgzhuanxiao.png'),
-						url: '/pages/mineEntry/schoolTransfer/schoolTransfer'
-					},
-					{
-						text: '车型变更',
-						icon: require('../../../static/images/userCenter/biangen.png'),
-						url: '/pages/mineEntry/modelChange/modelChange'
-					},
-					{
-						text: '申请退学',
-						icon: require('../../../static/images/userCenter/shenqingtuixue.png'),
-						url: '/pages/mineEntry/refund/refund'
-					},
+				ulData2: [
+					{name: '学时查询', icon: require('@/static/images/mineIcon/minIcon (4).png'),url: ''},
+					{name: '我的评价', icon: require('@/static/images/mineIcon/minIcon (1).png'),url: ''},
+					{name: '退款申请', icon: require('@/static/images/mineIcon/minIcon (3).png'),url: ''},
+					{name: '变更车型', icon: require('@/static/images/mineIcon/minIcon (7).png'),url: ''},
+					{name: '同城转校', icon: require('@/static/images/mineIcon/minIcon (5).png'),url: ''},
+					{name: '退款申请记录', icon: require('@/static/images/mineIcon/minIcon (6).png'),url: ''},
+					{name: '关于我们', icon: require('@/static/images/mineIcon/minIcon (2).png'),url: ''},
 				]
 			}
-		},
-		onLoad() {
-			console.log('我的页面')
-			
-		},
-		onShow() {
-			// uni.hideTabBar();
-		},
-		methods: {
-			topClick() {
-				if(!this.vuex_userInfo.phone) {
-					this.$goPage('/pages/userCenter/login/login')
-				}else {
-					this.$goPage('/pages/mineEntry/personaInfo/personaInfo')
-				}
-			},
-			async selectContractPdfBase64Fn() {
-				const {data: res} = await selectContractPdfBase64({studentId: this.studentId})
-				this.pdfUrl = res
-				console.log('this.pdfUrl')
-				console.log(this.pdfUrl)
-			},
-			 async goBusinessEntry(item) {
-				const res = await this.$store.dispatch('checkLogin')
-				if(!res) return
-				if(!this.vuex_userInfo.schoolId) return this.$u.toast('您不是平台学员')
-				this.$goPage(item.url)
-			},
-			async myPageEntryClick(item) {
-				const res = await this.$store.dispatch('checkLogin')
-				if(!res) return
-				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)
-			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	
-	.pageBgImg {
-	  .top_row {
-		  width: 100%;
-		  padding: 180rpx 62rpx 0 32rpx;
-	    .flex {
-			
-	      .userName {
-			font-size: 48rpx;
-			font-weight: 600;
-			color: #FFFFFF;
-	      }
-	
-	      .arrowIcon {
-	        margin-left: 24rpx;
-			width: 40rpx;
-			height: 40rpx;
-	      }
-	    }
-	
-	    .scanCode {
-	      width: 40rpx;
-		  height: 40rpx;
-	    }
-	  }
-	
-	  .userProgress {
-		  background: rgba(255,255,255,0.65);
-		  box-shadow: 2px 2px 8px 0px #C3D6E9, inset 0px 2px 4px 0px rgba(255,255,255,0.5);
-		  border-radius: 16rpx;
-		  padding: 22rpx 22rpx 22rpx 32rpx;
-		  margin-top: 32rpx;
-	    .progItme {
-			position: relative;
-			.dianBox {
-				width: 32rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				position: absolute;
-				left: 0rpx;
-				bottom: 14rpx;
-				z-index: 4;
-				.dian {
-						width: 12rpx;
-						height: 12rpx;
-						background: #1989FA;
-						border-radius: 50%;
-						&.active {
-							width: 32rpx;
-							height: 32rpx;
-							background: rgba(25,137,250,0.11);
-							position: relative;
-							&::before {
-								content: '' ;
-								width: 18rpx;
-								height: 18rpx;
-								position: absolute;
-								border-radius: 50%;
-								top: 50%;
-								left: 50%;
-								background: #1989FA;
-								transform: translate(-50%, -50%);
-							}
-						}
-				}
-			}
-			.line {
-			  position: absolute;
-			  left: 14rpx;
-			  bottom: 30rpx;
-			  width: 0rpx;
-			  height: 90rpx;
-			  border: 1rpx dashed rgba(25,137,250,0.7);
-			  z-index: 1;
-			}
-	      .rightCon {
-			  flex: 1;
-			  padding: 0 0 0 54rpx;
-	        .day {
-				font-size: 20rpx;
-				color: $themC;
-				margin: 12rpx 0 0rpx 0;
-	        }
-	  
-	        .flex-b {
-				
-	          .flex {
-	            .text {
-					font-size: 28rpx;
-					color: #333;
-					font-weight: 600;
-	            }
-	  
-	            .tag {
-					margin-left: 10rpx;
-					width: 110rpx;
-					height: 44rpx;
-					background: #FAF0E4;
-					border-radius: 8rpx;
-					font-size: 20rpx;
-					color: #FA7919;
-					line-height: 44rpx;
-					text-align: center;
-	            }
-	          }
-	  
-	          .progBtn {
-				width: 130rpx;
-				height: 60rpx;
-				background: rgba(25,137,250,0.1);
-				border-radius: 8rpx;
-				border: 2rpx solid #1989FA;
-				font-size: 28rpx;
-				color: $themC;
-				line-height: 60rpx;
-				text-align: center;
-	          }
-	        }
-	      }
-	    }
-	  }
-	
-	  .ul {
-		  padding: 38rpx 0;
-		  display: flex;
-		  flex-wrap: wrap;
-		  width: 100%;
-	    .li {
-			width: 25%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			margin: 24rpx 0;
-	      .icon {
-	        width: 68rpx;
-			height: 68rpx;
-	      }
-	
-	      .text {
-			font-size: 28rpx;
-			margin-top: 16rpx;
-			color: #333;
-	      }
-	    }
-	  }
-	
-	  .business {
-		  padding: 32rpx 0;
-	    .h1 {
-			margin-bottom: 24rpx;
-	    }
-	
-	    .card {
-			width: 100%;
-			height: 390rpx;
-			background: #FFFFFF;
-			border-radius: 16rpx;
-			display: flex;
-			flex-wrap: wrap;
-			padding: 38rpx 0 0 0;
-	      .item {
-			  width: 33.33%;
-			  display: flex;
-			  flex-direction: column;
-			  align-items: center;
-			  height: 162rpx;
-	        .icon {
-	          width: 72rpx;
-			  height: 72rpx;
-			  background: #F6F7F8;
-			  border-radius: 50%;
-			  display: flex;
-			  align-items: center;
-			  justify-content: center;
-			  image {
-				  width: 48rpx;
-				  height: 48rpx;
-			  }
-	        }
-	
-	        .text {
-				margin-top: 16rpx;
-				font-size: 28rpx;
-				color: #333;
-	        }
-	      }
-	    }
-	  }
-	}
-</style>
+	@import './index.scss';
+</style>
\ No newline at end of file
diff --git a/static/images/icon/arrowRightfff.png b/static/images/icon/arrowRightfff.png
new file mode 100644
index 0000000000000000000000000000000000000000..5adc259748bdc7bbc67ba9bd15f76e42d2c15369
GIT binary patch
literal 516
zcmV+f0{i`mP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px$zDYzuR9Hvt*1bwxQ541T{{n3!8f;CICP9Q$G1XupgtWnsDiB2o#KNye5MMw9
z8!;(j)FMraU|}p2LSl+k7J|Njk6;^7*v^4nh>VQq+$~NqQ{K7v@Vjdr?mnW$erhof
zZBVmD+6jdwWM)5r7r<*tN6i*5`9G^NGdlqu1E;|7U7&J7{lIUa&rvTW9hM|<(=%D1
zw1}BK0``F?z!@+iX*UX$4RTaU=&z&BeNTm;ia=LTDXFKxf1nmoUops0J-(*~qw1>!
za#T0)2S}*O^;HHr>LGC8^(E9>Nk2<AdI+dNed*FiNo%>NFi?Z~icp~-M?C<xfLET*
ztfZCOCKV2H)K}nxBfdzQxHpiQZ35#C_$+DiwwQEZSVCsj0c-%H4p@~mor4JjnOS<V
zG<1g@upntM7ZVBk2E2E`yriWPOl6Rnbpq>GYMPU@T#Bg#GP5pVuU^%V1KvscUIkMO
zGPCrpNtl`grX+o;iYWq_S#KTk3wWN+YxR@kjHJ~FOg8A+Y4O5`=ynvQ1aw><3(tUr
zc_V2j5>o>D2MhpXcY(<UMW@kdy|B>{g>8eHCD~4>Swfc(f`cUr{1Ykw0000<MNUMn
GLSTX#E!1WJ

literal 0
HcmV?d00001

diff --git a/static/images/icon/箭头 拷贝 2(1).png b/static/images/icon/箭头 拷贝 2(1).png
new file mode 100644
index 0000000000000000000000000000000000000000..ee2f86034b59cb2065d393bfeb07112ffc6a7a6c
GIT binary patch
literal 638
zcmV-^0)hRBP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px%I7vi7R9Hvt*UM@YK@<ky|8$Qx6cO}Ex=xLXLN;C^xYccpQOHJ71a;%ijS3<t
zLclw?)kK9z)CZXE>V6U5p^sFk3WJ1nbytbA$n1u$?(@xmrmCw5Gxnhw^I#X$)sf(Y
zj4>|(Tq2@dN~w=s4<35G59l|5W44fpENHDi3@y6TeZio*uIEMM3xGZLfmxO<6h)C7
z6%4Y7s;Vv!(JFww?pI!6=JzR+>IJfeT~ccv)wb>8cszcW3e_8A3zua%pJmw=iij4K
zQb|yQKpvIn`KpNQv)@yp27_Gt&I4GRLS0o#y^U#K6v!4f#+(CSXP-|h3Kb1<v+pbs
zef202S<+g+8In{I&~~US%a)3w=#5GSa;P&z^ld7sYg+5qeUeHFnnKzC)By*%&djeu
zQOQ9Lb;>1m#J&4&Xsus_p#BNS7*hb)0C3bH9x(I6{{m{7hTFFN1>mp)+-K%TA(+ht
zHgsUfIAhFl06zg7a;>_jwSF9OuOE{PRM+(h5&7XUM08gv^`s9bSwfS^<m6~H+7OY=
zWQJmrfGj4@bDPXTm&P4te%d#gBrP+>oCfgSV~FUsQtH`IOjJT;S<VsBIuZE=@Fp`q
zkHHKEHBB?uw(YuKjfrSkDYX)d83b}$*v|m=yQ#gbwN8TR4f=bNFCx8Po?R&huS0cR
zUlfr~{umUq=h+Dr3^K-S9TbTuYFC&9R8`dq5nXmuJIM)SJ6Lc+UA<3reHYY~<jf`X
Y2Pt>OC6`(c;Q#;t07*qoM6N<$f*h?E(EtDd

literal 0
HcmV?d00001

diff --git a/static/images/mineIcon/sanCode.png b/static/images/mineIcon/sanCode.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3911039659e11ca80487485b617272a3c83b6d2
GIT binary patch
literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px%EJ;K`R9Hvtm`Q6DQ4oc{<4Vx21BjqF{shsbxK$L#g>j{*SvdX-2M`m7tP&TZ
z5Dd6gveUm{Oau*zCfO>u(c`Od`_abNuUmLS2VSijZgthU=T4_e)XbFOvAqVk44eQq
z7U291+>`XE-8@pP@Hqf9bF}zp33v)Tl;jxC19}FWtU%ZYNjpmb?EvN~#L8SIB^_@9
zvV8=YN~52Fw*@l`h8|0LU6#!D)x=PdYcR4O*peI$OM1D?knIP+Mc^l}UDCI*gq;{~
z<lO{(1lFcyyOaSM2Zn$JNt-*7tZEF~G5G*CA?e&oK#P)MuxDm_AswOtpq8w!8ipo-
zv%r$1qD!$W`^xqrumN}?X(-#&w}2bKjHJC?$y^ZB_PfSyy$850>1GCKeLD89B)#u3
zpxwa1#L)M4?@TXoHFFIBmC>%oraBE=078EB)8gSC3qbS0)_x+%<(>~fXMpoHVCdH}
zLp5P$aLOt#M0QiJOK;h<q?yWpcfiqh=<`EKp#8`I-2tuvvy$Q}@0r=21p?GvN!M2@
z#@f90nWi2{*j1w#Yqw;XgzaZt_LqbmNsWf6T(?PzTB+-1JM{afRJo2y8qSXWF<>$w
z_yW9XQ`<+UV!8~i?JFhSkEreU<&?%zNmKdmM*s?7Wi}^iS34)$|J(g|F6mUn%ma$=
z;nb3evZR%Th#F~>N~0x!LhOyD?nXP;ufPl7{y+VpGFo~yUOPSX2hJxCy&XED-v9sr
M07*qoM6N<$f}xZm`2YX_

literal 0
HcmV?d00001

diff --git a/static/images/mineIcon/扫码.png b/static/images/mineIcon/扫码.png
deleted file mode 100644
index d3911039659e11ca80487485b617272a3c83b6d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px%EJ;K`R9Hvtm`Q6DQ4oc{<4Vx21BjqF{shsbxK$L#g>j{*SvdX-2M`m7tP&TZ
z5Dd6gveUm{Oau*zCfO>u(c`Od`_abNuUmLS2VSijZgthU=T4_e)XbFOvAqVk44eQq
z7U291+>`XE-8@pP@Hqf9bF}zp33v)Tl;jxC19}FWtU%ZYNjpmb?EvN~#L8SIB^_@9
zvV8=YN~52Fw*@l`h8|0LU6#!D)x=PdYcR4O*peI$OM1D?knIP+Mc^l}UDCI*gq;{~
z<lO{(1lFcyyOaSM2Zn$JNt-*7tZEF~G5G*CA?e&oK#P)MuxDm_AswOtpq8w!8ipo-
zv%r$1qD!$W`^xqrumN}?X(-#&w}2bKjHJC?$y^ZB_PfSyy$850>1GCKeLD89B)#u3
zpxwa1#L)M4?@TXoHFFIBmC>%oraBE=078EB)8gSC3qbS0)_x+%<(>~fXMpoHVCdH}
zLp5P$aLOt#M0QiJOK;h<q?yWpcfiqh=<`EKp#8`I-2tuvvy$Q}@0r=21p?GvN!M2@
z#@f90nWi2{*j1w#Yqw;XgzaZt_LqbmNsWf6T(?PzTB+-1JM{afRJo2y8qSXWF<>$w
z_yW9XQ`<+UV!8~i?JFhSkEreU<&?%zNmKdmM*s?7Wi}^iS34)$|J(g|F6mUn%ma$=
z;nb3evZR%Th#F~>N~0x!LhOyD?nXP;ufPl7{y+VpGFo~yUOPSX2hJxCy&XED-v9sr
M07*qoM6N<$f}xZm`2YX_

diff --git a/static/images/mineIcon/箭头 拷贝 2(1).png b/static/images/mineIcon/箭头 拷贝 2(1).png
deleted file mode 100644
index ee2f86034b59cb2065d393bfeb07112ffc6a7a6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 638
zcmV-^0)hRBP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px%I7vi7R9Hvt*UM@YK@<ky|8$Qx6cO}Ex=xLXLN;C^xYccpQOHJ71a;%ijS3<t
zLclw?)kK9z)CZXE>V6U5p^sFk3WJ1nbytbA$n1u$?(@xmrmCw5Gxnhw^I#X$)sf(Y
zj4>|(Tq2@dN~w=s4<35G59l|5W44fpENHDi3@y6TeZio*uIEMM3xGZLfmxO<6h)C7
z6%4Y7s;Vv!(JFww?pI!6=JzR+>IJfeT~ccv)wb>8cszcW3e_8A3zua%pJmw=iij4K
zQb|yQKpvIn`KpNQv)@yp27_Gt&I4GRLS0o#y^U#K6v!4f#+(CSXP-|h3Kb1<v+pbs
zef202S<+g+8In{I&~~US%a)3w=#5GSa;P&z^ld7sYg+5qeUeHFnnKzC)By*%&djeu
zQOQ9Lb;>1m#J&4&Xsus_p#BNS7*hb)0C3bH9x(I6{{m{7hTFFN1>mp)+-K%TA(+ht
zHgsUfIAhFl06zg7a;>_jwSF9OuOE{PRM+(h5&7XUM08gv^`s9bSwfS^<m6~H+7OY=
zWQJmrfGj4@bDPXTm&P4te%d#gBrP+>oCfgSV~FUsQtH`IOjJT;S<VsBIuZE=@Fp`q
zkHHKEHBB?uw(YuKjfrSkDYX)d83b}$*v|m=yQ#gbwN8TR4f=bNFCx8Po?R&huS0cR
zUlfr~{umUq=h+Dr3^K-S9TbTuYFC&9R8`dq5nXmuJIM)SJ6Lc+UA<3reHYY~<jf`X
Y2Pt>OC6`(c;Q#;t07*qoM6N<$f*h?E(EtDd

diff --git a/static/images/mineIcon/箭头 拷贝 2.png b/static/images/mineIcon/箭头 拷贝 2.png
deleted file mode 100644
index 5adc259748bdc7bbc67ba9bd15f76e42d2c15369..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 516
zcmV+f0{i`mP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px$zDYzuR9Hvt*1bwxQ541T{{n3!8f;CICP9Q$G1XupgtWnsDiB2o#KNye5MMw9
z8!;(j)FMraU|}p2LSl+k7J|Njk6;^7*v^4nh>VQq+$~NqQ{K7v@Vjdr?mnW$erhof
zZBVmD+6jdwWM)5r7r<*tN6i*5`9G^NGdlqu1E;|7U7&J7{lIUa&rvTW9hM|<(=%D1
zw1}BK0``F?z!@+iX*UX$4RTaU=&z&BeNTm;ia=LTDXFKxf1nmoUops0J-(*~qw1>!
za#T0)2S}*O^;HHr>LGC8^(E9>Nk2<AdI+dNed*FiNo%>NFi?Z~icp~-M?C<xfLET*
ztfZCOCKV2H)K}nxBfdzQxHpiQZ35#C_$+DiwwQEZSVCsj0c-%H4p@~mor4JjnOS<V
zG<1g@upntM7ZVBk2E2E`yriWPOl6Rnbpq>GYMPU@T#Bg#GP5pVuU^%V1KvscUIkMO
zGPCrpNtl`grX+o;iYWq_S#KTk3wWN+YxR@kjHJ~FOg8A+Y4O5`=ynvQ1aw><3(tUr
zc_V2j5>o>D2MhpXcY(<UMW@kdy|B>{g>8eHCD~4>Swfc(f`cUr{1Ykw0000<MNUMn
GLSTX#E!1WJ