From 84613456a7ab022abb9b033c048a3db7a01c201b Mon Sep 17 00:00:00 2001
From: caoliancun <572275724@qq.com>
Date: Wed, 15 Feb 2023 08:54:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BagSetup/setup/setup.vue                          |  4 ++--
 .../components/serviceStation.vue                 | 15 +++++++++------
 manifest.json                                     |  2 +-
 pages/index/startPage/startPage.vue               |  4 ++--
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/BagSetup/setup/setup.vue b/BagSetup/setup/setup.vue
index 6a8be8f..ded31b0 100644
--- a/BagSetup/setup/setup.vue
+++ b/BagSetup/setup/setup.vue
@@ -135,8 +135,8 @@
 							uni.setStorageSync('loginOut', true)
 							setTimeout(() => {
 								uni.reLaunch({
-									// url: '/BagAuth/pages/login/login'
-									url:'/BagAuth/pages/login/oldLogin'
+									url: '/BagAuth/pages/login/login'
+									// url:'/BagAuth/pages/login/oldLogin'
 								})
 							}, 1000)
 						}
diff --git a/BagStation/pages/newRoutePlanning/components/serviceStation.vue b/BagStation/pages/newRoutePlanning/components/serviceStation.vue
index aca5e11..62a14b5 100644
--- a/BagStation/pages/newRoutePlanning/components/serviceStation.vue
+++ b/BagStation/pages/newRoutePlanning/components/serviceStation.vue
@@ -1,10 +1,10 @@
 <template>
 	<view  >
-		<view @touchend='touchend' @touchmove='touchmove' @touchstart='onChange'
+		<view @touchend.stop.prevent ='touchend' @touchmove.stop.prevent ='touchmove' @touchstart.stop.prevent ='onChange'
 			style="display: flex;flex-direction: column;flex-wrap: wrap;z-index: 9999999999999999999999999 !important;"
 			:style="{height:isShow.switchBar?`calc(${styles.height}rpx + ${styles.move}rpx )`: ` calc( ${styles.move}rpx + 150rpx)` }"
 			:class="styles.open? 'serviceStation_body' :'seleServiceStation_body' ">
-			<view @click.stop="switchBar()" class="switchBar"></view>
+			<view id="switchBar" @tap.stop="switchBar()" class="switchBar"></view>
 			<view style="flex: 1; overflow: hidden; width: 100%; ">
 				<view style="" class="information">
 					<view class="information_left">
@@ -49,9 +49,9 @@
 				</view>
 		
 				<view class="serviceStation_footer">
-					<view @click.stop="Navigation" style="background-color: #8B583E;" class="serviceStation_footer_butten">导航
+					<view id="Navigation" @tap.stop="Navigation" style="background-color: #8B583E;" class="serviceStation_footer_butten">导航
 					</view>
-					<view @tap.stop="jump" style="background-color: #FF6700;" class="serviceStation_footer_butten">详情</view>
+					<view id="jump" @tap.stop="jump" style="background-color: #FF6700;" class="serviceStation_footer_butten">详情</view>
 				</view>
 			</view>
 		</view>
@@ -139,12 +139,15 @@
 			},
 			//开始滑动
 			onChange(e) {
-				console.log('开始滑动');
+				if(e.target.id){ 
+					this[e.target.id]() 
+					return 
+					}
+				console.log(e.target.id,'开始滑动');
 				this.$emit('dragMap', this.details, false)
 				// 这一行为记录滑动位置代码 this.styles.Y = e.changedTouches[0].clientY + this.styles.move;
 				this.styles.open = true;
 				this.styles.Y = e.changedTouches[0].clientY;
-				console.log(e,'onChange')
 			},
 			// 滑动完成
 			touchend(e) {
diff --git a/manifest.json b/manifest.json
index 2f21e26..6ddebb1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "星油",
-    "appid" : "__UNI__B20D014",
+    "appid" : "__UNI__F7EF840",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
diff --git a/pages/index/startPage/startPage.vue b/pages/index/startPage/startPage.vue
index 0da1167..29a61e2 100644
--- a/pages/index/startPage/startPage.vue
+++ b/pages/index/startPage/startPage.vue
@@ -77,8 +77,8 @@
 						})
 					} else {
 						uni.redirectTo({
-							// url: '/BagAuth/pages/login/login'
-							url:'/BagAuth/pages/login/oldLogin'
+							url: '/BagAuth/pages/login/login'
+							// url:'/BagAuth/pages/login/oldLogin'
 						})
 					}
 				}, 2000)