From 1b9724ada95c7d14da63c1a94e651cffdec5cf07 Mon Sep 17 00:00:00 2001
From: xyc <3422692813@qq.com>
Date: Wed, 16 Apr 2025 14:24:41 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesA/appointment/index.vue                     |   4 +++-
 ...SSlicePNG9781bf564ae15eee66e88c90622422db.png | Bin 0 -> 1086 bytes
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 static/lanhu_pingjiazhongxin/FigmaDDSSlicePNG9781bf564ae15eee66e88c90622422db.png

diff --git a/pagesA/appointment/index.vue b/pagesA/appointment/index.vue
index 7e33633..40c53eb 100644
--- a/pagesA/appointment/index.vue
+++ b/pagesA/appointment/index.vue
@@ -41,8 +41,9 @@
 			</view>
 			<!-- 新增内容容器 -->
 			<view class="box_2 flex-col" v-if="curNow === 1">
-				<view class="box_4 flex-col" v-for="item in appointmentList" @click="goDetail(item,'train')"
+				<view class="box_4 flex-col" v-for="item in appointmentList" 
 					:key="item.id">
+					<view @click="goDetail(item,'train')">
 					<view class="group_5 flex-row justify-between">
 						<view class="block_3 flex-col justify-between">
 							<text class="text_2">{{ item.trainDay }}</text>
@@ -72,6 +73,7 @@
 						<text class="text_8">教练名称：</text>
 						<text class="text_9">{{ item.coachName }}</text>
 					</view>
+					</view>
 					<view class="block_5 box_10 flex-row" style="justify-content: flex-end; margin: 0 20rpx 15rpx 0;"
 						v-if="!item.ifEvaluate" @click="goEvaluateAdd(item)">
 						<view
diff --git a/static/lanhu_pingjiazhongxin/FigmaDDSSlicePNG9781bf564ae15eee66e88c90622422db.png b/static/lanhu_pingjiazhongxin/FigmaDDSSlicePNG9781bf564ae15eee66e88c90622422db.png
new file mode 100644
index 0000000000000000000000000000000000000000..321efee456a8fe9f25849b45c16525a82cd33836
GIT binary patch
literal 1086
zcmV-E1i|}>P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1Jg-FK~#7FrBz>S
zQ&kxMo!i@XZEx4x{ne#z9SohRGi=e#7y{c8lfB?(h=D{R@}O^q@#KS1y6BsU?#%}u
z*qge<MQ~A!F>Wp-%eKfEpu>>Sz!*^2dfU?7+xFgjIQK#eT~A>NzvSlL`+eW}{l4>k
zU(O+T0ul)-i>}-;N@*_z!h}7xgF*qpBBA(M*XgNX&=ae~LHNXK*x@86*=H}d1u|yj
z%@LlEu+@;>)Q&ksa&G(N7U%~op>xT5+Hje433(=af|VnRX8<82>i4-v$^@*;sfkhE
zBGWW+<??^HeRB;CQABNR9d^AOfglK65!SEc0jX-VC}7vzDhq+UmH7LU-{F^^en9-z
z%@UGOa|?zJzQ>-!JR!x%(@v`=wm>qajuC+z*&6lrm!D&DVjNGx{sV__{L?7UHB~KD
z^$Aw?Jo34-e?OJng0;J;KhE%6z1Eluf|CyMyk|~NV7r(*JI%EVqBblN2!lLlQb`oQ
zzxent;u{M7oIQ`_l~tIOmc-tP$GHM*qV|dGy_@H>D6Hmv^zHx#_H@~{_uuZvT6_a5
ztGAH6w`otvw?F=dtfry@!dClbp2sIi80_!CU|%=Jf1Sa)lCteh4K-+Q4Pi5*;`LYB
z(AV7om(x{IK&<5184jb~Tt_yWNBhnY1oCJU4Z~oz7gz}d)CBx!@%by!*hfXI%&4Vs
zu&W+z&CjE;PR8{71yoDkqQ9{&i0OrkkbEAr?+D>QXFVKRg2%6L1su5)yvX6TNE-wP
z%hF%PvMr5ikbQO!-spG{O_B&9$L+%+Nv72(>-LGqt;EQ|eSH?9u7Xgbbcr=VkEu~s
zCf!wyY*QDgSXCOzjtr7WBxHxv!`+|z&N5ueO7UM;(=d%ZTvAQZmJ75X+YsR`2RklW
zg<vqKu<t2eK)yNz-Fz_fG^g1O69p%zo_!$5e0jMUe2_8gED|0n9c3?NYl!KVu%Jjd
ze`S?z--V@B1<SY7piE@$-xwAWKA5iZ31U@LtP9ANDHsz;ZP?+!H@sXfEiGc^_tRLr
z`oBG*;kK6$>E4Ss_x1C_%a7{<cn!CZ)_}{GmaxbD4~(pe8NCO)B3-DJIOLR$1pJ<8
z;lJ!oez+4$M8398F+NW*xk#aA?xIz^h@2_nhV~pf)KiFb_TZiUdl9Z9c3BwPNFnoz
z0=5V{!soA<(a$DuB$F-ozZIN?SHFSD<N&;0AHF&yOhp=Tly~WK1qx{YL=F4hbWk@i
z6!6g9$|htvHG@~_U$OL#4`UZL8mI4Oq|w+YQ7UoV2XXR$>?{CP`v3p{07*qoM6N<$
Eg61L#-v9sr

literal 0
HcmV?d00001


From ee27f6bf7914cd57ffde1a592dd3d80c053888df Mon Sep 17 00:00:00 2001
From: xyc <3422692813@qq.com>
Date: Wed, 16 Apr 2025 16:15:01 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/contract.vue                      | 335 ++++++++++--------
 .../jushi-signature/jushi-signature.vue       |  39 +-
 2 files changed, 197 insertions(+), 177 deletions(-)

diff --git a/pages/index/contract.vue b/pages/index/contract.vue
index a46e9ba..011b0d4 100644
--- a/pages/index/contract.vue
+++ b/pages/index/contract.vue
@@ -1,178 +1,199 @@
 <template>
-  <view class="content">
-    <view class="container">
-      <headers :titles="titles">
-        <uni-icons type="arrow-left" color="#000000" size="22px"></uni-icons>
-      </headers>
-      <view class="f-box">
-        <u-parse :content="content"></u-parse>
-      </view>
+	<view class="content">
+		<view class="container">
+			<headers :titles="titles">
+				<uni-icons type="arrow-left" color="#000000" size="22px"></uni-icons>
+			</headers>
+			<view class="f-box">
+				<u-parse :content="content"></u-parse>
+			</view>
 
-      <jushi-signature :settings="settings" base64 @cancel="signatureCancel"
-                       @change="signatureChange"></jushi-signature>
-    </view>
+			<jushi-signature :settings="settings" base64 @cancel="signatureCancel"
+				@change="signatureChange"></jushi-signature>
+		</view>
 
-  </view>
+	</view>
 </template>
 
 <script>
-import headers from '../../components/header/headers.vue'
-import request from '@/utils/request.js'
+	import headers from '../../components/header/headers.vue'
+	import upload from '../../utils/upload';
+	import request from '@/utils/request.js'
 
-export default {
-  data() {
-    return {
-      titles: "合同",
-      settings: { //签名设置
-        width: '750', //签名区域的宽
-        height: '500', //签名区域的高
-        lineWidth: 4, //签名时线宽
-        textColor: '#000' //签名文字颜色
-      },
-      contentTemp: '',
-      content: '',
-      List: [],
-      show: false,
-      status: 'loading',
-      name: '',
-      Address: '',
-      tenantId: '',
-      contractData: {},
-      userData: {},
-	  callback: null,
-    }
-  },
-  onLoad(options) {
-    /*this.name = option.name
-    this.Address = option.Address
-    this.tenantId = option.tenantId
-    console.log('name',this.name)
-    console.log('Address',this.Address)
-    console.log('tenantId',this.tenantId)*/
-    if (options.data) {
-      this.contractData = JSON.parse(decodeURIComponent(options.data));
-      this.callback = options.callback;
-    }
-	this.callback = options.callback;
-    this.userData = uni.getStorageSync('userInfo');
-  },
-  onShow() {
-    this.getdriveSchool()
-    // this.actList = ["1", "1", "1", "1", "1", ]
-    // this.status = "nomore" 底部刷新结束
-  },
-  onPullDownRefresh() {
-    console.log("刷新");
-    uni.stopPullDownRefresh()
-  },
-  onReachBottom() {
-    // this.show = true
-    setTimeout(() => {
-      console.log("加载执行");
-    }, 2000)
-  },
-  components: {
-    headers
-  },
-  methods: {
-    async getdriveSchool() {
-      let res = await request({
-        url: `/app-api/small/driveSchool/obtainContract/tenantId/${this.contractData.tenantId}`,
-        method: 'get',
-      })
-      this.content = res.data.content
+	export default {
+		data() {
+			return {
+				titles: "合同",
+				settings: { //签名设置
+					width: '750', //签名区域的宽
+					height: '500', //签名区域的高
+					lineWidth: 4, //签名时线宽
+					textColor: '#000' //签名文字颜色
+				},
+				contentTemp: '',
+				content: '',
+				userUrl: '',
+				List: [],
+				show: false,
+				status: 'loading',
+				name: '',
+				Address: '',
+				tenantId: '',
+				contractData: {},
+				userData: {},
+				callback: null,
+			}
+		},
+		onLoad(options) {
+			/*this.name = option.name
+			this.Address = option.Address
+			this.tenantId = option.tenantId
+			console.log('name',this.name)
+			console.log('Address',this.Address)
+			console.log('tenantId',this.tenantId)*/
+			if (options.data) {
+				this.contractData = JSON.parse(decodeURIComponent(options.data));
+				this.callback = options.callback;
+			}
+			this.callback = options.callback;
+			this.userData = uni.getStorageSync('userInfo');
+			// 监听 tempFilePath 事件
+			uni.$off('tempFilePath');
+			uni.$on('tempFilePath', (data) => {
+				console.log('Received tempFilePath:', data);
+				//上传图片
+				upload({
+					url: '/app-api/small-upload/common/upload',
+					filePath: data,
+				}).then((res) => {
+					this.userUrl = res.data.url
+					console.log(this.userUrl, 'userUrl');
+					this.signatureChange()
+				})
+			});
 
-      // 执行替换
-      for (const [key, value] of Object.entries(this.contractData)) {
-        this.content = this.content.replace(
-            new RegExp(`&nbsp;${key}&nbsp;|${key}`, 'g'),
-            value
-        );
-      }
+		},
+		onShow() {
+			this.getdriveSchool()
+			// this.actList = ["1", "1", "1", "1", "1", ]
+			// this.status = "nomore" 底部刷新结束
+		},
+		onPullDownRefresh() {
+			console.log("刷新");
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			// this.show = true
+			setTimeout(() => {
+				console.log("加载执行");
+			}, 2000)
+		},
+		components: {
+			headers
+		},
+		methods: {
+			async getdriveSchool() {
+				let res = await request({
+					url: `/app-api/small/driveSchool/obtainContract/tenantId/${this.contractData.tenantId}`,
+					method: 'get',
+				})
+				this.content = res.data.content
 
-      // 处理特殊格式的占位符（如下划线格式）
-      this.content = this.content.replace(/<u[^>]*>([^<]*)name([^<]*)<\/u>/g, `<u>$1${this.contractData.name}$2</u>`);
-      this.content = this.content.replace(/<u[^>]*>([^<]*)type([^<]*)<\/u>/g, `<u>$1${this.contractData.type}$2</u>`);
+				// 执行替换
+				for (const [key, value] of Object.entries(this.contractData)) {
+					this.content = this.content.replace(
+						new RegExp(`&nbsp;${key}&nbsp;|${key}`, 'g'),
+						value
+					);
+				}
+
+				// 处理特殊格式的占位符（如下划线格式）
+				this.content = this.content.replace(/<u[^>]*>([^<]*)name([^<]*)<\/u>/g,
+					`<u>$1${this.contractData.name}$2</u>`);
+				this.content = this.content.replace(/<u[^>]*>([^<]*)type([^<]*)<\/u>/g,
+					`<u>$1${this.contractData.type}$2</u>`);
 
 
-    },
+			},
 
-    signatureCancel() {
-      uni.navigateBack()
-    },
-    async signatureChange(e) {
-      this.imgUrl = e
-      let res = await request({
-        url: '/app-api/small/driveSchool/obtainContract',
-        method: 'post',
-        data: {
-          userName: this.contractData.name,
-          tenantId: this.tenantId,
-          userId: this.userData.id,
-          content: this.content,
-        }
-      })
-      console.log(res);
-      uni.showToast({
-        title: '报名成功',
-        duration: 3000
-		
-      });
-	  
-	  const pages = getCurrentPages();
-	    const prevPage = pages[pages.length - 2];
-	    
-	    if (prevPage && (prevPage.route === 'pagesA/register/index' || prevPage.route === '/pagesA/register/index')) {
-	      if (this.callback) { // 从onLoad中获取的callback
-	        try {
-	          const callback = decodeURIComponent(this.callback);
-	          if (prevPage.$vm && typeof prevPage.$vm[callback] === 'function') {
-	            prevPage.$vm[callback]();
-	          }
-	        } catch (e) {
-	          console.error('回调执行失败:', e);
-	        }
-	      }
-	    }
-		
-      setTimeout(function () {
-        // 在这里写需要延迟执行的代码
-        uni.navigateTo({
-          url: '/newPages/newIndex/index'
-        })
-      }, 2600); // 3000毫秒即为3秒
+			signatureCancel() {
+				uni.navigateBack()
+			},
+			async signatureChange(e) {
+				this.imgUrl = e
+				let res = await request({
+					url: '/app-api/small/driveSchool/obtainContract',
+					method: 'post',
+					data: {
+						userName: this.contractData.name,
+						tenantId: this.tenantId,
+						userId: this.userData.id,
+						content: this.content,
+						userUrl: this.userUrl,
+					}
+				})
+				console.log(res);
+				uni.showToast({
+					title: '报名成功',
+					duration: 3000
 
-      // const index = e.lastIndexOf("/")
-      // let fileName = e.substring(index + 1, e.length)
-      // this.uploadFile(this.imgUrl, fileName)
+				});
 
-    },
-	
-    goback() {
-      uni.navigateBack()
-    },
+				const pages = getCurrentPages();
+				const prevPage = pages[pages.length - 2];
 
-  }
-}
+				if (prevPage && (prevPage.route === 'pagesA/register/index' || prevPage.route ===
+						'/pagesA/register/index')) {
+					if (this.callback) { // 从onLoad中获取的callback
+						try {
+							const callback = decodeURIComponent(this.callback);
+							if (prevPage.$vm && typeof prevPage.$vm[callback] === 'function') {
+								prevPage.$vm[callback]();
+							}
+						} catch (e) {
+							console.error('回调执行失败:', e);
+						}
+					}
+				}
+
+				setTimeout(function() {
+					// 在这里写需要延迟执行的代码
+					uni.navigateTo({
+						url: '/newPages/newIndex/index'
+					})
+				}, 2600); // 3000毫秒即为3秒
+
+				// const index = e.lastIndexOf("/")
+				// let fileName = e.substring(index + 1, e.length)
+				// this.uploadFile(this.imgUrl, fileName)
+
+			},
+
+			goback() {
+				uni.navigateBack()
+			},
+
+		}
+	}
 </script>
 
 <style scoped lang="scss">
-.content {
-  background: #f4f5f6;
+	.content {
+		background: #f4f5f6;
 
-  height: 100vh;
-}
+		height: 100vh;
+	}
 
-.container {
-  width: 100%;
-  background: #f4f5f6;
-  box-sizing: border-box;
-  padding-top: 88px;
-}
+	.container {
+		width: 100%;
+		background: #f4f5f6;
+		box-sizing: border-box;
+		padding-top: 88px;
+	}
 
-.f-box {
-  width: 100%;
-  box-sizing: border-box;
-  padding: 15px;
-}
-</style>
+	.f-box {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 15px;
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/jushi-signature/components/jushi-signature/jushi-signature.vue b/uni_modules/jushi-signature/components/jushi-signature/jushi-signature.vue
index ba95409..b0b49e7 100644
--- a/uni_modules/jushi-signature/components/jushi-signature/jushi-signature.vue
+++ b/uni_modules/jushi-signature/components/jushi-signature/jushi-signature.vue
@@ -141,7 +141,7 @@
 					success: function(res) {
 						console.log(res, '签名');
 						//强制返回base64
-						that.emit(res.tempFilePath)
+						uni.$emit('tempFilePath', res.tempFilePath)
 					},
 					fail(e) {
 						console.log(JSON.stringify(e))
@@ -149,20 +149,20 @@
 				}, this)
 			},
 			reset() {
-					let that = this
-					uni.getSystemInfo({
-						success: function(res) {
-							ctx.clearRect(0, 0, res.windowWidth, res.windowHeight)
-							ctx.draw(true)
-							// #ifdef MP-WEIXIN
-							that.setCanvasBg()
-							// #endif
-							that.setPaintStyle()
-						},
-					})
-					tempPoint = []
-					// 注意：这里不触发任何emit事件
-				},
+				let that = this
+				uni.getSystemInfo({
+					success: function(res) {
+						ctx.clearRect(0, 0, res.windowWidth, res.windowHeight)
+						ctx.draw(true)
+						// #ifdef MP-WEIXIN
+						that.setCanvasBg()
+						// #endif
+						that.setPaintStyle()
+					},
+				})
+				tempPoint = []
+				// 注意：这里不触发任何emit事件
+			},
 			emit(tempFilePath) {
 				this.$emit('change', tempFilePath)
 			},
@@ -226,11 +226,11 @@
 	}
 
 	.clear {}
-	
+
 	.reset {
-			background: #FF9900;
-			color: white;
-		}
+		background: #FF9900;
+		color: white;
+	}
 
 	.sign-area {
 		position: absolute;
@@ -240,5 +240,4 @@
 		font-size: 130rpx;
 		transform: rotate(-20deg);
 	}
-	
 </style>
\ No newline at end of file

From e74fc686b06073bb58ad8ca58a9ff03ec14885e8 Mon Sep 17 00:00:00 2001
From: xyc <3422692813@qq.com>
Date: Wed, 16 Apr 2025 17:13:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 newPages/newIndex/index.vue     |  765 +++++++++++-----------
 newPages/schoolDetail/index.vue |  571 ++++++++---------
 pages/login/login.vue           | 1045 +++++++++++++++----------------
 3 files changed, 1185 insertions(+), 1196 deletions(-)

diff --git a/newPages/newIndex/index.vue b/newPages/newIndex/index.vue
index 2a2af84..8938234 100644
--- a/newPages/newIndex/index.vue
+++ b/newPages/newIndex/index.vue
@@ -1,229 +1,211 @@
 <template>
-  <view class="page flex-col">
-    <view class="top_">
-      <u-swiper class="lunbo_" :list="swiperList" keyName="swiperPicture" radius="10" height="300" indicator
-                indicatorMode="line"></u-swiper>
-    </view>
-    <view class="section_2 flex-col">
-      <view class="list_1 flex-row">
-        <view
-            class="image-text_1 flex-col align-items-center justify-content-center;"
-            v-for="(item, index) in loopData0"
-            :key="index"
-            @click="handleItemClick(item)"
-        >
-          <image
-              class="label_1"
-              referrerpolicy="no-referrer"
-              :src="item.url"
-          />
-          <text class="text-group_1" v-text="item.text"></text>
-        </view>
-      </view>
-      <view class="box_4 flex-row justify-between">
-		
-        <view class="image-text_2 flex-row justify-between">
-          <!-- <u-notice-bar direction="column" duration="10000" bgColor="#e9f1ff"  color="black" :text="textList.map(item => item.title)" @click="handleNoticeClick" icon="/static/lanhu_shouye2gai/FigmaDDSSlicePNGd2c17b5f24182e597acbfa50481040c1.png"></u-notice-bar> -->
-		  <u-notice-bar
-		    direction="column"
-		    duration="10000"
-		    bgColor="#e9f1ff"
-		    color="black"
-		    :text="textList"
-		    @click="handleNoticeClick"
-		    icon="/static/lanhu_shouye2gai/FigmaDDSSlicePNGd2c17b5f24182e597acbfa50481040c1.png"
-		  />
-        </view>
-		
-        <view class="group_3 flex-col justify-between">
-          <view class="block_5 flex-col"></view>
-          <view class="block_6 flex-col"></view>
-          <view class="block_7 flex-col"></view>
-        </view>
-      </view>
-      <view class="box_5 flex-row justify-between">
-        <text class="text_2">优质驾校</text>
-        <view class="image-text_3 flex-row justify-between">
-          <text class="text-group_3" @click="goSchoolList()">查看更多</text>
-          <image
-              class="thumbnail_2"
-              referrerpolicy="no-referrer"
-              src="/static/lanhu_shouye2gai/FigmaDDSSlicePNGc8586e4d9e76802e4b93ae8fb3654b38.png"
-          />
-        </view>
-      </view>
-      <view class="itemContent">
-        <!-- 使用 scroll-view 包裹 SchoolInfo 组件 -->
-        <scroll-view class="school-scroll-view" scroll-y @scrolltolower="onReachBottomCus"
-                     refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered">
-          <SchoolInfo style="" v-for="(school, index) in schoolList" :key="index" :schoolInfo="school"
-                      @click="goSchoolDetail(school)"/>
-        </scroll-view>
-      </view>
+	<view class="page flex-col">
+		<view class="top_">
+			<u-swiper class="lunbo_" :list="swiperList" keyName="swiperPicture" radius="10" height="300" indicator
+				indicatorMode="line"></u-swiper>
+		</view>
+		<view class="section_2 flex-col">
+			<view class="list_1 flex-row">
+				<view class="image-text_1 flex-col align-items-center justify-content-center;"
+					v-for="(item, index) in loopData0" :key="index" @click="handleItemClick(item)">
+					<image class="label_1" referrerpolicy="no-referrer" :src="item.url" />
+					<text class="text-group_1" v-text="item.text"></text>
+				</view>
+			</view>
+			<view class="box_4 flex-row justify-between">
 
-    </view>
-    <tabbar :msg='msg'></tabbar>
-  </view>
+				<view class="image-text_2 flex-row justify-between">
+					<!-- <u-notice-bar direction="column" duration="10000" bgColor="#e9f1ff"  color="black" :text="textList.map(item => item.title)" @click="handleNoticeClick" icon="/static/lanhu_shouye2gai/FigmaDDSSlicePNGd2c17b5f24182e597acbfa50481040c1.png"></u-notice-bar> -->
+					<u-notice-bar direction="column" duration="10000" bgColor="#e9f1ff" color="black" :text="textList"
+						@click="handleNoticeClick"
+						icon="/static/lanhu_shouye2gai/FigmaDDSSlicePNGd2c17b5f24182e597acbfa50481040c1.png" />
+				</view>
+
+				<view class="group_3 flex-col justify-between">
+					<view class="block_5 flex-col"></view>
+					<view class="block_6 flex-col"></view>
+					<view class="block_7 flex-col"></view>
+				</view>
+			</view>
+			<view class="box_5 flex-row justify-between">
+				<text class="text_2">优质驾校</text>
+				<view class="image-text_3 flex-row justify-between">
+					<text class="text-group_3" @click="goSchoolList()">查看更多</text>
+					<image class="thumbnail_2" referrerpolicy="no-referrer"
+						src="/static/lanhu_shouye2gai/FigmaDDSSlicePNGc8586e4d9e76802e4b93ae8fb3654b38.png" />
+				</view>
+			</view>
+			<view class="itemContent">
+				<!-- 使用 scroll-view 包裹 SchoolInfo 组件 -->
+				<scroll-view class="school-scroll-view" scroll-y @scrolltolower="onReachBottomCus" refresher-enabled
+					@refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered">
+					<SchoolInfo style="" v-for="(school, index) in schoolList" :key="index" :schoolInfo="school"
+						@click="goSchoolDetail(school)" />
+				</scroll-view>
+			</view>
+
+		</view>
+		<tabbar :msg='msg'></tabbar>
+	</view>
 </template>
 
 <script>
-import SchoolInfo from './SchoolInfo.vue';
-import request from "@/utils/request";
-import {
-  getCoachId,
-  getInviteId,
-  getLocalUserInfo,
-  getToken,
-  removeCoachId,
-  removeInviteId,
-  removeTenantId,
-  setCoachId,
-  setInviteId,
-  setLocalUserInfo,
-  setStaffType,
-  setTenantId
-} from '@/utils/auth'
-export default {
-  components: {
-    SchoolInfo
-  },
-  data() {
-    return {
-      loopData0: [
-        {
-          url: '/static/lanhu_shouye2gai/xcbm.png',
-          text: '学车报名'
-        },
-        {
-          url: '/static/lanhu_shouye2gai/yyxl.png',
-          text: '预约训练'
-        },
-        {
-          url: '/static/lanhu_shouye2gai/kslr.png',
-          text: '考试结果录入'
-        },
-        {
-          url: '/static/lanhu_shouye2gai/pj.png',
-          text: '评价'
-        },
-      ],
-      swiperList: [],
-      msg: "1",
-      constants: {},
-      schoolList: [],
-      //下来刷新状态
-      isTriggered: false,
-      pageNo: 1,
-      pageSize: 10,
-      total: 0,
-      imageUrl: this.$imagesUrl,
-      textList:[],
-	  noticeList: [],
-	  qTenantId: null,
-	  qCoachId: null,
-    };
-  },
-  onLoad(query) {
-	  // setInviteId('JLPXF1')
-	// this.getTenantIdByInviteId()
-    this.getSwiperList()
-    this.getTextList()
-	
-	const q = decodeURIComponent(query.q) // 获取到二维码原始链接内容
-	let theRequest = this.getUrlValue(q)
-	if(theRequest.hasOwnProperty("inviteId")){
-	  //扫码邀请过来的，设置邀请者code
-	  setInviteId(theRequest['inviteId'])
-	  this.getTenantIdByInviteId()
-	  //先登录
-	  uni.reLaunch({
-	    url: '/pages/login/login'
-	  })
-	}else{
-	  removeInviteId()
-	  removeCoachId()
-	  removeTenantId()
-	  this.getList()
-	  /* uni.reLaunch({
-	    url: '/pages-home/home/home'
-	  }) */
-	}
-  },
-  methods: {
-    getTenantIdByInviteId(){
-		console.log('1122', getInviteId())
-		if(!getInviteId()){
-			console.log(1)
-			this.getList()
-			return
-		}
-		request({
-			url: '/app-api/dl-drive-school-coach-small/getCoachByUniqueCode',
-			method: 'GET',
-			params: {
-				uniqueCode: getInviteId()
-			}
-		}).then(res => {
-			console.log(123)
-			if(res.data != null){
-				this.qTenantId = res.data.tenantId
-				this.qCoachId = res.data.userId
-				setTenantId(res.data.tenantId)
+	import SchoolInfo from './SchoolInfo.vue';
+	import request from "@/utils/request";
+	import {
+		getCoachId,
+		getInviteId,
+		getLocalUserInfo,
+		getToken,
+		removeCoachId,
+		removeInviteId,
+		removeTenantId,
+		setCoachId,
+		setInviteId,
+		setLocalUserInfo,
+		setStaffType,
+		setTenantId
+	} from '@/utils/auth'
+	export default {
+		components: {
+			SchoolInfo
+		},
+		data() {
+			return {
+				loopData0: [{
+						url: '/static/lanhu_shouye2gai/xcbm.png',
+						text: '学车报名'
+					},
+					{
+						url: '/static/lanhu_shouye2gai/yyxl.png',
+						text: '预约训练'
+					},
+					{
+						url: '/static/lanhu_shouye2gai/kslr.png',
+						text: '考试结果录入'
+					},
+					{
+						url: '/static/lanhu_shouye2gai/pj.png',
+						text: '评价'
+					},
+				],
+				swiperList: [],
+				msg: "1",
+				constants: {},
+				schoolList: [],
+				//下来刷新状态
+				isTriggered: false,
+				pageNo: 1,
+				pageSize: 10,
+				total: 0,
+				imageUrl: this.$imagesUrl,
+				textList: [],
+				noticeList: [],
+				qTenantId: null,
+				qCoachId: null,
+			};
+		},
+		onLoad(query) {
+			// setInviteId('JLPXF1')
+			// this.getTenantIdByInviteId()
+			this.getSwiperList()
+			this.getTextList()
+
+			const q = decodeURIComponent(query.q) // 获取到二维码原始链接内容
+			let theRequest = this.getUrlValue(q)
+			if (theRequest.hasOwnProperty("inviteId")) {
+				//扫码邀请过来的，设置邀请者code
+				setInviteId(theRequest['inviteId'])
+				this.getTenantIdByInviteId()
+				//先登录
+				// uni.reLaunch({
+				//   url: '/pages/login/login'
+				// })
+			} else {
+				removeInviteId()
+				removeCoachId()
+				removeTenantId()
 				this.getList()
-				if(res.data.type == 'jl'){
-					setCoachId(res.data.userId)
-					setStaffType('02')
-				}
-				if(res.data.type == 'yg'){
-					setCoachId(res.data.userId)
-					setStaffType('01')
-				}
+				/* uni.reLaunch({
+				  url: '/pages-home/home/home'
+				}) */
 			}
-		})
-    },
-    getList() {
-	  const params = {
-		pageNo: this.pageNo,
-	    pageSize: this.pageSize,
-	    serviceCodes: 'jiaxiao',
-	  };
-	  
-	  if (this.qTenantId) {
-	    params.tenantId = this.qTenantId;
-	  }
-	  console.log('params', params)
-      request({
-        url: '/userClient/base/companySmallProgram/pageNoTenantId',
-        method: 'GET',
-        params: params,
-        tenantIdFlag: false
-      }).then(res => {
-        res.data.records.forEach(item => {
-          item.features = ['有接送', '规模大']
-          item.imageUrl = this.imageUrl + '/' + item.photo
-        })
-        this.schoolList = this.schoolList.concat(res.data.records)
-        this.isTriggered = false
-		this.total = res.data.total
-		console.log(res)
-      })
-    },
-	getUrlValue(url) {
-	  var theRequest = new Object();
-	  if (url.indexOf("?") != -1) {
-	    //有参数
-	    var str = url.split("?")[1];
-	    var strs = str.split("&");
-	    for (var i = 0; i < strs.length; i++) {
-	      theRequest[strs[i].split("=")[0]] = (strs[i].split("=")[1]);
-	    }
-	  }
-	  return theRequest
-	},
-    /**
-     * 实时讯息
-     */
-    /* async getTextList() {
+		},
+		methods: {
+			getTenantIdByInviteId() {
+				console.log('1122', getInviteId())
+				if (!getInviteId()) {
+					console.log(1)
+					this.getList()
+					return
+				}
+				request({
+					url: '/app-api/dl-drive-school-coach-small/getCoachByUniqueCode',
+					method: 'GET',
+					params: {
+						uniqueCode: getInviteId()
+					}
+				}).then(res => {
+					console.log(123, res.data)
+					if (res.data != null) {
+						this.qTenantId = res.data.tenantId
+						this.qCoachId = res.data.userId
+						setTenantId(res.data.tenantId)
+						this.getList()
+						if (res.data.type == 'jl') {
+							setCoachId(res.data.userId)
+							setStaffType('02')
+						}
+						if (res.data.type == 'yg') {
+							setCoachId(res.data.userId)
+							setStaffType('01')
+						}
+					}
+				})
+			},
+			getList() {
+				const params = {
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					serviceCodes: 'jiaxiao',
+				};
+
+				if (this.qTenantId) {
+					params.tenantId = this.qTenantId;
+				}
+				console.log('params', params)
+				request({
+					url: '/userClient/base/companySmallProgram/pageNoTenantId',
+					method: 'GET',
+					params: params,
+					tenantIdFlag: false
+				}).then(res => {
+					res.data.records.forEach(item => {
+						item.features = ['有接送', '规模大']
+						item.imageUrl = this.imageUrl + '/' + item.photo
+					})
+					this.schoolList = this.schoolList.concat(res.data.records)
+					this.isTriggered = false
+					this.total = res.data.total
+					console.log(res)
+				})
+			},
+			getUrlValue(url) {
+				var theRequest = new Object();
+				if (url.indexOf("?") != -1) {
+					//有参数
+					var str = url.split("?")[1];
+					var strs = str.split("&");
+					for (var i = 0; i < strs.length; i++) {
+						theRequest[strs[i].split("=")[0]] = (strs[i].split("=")[1]);
+					}
+				}
+				return theRequest
+			},
+			/**
+			 * 实时讯息
+			 */
+			/* async getTextList() {
       let res = await request({
         url: '/app-api/base/notice/pageList',
         method: 'get',
@@ -239,189 +221,190 @@ export default {
         this.textList.push(item.title)
       })
     }, */
-	async getTextList() {
-	  let res = await request({
-	    url: '/app-api/base/notice/pageList',
-	    method: 'get',
-	    params: {
-	      pageNum: 1,
-	      pageSize: 10000,
-	      parentServer: 'jiaxiao',
-	      server: 'wx'
-	    }
-	  })
-	  this.noticeList = res.data.records // 保留原始数据
-	  this.textList = res.data.records.map(item => item.title) // 提取 title 用于展示
-	},
-	handleNoticeClick(index) {
-	  const currentNotice = this.noticeList[index]
-	  if (currentNotice && currentNotice.id) {
-	    uni.navigateTo({
-	      url: `/pagesA/noticeContent/index?id=${currentNotice.id}`
-	    })
-	  }
-	},
-    getSwiperList() {
-      request({
-        url: '/app-api/drivingSchool/text/swiper/list',
-        method: 'GET'
-      }).then(res => {
-        res.data.forEach(item => {
-          item.swiperPicture = this.imageUrl + item.swiperPicture
-        })
-        this.swiperList = res.data
-      })
-    },
-    /**
-     * 上滑加载数据
-     */
-    onReachBottomCus() {
-      //判断 如果页码*页容量大于等于总条数，提示该页数据加载完毕
-      if (this.pageNo * this.pageSize >= this.total) {
-        uni.$u.toast('没有更多数据了')
-        return
-      }
-      //页码+1,调用获取数据的方法获取第二页数据
-      this.pageNo++
-      //此处调用自己获取数据列表的方法
-      this.getList()
-    },
-    /**
-     * 下拉刷新数据
-     */
-    onRefresherrefresh() {
-      this.isTriggered = true
-      this.pageNo = 1
-      this.total = 0
-      this.schoolList = []
-      this.getList()
-    },
-    goSchoolList() {
-      uni.navigateTo({
-        url: '/newPages/schoolList/index',
-      });
-    },
-    goSchoolDetail(data) {
-      uni.navigateTo({
-        url: `/newPages/schoolDetail/index?id=${data.id}&tenantId=${data.tenantId}&schoolName=${data.corpName}`,
-        // url: '/newPages/schoolDetail/index',
-      });
-    },
+			async getTextList() {
+				let res = await request({
+					url: '/app-api/base/notice/pageList',
+					method: 'get',
+					params: {
+						pageNum: 1,
+						pageSize: 10000,
+						parentServer: 'jiaxiao',
+						server: 'wx'
+					}
+				})
+				this.noticeList = res.data.records // 保留原始数据
+				this.textList = res.data.records.map(item => item.title) // 提取 title 用于展示
+			},
+			handleNoticeClick(index) {
+				const currentNotice = this.noticeList[index]
+				if (currentNotice && currentNotice.id) {
+					uni.navigateTo({
+						url: `/pagesA/noticeContent/index?id=${currentNotice.id}`
+					})
+				}
+			},
+			getSwiperList() {
+				request({
+					url: '/app-api/drivingSchool/text/swiper/list',
+					method: 'GET'
+				}).then(res => {
+					res.data.forEach(item => {
+						item.swiperPicture = this.imageUrl + item.swiperPicture
+					})
+					this.swiperList = res.data
+				})
+			},
+			/**
+			 * 上滑加载数据
+			 */
+			onReachBottomCus() {
+				//判断 如果页码*页容量大于等于总条数，提示该页数据加载完毕
+				if (this.pageNo * this.pageSize >= this.total) {
+					uni.$u.toast('没有更多数据了')
+					return
+				}
+				//页码+1,调用获取数据的方法获取第二页数据
+				this.pageNo++
+				//此处调用自己获取数据列表的方法
+				this.getList()
+			},
+			/**
+			 * 下拉刷新数据
+			 */
+			onRefresherrefresh() {
+				this.isTriggered = true
+				this.pageNo = 1
+				this.total = 0
+				this.schoolList = []
+				this.getList()
+			},
+			goSchoolList() {
+				uni.navigateTo({
+					url: '/newPages/schoolList/index',
+				});
+			},
+			goSchoolDetail(data) {
+				uni.navigateTo({
+					url: `/newPages/schoolDetail/index?id=${data.id}&tenantId=${data.tenantId}&schoolName=${data.corpName}`,
+					// url: '/newPages/schoolDetail/index',
+				});
+			},
 
-    handleItemClick(item) {
-      // 根据 item.text 判断点击的是哪一项
-      switch (item.text) {
-        case '学车报名':
-          uni.navigateTo({
-            url: '/newPages/schoolList/index'
-          });
-          break;
-        case '预约训练':
-		  if (!getToken()) {
-			 /* uni.showToast({
+			handleItemClick(item) {
+				// 根据 item.text 判断点击的是哪一项
+				switch (item.text) {
+					case '学车报名':
+						uni.navigateTo({
+							url: '/newPages/schoolList/index'
+						});
+						break;
+					case '预约训练':
+						if (!getToken()) {
+							/* uni.showToast({
 			  title: '请先登录',
 			  icon: 'none',
 			  duration: 2000
 			}); */
-			uni.showModal({
-			  title: '未登录',
-			  content: '请先登录',
-			  confirmText: '去登录',
-			  success: (res) => {
-				if (res.confirm) {
-				  uni.navigateTo({
-					url: '/pages/login/login'
-				  });
+							uni.showModal({
+								title: '未登录',
+								content: '请先登录',
+								confirmText: '去登录',
+								success: (res) => {
+									if (res.confirm) {
+										uni.navigateTo({
+											url: '/pages/login/login'
+										});
+									}
+								}
+							});
+							return;
+						}
+						uni.navigateTo({
+							url: '/pagesA/appointment/index'
+						});
+						break;
+					case '考试结果录入':
+						if (!getToken()) {
+							uni.showModal({
+								title: '未登录',
+								content: '请先登录',
+								confirmText: '去登录',
+								success: (res) => {
+									if (res.confirm) {
+										uni.navigateTo({
+											url: '/pages/login/login'
+										});
+									}
+								}
+							});
+							return;
+						}
+						uni.navigateTo({
+							url: '/pagesA/examinationList/index'
+						});
+						break;
+					case '评价':
+						if (!getToken()) {
+							uni.showModal({
+								title: '未登录',
+								content: '请先登录',
+								confirmText: '去登录',
+								success: (res) => {
+									if (res.confirm) {
+										uni.navigateTo({
+											url: '/pages/login/login'
+										});
+									}
+								}
+							});
+							return;
+						}
+						uni.navigateTo({
+							url: '/pagesA/evaluate/index'
+						});
+						break;
+					default:
+						console.warn('未知的点击项:', item.text);
+						break;
 				}
-			  }
-			});
-			return; 
-		  }
-          uni.navigateTo({
-            url: '/pagesA/appointment/index'
-          });
-          break;
-        case '考试结果录入':
-		  if (!getToken()) {
-			uni.showModal({
-			  title: '未登录',
-			  content: '请先登录',
-			  confirmText: '去登录',
-			  success: (res) => {
-				if (res.confirm) {
-				  uni.navigateTo({
-					url: '/pages/login/login'
-				  });
-				}
-			  }
-			});
-			return; 
-		  }
-          uni.navigateTo({
-            url: '/pagesA/examinationList/index'
-          });
-          break;
-        case '评价':
-		  if (!getToken()) {
-			uni.showModal({
-			  title: '未登录',
-			  content: '请先登录',
-			  confirmText: '去登录',
-			  success: (res) => {
-				if (res.confirm) {
-				  uni.navigateTo({
-					url: '/pages/login/login'
-				  });
-				}
-			  }
-			});
-			return; 
-		  }
-          uni.navigateTo({
-            url: '/pagesA/evaluate/index'
-          });
-          break;
-        default:
-          console.warn('未知的点击项:', item.text);
-          break;
-      }
-    }
+			}
 
-  }
-};
+		}
+	};
 </script>
 
 <style lang='scss'>
-@import '../common/common.scss';
-@import './assets/style/index.rpx.scss';
-// 新增样式，使文字居中显示
-.text-group_1 {
-  text-align: center;
-}
+	@import '../common/common.scss';
+	@import './assets/style/index.rpx.scss';
 
-// 修改 image-text_1 样式，使其内容垂直排列并居中
-.image-text_1 {
-  display: flex;
-  flex-direction: column;
-  align-items: center; // 使内容水平居中
-  justify-content: center; // 可根据需要使内容垂直居中
-}
+	// 新增样式，使文字居中显示
+	.text-group_1 {
+		text-align: center;
+	}
 
-// 新增 scroll-view 样式
-.school-scroll-view {
-  height: 500rpx; // 设置一个固定高度，根据需要调整
-  overflow-y: auto;
-  margin-left: 22rpx;
-}
+	// 修改 image-text_1 样式，使其内容垂直排列并居中
+	.image-text_1 {
+		display: flex;
+		flex-direction: column;
+		align-items: center; // 使内容水平居中
+		justify-content: center; // 可根据需要使内容垂直居中
+	}
 
-.itemContent {
-  padding: 30rpx 0;
-  display: flex;
-  flex-direction: column;
-  row-gap: 20rpx;
-}
+	// 新增 scroll-view 样式
+	.school-scroll-view {
+		height: 500rpx; // 设置一个固定高度，根据需要调整
+		overflow-y: auto;
+		margin-left: 22rpx;
+	}
 
-.top_ {
-  //padding-top: 200rpx;
-}
-</style>
+	.itemContent {
+		padding: 30rpx 0;
+		display: flex;
+		flex-direction: column;
+		row-gap: 20rpx;
+	}
+
+	.top_ {
+		//padding-top: 200rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/newPages/schoolDetail/index.vue b/newPages/schoolDetail/index.vue
index 96ee305..c0babe4 100644
--- a/newPages/schoolDetail/index.vue
+++ b/newPages/schoolDetail/index.vue
@@ -1,305 +1,312 @@
 <template>
-  <view class="page flex-col">
-    <view style="width: 100%;background: #f4f5f6;box-sizing: border-box;padding-top: 88px;">
-      <headers titles="驾校">
-        <uni-icons type="left" color="#000000" size="22px"></uni-icons>
-      </headers>
-    </view>
-    <view class="group_4 flex-col">
-      <image
-          style="width: 100%; height: 100%;"
-          referrerpolicy="no-referrer"
-          :src="imagesUrl + '/' + schoolInfo.photo"
-      />
-	  <!-- src="/static/lanhu_jiaxiaoxiangqing/FigmaDDSSlicePNGcd54efcc9a8c89af0ef99c8275464828.png" -->
-    </view>
-    <view class="group_5 flex-col">
-      <text class="text_3">{{ schoolInfo.corpName }}</text>
-	  <text class="text_3_2">地址：{{ schoolInfo.address }}</text>
-      <view class="text-wrapper_1 flex-row justify-between">
-        <text class="text_4">营业时间</text>
-		<text class="text_5" v-if=" schoolInfo.businessStartTime && schoolInfo.businessEndTime ">{{ schoolInfo.businessStartTime }} - {{ schoolInfo.businessEndTime }}</text>
-		<text class="text_5" v-else>08:00-18:00</text>
-      </view>
-      
-    </view>
+	<view class="page flex-col">
+		<view style="width: 100%;background: #f4f5f6;box-sizing: border-box;padding-top: 88px;">
+			<headers titles="驾校">
+				<uni-icons type="left" color="#000000" size="22px"></uni-icons>
+			</headers>
+		</view>
+		<view class="group_4 flex-col">
+			<image style="width: 100%; height: 100%;" referrerpolicy="no-referrer"
+				:src="imagesUrl + '/' + schoolInfo.photo" />
+			<!-- src="/static/lanhu_jiaxiaoxiangqing/FigmaDDSSlicePNGcd54efcc9a8c89af0ef99c8275464828.png" -->
+		</view>
+		<view class="group_5 flex-col">
+			<text class="text_3">{{ schoolInfo.corpName }}</text>
+			<text class="text_3_2">地址：{{ schoolInfo.address }}</text>
+			<!-- <view class="text-wrapper_1 flex-row justify-between">
+				<text class="text_4">营业时间</text>
+				<text class="text_5"
+					v-if=" schoolInfo.businessStartTime && schoolInfo.businessEndTime ">{{ schoolInfo.businessStartTime }}
+					- {{ schoolInfo.businessEndTime }}</text>
+				<text class="text_5" v-else>08:00-18:00</text>
+			</view> -->
 
-    <view class="group_6 flex-col">
-      <view class="box_4 flex-row justify-between">
-        <view class="box_5 flex-col"></view>
-        <text class="text_8">报名类型</text>
-      </view>
-      <view v-if="schoolClassList.length > 0">
-        <view class="box_6 flex-row" v-for="(item, index) in schoolClassList" :key="index" @click="goToDetail(item.id)">
-          <view class="image-text_1 flex-row">
-            <image
-                class="image_2"
-                referrerpolicy="no-referrer"
-                :src="imagesUrl + '/' + item.photo"
-            />
-            <view class="text-group_2 flex-col justify-between">
-              <text class="text_9">{{ item.name }}</text>
-              <view class="text-wrapper_2 flex-row justify-between">
-                <text class="text_10">￥{{ item.price }}</text>
-              </view>
-            </view>
-            <view class="text-wrapper_4 flex-col">
-              <view style="display: flex">
-                <text class="text_13" style="background-color: rgba(223, 235, 255, 1);padding: 5rpx 15rpx">{{
+		</view>
+
+		<view class="group_6 flex-col">
+			<view class="box_4 flex-row justify-between">
+				<view class="box_5 flex-col"></view>
+				<text class="text_8">报名类型</text>
+			</view>
+			<view v-if="schoolClassList.length > 0">
+				<view class="box_6 flex-row" v-for="(item, index) in schoolClassList" :key="index"
+					@click="goToDetail(item.id)">
+					<view class="image-text_1 flex-row">
+						<image class="image_2" referrerpolicy="no-referrer" :src="imagesUrl + '/' + item.photo" />
+						<view class="text-group_2 flex-col justify-between">
+							<text class="text_9">{{ item.name }}</text>
+							<view class="text-wrapper_2 flex-row justify-between">
+								<text class="text_10">￥{{ item.price }}</text>
+							</view>
+						</view>
+						<view class="text-wrapper_4 flex-col">
+							<view style="display: flex">
+								<text class="text_13"
+									style="background-color: rgba(223, 235, 255, 1);padding: 5rpx 15rpx">{{
                     item.tittle
                   }}
-                </text>
-                <text class="text-wrapper_3  text_13" style="color: black;padding: 5rpx 10rpx">{{ item.type }}</text>
-              </view>
-            </view>
-          </view>
-        </view>
+								</text>
+								<text class="text-wrapper_3  text_13"
+									style="color: black;padding: 5rpx 10rpx">{{ item.type }}</text>
+							</view>
+						</view>
+					</view>
+				</view>
 
-        <view class="box_12 flex-row">
-          <view class="image-text_2 flex-row justify-between" @click="goClassList()">
-            <text class="text-group_3">查看全部班型({{ schoolAllClassList.length }})</text>
-            <image
-                class="thumbnail_2"
-                referrerpolicy="no-referrer"
-                src="/static/lanhu_jiaxiaoxiangqing/FigmaDDSSlicePNGb5045194768d2baa618848ea60e5a9e4.png"
-            />
-          </view>
-        </view>
-      </view>
-      <view v-else>
-        <u-empty
-            mode="data"
-            text="该驾校没有课程..."
-        >
-        </u-empty>
-      </view>
-    </view>
+				<view class="box_12 flex-row">
+					<view class="image-text_2 flex-row justify-between" @click="goClassList()">
+						<text class="text-group_3">查看全部班型({{ schoolAllClassList.length }})</text>
+						<image class="thumbnail_2" referrerpolicy="no-referrer"
+							src="/static/lanhu_jiaxiaoxiangqing/FigmaDDSSlicePNGb5045194768d2baa618848ea60e5a9e4.png" />
+					</view>
+				</view>
+			</view>
+			<view v-else>
+				<u-empty mode="data" text="该驾校没有课程...">
+				</u-empty>
+			</view>
+		</view>
 
-    <view class="group_8 flex-col">
-      <view class="group_9 flex-row justify-between">
-        <view class="block_3 flex-col"></view>
-        <text class="text_24">团队教练</text>
-      </view>
-      <view  v-if="schoolCoachList.length > 0">
-        <view class="group_10 flex-row justify-between" v-for="(item, index) in schoolCoachList" :key="index">
-          <view class="image-text_3 flex-row justify-between">
-            <image
-                class="label_3"
-                referrerpolicy="no-referrer"
-                :src="imagesUrl + '/' + item.image"
-            />
-            <view class="text-group_4 flex-col justify-between">
-              <text class="text_25">{{ item.name }}</text>
-              <text class="text_27">教龄&nbsp;{{ item.seniority }}年</text>
-            </view>
-          </view>
-        </view>
-      </view>
-      <view v-else>
-        <u-empty
-            mode="list"
-            text="该驾校没有团队教练..."
-        >
-        </u-empty>
-      </view>
+		<view class="group_8 flex-col">
+			<view class="group_9 flex-row justify-between">
+				<view class="block_3 flex-col"></view>
+				<text class="text_24">团队教练</text>
+			</view>
+			<view v-if="schoolCoachList.length > 0">
+				<view class="group_10 flex-row justify-between" v-for="(item, index) in schoolCoachList" :key="index">
+					<view class="image-text_3 flex-row justify-between">
+						<image class="label_3" referrerpolicy="no-referrer" :src="imagesUrl + '/' + item.image" />
+						<view class="text-group_4 flex-col justify-between">
+							<text class="text_25">{{ item.name }}</text>
+							<text class="text_27">教龄&nbsp;{{ item.seniority }}年</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view v-else>
+				<u-empty mode="list" text="该驾校没有团队教练...">
+				</u-empty>
+			</view>
 
-    </view>
+		</view>
 
-  </view>
+	</view>
 </template>
 <script>
-import request from "@/utils/request";
-import config from "@/config.js"
-import headers from "@/components/header/headers.vue";
+	import request from "@/utils/request";
+	import config from "@/config.js"
+	import headers from "@/components/header/headers.vue";
+	import * as auth from '@/utils/auth';
 
-export default {
-  components: {headers},
-  data() {
-    return {
-      imagesUrl: config.imagesUrl,
-      constants: {},
-      schoolId: undefined,
-      tenantId: undefined,
-	  schoolName: undefined,
-      schoolDetails: {},
-	  schoolInfo: [],
-      schoolClassList: [],
-      schoolAllClassList: [],
-      schoolCoachList: [],
+	export default {
+		components: {
+			headers
+		},
+		data() {
+			return {
+				imagesUrl: config.imagesUrl,
+				constants: {},
+				schoolId: undefined,
+				tenantId: undefined,
+				schoolName: undefined,
+				schoolDetails: {},
+				schoolInfo: [],
+				schoolClassList: [],
+				schoolAllClassList: [],
+				schoolCoachList: [],
 
-    };
-  },
-  async onShow() {
-    // const res = await this.getLocation();
-    // console.log('位置信息',res)
+			};
+		},
+		async onShow() {
+			// const res = await this.getLocation();
+			// console.log('位置信息',res)
 
-  },
-  onLoad(options) {
-      this.schoolId = options.id;
-      this.tenantId = options.tenantId;
-	  this.schoolName = options.schoolName;
-      // this.getSchoolDetails();
-	  this.getSchoolInfo()
-      this.getSchoolClass();
-      this.getSchoolAllClass()
-      this.getSchoolCoach()
-  },
-  methods: {
-    handleBack() {
-      uni.navigateBack({
-        delta: 1
-      });
-    },
-    getSchoolDetails() {
-      request({
-        url: '/userClient/base/companySmallProgram/noTenantIdGet',
-        method: 'GET',
-        params: {
-          id: this.schoolId
-        },
-        tenantIdFlag: false
-      }).then(res => {
-        this.schoolDetails = res.data;
-        this.tenantId = res.data.tenantId
-      }).catch(err => {
-        console.error('获取驾校详情失败', err);
-      });
-    },
-	getSchoolInfo(){
-		request({
-			url:'/userClient/base/companySmallProgram/getCompanyByTenantId',
-			method: 'GET',
-			params: {
-				tenantId: this.tenantId,
-				systemCode: 'jiaxiao',
-			}
-		}).then(res => {
-			this.schoolInfo = res.data
-		})
-	},
-    getSchoolClass() {
-      request({
-        url: '/app-api/dl-drive-school-course-small/noTenantIdPage',
-        method: 'GET',
-        params: {
-          pageNo: 1,
-          pageSize: 3,
-          tenantId: this.tenantId,
-        },
-        tenantIdFlag: false
-      }).then(res => {
-        this.schoolClassList = res.data.records;
-        this.total = res.data.total;
-      })
-    },
-    //获取当前位置
-    getLocation() {
-      let location = {
-        lat: 0,
-        lng: 0,
-      }
-      return new Promise((reserve, reject) => {//因为获取位置是异步接口所以需要使用promise
-        uni.getLocation({
-          success(res) {
-            console.log('成功')
-            location.lat = res.latitude
-            location.lng = res.longitude,
-                reserve(location);
-          },
-          fail(err) {
-            console.log('失败', err)
-            reject(location);//获取失败则返回经纬坐标为0
-          }
-        })
-      })
-    },
-    // 计算两点间距离（单位：米）
-    calculateDistance(loc1, loc2) {
-      const {latitude: lat1, longitude: lng1} = loc1;
-      const {latitude: lat2, longitude: lng2} = loc2;
+		},
+		onLoad(options) {
+			this.schoolId = options.id;
+			this.tenantId = options.tenantId;
+			this.schoolName = options.schoolName;
+			// this.getSchoolDetails();
+			this.getSchoolInfo()
+			this.getSchoolClass();
+			this.getSchoolAllClass()
+			this.getSchoolCoach()
+		},
+		methods: {
+			handleBack() {
+				uni.navigateBack({
+					delta: 1
+				});
+			},
+			getSchoolDetails() {
+				request({
+					url: '/userClient/base/companySmallProgram/noTenantIdGet',
+					method: 'GET',
+					params: {
+						id: this.schoolId
+					},
+					tenantIdFlag: false
+				}).then(res => {
+					this.schoolDetails = res.data;
+					this.tenantId = res.data.tenantId
+				}).catch(err => {
+					console.error('获取驾校详情失败', err);
+				});
+			},
+			getSchoolInfo() {
+				request({
+					url: '/userClient/base/companySmallProgram/getCompanyByTenantId',
+					method: 'GET',
+					params: {
+						tenantId: this.tenantId,
+						systemCode: 'jiaxiao',
+					}
+				}).then(res => {
+					this.schoolInfo = res.data
+				})
+			},
+			getSchoolClass() {
+				request({
+					url: '/app-api/dl-drive-school-course-small/noTenantIdPage',
+					method: 'GET',
+					params: {
+						pageNo: 1,
+						pageSize: 3,
+						tenantId: this.tenantId,
+					},
+					tenantIdFlag: false
+				}).then(res => {
+					this.schoolClassList = res.data.records;
+					this.total = res.data.total;
+				})
+			},
+			//获取当前位置
+			getLocation() {
+				let location = {
+					lat: 0,
+					lng: 0,
+				}
+				return new Promise((reserve, reject) => { //因为获取位置是异步接口所以需要使用promise
+					uni.getLocation({
+						success(res) {
+							console.log('成功')
+							location.lat = res.latitude
+							location.lng = res.longitude,
+								reserve(location);
+						},
+						fail(err) {
+							console.log('失败', err)
+							reject(location); //获取失败则返回经纬坐标为0
+						}
+					})
+				})
+			},
+			// 计算两点间距离（单位：米）
+			calculateDistance(loc1, loc2) {
+				const {
+					latitude: lat1,
+					longitude: lng1
+				} = loc1;
+				const {
+					latitude: lat2,
+					longitude: lng2
+				} = loc2;
 
-      const rad = (d) => d * Math.PI / 180.0;
-      const radLat1 = rad(lat1);
-      const radLat2 = rad(lat2);
-      const a = radLat1 - radLat2;
-      const b = rad(lng1) - rad(lng2);
+				const rad = (d) => d * Math.PI / 180.0;
+				const radLat1 = rad(lat1);
+				const radLat2 = rad(lat2);
+				const a = radLat1 - radLat2;
+				const b = rad(lng1) - rad(lng2);
 
-      const distance = 2 * Math.asin(Math.sqrt(
-          Math.pow(Math.sin(a / 2), 2) +
-          Math.cos(radLat1) *
-          Math.cos(radLat2) *
-          Math.pow(Math.sin(b / 2), 2)
-      ));
+				const distance = 2 * Math.asin(Math.sqrt(
+					Math.pow(Math.sin(a / 2), 2) +
+					Math.cos(radLat1) *
+					Math.cos(radLat2) *
+					Math.pow(Math.sin(b / 2), 2)
+				));
 
-      const EARTH_RADIUS = 6378.137; // 地球半径（千米）
-      // 修改计算结果（原米制 → 公里制）
-      const result = (distance * EARTH_RADIUS).toFixed(2); // 直接得到公里，保留2位小数
-      console.log('距离:', result + 'km');
-      return result;
-    },
-    wxGeocoder(address) {
-      return new Promise((resolve, reject) => {
-        // 需要先通过chooseLocation获取坐标（用户交互触发）
-        uni.chooseLocation({
-          success: (res) => {
-            resolve({
-              latitude: res.latitude,
-              longitude: res.longitude
-            });
-          },
-          fail: (err) => reject(err)
-        });
-      });
-    },
+				const EARTH_RADIUS = 6378.137; // 地球半径（千米）
+				// 修改计算结果（原米制 → 公里制）
+				const result = (distance * EARTH_RADIUS).toFixed(2); // 直接得到公里，保留2位小数
+				console.log('距离:', result + 'km');
+				return result;
+			},
+			wxGeocoder(address) {
+				return new Promise((resolve, reject) => {
+					// 需要先通过chooseLocation获取坐标（用户交互触发）
+					uni.chooseLocation({
+						success: (res) => {
+							resolve({
+								latitude: res.latitude,
+								longitude: res.longitude
+							});
+						},
+						fail: (err) => reject(err)
+					});
+				});
+			},
 
 
-    getSchoolAllClass() {
-      request({
-        url: '/app-api/dl-drive-school-course-small/list',
-        method: 'GET',
-        params: {
-          tenantId: this.tenantId,
-        },
-        tenantIdFlag: false
-      }).then(res => {
-        this.schoolAllClassList = res.data;
-        this.total = res.data.total;
-      })
-    },
+			getSchoolAllClass() {
+				request({
+					url: '/app-api/dl-drive-school-course-small/list',
+					method: 'GET',
+					params: {
+						tenantId: this.tenantId,
+					},
+					tenantIdFlag: false
+				}).then(res => {
+					this.schoolAllClassList = res.data;
+					this.total = res.data.total;
+				})
+			},
 
-    getSchoolCoach() {
-      request({
-        url: '/app-api/dl-drive-school-coach-small/page',
-        method: 'GET',
-        params: {
-          tenantId: this.tenantId,
-        },
-        tenantIdFlag: false
-      }).then(res => {
-        // 对数据进行排序
-        const sortedList = res.data.records.sort((a, b) => b.seniority - a.seniority);
-        // 取排序后的前三条数据
-        this.schoolCoachList = sortedList.slice(0, 3);
-        this.total = res.data.total;
-      })
-    },
+			getSchoolCoach() {
+				console.log('执行');
+				request({
+					url: '/app-api/dl-drive-school-coach-small/page',
+					method: 'GET',
+					params: {
+						tenantId: this.tenantId,
+						pageNo: 1,
+						pageSize: 100000
+					},
+					tenantIdFlag: false
+				}).then(res => {
+					// 对数据进行排序
+					const sortedList = res.data.records.sort((a, b) => b.seniority - a.seniority);
+					const coachId = auth.getCoachId()
+					console.log(coachId, 'coachId');
+					const coach = res.data.records.find(item => item.userId == coachId)
+					console.log(coach, 'coach');
+					if (coach) {
+						this.schoolCoachList.push(coach)
+					} else {
+						// 取排序后的前三条数据
+						this.schoolCoachList = sortedList.slice(0, 3);
+						this.total = res.data.total;
+					}
+				}).catch(e => {
+					console.log(e);
+				})
+			},
 
-    goClassList() {
-      uni.navigateTo({
-        url: '/newPages/courseList/index?tenantId=' + this.tenantId,
-      });
-    },
-    // 跳转到详情页
-    goToDetail(courseId) {
-      uni.navigateTo({
-        url: `/pagesA/courseDetail/index?courseId=${courseId}&tenantId=${this.tenantId}`,
-      });
-    },
+			goClassList() {
+				uni.navigateTo({
+					url: '/newPages/courseList/index?tenantId=' + this.tenantId,
+				});
+			},
+			// 跳转到详情页
+			goToDetail(courseId) {
+				uni.navigateTo({
+					url: `/pagesA/courseDetail/index?courseId=${courseId}&tenantId=${this.tenantId}`,
+				});
+			},
 
-  }
-};
+		}
+	};
 </script>
 <style lang='scss'>
-@import '../common/common.scss';
-@import './assets/style/index.rpx.scss';
-</style>
+	@import '../common/common.scss';
+	@import './assets/style/index.rpx.scss';
+</style>
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d7e629c..5029dc1 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,32 +1,32 @@
 <template>
-  <view class="content">
+	<view class="content">
 
-    <view class="kuang">
-      <view class="land">您好，</view>
-      <view class="land">欢迎登录驾悦同行</view>
-    </view>
-    <view style="text-align: center;">
-      <image src="../../static/imgs/hh.png" style="width: 80%; height: 200px;  margin: 40px auto; "></image>
-    </view>
+		<view class="kuang">
+			<view class="land">您好，</view>
+			<view class="land">欢迎登录驾悦同行</view>
+		</view>
+		<view style="text-align: center;">
+			<image src="../../static/imgs/hh.png" style="width: 80%; height: 200px;  margin: 40px auto; "></image>
+		</view>
 
-    <view class="xiaoannoi">
-      <u-button v-if="privacyPolicyChecked == true" text="手机号快捷登录" class="dl" :customStyle="{color:'#ffffff'}"
-                color="#2c78f5" open-type='getPhoneNumber' @getphonenumber="getPhone"></u-button>
-      <u-button v-else text="手机号快捷登录" class="dl" :customStyle="{color:'#ffffff'}" color="#2c78f5"
-                @click="shibai()"></u-button>
-    </view>
-    <view class="dbottom">
-      <view class="axquan" v-if="privacyPolicyChecked == false" @click="privacyPolicyChecked = true"></view>
-      <view class="axquanl" v-if="privacyPolicyChecked == true" @click="privacyPolicyChecked = false">
-        <uni-icons type="checkmarkempty" color="#ffffff" size="14"></uni-icons>
-      </view>
-      <text>请您认真阅读</text>
-      <text class="lan" @click="goPolicy()">《用户协议》</text>
-      <text>和</text>
-      <text class="lan" @click="goPolicy()">《隐私政策》</text>
-    </view>
+		<view class="xiaoannoi">
+			<u-button v-if="privacyPolicyChecked == true" text="手机号快捷登录" class="dl" :customStyle="{color:'#ffffff'}"
+				color="#2c78f5" open-type='getPhoneNumber' @getphonenumber="getPhone"></u-button>
+			<u-button v-else text="手机号快捷登录" class="dl" :customStyle="{color:'#ffffff'}" color="#2c78f5"
+				@click="shibai()"></u-button>
+		</view>
+		<view class="dbottom">
+			<view class="axquan" v-if="privacyPolicyChecked == false" @click="privacyPolicyChecked = true"></view>
+			<view class="axquanl" v-if="privacyPolicyChecked == true" @click="privacyPolicyChecked = false">
+				<uni-icons type="checkmarkempty" color="#ffffff" size="14"></uni-icons>
+			</view>
+			<text>请您认真阅读</text>
+			<text class="lan" @click="goPolicy()">《用户协议》</text>
+			<text>和</text>
+			<text class="lan" @click="goPolicy()">《隐私政策》</text>
+		</view>
 
-    <!-- <u-popup :show="show" mode="center" @close="close" @open="open">
+		<!-- <u-popup :show="show" mode="center" @close="close" @open="open">
                 <view class="cont-popup">
             <view class="popup-title">
               <text>请选择身份</text>
@@ -50,552 +50,551 @@
             <text>确认选择</text>
           </view>
       </u-popup> -->
-  </view>
+	</view>
 </template>
 
 <script>
-import request from '../../utils/request';
-import config from '@/config'
-import {
-  getLocalUserInfo,
-  setLocalUserInfo,
-  setToken, setUserInfo
-} from '@/utils/auth.js'
+	import request from '../../utils/request';
+	import config from '@/config'
+	import {
+		getLocalUserInfo,
+		setLocalUserInfo,
+		setToken,
+		setUserInfo
+	} from '@/utils/auth.js'
 
-export default {
-  data() {
-    return {
-      yd: false,
-      shenfen: 'jcyh',
-      show: false,
-      baseUrl: this.$imagesUrl,
-      loginUrl: this.$baseUrl,
-      appId: this.$appId,
-      appSecret: this.$appSecret,
-      privacyPolicyChecked: false,
-      phoneNumber: "",
-      isButtonDisabled: false,
-      countdownTime: 60,
-      qh: [{
-        text: '密码登录'
-      },
-        {
-          text: '验证码登录'
-        }
-      ],
-      columns: [
-        ['用户', '代办']
-      ],
-      tel: '',
-      yzm: '',
-      wrod: '',
-      activeid: 0
-    }
-  },
-  onLoad() {
-    this.wxlogin()
-  },
-  computed: {
-    buttonText() {
-      if (this.isButtonDisabled) {
-        return `${this.countdownTime}s 后重新发送`;
-      } else {
-        return "获取验证码";
-      }
-    },
-  },
-  methods: {
-    wxlogin() {
-      uni.login({
-        provider: 'weixin',
-        success(res) {
-          if (res.code) {
-            uni.setStorageSync('c1', res.code);
-          } else {
-            console.log('登录失败！' + res.errMsg)
-          }
-        }
-      })
-    },
-    async getsxshenfen() {
-      let data = {
-        roleCode: this.shenfen
-      }
-      let res = await request({
-        url: '/appInspection/userOwn/updateRole',
-        method: 'post',
-        params: data
-      })
-      if (res.code == 200) {
-        uni.redirectTo({
-          url: '/pages/detection/my'
-        })
-      }
-    },
-    getshenfen(text) {
-      this.shenfen = text
-    },
-    open() {
-    },
-    close() {
-    },
-    goPolicy() {
-      uni.navigateTo({
-        url: "/pages/login/PrivacyPolicy"
-      })
-    },
+	export default {
+		data() {
+			return {
+				yd: false,
+				shenfen: 'jcyh',
+				show: false,
+				baseUrl: this.$imagesUrl,
+				loginUrl: this.$baseUrl,
+				appId: this.$appId,
+				appSecret: this.$appSecret,
+				privacyPolicyChecked: false,
+				phoneNumber: "",
+				isButtonDisabled: false,
+				countdownTime: 60,
+				qh: [{
+						text: '密码登录'
+					},
+					{
+						text: '验证码登录'
+					}
+				],
+				columns: [
+					['用户', '代办']
+				],
+				tel: '',
+				yzm: '',
+				wrod: '',
+				activeid: 0
+			}
+		},
+		onLoad() {
+			this.wxlogin()
+		},
+		computed: {
+			buttonText() {
+				if (this.isButtonDisabled) {
+					return `${this.countdownTime}s 后重新发送`;
+				} else {
+					return "获取验证码";
+				}
+			},
+		},
+		methods: {
+			wxlogin() {
+				uni.login({
+					provider: 'weixin',
+					success(res) {
+						if (res.code) {
+							uni.setStorageSync('c1', res.code);
+						} else {
+							console.log('登录失败！' + res.errMsg)
+						}
+					}
+				})
+			},
+			async getsxshenfen() {
+				let data = {
+					roleCode: this.shenfen
+				}
+				let res = await request({
+					url: '/appInspection/userOwn/updateRole',
+					method: 'post',
+					params: data
+				})
+				if (res.code == 200) {
+					uni.redirectTo({
+						url: '/pages/detection/my'
+					})
+				}
+			},
+			getshenfen(text) {
+				this.shenfen = text
+			},
+			open() {},
+			close() {},
+			goPolicy() {
+				uni.navigateTo({
+					url: "/pages/login/PrivacyPolicy"
+				})
+			},
 
-    async getAppinfo() {
-      let res = await request({
-        url: '/getAppInfo',
-        method: 'get',
-      })
-      console.log('getappinfo', res);
-    },
-    //授权
-    authorize() {
-      uni.showToast({
-        icon: "none",
-        title: "请阅读并勾选用户协议",
-        duration: 2000
-      })
-    },
-    shibai() {
-      uni.showToast({
-        icon: "none",
-        title: "请阅读并勾选用户协议",
-        duration: 2000
-      })
-    },
-    getPhone(e) {
-      console.log('执行了');
-      config.header = config.header || {}
-      config.header['tenant-id'] = '180'
-      if (this.privacyPolicyChecked == false) {
-        uni.showToast({
-          icon: "none",
-          title: "请阅读并勾选用户协议",
-          duration: 2000
-        })
-        return;
-      }
-      uni.checkSession({
-        success: () => {
-          uni.request({
-            url: this.loginUrl + "/userClient/repair/wxLogin",
-            method: "POST",
-            header: config.header,
-            data: {
-              code: uni.getStorageSync('c1'),
-              encryptedIv: e.detail.iv,
-              encryptedData: e.detail.encryptedData,
-              inviteId: uni.getStorageSync('inviteId') ? uni.getStorageSync(
-                  'inviteId') : null,
-              type: 'jx',
-            },
-            success: (rex) => {
-              console.log('yongdao返回', rex)
-              if (rex.data.code == 0) {
-                // if (this.loginStatus) {
-                // 	clearInterval(this.loginStatus)
-                // }
-                setToken(rex.data.data.token)
-				        setLocalUserInfo(rex.data.data.userinfo)
-                //uni.setStorageSync('App-Token', );
-                if (this.returnUrl) {
-                  uni.navigateBack()
-                } else {
-                  this.userinfo()
-                  console.log('跳转');
-                }
-              }
-              if (rex.data.code == 500) {
-                uni.clearStorageSync();
-                uni.showToast({
-                  icon: 'none',
-                  title: rex.data.msg
-                })
-                console.log('走错误请求');
-                this.wxlogin()
-              }
-            },
-            fail: (res) => {
-              console.log("fail", res);
-              uni.showToast({
-                icon: "error",
-                title: "登录失败，请重新点击并授权！",
-                duration: 2000
-              })
-            }
-          })
-        },
-        fail: () => {
-          uni.showToast({
-            icon: 'error',
-            duration: 2000,
-            title: "登录状态过期，重新登录"
-          });
-        }
-      })
+			async getAppinfo() {
+				let res = await request({
+					url: '/getAppInfo',
+					method: 'get',
+				})
+				console.log('getappinfo', res);
+			},
+			//授权
+			authorize() {
+				uni.showToast({
+					icon: "none",
+					title: "请阅读并勾选用户协议",
+					duration: 2000
+				})
+			},
+			shibai() {
+				uni.showToast({
+					icon: "none",
+					title: "请阅读并勾选用户协议",
+					duration: 2000
+				})
+			},
+			getPhone(e) {
+				console.log('执行了');
+				config.header = config.header || {}
+				config.header['tenant-id'] = '180'
+				if (this.privacyPolicyChecked == false) {
+					uni.showToast({
+						icon: "none",
+						title: "请阅读并勾选用户协议",
+						duration: 2000
+					})
+					return;
+				}
+				uni.checkSession({
+					success: () => {
+						uni.request({
+							url: this.loginUrl + "/userClient/repair/wxLogin",
+							method: "POST",
+							header: config.header,
+							data: {
+								code: uni.getStorageSync('c1'),
+								encryptedIv: e.detail.iv,
+								encryptedData: e.detail.encryptedData,
+								inviteId: uni.getStorageSync('inviteId') ? uni.getStorageSync(
+									'inviteId') : null,
+								type: 'jx',
+							},
+							success: (rex) => {
+								console.log('yongdao返回', rex)
+								if (rex.data.code == 0) {
+									// if (this.loginStatus) {
+									// 	clearInterval(this.loginStatus)
+									// }
+									setToken(rex.data.data.token)
+									setLocalUserInfo(rex.data.data.userinfo)
+									//uni.setStorageSync('App-Token', );
+									if (this.returnUrl) {
+										uni.navigateBack()
+									} else {
+										this.userinfo()
+										console.log('跳转');
+									}
+								}
+								if (rex.data.code == 500) {
+									uni.clearStorageSync();
+									uni.showToast({
+										icon: 'none',
+										title: rex.data.msg
+									})
+									console.log('走错误请求');
+									this.wxlogin()
+								}
+							},
+							fail: (res) => {
+								console.log("fail", res);
+								uni.showToast({
+									icon: "error",
+									title: "登录失败，请重新点击并授权！",
+									duration: 2000
+								})
+							}
+						})
+					},
+					fail: () => {
+						uni.showToast({
+							icon: 'error',
+							duration: 2000,
+							title: "登录状态过期，重新登录"
+						});
+					}
+				})
 
 
-    },
+			},
 
-    userinfo() {
-      console.log('执行了');
-      request({
-        url: '/app-api/jx/auth/getAppInfo',
-        method: 'get',
+			userinfo() {
+				console.log('执行了');
+				request({
+					url: '/app-api/jx/auth/getAppInfo',
+					method: 'get',
 
-      }).then((res) => {
-        let userJson = {}
-        userJson.userId = res.data.user.id
-        uni.setStorageSync('role', res.data.role)
-        uni.setStorageSync('userinfo', res.data.user)
-        uni.reLaunch({
-          url: '/newPages/newIndex/index'
-        })
-		// uni.navigateBack()
-      })
-    },
+				}).then((res) => {
+					let userJson = {}
+					userJson.userId = res.data.user.id
+					uni.setStorageSync('role', res.data.role)
+					uni.setStorageSync('userinfo', res.data.user)
+					// uni.reLaunch({
+					//   url: '/newPages/newIndex/index'
+					// })
+					uni.navigateBack()
+				})
+			},
 
-    getxz(index) {
-      this.activeid = index
-    },
-    goregister() {
-      uni.redirectTo({
-        url: '/pages/login/register'
-      })
-    },
-    goforgot() {
-      uni.redirectTo({
-        url: '/pages/login/forgot'
-      })
-    },
-    goselect() {
-      console.log('执行');
-      uni.redirectTo({
-        url: '/pages/index/index'
-      })
-    },
-    // 验证码方法
-    sendVerificationCode() {
-      let reg = /^((13[0-9])|(14[0-9])|(15[0-9])|(17[0-9])|(18[0-9]))\d{8}$/;
-      if (!reg.test(this.tel)) {
-        uni.showToast({
-          icon: 'none',
-          title: '请输入正确的11位手机号'
-        })
-        this.tel = '';
-        return false;
-      }
-      if (this.isButtonDisabled) {
-        return; // 如果按钮已禁用，则直接返回
-      }
-      const data = {
-        phone: this.tel,
-      }
-      request({
-        url: '/loginSmsCode',
-        method: 'post',
-        params: data
-      }).then((res) => {
-        console.log('验证码', res);
-        if (res.code == 200) {
-          uni.showToast({
-            title: '验证码已发送 请注意查收',
-            icon: 'none'
-          })
-        } else {
-          uni.showToast({
-            title: '网络不佳请稍后再试',
-            icon: 'none'
-          })
-        }
-      })
+			getxz(index) {
+				this.activeid = index
+			},
+			goregister() {
+				uni.redirectTo({
+					url: '/pages/login/register'
+				})
+			},
+			goforgot() {
+				uni.redirectTo({
+					url: '/pages/login/forgot'
+				})
+			},
+			goselect() {
+				console.log('执行');
+				uni.redirectTo({
+					url: '/pages/index/index'
+				})
+			},
+			// 验证码方法
+			sendVerificationCode() {
+				let reg = /^((13[0-9])|(14[0-9])|(15[0-9])|(17[0-9])|(18[0-9]))\d{8}$/;
+				if (!reg.test(this.tel)) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入正确的11位手机号'
+					})
+					this.tel = '';
+					return false;
+				}
+				if (this.isButtonDisabled) {
+					return; // 如果按钮已禁用，则直接返回
+				}
+				const data = {
+					phone: this.tel,
+				}
+				request({
+					url: '/loginSmsCode',
+					method: 'post',
+					params: data
+				}).then((res) => {
+					console.log('验证码', res);
+					if (res.code == 200) {
+						uni.showToast({
+							title: '验证码已发送 请注意查收',
+							icon: 'none'
+						})
+					} else {
+						uni.showToast({
+							title: '网络不佳请稍后再试',
+							icon: 'none'
+						})
+					}
+				})
 
 
-      this.disableButton(); // 禁用按钮
-      this.startCountdown(); // 启动倒计时
+				this.disableButton(); // 禁用按钮
+				this.startCountdown(); // 启动倒计时
 
-    },
-    disableButton() {
-      this.isButtonDisabled = true;
-    },
-    enableButton() {
-      this.isButtonDisabled = false;
-    },
-    startCountdown() {
-      let countdown = setInterval(() => {
-        this.countdownTime--;
-        if (this.countdownTime === 0) {
-          clearInterval(countdown);
-          this.enableButton(); // 启用按钮
-        }
-      }, 1000);
-    },
-  }
-}
+			},
+			disableButton() {
+				this.isButtonDisabled = true;
+			},
+			enableButton() {
+				this.isButtonDisabled = false;
+			},
+			startCountdown() {
+				let countdown = setInterval(() => {
+					this.countdownTime--;
+					if (this.countdownTime === 0) {
+						clearInterval(countdown);
+						this.enableButton(); // 启用按钮
+					}
+				}, 1000);
+			},
+		}
+	}
 </script>
 
 <style scoped lang="scss">
-.jsq {
-  border: none !important;
-  font-size: 14px;
-  font-weight: 400;
-  color: #0078FF;
-}
+	.jsq {
+		border: none !important;
+		font-size: 14px;
+		font-weight: 400;
+		color: #0078FF;
+	}
 
-.anniu {
-  width: 150px;
-  height: 40px;
-  border-radius: 50px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: white;
-  background: #0D2E8D;
-  color: #FFFFFF;
-  margin: 0 auto;
-}
+	.anniu {
+		width: 150px;
+		height: 40px;
+		border-radius: 50px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: white;
+		background: #0D2E8D;
+		color: #FFFFFF;
+		margin: 0 auto;
+	}
 
-.cont-popup {
-  height: 250px;
-  width: 300px;
-  background-color: #FFFFFF;
-  box-sizing: border-box;
-  padding: 15px;
-  border-radius: 10px;
-}
+	.cont-popup {
+		height: 250px;
+		width: 300px;
+		background-color: #FFFFFF;
+		box-sizing: border-box;
+		padding: 15px;
+		border-radius: 10px;
+	}
 
-.popup-title {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 18px;
-  font-weight: bold;
-  color: #0D2E8D;
-}
+	.popup-title {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 18px;
+		font-weight: bold;
+		color: #0D2E8D;
+	}
 
-.dix {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin: 20px 0px;
-  font-size: 18px;
-  font-weight: bold;
-}
+	.dix {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin: 20px 0px;
+		font-size: 18px;
+		font-weight: bold;
+	}
 
-.lqiu {
-  width: 15px;
-  height: 15px;
-  border-radius: 50%;
-  border: 1px solid #0D2E8D;
-  background: #0D2E8D;
-  color: white;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
+	.lqiu {
+		width: 15px;
+		height: 15px;
+		border-radius: 50%;
+		border: 1px solid #0D2E8D;
+		background: #0D2E8D;
+		color: white;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 
-.qiu {
-  width: 15px;
-  height: 15px;
-  border-radius: 50%;
-  border: 1px solid #E8E8E8;
-}
+	.qiu {
+		width: 15px;
+		height: 15px;
+		border-radius: 50%;
+		border: 1px solid #E8E8E8;
+	}
 
-button {
-  border: none !important;
-  background: none !important;
-  margin: 0px;
-  display: block;
-}
+	button {
+		border: none !important;
+		background: none !important;
+		margin: 0px;
+		display: block;
+	}
 
-button:focus {
-  color: #0078FF;
-  outline: none;
-  box-shadow: none;
-}
+	button:focus {
+		color: #0078FF;
+		outline: none;
+		box-shadow: none;
+	}
 
-.content {
-  box-sizing: border-box;
-  padding-top: 1px;
-  // background-image: url('http://www.nuoyunr.com/lananRsc/jdc-bj.png');
+	.content {
+		box-sizing: border-box;
+		padding-top: 1px;
+		// background-image: url('http://www.nuoyunr.com/lananRsc/jdc-bj.png');
 
-  background-size: cover;
-  width: 100%;
-  height: calc(100vh);
-}
+		background-size: cover;
+		width: 100%;
+		height: calc(100vh);
+	}
 
-.top {
-  box-sizing: border-box;
-  padding: 0px 27px;
-  padding-top: 100px;
+	.top {
+		box-sizing: border-box;
+		padding: 0px 27px;
+		padding-top: 100px;
 
 
-  // background-color:lightseagreen;
+		// background-color:lightseagreen;
 
-  background-position: center;
-  width: 100%;
-  // height: 385px;
-}
+		background-position: center;
+		width: 100%;
+		// height: 385px;
+	}
 
-.touxiang {
-  width: 88px;
-  height: 88px;
-  border-radius: 10px;
-  background: #D7D7D7;
-  margin: 0 auto;
-  margin-bottom: 40px;
-  overflow: hidden;
+	.touxiang {
+		width: 88px;
+		height: 88px;
+		border-radius: 10px;
+		background: #D7D7D7;
+		margin: 0 auto;
+		margin-bottom: 40px;
+		overflow: hidden;
 
-  image {
-    width: 100%;
-    height: 100%;
-  }
-}
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
 
-.twotap {
-  width: 100%;
-  display: flex;
-  align-items: center;
+	.twotap {
+		width: 100%;
+		display: flex;
+		align-items: center;
 
-  view {
-    font-size: 15px;
-    font-family: Microsoft YaHei;
-    font-weight: 400;
-    color: #666666;
-    margin-right: 38.5px;
-  }
-}
+		view {
+			font-size: 15px;
+			font-family: Microsoft YaHei;
+			font-weight: 400;
+			color: #666666;
+			margin-right: 38.5px;
+		}
+	}
 
-.blck {
-  color: #333333 !important;
-  font-weight: bold !important;
-}
+	.blck {
+		color: #333333 !important;
+		font-weight: bold !important;
+	}
 
-.inputs {
-  box-sizing: border-box;
-  padding: 16px 0px;
-  display: flex;
-  align-items: center;
-  border-bottom: 2px solid #E8E8E8;
-  margin-top: 20px;
-}
+	.inputs {
+		box-sizing: border-box;
+		padding: 16px 0px;
+		display: flex;
+		align-items: center;
+		border-bottom: 2px solid #E8E8E8;
+		margin-top: 20px;
+	}
 
-.wjworb {
-  margin-top: 5px;
-  width: 100%;
-  display: flex;
-  font-size: 12px;
-  color: #0078FF;
-  justify-content: flex-end;
-  align-items: center;
+	.wjworb {
+		margin-top: 5px;
+		width: 100%;
+		display: flex;
+		font-size: 12px;
+		color: #0078FF;
+		justify-content: flex-end;
+		align-items: center;
 
-}
+	}
 
-.dl {
-  width: 90%;
-  height: 44px;
-  background-color: #0D2E8D;
-  border-radius: 50px;
-  margin: 0 auto;
-  font-size: 16px;
-  color: #FFFFFF;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin-top: 300px;
-}
+	.dl {
+		width: 90%;
+		height: 44px;
+		background-color: #0D2E8D;
+		border-radius: 50px;
+		margin: 0 auto;
+		font-size: 16px;
+		color: #FFFFFF;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		margin-top: 300px;
+	}
 
-.xiaoannoi {
-  width: 90%;
-  height: 40px;
-  margin: 0 auto;
-  border-radius: 50px;
-  overflow: hidden;
-  margin-top: 80px;
-}
+	.xiaoannoi {
+		width: 90%;
+		height: 40px;
+		margin: 0 auto;
+		border-radius: 50px;
+		overflow: hidden;
+		margin-top: 80px;
+	}
 
-.hging {
-  width: 100%;
-  text-align: center;
-  font-size: 14px;
-  font-weight: 400;
-  color: #636363;
-  margin-top: 20px;
-}
+	.hging {
+		width: 100%;
+		text-align: center;
+		font-size: 14px;
+		font-weight: 400;
+		color: #636363;
+		margin-top: 20px;
+	}
 
-.wx {
-  width: 38px;
-  height: 38px;
-  overflow: hidden;
-  box-sizing: border-box;
-  margin: 0px auto;
-  margin-top: 20px;
+	.wx {
+		width: 38px;
+		height: 38px;
+		overflow: hidden;
+		box-sizing: border-box;
+		margin: 0px auto;
+		margin-top: 20px;
 
-  image {
-    width: 100%;
-    height: 100%;
-  }
-}
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
 
-.hui {
-  font-size: 10px;
-  width: 100%;
-  text-align: center;
-  font-weight: 400;
-  color: #666666;
-}
+	.hui {
+		font-size: 10px;
+		width: 100%;
+		text-align: center;
+		font-weight: 400;
+		color: #666666;
+	}
 
-.dbottom {
-  width: 100%;
-  text-align: center;
-  font-size: 12px;
-  color: #333333;
-  margin-top: 40px;
-  position: fixed;
-  bottom: 25px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
+	.dbottom {
+		width: 100%;
+		text-align: center;
+		font-size: 12px;
+		color: #333333;
+		margin-top: 40px;
+		position: fixed;
+		bottom: 25px;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
 
-.lan {
-  color: #2c78f5;
-}
+	.lan {
+		color: #2c78f5;
+	}
 
-.land {
+	.land {
 
-  font-size: 25px;
-  font-weight: bold;
-  color: #2c78f5;
-  margin-bottom: 5px;
-}
+		font-size: 25px;
+		font-weight: bold;
+		color: #2c78f5;
+		margin-bottom: 5px;
+	}
 
-.kuang {
-  width: 90%;
-  margin: 0 auto;
-  margin-top: 100px;
-}
+	.kuang {
+		width: 90%;
+		margin: 0 auto;
+		margin-top: 100px;
+	}
 
-.axquan {
-  width: 18px;
-  height: 18px;
-  border-radius: 50%;
-  border: 1px solid #AAAAAA;
-  margin-right: 5px;
-}
+	.axquan {
+		width: 18px;
+		height: 18px;
+		border-radius: 50%;
+		border: 1px solid #AAAAAA;
+		margin-right: 5px;
+	}
 
-.axquanl {
-  width: 18px;
-  height: 18px;
-  border-radius: 50%;
-  border: 1px solid #AAAAAA;
-  margin-right: 5px;
-  background-color: #2c78f5;
-}
-</style>
+	.axquanl {
+		width: 18px;
+		height: 18px;
+		border-radius: 50%;
+		border: 1px solid #AAAAAA;
+		margin-right: 5px;
+		background-color: #2c78f5;
+	}
+</style>
\ No newline at end of file