From 02973cd898027e52458dc39cabf20aba6c24e945 Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Fri, 15 Sep 2023 17:20:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8A=A5=E5=90=8D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/utils.js                                 |  24 +-
 components/callPhone/callPhone.vue                 |  45 +++
 components/mySelect/mySelect.vue                   |  34 ++
 manifest.json                                      |  13 +-
 pages.json                                         |   9 +
 pages/indexEntry/consult/consult.vue               |   2 +-
 .../consult/pubComplaint/pubComplaint.vue          |   3 +-
 pages/indexEntry/consult/pubConsult/pubConsult.vue |   2 +-
 .../consult/record/comp/complaintItem.vue          |  19 +-
 .../indexEntry/consult/record/comp/consultItem.vue |  19 +-
 pages/indexEntry/consult/record/record.vue         |   1 -
 pages/indexEntry/credit/credit.vue                 |   2 +-
 .../enroll/registInfo/chooseCoach/chooseCoach.vue  | 100 ++++++
 .../indexEntry/enroll/registInfo/comp/oldDrive.vue | 101 ++++++
 .../enroll/registInfo/comp/searchSchool.vue        | 102 ++++++
 pages/indexEntry/enroll/registInfo/registInfo.vue  | 191 +++++++++--
 .../examines/allExamines/allExamines.vue           |  10 +-
 pages/indexEntry/examines/comp/examineItem.vue     |   9 +-
 .../indexEntry/examines/newsDetail/newsDetail.vue  |   1 -
 pages/indexEntry/findShcool/comp/schoolItem.vue    |  16 +-
 pages/indexEntry/findShcool/findShcool.vue         |  12 +-
 pages/indexEntry/findShcool/screen/screen.vue      |  27 +-
 .../findShcool/searchShcool/searchShcool.vue       |   2 +-
 .../findShcool/shcoolDetail/comp/tab1.vue          |   2 +-
 .../findShcool/shcoolDetail/shcoolDetail.vue       |  15 +-
 pages/indexEntry/iIndustryInfo/detail/detail.vue   |   4 +-
 pages/indexEntry/iIndustryInfo/iIndustryInfo.vue   |   3 -
 pages/indexEntry/industryPolicy/industryPolicy.vue |   3 -
 pages/mineEntry/carData/carData - 副本.vue       | 364 +++++++++++++++++++++
 pages/mineEntry/carData/carData.vue                | 178 +++++-----
 pages/mineEntry/carData/columnChart.vue            |  20 +-
 static/images/index/img_6@2x.png                   | Bin 2674 -> 3442 bytes
 static/images/index/img_7@2x.png                   | Bin 0 -> 3443 bytes
 static/images/index/img_8@2x.png                   | Bin 0 -> 2441 bytes
 .../charts/js_sdk/u-charts/config-ucharts.js       |   2 +-
 35 files changed, 1157 insertions(+), 178 deletions(-)
 create mode 100644 components/callPhone/callPhone.vue
 create mode 100644 components/mySelect/mySelect.vue
 create mode 100644 pages/indexEntry/enroll/registInfo/chooseCoach/chooseCoach.vue
 create mode 100644 pages/indexEntry/enroll/registInfo/comp/oldDrive.vue
 create mode 100644 pages/indexEntry/enroll/registInfo/comp/searchSchool.vue
 create mode 100644 pages/mineEntry/carData/carData - 副本.vue
 create mode 100644 static/images/index/img_7@2x.png
 create mode 100644 static/images/index/img_8@2x.png

diff --git a/common/js/utils.js b/common/js/utils.js
index c3c501a..220fbde 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -77,7 +77,28 @@ const install = (Vue, vm) => {
 		return `${year}${splitor}${addZeroPrefix(month)}${splitor}${addZeroPrefix(day)}`
 	}
 	
-	
+	const callPhone = (phone)=> {
+		phone = phone.trim()
+		if(!phone)  {
+			uni.showToast({
+				title: '暂无联系方式',
+				icon: 'none'
+			});
+			return
+		}
+		uni.showModal({
+			content: '确定要拨打：'+phone+'？' ,
+			success: function (res) {
+				if (res.confirm) {
+					uni.makePhoneCall({
+						phoneNumber: phone //仅为示例
+					});
+				} else if (res.cancel) {
+					console.log('用户点击取消');
+				}
+			}
+		});
+	}
 
 	
 
@@ -90,6 +111,7 @@ const install = (Vue, vm) => {
 		distanceLatLng,
 		distanceFn,
 		getDate,
+		callPhone
 	}
 }
 
diff --git a/components/callPhone/callPhone.vue b/components/callPhone/callPhone.vue
new file mode 100644
index 0000000..f0e0094
--- /dev/null
+++ b/components/callPhone/callPhone.vue
@@ -0,0 +1,45 @@
+<template>
+	<view class="box">
+		<view class="phoneIcon" @click.stop="show=true">
+			<slot></slot>
+		</view>
+		<u-action-sheet :actions="servicePhone" :show="show" @select="callPhoneClick" :closeOnClickOverlay="true" @close="show=false" cancelText="取消"></u-action-sheet>
+	</view>
+	
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				servicePhone: [
+					{name: '18267103167'},
+					{name: '18267103168'},
+				],
+				show: false
+			}
+		},
+		methods: {
+			callPhoneClick(item) {
+				
+				let phone = item.name
+				// #ifdef MP-WEIXIN
+				this.$u.utils.callPhone(phone)
+				// #endif
+				
+				// #ifdef H5
+				var a = document.createElement('a')
+				a.setAttribute('href', 'tel:'+ phone)
+				document.body.appendChild(a)
+				a.click()
+				console.log(phone)
+				// #endif
+				
+				this.show =false
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/components/mySelect/mySelect.vue b/components/mySelect/mySelect.vue
new file mode 100644
index 0000000..9ba4c5e
--- /dev/null
+++ b/components/mySelect/mySelect.vue
@@ -0,0 +1,34 @@
+<template>
+	<view class="mySelect">
+		<view class="text hui" v-if="!value">{{ placeholder }}</view>
+		<view class="text" v-else>{{ value }}</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			value: {
+				type: String,
+				default: ''
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			}
+		},
+		data() {
+			return {}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.mySelect {
+		color: #333;
+		font-size: 26rpx;
+		.hui {
+			color: #ADADAD;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index bf330cd..be2f3d5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -17,7 +17,9 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Share" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -43,7 +45,14 @@
             /* ios打包配置 */
             "ios" : {},
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wxae509f512c11c039",
+                        "UniversalLinks" : ""
+                    }
+                }
+            }
         }
     },
     /* 快应用特有相关 */
diff --git a/pages.json b/pages.json
index d5f047d..17d49cd 100644
--- a/pages.json
+++ b/pages.json
@@ -89,6 +89,15 @@
 					}
 				},
 				{
+					"path": "enroll/registInfo/chooseCoach/chooseCoach",
+					"style": {
+						"navigationBarTitleText": "选择教练",
+						"enablePullDownRefresh": false,
+						"backgroundTextStyle": "dark" 
+					}
+				},
+				
+				{
 					"path": "enroll/payment/payment",
 					"style": {
 						"navigationBarTitleText": "报名缴费",
diff --git a/pages/indexEntry/consult/consult.vue b/pages/indexEntry/consult/consult.vue
index a2ef35b..8df95a3 100644
--- a/pages/indexEntry/consult/consult.vue
+++ b/pages/indexEntry/consult/consult.vue
@@ -52,7 +52,7 @@
 <style lang="scss" scoped>
 	.tabBox {
 		display: flex;
-		margin-top: 20rpx;
+		// margin-top: 20rpx;
 		height: 192rpx;
 		.tab {
 			flex: 1;
diff --git a/pages/indexEntry/consult/pubComplaint/pubComplaint.vue b/pages/indexEntry/consult/pubComplaint/pubComplaint.vue
index 867854b..0372c3d 100644
--- a/pages/indexEntry/consult/pubComplaint/pubComplaint.vue
+++ b/pages/indexEntry/consult/pubComplaint/pubComplaint.vue
@@ -180,9 +180,8 @@
 <style lang="scss" scoped>
 	
 	.pageBgImg {
-		.pad {}
 	  .card {
-		   margin-top: 20rpx;
+		   margin-bottom: 20rpx;
 	    .h2 {
 			font-size: 28rpx;
 			font-weight: 600;
diff --git a/pages/indexEntry/consult/pubConsult/pubConsult.vue b/pages/indexEntry/consult/pubConsult/pubConsult.vue
index face3ab..684b170 100644
--- a/pages/indexEntry/consult/pubConsult/pubConsult.vue
+++ b/pages/indexEntry/consult/pubConsult/pubConsult.vue
@@ -108,7 +108,7 @@
 	.pageBgImg {
 		.pad {}
 	  .card {
-		  padding: 0 24rpx 24rpx 24rpx ; margin-top: 20rpx;
+		  padding: 0 24rpx 24rpx 24rpx ;
 	    .h2 {
 			font-size: 32rpx;
 			font-weight: 600;
diff --git a/pages/indexEntry/consult/record/comp/complaintItem.vue b/pages/indexEntry/consult/record/comp/complaintItem.vue
index 1c46629..f861ad9 100644
--- a/pages/indexEntry/consult/record/comp/complaintItem.vue
+++ b/pages/indexEntry/consult/record/comp/complaintItem.vue
@@ -36,12 +36,29 @@
 				<view class="date">创建时间：2022-01-04</view>
 				<!-- <view class="date">处理时间：2022-01-04</view> -->
 			</view>
-			<view class="close_btn">关闭</view>
+			<view class="close_btn" @click="closeFn">关闭</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	export default {
+		methods: {
+			closeFn() {
+				uni.showModal({
+					content:'确定要关闭吗？',
+					success: function(res) {
+						if (res.confirm) {
+							
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				})
+				
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/indexEntry/consult/record/comp/consultItem.vue b/pages/indexEntry/consult/record/comp/consultItem.vue
index f0dd975..28eb290 100644
--- a/pages/indexEntry/consult/record/comp/consultItem.vue
+++ b/pages/indexEntry/consult/record/comp/consultItem.vue
@@ -18,9 +18,26 @@
 	</view>
 </template>
 
+
 <script>
+	export default {
+		methods: {
+			closeFn() {
+				uni.showModal({
+					content:'确定要关闭吗？',
+					success: function(res) {
+						if (res.confirm) {
+							
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				})
+				
+			}
+		}
+	}
 </script>
-
 <style lang="scss" scoped>
 	.consultItem {
 		width: 100%;
diff --git a/pages/indexEntry/consult/record/record.vue b/pages/indexEntry/consult/record/record.vue
index cca478c..4081bbc 100644
--- a/pages/indexEntry/consult/record/record.vue
+++ b/pages/indexEntry/consult/record/record.vue
@@ -70,7 +70,6 @@
 		height: 72rpx;
 		background: #FFFFFF;
 		border-radius: 16rpx;
-		margin-top: 20rpx;
 		.tab  {
 			flex: 1;
 			text-align: center;
diff --git a/pages/indexEntry/credit/credit.vue b/pages/indexEntry/credit/credit.vue
index 0d8f7d4..3106456 100644
--- a/pages/indexEntry/credit/credit.vue
+++ b/pages/indexEntry/credit/credit.vue
@@ -4,7 +4,7 @@
 			<view class="li">
 				<view class="num">1</view>
 				<view class="con">
-					<schoolItme/>
+					<schoolItme :showPhone="false"/>
 				</view>
 			</view>
 		</view>
diff --git a/pages/indexEntry/enroll/registInfo/chooseCoach/chooseCoach.vue b/pages/indexEntry/enroll/registInfo/chooseCoach/chooseCoach.vue
new file mode 100644
index 0000000..f1921d8
--- /dev/null
+++ b/pages/indexEntry/enroll/registInfo/chooseCoach/chooseCoach.vue
@@ -0,0 +1,100 @@
+<template>
+	<view class="main">
+		<u-sticky>
+			<view class="searchBox">
+				<u-search placeholder="请输入教练姓名" v-model="params.coachName"  :show-action="false" @search="searchFn"> </u-search>
+			</view>
+		</u-sticky>
+		
+		<view class="ul">
+			<view class="li" v-for="(item,index) in list" :key="index" @click="chooseClick(item)">
+				<view class="leftT">{{item.coachName}}</view>
+				<view class="rigthT">{{item.mobilePhone}}</view>
+			</view>
+		</view>
+		<u-loadmore :status="status"  v-if="list.length>30" :icon-type="'flower'" />
+	</view>
+</template>
+
+<script>
+	// import learnDrive from '@/api/learnDrive.js'
+	export default {
+		data() {
+			return {
+				keyword: '',
+				trainingSchoolId: '',
+				list: [
+					{coachName: '张教练', mobilePhone: '15698236123'}
+				],
+				params: {
+					pageIndex: 1,
+					pageSize: 30,
+					trainingSchoolId: ''
+				},
+				status: 'loadmore',
+				
+			}
+		},
+		onLoad(options) {
+			this.params.trainingSchoolId = options.trainingSchoolId
+			this.querySchoolCoachFn()
+		},
+		
+		onReachBottom() {
+			if(status=='nomore') return
+			this.querySchoolCoachFn()
+			
+		},
+		methods: {
+			chooseClick(item) {
+				this.$store.commit('upDateCoachItem', item)
+				uni.navigateBack()
+			},
+			searchFn() {
+				this.list = []
+				this.params.pageIndex = 1
+				this.status = 'loadmore'
+				this.querySchoolCoachFn()
+			},
+			// 获取教练
+			async querySchoolCoachFn() {
+				// const [nulls, res] = await learnDrive.querySchoolCoach(this.params)
+				// this.list.push(...res.data)
+				// this.params.pageIndex ++
+				// if(res.data.length<this.params.pageSize) {
+				// 	this.status = 'nomore'
+				// }
+				// console.log('获取教练')
+				// console.log(res)
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.main {
+		background-color: #f8f8f8;
+		.searchBox {
+			background-color: #fff;
+			padding: 16rpx 32rpx;
+		}
+	}
+	.ul {
+		width: 100%;
+		border-bottom: 10rpx solid #f8f8f8;
+		font-size: 30rpx;
+		padding: 0 32rpx;
+		color: #333333;
+		background-color: #fff;
+		.li {
+			width: 100%;
+			height: 98rpx;
+			line-height: 98rpx;
+			display: flex;
+			font-size: 30rpx;
+			justify-content: space-between;
+			align-center: center;
+			border-bottom: 1px solid #F5F7FA;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/indexEntry/enroll/registInfo/comp/oldDrive.vue b/pages/indexEntry/enroll/registInfo/comp/oldDrive.vue
new file mode 100644
index 0000000..3d36039
--- /dev/null
+++ b/pages/indexEntry/enroll/registInfo/comp/oldDrive.vue
@@ -0,0 +1,101 @@
+<template>
+	<view class="carBox">
+		<view class="carh1">学驾车型</view>
+		<view v-for="(item,index) in carTypeArr" :key="index" class="carLi">
+			<view class="carType">{{item.lab}}</view>
+			<view class="carName_row">
+				<view class="carName" v-for="(item2,index2) in item.arr" :key="index2"  @click="pickerCarClick(item2)" :class="{active: pickerCarArr.indexOf(item2) > -1}">{{item2}}</view>
+			</view>
+		</view>
+		<view class="payBtn_row">
+			<view class="btnBorder btn" @click="pickerCar()">重置</view>
+			<view class="btnBg btn"  @click="pickerCar(1)">完成</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				carTypeArr: [
+					{lab: '小车',arr: ['C1','C2','C3']},
+					{lab: '货车',arr: ['A2','B2',]},
+					{lab: '客车',arr: ['A1','A3','B1']},
+					{lab: '摩托车',arr: ['D','E','F']},
+					{lab: '其它',arr: ['C4','C5','C6']},
+				],
+				pickerCarArr: [],
+			}
+		},
+		methods: {
+			pickerCar(num) {
+				if(num==1) {
+					if(!this.pickerCarArr.length) return this.$u.toast('请选择学驾车型')
+					let oldDriveModel = this.pickerCarArr.join(',')
+					this.$emit('pickerOldDrive', oldDriveModel)
+				}else {
+					this.pickerCarArr = []
+					this.form.oldDriveModel = ''
+				}
+			},
+			pickerCarClick(item) {
+				let index = this.pickerCarArr.indexOf(item)
+				if(index>-1) {
+					this.pickerCarArr.splice(index, 1);
+				}else {
+					this.pickerCarArr.push(item)
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.carBox {
+		width: 100%;
+		.carh1 {
+			font-size: 26rpx;
+			font-weight: 700;
+			text-align: center;
+			padding: 30rpx 0 0  0;
+		}
+		.carLi {
+			width: 100%;
+			margin-bottom: 30rpx;
+			padding: 0 32rpx;
+		}
+		.carType {
+			font-size: 26rpx;
+			font-weight: 500;
+			line-height: 40rpx;
+			padding: 28rpx 12rpx 12rpx 0;
+		}
+		.carName_row {
+			display: flex;
+			.carName {
+				margin-right: 40rpx;
+				width: 88rpx;
+				height: 56rpx;
+				background: #F6F7F8;
+				border-radius: 28rpx;
+				line-height: 56rpx;
+				text-align: center;
+				color: #686B73;
+				&.active {
+					background: #ECF7FE;
+					border: 1px solid #3593FB;
+					color: #1989FA;
+				}
+			}
+		}
+	}
+	.payBtn_row {
+		display: flex;
+		justify-content: space-between;
+		padding: 30rpx;
+		.btn {
+			width: 48%;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/indexEntry/enroll/registInfo/comp/searchSchool.vue b/pages/indexEntry/enroll/registInfo/comp/searchSchool.vue
new file mode 100644
index 0000000..c98f60d
--- /dev/null
+++ b/pages/indexEntry/enroll/registInfo/comp/searchSchool.vue
@@ -0,0 +1,102 @@
+<template>
+	<!-- 选择驾校弹出框 -->
+	
+	<view class="box">
+		<view class="schoolTit">
+			选择驾校
+		</view>
+		<view class="searchBox">
+			<u-search placeholder="请输入驾校名称" v-model.trim="keyword" @search="searchSchool" @custom="searchSchool">
+			</u-search>
+		</view>
+		<scroll-view scroll-y="true" style="height: calc(100% - 180rpx);" @scrolltolower="loadMore">
+			<view class="ul">
+				<view class="li" v-for="(item,index) in list" :key="index" @click="chooseSchool(item)">
+					<view class="name">
+						{{item.schoolName}}
+					</view>
+					<view class="starText">
+						{{item.starLevel}}分
+					</view>
+					<!-- <view class="distance">
+						{{ $u.utils.distanceFn(item.distance)}}
+					</view> -->
+				</view>
+			</view>
+			<u-loadmore :status="status" icon-type="circle" />
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				keyword: '',
+				status: 'loadmore',
+				list: [
+					{schoolName: '翔力驾校',starLevel: 5, }
+				]
+			}
+		},
+		methods: {
+			// 选择驾校
+			chooseSchool(item) {
+				this.$emit('chooseSchool', item)
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.schoolTit {
+		line-height: 90rpx;
+		text-align: center;
+		font-size: 28rpx;
+	}
+	
+	.searchBox {
+		width: 100%;
+		padding: 0 20rpx 20rpx 20rpx;
+		border-bottom: 1rpx solid #ededed;
+	}
+	
+	.ul {
+		width: 100%;
+		padding: 0 20rpx;
+	
+		.li {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			height: 90rpx;
+			font-size: 24rpx;
+			border-bottom: 1rpx solid #ededed;
+	
+			&:last-child {
+				border: none;
+			}
+	
+			.name {
+				width: 0;
+				flex: 1;
+				font-size: 28rpx;
+			}
+	
+			.starText {
+				color: red;
+				width: 100rpx;
+				text-align: right;
+				flex-shrink: 0;
+				white-space: nowrap;
+			}
+	
+			.distance {
+				width: 120rpx;
+				text-align: right;
+				flex-shrink: 0;
+				white-space: nowrap;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/indexEntry/enroll/registInfo/registInfo.vue b/pages/indexEntry/enroll/registInfo/registInfo.vue
index e832f2c..64a5860 100644
--- a/pages/indexEntry/enroll/registInfo/registInfo.vue
+++ b/pages/indexEntry/enroll/registInfo/registInfo.vue
@@ -2,22 +2,24 @@
 	<view class="pageBgImg">
 		<topNavbar title="报名信息确认"></topNavbar>
 		<view class="pad">
+			<!-- #ifndef H5 -->
 			<view class="card">
 				<view class="row">
 					<view class="lab">扫描教练二维码</view>
 					<view class="rightCon">
-						<view class="scan">扫一扫</view>
+						<view class="scan" @click="scanCodeFn">扫一扫</view>
 					</view>
 				</view>
 			</view>
+			<!-- #endif -->
 			
 			<view class="card">
-				<view class="row">
+				<view class="row" >
 					<view class="lab">选择驾校</view>
 					<view class="rightCon">
-						<view class="row">
+						<view class="row" @click="showSchool=true">
 							<view class="val">
-								<input v-model="form.classModel"   placeholder="请选择"   @click="showSchool=true" disabled/></input>
+								<mySelect :value="form.school"/>
 							</view>
 							<view class="arrow">
 								<u-icon name="arrow-right" size="14" color="#686B73" style="margin-left: 12rpx;" ></u-icon>
@@ -28,9 +30,9 @@
 				<view class="row">
 					<view class="lab">选择车型</view>
 					<view class="rightCon">
-						<view class="row">
+						<view class="row" @click="showCar=true">
 							<view class="val">
-								<input v-model="form.classModel"   placeholder="请选择"   @click="showSchool=true" disabled/></input>
+								<mySelect :value="form.car"/>
 							</view>
 							<view class="arrow">
 								<u-icon name="arrow-right" size="14" color="#686B73" style="margin-left: 12rpx;" ></u-icon>
@@ -41,9 +43,9 @@
 				<view class="row">
 					<view class="lab">选择班型</view>
 					<view class="rightCon">
-						<view class="row">
+						<view class="row"  @click="showClassModel=true">
 							<view class="val">
-								<input v-model="form.classModel"   placeholder="请选择"   @click="showSchool=true" disabled/></input>
+								<mySelect :value="form.classModel"/>
 							</view>
 							<view class="arrow">
 								<u-icon name="arrow-right" size="14" color="#686B73" style="margin-left: 12rpx;" ></u-icon>
@@ -54,9 +56,9 @@
 				<view class="row">
 					<view class="lab">选择教练</view>
 					<view class="rightCon">
-						<view class="row">
+						<view class="row" @click="$goPage('/pages/indexEntry/enroll/registInfo/chooseCoach/chooseCoach')">
 							<view class="val">
-								<input v-model="form.classModel"   placeholder="请选择"   @click="showSchool=true" disabled/></input>
+								<mySelect :value="form.coach"/>
 							</view>
 							<view class="arrow">
 								<u-icon name="arrow-right" size="14" color="#686B73" style="margin-left: 12rpx;" ></u-icon>
@@ -109,21 +111,19 @@
 			
 			<view class="card" v-if="form.radiovalue1==2">
 				<view class="row">
-					<view class="lab">原驾驶证号</view>
+					<view class="lab long">原驾驶证号</view>
 					<view class="rightCon">
 						<view class="row">
-							<view class="val">
-								<input v-model="form.classModel"   placeholder="请选择"   @click="showSchool=true" disabled/></input>
-							</view>
+							<view class="val">{{ form.certificateCodeShow }}</view>
 						</view>
 					</view>
 				</view>
 				<view class="row">
-					<view class="lab">驾驶证初领日期</view>
-					<view class="rightCon" style="margin-left: 56rpx;">
-						<view class="row">
+					<view class="lab long">驾驶证初领日期</view>
+					<view class="rightCon">
+						<view class="row" @click="showFirstLicenceTime=true" >
 							<view class="val">
-								<input v-model="form.classModel"   placeholder="请选择"   @click="showSchool=true" disabled/></input>
+								<mySelect :value="form.firstLicenceTime"/>
 							</view>
 							<view class="arrow">
 								<u-icon name="arrow-right" size="14" color="#686B73" style="margin-left: 12rpx;" ></u-icon>
@@ -132,11 +132,11 @@
 					</view>
 				</view>
 				<view class="row">
-					<view class="lab">原准驾车型</view>
+					<view class="lab long">原准驾车型</view>
 					<view class="rightCon">
-						<view class="row">
+						<view class="row" @click="showOldDriveModel=true" >
 							<view class="val">
-								<input v-model="form.classModel"   placeholder="请选择"   @click="showSchool=true" disabled/></input>
+								<mySelect :value="form.oldDriveModel"/>
 							</view>
 							<view class="arrow">
 								<u-icon name="arrow-right" size="14" color="#686B73" style="margin-left: 12rpx;" ></u-icon>
@@ -146,13 +146,13 @@
 				</view>
 			</view>
 			
-			<view class="card" v-if="form.radiovalue2==2">
+			<view class="card" v-if="form.radiovalue2==1">
 				<view class="row">
 					<view class="lab">来源城市</view>
 					<view class="rightCon">
 						<view class="row">
 							<view class="val">
-								<input v-model="form.classModel"   placeholder="请选择"   @click="showSchool=true" disabled/></input>
+								<mySelect :value="form.classModel"/>
 							</view>
 							<view class="arrow">
 								<u-icon name="arrow-right" size="14" color="#686B73" style="margin-left: 12rpx;" ></u-icon>
@@ -161,11 +161,11 @@
 					</view>
 				</view>
 				<view class="row">
-					<view class="lab">已过科目</view>
+					<view class="lab ">已过科目</view>
 					<view class="rightCon">
-						<view class="row">
+						<view class="row" @click="showSubjectPass=true">
 							<view class="val">
-								<input v-model="form.classModel"   placeholder="请选择"   @click="showSchool=true" disabled/></input>
+								<mySelect :value="form.subjectPass"/>
 							</view>
 							<view class="arrow">
 								<u-icon name="arrow-right" size="14" color="#686B73" style="margin-left: 12rpx;" ></u-icon>
@@ -176,9 +176,9 @@
 				<view class="row">
 					<view class="lab">待学科目</view>
 					<view class="rightCon">
-						<view class="row">
+						<view class="row" @click="showSubjectTreat=true">
 							<view class="val">
-								<input v-model="form.classModel"   placeholder="请选择"   @click="showSchool=true" disabled/></input>
+								<mySelect :value="form.subjectTreat"/>
 							</view>
 							<view class="arrow">
 								<u-icon name="arrow-right" size="14" color="#686B73" style="margin-left: 12rpx;" ></u-icon>
@@ -261,17 +261,85 @@
 		<u-popup :show="showPopup" mode="center" :round="8" >
 			<comfigPopup @comfigClick="comfigClick"/>
 		</u-popup>
+		
+		<u-popup :show="showSchool" mode="bottom" :round="8"  @close="showSchool=false">
+			<searchSchool @chooseSchool="chooseSchool"/>
+		</u-popup>
+		
+		<!-- 选择班型 -->
+		<u-picker :show="showClassModel" :columns="columnsClassModel" keyName="label" @confirm="confirmClassModel"></u-picker>
+		<!-- 选择车型 -->
+		<u-picker :show="showCar" :columns="columnsCar" keyName="label" @confirm="confirmCar"></u-picker>
+		<!-- 原驾驶证初领日期 -->
+		<u-datetime-picker :show="showFirstLicenceTime"  mode="date"  @confirm="confirmFirstLicenceTime"></u-datetime-picker>
+		<!-- 原驾驶证学驾车型 -->
+		<u-popup :show="showOldDriveModel" mode="bottom" :round="8"  @close="showOldDriveModel=false">
+			<oldDrive @pickerOldDrive="pickerOldDrive"/>
+		</u-popup>
+		<!-- 已过科目 -->
+		<u-picker :show="showSubjectPass" :columns="columnsSubject" keyName="label" @confirm="confirmSubjectPass"></u-picker>
+		<!-- 待科目 -->
+		<u-picker :show="showSubjectTreat" :columns="columnsSubject" keyName="label" @confirm="confirmTreat"></u-picker>
+		
 	</view>
 </template>
 
 <script>
 	import comfigPopup from './comp/comfigPopup'
+	import searchSchool from './comp/searchSchool'
+	import oldDrive from './comp/oldDrive'
 	export default {
-		components: { comfigPopup },
+		components: { comfigPopup, searchSchool, oldDrive },
 		data() {
 			return {
 				showPopup: false,
+				showClassModel: false,
+				showCar: false,
+				showFirstLicenceTime: false,
+				showOldDriveModel: false,
+				showSubjectPass: false,
+				showSubjectTreat: false,
+				columnsClassModel: [
+					[
+						{
+							label: '普通班型',
+							id: 1
+						},
+						{
+							label: 'vip班型',
+							id: 2
+						}
+					]
+				],
+				columnsSubject: [
+					[
+						{label: '科目一', id: 1},
+						{label: '科目二', id: 2},
+						{label: '科目三', id: 3},
+					]
+				],
+				columnsCar: [
+					[
+						{
+							label: 'C1',
+							id: 1
+						},
+						{
+							label: 'C2',
+							id: 2
+						}
+					]
+				],
 				form: {
+					school: '',
+					classModel: '',
+					car: '',
+					coach: '',
+					certificateCodeShow: '原驾驶证号xxx',
+					firstLicenceTime: '',
+					oldDriveModel: '',
+					subjectPass: '',
+					subjectTreat: '',
 					radiovalue2: 1,
 					radiovalue1: 1,
 				},
@@ -281,7 +349,68 @@
 				radiolist3: [ {name: '全款', id: 1}, {name: '预付款', id: 2}]
 			}
 		},
+		onLoad() {
+			this.$on('upDateCoachItem',(item)=>{
+				console.log(item)
+				this.form.coach = item.coachName
+			})
+		},
 		methods: {
+			// 选择驾校
+			chooseSchool(item) {
+				this.form.school = item.schoolName
+				console.log(item)
+				this.showSchool = false
+			},
+			// 选择班型
+			confirmClassModel(val) {
+				let item = val.value[0]
+				console.log(item)
+				this.showClassModel = false
+				this.form.classModel = item.label
+			},
+			// 选择车型
+			confirmCar(val) {
+				let item = val.value[0]
+				console.log(item)
+				this.showCar = false
+				this.form.car = item.label
+			},
+			// 选择原驾驶证初领日期
+			confirmFirstLicenceTime(val) {
+				console.log(val)
+				this.form.firstLicenceTime = uni.$u.timeFormat(val.value, 'yyyy-mm-dd');
+				this.showFirstLicenceTime = false
+			},
+			// 选择原准驾车型
+			pickerOldDrive(val) {
+				this.form.oldDriveModel = val
+				this.showOldDriveModel = false
+				console.log(val)
+			},
+			// 选择已过科目
+			confirmSubjectPass(val) {
+				let item = val.value[0]
+				this.form.subjectPass = item.label
+				this.showSubjectPass = false
+			},
+			// 选择已过科目
+			confirmTreat(val) {
+				let item = val.value[0]
+				this.form.subjectTreat = item.label
+				this.showSubjectTreat = false
+			},
+			// 扫码
+			scanCodeFn() {
+				let _this = this
+				uni.scanCode({
+					success: function(res) {
+						console.log('条码类型：' + res.scanType);
+						console.log('条码内容：' + res.result);
+						
+					}
+				});
+			},
 			changeVal(val) {
 				console.log(val)
 			},
@@ -289,6 +418,7 @@
 			confirmClick() {
 				this.showPopup = true
 			},
+			
 			comfigClick(val) {
 				console.log(val)
 				this.showPopup = false
@@ -316,6 +446,9 @@
 			width: 152rpx;
 			line-height: 100rpx;
 			white-space: nowrap;
+			&.long {
+				width: 230rpx;
+			}
 	    }
 		.scan {
 			margin-left: auto;
diff --git a/pages/indexEntry/examines/allExamines/allExamines.vue b/pages/indexEntry/examines/allExamines/allExamines.vue
index 68cd945..10d1418 100644
--- a/pages/indexEntry/examines/allExamines/allExamines.vue
+++ b/pages/indexEntry/examines/allExamines/allExamines.vue
@@ -6,7 +6,7 @@
 				<searchRow placeholder="搜索考场名称"/>
 			</view>
 			<view class="navBox">
-				<view class="nav" v-for="(item,index) in navList" :key="index" :class="{active: index==0}">{{ item.text }}</view>
+				<view class="nav" v-for="(item,index) in navList" :key="index" :class="{active: currentNav==item.id}" @click="changeNav(item)">{{ item.text }}</view>
 			</view>
 			<view class="card">
 				<examineItem></examineItem>
@@ -28,7 +28,13 @@
 					{text: '理论', id: 1},
 					{text: '科目二', id: 2},
 					{text: '科目三', id: 3},
-				]
+				],
+				currentNav: 0
+			}
+		},
+		methods: {
+			changeNav(item) {
+				this.currentNav = item.id
 			}
 		}
 	}
diff --git a/pages/indexEntry/examines/comp/examineItem.vue b/pages/indexEntry/examines/comp/examineItem.vue
index 3c0be6f..935973b 100644
--- a/pages/indexEntry/examines/comp/examineItem.vue
+++ b/pages/indexEntry/examines/comp/examineItem.vue
@@ -12,9 +12,12 @@
 				</view>
 				<view class="modeCar">准考车型：C1/C2</view>
 			</view>
-			<view class="pozPhone">
-				<image src="@/static/images/index/telephone.png" mode=""></image>
-			</view>
+			<callPhone>
+				<view class="pozPhone">
+					<image src="@/static/images/index/telephone.png" mode=""></image>
+				</view>
+			</callPhone>
+			
 		</view>
 		<view class="redBox">
 			<!-- <view class="icon">
diff --git a/pages/indexEntry/examines/newsDetail/newsDetail.vue b/pages/indexEntry/examines/newsDetail/newsDetail.vue
index f57f19c..307e55a 100644
--- a/pages/indexEntry/examines/newsDetail/newsDetail.vue
+++ b/pages/indexEntry/examines/newsDetail/newsDetail.vue
@@ -19,7 +19,6 @@
 <style lang="scss" scoped>
 	.card {
 		padding: 28rpx 24rpx;
-		margin-top: 20rpx;
 		.h2 {
 			font-size: 28rpx;
 			font-weight: 500;
diff --git a/pages/indexEntry/findShcool/comp/schoolItem.vue b/pages/indexEntry/findShcool/comp/schoolItem.vue
index e0e5118..86aad85 100644
--- a/pages/indexEntry/findShcool/comp/schoolItem.vue
+++ b/pages/indexEntry/findShcool/comp/schoolItem.vue
@@ -12,13 +12,23 @@
 			<view class="credit">行业信用AA</view>
 			<view class="adr">距您1000.99公里</view>
 		</view>
-		<view class="pozPhone">
-			<image src="@/static/images/index/telephone.png" mode=""></image>
-		</view>
+		<callPhone v-if="showPhone">
+			<view class="pozPhone">
+				<image src="@/static/images/index/telephone.png" mode=""></image>
+			</view>
+		</callPhone>
 	</view>
 </template>
 
 <script>
+	export default {
+		props: {
+			showPhone: {
+				type: Boolean,
+				default: true
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/indexEntry/findShcool/findShcool.vue b/pages/indexEntry/findShcool/findShcool.vue
index 82f9935..66741ac 100644
--- a/pages/indexEntry/findShcool/findShcool.vue
+++ b/pages/indexEntry/findShcool/findShcool.vue
@@ -6,7 +6,7 @@
 				<searchRow placeholder="搜索驾校、教练…"></searchRow>
 			</view>
 			<view class="navBox">
-				<view class="tab" v-for="(item,index) in tabData" :key="index" :class="{active: index==0}">
+				<view class="tab" v-for="(item,index) in tabData" :key="index" :class="{active: currentTab==item.id}" @click="tabClick(item)">
 					{{ item.text }}</view>
 				<view class="screen" @click="$goPage('/pages/indexEntry/findShcool/screen/screen')">
 					<view class="txt">筛选</view>
@@ -31,21 +31,22 @@
 		components: { schoolItme },
 		data() {
 			return {
+				currentTab: 0,
 				tabData: [{
 						text: '全部',
 						id: 0
 					},
 					{
 						text: '场地优先',
-						id: 0
+						id: 1
 					},
 					{
 						text: '距离优先',
-						id: 0
+						id: 2
 					},
 					{
 						text: '好评优先',
-						id: 0
+						id: 3
 					},
 				]
 			}
@@ -54,6 +55,9 @@
 			goPage() {
 				console.log(this.$goPage)
 				this.$goPage('/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail')
+			},
+			tabClick(item) {
+				this.currentTab = item.id
 			}
 		}
 	}
diff --git a/pages/indexEntry/findShcool/screen/screen.vue b/pages/indexEntry/findShcool/screen/screen.vue
index 87bc4bc..6b54b84 100644
--- a/pages/indexEntry/findShcool/screen/screen.vue
+++ b/pages/indexEntry/findShcool/screen/screen.vue
@@ -4,7 +4,7 @@
 			<view class="type">
 				<view class="h1">驾照类型</view>
 				<view class="tagFlex">
-					<view class="tab" v-for="(item,index) in tagList" :class="{active: index==1}">{{ item.text }}</view>
+					<view class="tab" v-for="(item,index) in tagList" :class="{active: driverTypeArr.indexOf(item.id)!=-1}" @click="driverTypeClick(item)">{{ item.text }}</view>
 				</view>
 			</view>
 			
@@ -13,7 +13,7 @@
 			</view>
 			
 			<view class="btn_row">
-				<view class="btn border">重置</view>
+				<view class="btn border" @click="reSetFn">重置</view>
 				<view class="btn">确定</view>
 			</view>
 		</view>
@@ -27,10 +27,25 @@
 			return {
 				tagList: [
 					{text: '名称', id: 1},
-					{text: '名称', id: 1},
-					{text: '名称', id: 1},
-					{text: '名称', id: 1},
-				]
+					{text: '名称', id: 2},
+					{text: '名称', id: 3},
+				],
+				driverTypeArr: []
+			}
+		},
+		methods: {
+			driverTypeClick(item) {
+				let index = this.driverTypeArr.indexOf(item.id)
+				if( index==-1) {
+					this.driverTypeArr.push(item.id)
+				}else {
+					this.driverTypeArr.splice(index,1)
+				}
+				console.log(index)
+				console.log(this.driverTypeArr)
+			},
+			reSetFn() {
+				
 			}
 		}
 	}
diff --git a/pages/indexEntry/findShcool/searchShcool/searchShcool.vue b/pages/indexEntry/findShcool/searchShcool/searchShcool.vue
index be7ba8a..b7194df 100644
--- a/pages/indexEntry/findShcool/searchShcool/searchShcool.vue
+++ b/pages/indexEntry/findShcool/searchShcool/searchShcool.vue
@@ -35,7 +35,7 @@
 					<view class="li">
 						<view class="num">1</view>
 						<view class="con">
-							<schoolItme v-show="currentTab==1"/>
+							<schoolItme v-show="currentTab==1" :showPhone="false"/>
 							<coachItem  v-show="currentTab==2"/>
 						</view>
 					</view>
diff --git a/pages/indexEntry/findShcool/shcoolDetail/comp/tab1.vue b/pages/indexEntry/findShcool/shcoolDetail/comp/tab1.vue
index 5fc5793..518f045 100644
--- a/pages/indexEntry/findShcool/shcoolDetail/comp/tab1.vue
+++ b/pages/indexEntry/findShcool/shcoolDetail/comp/tab1.vue
@@ -5,7 +5,7 @@
 				<view class="name">C2自动挡一对一VIP班</view>
 				<view class="flex-b">
 					<view class="price">￥2566</view>
-					<view class="btn">导航</view>
+					<view class="btn">报名</view>
 				</view>
 			</view>
 		</view>
diff --git a/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue b/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
index 6583014..186f3a6 100644
--- a/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
+++ b/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
@@ -27,9 +27,11 @@
 							<u-icon name="arrow-right" color="#363A44" size="14"></u-icon>
 						</view>
 					</view>
-					<view class="pozPhone">
-						<image src="@/static/images/index/telephone.png" mode=""></image>
-					</view>
+					<callPhone>
+						<view class="pozPhone">
+							<image src="@/static/images/index/telephone.png" mode=""></image>
+						</view>
+					</callPhone>
 				</view>
 			</view>
 			<!-- 驾校位置 -->
@@ -66,6 +68,7 @@
 					'https://cdn.uviewui.com/uview/swiper/swiper2.png',
 					'https://cdn.uviewui.com/uview/swiper/swiper3.png',
 				],
+				show: false,
 				navList: [
 					{text: '班型', id: 1},
 					{text: '场地', id: 2},
@@ -73,12 +76,16 @@
 					{text: '教练车', id: 4},
 				],
 				currentNav: 1,
+				
 			}
 		},
+		onLoad() {
+			
+		},
 		methods: {
 			changeNav(item) {
 				this.currentNav = item.id
-			}
+			},
 		}
 	}
 </script>
diff --git a/pages/indexEntry/iIndustryInfo/detail/detail.vue b/pages/indexEntry/iIndustryInfo/detail/detail.vue
index 8c2448b..271d42d 100644
--- a/pages/indexEntry/iIndustryInfo/detail/detail.vue
+++ b/pages/indexEntry/iIndustryInfo/detail/detail.vue
@@ -20,9 +20,7 @@
 <style lang="scss" scoped>
 	.pageBgImg {
 		min-height: 100vh;
-		.pad {
-			margin-top: 24rpx;
-		}
+		
 	  .card {
 		  padding: 28rpx 24rpx;
 	    .tit {
diff --git a/pages/indexEntry/iIndustryInfo/iIndustryInfo.vue b/pages/indexEntry/iIndustryInfo/iIndustryInfo.vue
index 2231f84..7e34fe2 100644
--- a/pages/indexEntry/iIndustryInfo/iIndustryInfo.vue
+++ b/pages/indexEntry/iIndustryInfo/iIndustryInfo.vue
@@ -43,9 +43,6 @@
 <style lang="scss" scoped>
 	.pageBgImg {
 		min-height: 100vh;
-		.pad {
-			margin-top: 24rpx;
-		}
 	  .card {
 		  width: 100%;
 		  padding: 0 24rpx 10rpx 24rpx;
diff --git a/pages/indexEntry/industryPolicy/industryPolicy.vue b/pages/indexEntry/industryPolicy/industryPolicy.vue
index 87dcb51..960161a 100644
--- a/pages/indexEntry/industryPolicy/industryPolicy.vue
+++ b/pages/indexEntry/industryPolicy/industryPolicy.vue
@@ -43,9 +43,6 @@
 <style lang="scss" scoped>
 	.pageBgImg {
 		min-height: 100vh;
-		.pad {
-			margin-top: 24rpx;
-		}
 	  .card {
 		  width: 100%;
 		  padding: 0 24rpx 10rpx 24rpx;
diff --git a/pages/mineEntry/carData/carData - 副本.vue b/pages/mineEntry/carData/carData - 副本.vue
new file mode 100644
index 0000000..732df49
--- /dev/null
+++ b/pages/mineEntry/carData/carData - 副本.vue	
@@ -0,0 +1,364 @@
+<template>
+	<view class="myData pad" id="app">
+		<topNavbar title=""></topNavbar>
+		<view class="topText">
+			<view class="h3">专属您的</view>
+			<view class="h4">学车数据</view>
+		</view>
+		<view class="card">
+			<view class="row">
+				<view class="leftCon">
+					<view class="icon">
+						<image src="@/static/images/userCenter/ic_jiaxiao.png" mode=""></image>
+					</view>
+					<view class="text">我的驾校</view>
+				</view>
+				<view class="value">翔力驾校</view>
+			</view>
+			<view class="row">
+				<view class="leftCon">
+					<view class="icon">
+						<image src="@/static/images/userCenter/ic_jiaolian.png" mode=""></image>
+					</view>
+					<view class="text">我的教练</view>
+				</view>
+				<view class="value">xxx</view>
+			</view>
+			<view class="row">
+				<view class="leftCon">
+					<view class="icon">
+						<image src="@/static/images/userCenter/ic_chexing.png" mode=""></image>
+					</view>
+					<view class="text">所学车型</view>
+				</view>
+				<view class="value">xxx</view>
+			</view>
+			<view class="row">
+				<view class="leftCon">
+					<view class="icon">
+						<image src="@/static/images/userCenter/ic_shijian.png" mode=""></image>
+					</view>
+					<view class="text">报名时间</view>
+				</view>
+				<view class="value">xxx</view>
+			</view>
+		</view>
+		<!-- 学驾共历时 -->
+		<view class="card">
+			<view class="chart_row">
+				<view class="leftText">
+					<view class="lab">学驾共历时</view>
+					<view class="val">33天</view>
+				</view>
+				<view class="rightChart">
+					<ringChart />
+				</view>
+			</view>
+
+		</view>
+		<!-- 考试通过率 -->
+		<view class="card">
+			<view class="chart_row">
+				<view class="leftText" style="width: 200rpx;">
+					<view class="lab">考试通过率</view>
+					<view class="val">90%</view>
+				</view>
+				<view class="rightChart pad28">
+					<view class="blueBg">
+						<columnChart/>
+					</view>
+				</view>
+			</view>
+
+		</view>
+		<view class="flex-b">
+			<view class="count card">
+				<view class="lab">实操练习次数</view>
+				<view class="val">20次</view>
+			</view>
+			<view class="count card">
+				<view class="lab">模拟训练次数</view>
+				<view class="val">20次</view>
+			</view>
+		</view>
+		<view class="btnBorder" @click="destImgFn">立即分享</view>
+		<!-- <button  @click="shareFn" open-type="share">立即分享</button> -->
+		<canvas canvas-id="canvas" style="width: 350px; height: 350px;" class="canvas">3333</canvas>
+		<view class="img" style="width: 300px; height: 300px;">
+			<image :src="shareImageUrl" mode=""></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	import ringChart from './ringChart.vue'
+	import columnChart from './columnChart'
+	export default {
+		components: { ringChart, columnChart },
+		data() {
+			return {
+				shareImageUrl: ''
+			}
+		},
+		onReady() {
+			this.destImgFn()
+		},
+
+		methods: {
+			captureCanvas() {
+			        // 获取 Canvas 组件实例
+			        const canvas = uni.createCanvasContext('myCanvas', this);
+			    
+			        // 绘制需要的内容
+			        canvas.setFontSize(20);
+			        canvas.fillText('Hello, Canvas!', 50, 50);
+			    
+			        // 绘制完成后执行截屏操作
+			        canvas.draw(true, () => {
+			          uni.canvasToTempFilePath({
+			            canvasId: 'myCanvas',
+			            fileType: 'png',
+			            success: (res) => {
+			              console.log('截屏成功', res.tempFilePath);
+			            },
+			            fail: (err) => {
+			              console.log('截屏失败', err);
+			            }
+			          }, this);
+			        });
+			      },
+			destImgFn() {
+				this.$nextTick(()=>{
+// 					uni.canvasToTempFilePath({
+// 					  x: 0,
+// 					  y: 0,
+// 					  width: 350,
+// 					  height: 350,
+// 					  destWidth: 350,
+// 					  destHeight: 350,
+// 					  canvasId: 'canvas',
+// 					  success: function(res) {
+// 					    // 在H5平台下，tempFilePath 为 base64
+// 					    console.log(res.tempFilePath)
+// 					  } 
+// 					},this)
+
+// return
+					let _this = this
+					uni.createSelectorQuery().select('#app').boundingClientRect((rect) => {
+						console.log(rect)
+							const context = uni.createCanvasContext('canvas')
+							context.draw(true, () => {
+								setTimeout(()=>{
+							  uni.canvasToTempFilePath({
+							    x: 0,
+							    y: 0,
+								fileType:'png',
+							    width: 200,
+							    height: 200,
+							    // destWidth: rect.width * uni.getSystemInfoSync().pixelRatio,
+							    // destHeight: rect.height * uni.getSystemInfoSync().pixelRatio,
+							    canvasId: 'canvas',
+							    success: (res) => {
+							  								  console.log('截图成功')
+							  								  console.log(res)
+							  								  uni.showToast({
+							  								    title: '截图成功',
+							  								    icon: 'none'
+							  								  })
+							      // uni.hideToast()
+							      // 将截屏图片路径保存至storage或全局变量，以便后续分享使用
+							      _this.shareImageUrl = res.tempFilePath
+							  					  console.log(_this.shareImageUrl)
+							    },
+							    fail: (error) => {
+							  								  console.log('截图失败')
+							  								  console.log(error)
+							      // uni.hideToast()
+							      uni.showToast({
+							        title: '截图失败',
+							        icon: 'none'
+							      })
+							    },
+							  })
+							  },2000)
+							})
+					 
+					}).exec()
+				})
+			},
+			shareFn() {
+				let _this = this
+				// uni.share({
+				// 	provider: "weixin",
+				// 	scene: "WXSceneSession",
+				// 	type: 2,
+				// 	imageUrl: _this.shareImageUrl,
+				// 	success: function (res) {
+				// 		console.log("success:" + JSON.stringify(res));
+				// 	},
+				// 	fail: function (err) {
+				// 		console.log("fail:" + JSON.stringify(err));
+				// 	}
+				// });
+				uni.showShareMenu({
+				  withShareTicket: true,
+				  success: () => {
+				    uni.showShareImageMenu({
+				      path: _this.shareImageUrl,
+				      success: (res) => {
+				        console.log('分享成功', res)
+				      },
+				      fail: (error) => {
+				        console.log('分享失败', error)
+				      }
+				    })
+				  }
+				})
+
+			},
+			// 在分享按钮的点击事件中调用分享API
+			onShareImageBtnClick() {
+			  wx.showShareMenu({
+			    withShareTicket: true,
+			    success: () => {
+			      wx.shareAppMessage({
+			        imageUrl: '/image/share-image.jpg',
+			        success: (res) => {
+			          console.log('分享成功', res)
+			        },
+			        fail: (error) => {
+			          console.log('分享失败', error)
+			        }
+			      })
+			    }
+			  })
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.myData {
+		width: 100%;
+		background: url('http://192.168.1.20:81/zhili/image/20230818/409dca21dfec44eb8477e056ee23e437.png') #f6f6f6 no-repeat;
+		background-size: 100% 544rpx;
+		min-height: 100vh;
+		font-size: 28rpx;
+		padding-bottom: 40rpx;
+
+		.topText {
+			padding: 56rpx 34rpx 84rpx 34rpx;
+			color: #fff;
+			font-weight: 600;
+
+			.h3 {
+				font-size: 42rpx;
+			}
+
+			.h4 {
+				font-size: 64rpx;
+			}
+		}
+
+		.card {
+			padding: 0 24rpx;
+			margin-bottom: 20rpx;
+
+			.row {
+				display: flex;
+				border-bottom: 2rpx solid #E8E9EC;
+				height: 102rpx;
+				align-items: center;
+
+				.leftCon {
+					display: flex;
+					align-items: center;
+
+					.icon {
+						width: 40rpx;
+						height: 40rpx;
+					}
+
+					.text {
+						font-size: 28rpx;
+						padding: 0 40rpx 0 12rpx;
+					}
+				}
+
+				.value {
+					font-size: 28rpx;
+					color: #1989FA;
+					flex: 1;
+				}
+			}
+		}
+
+		.count {
+			width: 48%;
+			height: 196rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			text-align: center;
+
+			.lab {
+				margin: 36rpx 0 28rpx 0;
+			}
+
+			.val {
+				font-weight: 500;
+				font-size: 40rpx;
+				color: $themC;
+			}
+		}
+
+
+		.btnBorder {
+			width: 396rpx;
+			margin: 48rpx auto 0 auto;
+		}
+	}
+
+	.chart_row {
+		height: 300rpx;
+		border-radius: 16rpx;
+		display: flex;
+
+		.leftText {
+			width: 270rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+
+			.lab {
+				margin: 0rpx 0 24rpx 0;
+			}
+
+			.val {
+				font-weight: 500;
+				font-size: 40rpx;
+				color: $themC;
+			}
+		}
+
+		.rightChart {
+			width: 0;
+			flex: 1;
+			&.pad28 {
+				padding: 28rpx 0;
+			}
+			.blueBg {
+				padding: 20rpx 0 10rpx 0;
+				width: 100%;
+				height: 100%;
+				background-color: #F2F8FF;
+			}
+		}
+	}
+	.img {
+		width: 100vw;
+		height: 100vh;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/mineEntry/carData/carData.vue b/pages/mineEntry/carData/carData.vue
index 3610369..6d04aba 100644
--- a/pages/mineEntry/carData/carData.vue
+++ b/pages/mineEntry/carData/carData.vue
@@ -1,87 +1,93 @@
 <template>
-	<view class="myData pad">
-		<topNavbar title=""></topNavbar>
-		<view class="topText">
-			<view class="h3">专属您的</view>
-			<view class="h4">学车数据</view>
-		</view>
-		<view class="card">
-			<view class="row">
-				<view class="leftCon">
-					<view class="icon">
-						<image src="@/static/images/userCenter/ic_jiaxiao.png" mode=""></image>
+	<view class="myData" id="app">
+		<topNavbar title=" "></topNavbar>
+		<view class="pad">
+			<view class="topText">
+				<view class="h3">专属您的</view>
+				<view class="h4">学车数据</view>
+			</view>
+			<view class="card">
+				<view class="row">
+					<view class="leftCon">
+						<view class="icon">
+							<image src="@/static/images/userCenter/ic_jiaxiao.png" mode=""></image>
+						</view>
+						<view class="text">我的驾校</view>
 					</view>
-					<view class="text">我的驾校</view>
+					<view class="value">翔力驾校</view>
 				</view>
-				<view class="value">翔力驾校</view>
-			</view>
-			<view class="row">
-				<view class="leftCon">
-					<view class="icon">
-						<image src="@/static/images/userCenter/ic_jiaolian.png" mode=""></image>
+				<view class="row">
+					<view class="leftCon">
+						<view class="icon">
+							<image src="@/static/images/userCenter/ic_jiaolian.png" mode=""></image>
+						</view>
+						<view class="text">我的教练</view>
 					</view>
-					<view class="text">我的教练</view>
+					<view class="value">xxx</view>
 				</view>
-				<view class="value">xxx</view>
-			</view>
-			<view class="row">
-				<view class="leftCon">
-					<view class="icon">
-						<image src="@/static/images/userCenter/ic_chexing.png" mode=""></image>
+				<view class="row">
+					<view class="leftCon">
+						<view class="icon">
+							<image src="@/static/images/userCenter/ic_chexing.png" mode=""></image>
+						</view>
+						<view class="text">所学车型</view>
 					</view>
-					<view class="text">所学车型</view>
+					<view class="value">xxx</view>
 				</view>
-				<view class="value">xxx</view>
-			</view>
-			<view class="row">
-				<view class="leftCon">
-					<view class="icon">
-						<image src="@/static/images/userCenter/ic_shijian.png" mode=""></image>
+				<view class="row">
+					<view class="leftCon">
+						<view class="icon">
+							<image src="@/static/images/userCenter/ic_shijian.png" mode=""></image>
+						</view>
+						<view class="text">报名时间</view>
 					</view>
-					<view class="text">报名时间</view>
+					<view class="value">xxx</view>
 				</view>
-				<view class="value">xxx</view>
 			</view>
-		</view>
-		<!-- 学驾共历时 -->
-		<view class="card">
-			<view class="chart_row">
-				<view class="leftText">
-					<view class="lab">学驾共历时</view>
-					<view class="val">33天</view>
-				</view>
-				<view class="rightChart">
-					<ringChart />
+			<!-- 学驾共历时 -->
+			<view class="card">
+				<view class="chart_row">
+					<view class="leftText">
+						<view class="lab">学驾共历时</view>
+						<view class="val">33天</view>
+					</view>
+					<view class="rightChart">
+						<ringChart />
+					</view>
 				</view>
+			
 			</view>
-
-		</view>
-		<!-- 考试通过率 -->
-		<view class="card">
-			<view class="chart_row">
-				<view class="leftText" style="width: 200rpx;">
-					<view class="lab">考试通过率</view>
-					<view class="val">90%</view>
-				</view>
-				<view class="rightChart pad28">
-					<view class="blueBg">
-						<columnChart/>
+			<!-- 考试通过率 -->
+			<view class="card">
+				<view class="chart_row">
+					<view class="leftText" style="width: 200rpx;">
+						<view class="lab">考试通过率</view>
+						<view class="val">90%</view>
+					</view>
+					<view class="rightChart pad28">
+						<view class="blueBg">
+							<columnChart/>
+						</view>
 					</view>
 				</view>
+			
 			</view>
-
-		</view>
-		<view class="flex-b">
-			<view class="count card">
-				<view class="lab">实操练习次数</view>
-				<view class="val">20次</view>
-			</view>
-			<view class="count card">
-				<view class="lab">模拟训练次数</view>
-				<view class="val">20次</view>
+			<view class="flex-b">
+				<view class="count card">
+					<view class="lab">实操练习次数</view>
+					<view class="val">20次</view>
+				</view>
+				<view class="count card">
+					<view class="lab">模拟训练次数</view>
+					<view class="val">20次</view>
+				</view>
 			</view>
 		</view>
-		<view class="btnBorder">立即分享</view>
+		<!-- <view class="btnBorder" @click="destImgFn">立即分享</view>
+		<canvas canvas-id="canvas" style="width: 350px; height: 350px;" class="canvas">3333</canvas>
+		<view class="img" style="width: 300px; height: 300px;">
+			<image :src="shareImageUrl" mode=""></image>
+		</view> -->
 	</view>
 </template>
 
@@ -92,35 +98,15 @@
 		components: { ringChart, columnChart },
 		data() {
 			return {
-				gaueData: {
-					series: [{
-						"data": [{
-								"name": "科目一",
-								"value": 7
-							},
-							{
-								"name": "模拟器",
-								"value": 0
-							},
-							{
-								"name": "科目二",
-								"value": 10
-							},
-							{
-								"name": "科目三",
-								"value": 20
-							}
-						]
-					}]
-				},
-				opts: {
-					dataLabel: false,
-					width: 300,
-					height: 300
-				}
 			}
+		},
+		onReady() {
+		},
+
+		methods: {
+			
 		}
-	}
+	}                                        
 </script>
 
 <style lang="scss" scoped>
@@ -241,4 +227,8 @@
 			}
 		}
 	}
+	.img {
+		width: 100vw;
+		height: 100vh;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/mineEntry/carData/columnChart.vue b/pages/mineEntry/carData/columnChart.vue
index 0c688b5..d1088f7 100644
--- a/pages/mineEntry/carData/columnChart.vue
+++ b/pages/mineEntry/carData/columnChart.vue
@@ -21,7 +21,7 @@ export default {
         rotateLock: false,
         color: ["#1890FF","#91CB74","#FAC858","#EE6666","#73C0DE","#3CA272","#FC8452","#9A60B4","#ea7ccc"],
         padding: [15,15,0,5],
-        fontSize: 13,
+        fontSize: 12,
         fontColor: "#1989FA",
         dataLabel: true,
         dataPointShape: true,
@@ -42,7 +42,7 @@ export default {
           fontColor: "#666666",
           lineHeight: 11,
           hiddenColor: "#CECECE",
-          itemGap: 10
+          itemGap: 10,
         },
         xAxis: {
           disableGrid: true,
@@ -72,13 +72,13 @@ export default {
           titleOffsetY: 0,
           titleOffsetX: 0,
           titleFontColor: "#666666",
-          format: ""
         },
         yAxis: {
           data: [
             {
-              min: 0
-            }
+              min: 0,
+			  format: "yAxisDemo1",
+            },
           ],
           disabled: true,
           disableGrid: false,
@@ -87,7 +87,7 @@ export default {
           dashLength: 8,
           gridColor: "#E8E9EC",
           padding: 10,
-          showTitle: false
+          showTitle: false,
         },
         extra: {
           column: {
@@ -103,7 +103,8 @@ export default {
             colorStop: 0,
             meterBorder: 1,
             meterFillColor: "#FFFFFF",
-            labelPosition: "outside"
+            labelPosition: "outside",
+			
           },
           tooltip: {
             showBox: false,
@@ -130,7 +131,7 @@ export default {
             yAxisLabel: false,
             labelBgColor: "#FFFFFF",
             labelBgOpacity: 0.7,
-            labelFontColor: "#666666"
+            labelFontColor: "#666666",
           },
           markLine: {
             type: "solid",
@@ -154,7 +155,8 @@ export default {
             series: [
               {
                 name: "目标值",
-                data: [35,36,31,33,]
+                data: [35,36,31,33,],
+				format: "yAxisDemo1",
               }
             ]
           };
diff --git a/static/images/index/img_6@2x.png b/static/images/index/img_6@2x.png
index b56759b89fc2eb8a96b557e350e21cf6d9a06c11..f67c7818916fba62eb47fec325a4bd2133370a8d 100644
GIT binary patch
delta 3427
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
FV1h;iaqIv9

delta 2653
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
LNkvXXu0mjfi&Qu?

diff --git a/static/images/index/img_7@2x.png b/static/images/index/img_7@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..35ddef539f11f5afe6ccc410667426fbe1ba2f7f
GIT binary patch
literal 3443
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
V(2a<&SI__e002ovPDHLkV1k*Ok_P|)

literal 0
HcmV?d00001

diff --git a/static/images/index/img_8@2x.png b/static/images/index/img_8@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..242f332cea3c4176eeb13d998be26c8ebc43fa1d
GIT binary patch
literal 2441
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
Hu0mjf0Yq?u

literal 0
HcmV?d00001

diff --git a/uni_modules/charts/js_sdk/u-charts/config-ucharts.js b/uni_modules/charts/js_sdk/u-charts/config-ucharts.js
index 17b28b3..369a361 100644
--- a/uni_modules/charts/js_sdk/u-charts/config-ucharts.js
+++ b/uni_modules/charts/js_sdk/u-charts/config-ucharts.js
@@ -54,7 +54,7 @@ const cfu = {
   "option":{},
   //下面是自定义format配置，因除H5端外的其他端无法通过props传递函数，只能通过此属性对应下标的方式来替换
   "formatter":{
-    "yAxisDemo1":function(val, index, opts){return val+'元'},
+    "yAxisDemo1":function(val, index, opts){return val+'分'},
     "yAxisDemo2":function(val, index, opts){return val.toFixed(2)},
     "xAxisDemo1":function(val, index, opts){return val+'年';},
     "xAxisDemo2":function(val, index, opts){return formatDateTime(val,'h:m')},