From f016da3b792cba11cfe6b1dd385240dc3bb35686 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Thu, 17 Oct 2024 20:15:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                              |  4 ++--
 components/base/tabbar.vue           |  2 +-
 components/tourGuide/locations.vue   |  8 ++++----
 interceptor/interceptor.js           | 29 +++++++++++++++++++++++++++++
 main.js                              |  2 ++
 pages/index/index.vue                |  1 +
 pages_order/auth/wxUserInfo.vue      |  2 +-
 pages_order/order/orderDetail.vue    |  8 ++++----
 pages_order/order/orderSubscribe.vue |  6 +++++-
 pages_order/service/heritagePath.vue |  2 +-
 store/store.js                       |  1 -
 11 files changed, 50 insertions(+), 15 deletions(-)
 create mode 100644 interceptor/interceptor.js

diff --git a/App.vue b/App.vue
index bcacb59..e92ef80 100644
--- a/App.vue
+++ b/App.vue
@@ -9,8 +9,8 @@
 			this.$store.commit('getSpotList')
 			
 			setInterval(() => {
-				// this.$store.commit('getPosition')
-			}, 5000)
+				this.$store.commit('getPosition')
+			}, 20000)
 		},
 		onHide: function() {
 		}
diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index 2248ec9..77680db 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -53,7 +53,7 @@
 				if(index == this.select){
 					return
 				}
-				uni.redirectTo({
+				uni.reLaunch({
 					url: item.pagePath
 				})
 			},
diff --git a/components/tourGuide/locations.vue b/components/tourGuide/locations.vue
index 0047159..05ce150 100644
--- a/components/tourGuide/locations.vue
+++ b/components/tourGuide/locations.vue
@@ -69,7 +69,7 @@
 			v-if="show && spotGuide.length > 0">
 				<view class="main"
 				v-for="(item, index) in spotGuide"
-				@click="toUrl(item)"
+				@click.stop="toUrl(item)"
 				:key="index">
 					<image 
 					class="main-image"
@@ -97,14 +97,14 @@
 						</view>
 						<view class="f">
 							<image 
-							@click="openLocation(item)"
+							@click.stop="openLocation(item)"
 							src="/static/image/tourGuide/f.png" mode=""></image>
 						</view>
 						<view 
 						v-if="item.categoryId == 0"
 						class="f">
 							<image 
-							@click="textToSpeech"
+							@click.stop="textToSpeech"
 							src="/static/image/tourGuide/a.png" mode=""></image>
 						</view>
 					</view>
@@ -125,7 +125,7 @@
 </template>
 
 <script>
-	var plugin = requirePlugin("WechatSI")
+	// var plugin = requirePlugin("WechatSI")
 	
 	// "plugins" : {
 	//     "WechatSI" : {
diff --git a/interceptor/interceptor.js b/interceptor/interceptor.js
new file mode 100644
index 0000000..407bee7
--- /dev/null
+++ b/interceptor/interceptor.js
@@ -0,0 +1,29 @@
+let needLogin = [
+	// "/pages/user/user",
+]
+let list = ["navigateTo"];
+list.forEach(item => { //用遍历的方式分别为,uni.navigateTo,uni.redirectTo,uni.reLaunch,uni.switchTab这4个路由方法添加拦截器
+	console.log(item, 'router list item')
+	uni.addInterceptor(item, {
+		invoke(e) { // 调用前拦截
+		
+			let length = getCurrentPages().length
+			
+			if (length >= 10) {
+				uni.showToast({
+					title: '页面栈已满，即将回到首页',
+					icon: 'none'
+				})
+				setTimeout(uni.reLaunch, 1000, {
+					url: '/pages/index/index'
+				})
+				return false
+			}
+
+			return true
+		},
+		fail(err) { // 失败回调拦截 
+			console.log(err);
+		},
+	})
+})
\ No newline at end of file
diff --git a/main.js b/main.js
index 68e7071..3bade57 100644
--- a/main.js
+++ b/main.js
@@ -23,6 +23,8 @@ Vue.component('configPopup',configPopup)
 Vue.component('navbar',navbar)
 Vue.component('tabber',tabber)
 
+import 'interceptor/interceptor.js'
+
 const app = new Vue({
 	...App,
 	store,
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4f3f4a7..dd4406d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -152,6 +152,7 @@
 				})
 			},
 			search(){
+				this.keyword = ''
 				uni.navigateTo({
 					url: '/pages_order/service/applyRelic?keyword=' + this.keyword
 				})
diff --git a/pages_order/auth/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue
index 3c0e986..d16dfa7 100644
--- a/pages_order/auth/wxUserInfo.vue
+++ b/pages_order/auth/wxUserInfo.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="login">
 		<view class="title">
-			酒店桌布租赁平台
+			遗产里的景徳镇
 		</view>
 		<view class="title">
 			申请获取你的头像、昵称
diff --git a/pages_order/order/orderDetail.vue b/pages_order/order/orderDetail.vue
index a91e275..8170300 100644
--- a/pages_order/order/orderDetail.vue
+++ b/pages_order/order/orderDetail.vue
@@ -528,8 +528,8 @@
 		}
 
 		.btn-x {
-			color: #6fc6ad;
-			border: 1px solid #6fc6ad;
+			color: $uni-color;
+			border: 1px solid $uni-color;
 			padding: 10rpx 20rpx;
 			border-radius: 30rpx;
 		}
@@ -539,8 +539,8 @@
 			justify-content: center;
 
 			.btn {
-				color: #6fc6ad;
-				border: 1px solid #6fc6ad;
+				color: $uni-color;
+				border: 1px solid $uni-color;
 				padding: 10rpx 20rpx;
 				border-radius: 30rpx;
 			}
diff --git a/pages_order/order/orderSubscribe.vue b/pages_order/order/orderSubscribe.vue
index 7da6bee..25facc9 100644
--- a/pages_order/order/orderSubscribe.vue
+++ b/pages_order/order/orderSubscribe.vue
@@ -227,6 +227,7 @@
 				}, res => {
 					if(res.code == 200){
 						this.timeColumns.splice(timeType, 0, res.result)
+						// this.form.orderTime.splice(timeType, 0, res.result[0].timeDot)
 					}
 				})
 			},
@@ -239,6 +240,9 @@
 				this.form.orderTime = []
 				e.value.forEach((n, i) => {
 					this.form.orderTime.push(n && n.timeDot)
+					if(!this.form.orderTime[i]){
+						this.form.orderTime[i] = this.timeColumns[i][0].timeDot
+					}
 				})
 			},
 			submit(){
@@ -269,7 +273,7 @@
 							title: res.message,
 							icon : 'none'
 						})
-						uni.navigateTo({
+						uni.redirectTo({
 							url: '/pages_order/mine/subscribe'
 						})
 					}
diff --git a/pages_order/service/heritagePath.vue b/pages_order/service/heritagePath.vue
index dece6ef..86f9bc9 100644
--- a/pages_order/service/heritagePath.vue
+++ b/pages_order/service/heritagePath.vue
@@ -37,7 +37,7 @@
 						<view style="font-size: 20rpx; color: #999999;" v-if="item.isPay == '1'">￥{{ item.amusementPrice }}起</view>
 					</view>
 					<view class="heritagePath-card-font-button" 
-					@click="toPayUrl(item)"
+					@click.stop="toPayUrl(item)"
 					v-if="item.isPay == '1'">线上预订</view>
 				</view>
 				<view style="height: 40rpx;" />
diff --git a/store/store.js b/store/store.js
index df3433d..0a1a319 100644
--- a/store/store.js
+++ b/store/store.js
@@ -149,7 +149,6 @@ const store = new Vuex.Store({
 				// 排序，最近的在前面
 				state.spotList.sort((a, b) => a.distance - b.distance)
 				
-				console.log(state.spotList);
 				
 			}
 		},