From 8d2434ea0c4036ab16e6f479eaa219d3f47893e4 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 11 Sep 2024 10:51:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=A4=96=E9=93=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/js/CommonFunction.js                 | 17 +++++++++++++++++
 subPackages/food/foodList.vue               | 11 +++++++++--
 subPackages/hotelHomestay/hotelHomestay.vue | 11 +++++++++--
 subPackages/techan/techanList.vue           |  4 ++--
 4 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/static/js/CommonFunction.js b/static/js/CommonFunction.js
index ac60561..df6e200 100644
--- a/static/js/CommonFunction.js
+++ b/static/js/CommonFunction.js
@@ -238,4 +238,21 @@ Vue.prototype.getMaxCoupon = async function (param) {
 		this.$store.commit("choseCoupon",res.data);
 	}
 	return res.data
+}
+
+// 判断是否去外部链接
+Vue.prototype.goOtherDetail = (item,type) => {
+ 	if(item.link_type == 1) {
+		// 外部小程序
+		uni.navigateToMiniProgram({
+			shortLink: item.ext_link
+		})
+		return
+	}else if(item.link_type == 2){
+		// 外部H5
+		uni.navigateTo({
+			url: '/subPackages/webPage/webPage?url=' + item.ext_link
+		});
+		return
+	}
 }
\ No newline at end of file
diff --git a/subPackages/food/foodList.vue b/subPackages/food/foodList.vue
index bb2fc2e..e3806d3 100644
--- a/subPackages/food/foodList.vue
+++ b/subPackages/food/foodList.vue
@@ -2,7 +2,7 @@
 	<view class="bg">
 		<span class="iconfont topLeft" @click="goBack">&#xe660;</span>
 		<img :src="showImg('/uploads/20240826/7329f5c692bfee0c3a3acacc0205761d.png')" class="topImg" />
-		<navigator :url="'/subPackages/food/foodDetail?id=' + item.id" class="item" v-for="item in list" :key="item.id">
+		<view  class="item" v-for="item in list" :key="item.id" @click="viewDetail(item)">
 			<image class="img" :src="showImg(item.image)" mode=""></image>
 			<view class="content">
 				<view class="title text-overflowRows">
@@ -20,7 +20,7 @@
 					</view>
 				</view>
 			</view>
-		</navigator>
+		</view>
 	</view>
 </template>
 
@@ -55,6 +55,13 @@
 					}
 				})
 			},
+
+			viewDetail (item) {
+				this.goOtherDetail(item)
+				uni.navigateTo({
+					url: '/subPackages/food/foodDetail?id=' + item.id
+				});
+			}
 		},
 		onReachBottom() {
 			setTimeout(() => {
diff --git a/subPackages/hotelHomestay/hotelHomestay.vue b/subPackages/hotelHomestay/hotelHomestay.vue
index 90850ba..074b851 100644
--- a/subPackages/hotelHomestay/hotelHomestay.vue
+++ b/subPackages/hotelHomestay/hotelHomestay.vue
@@ -9,7 +9,7 @@
 		
 		
 		<view class="goodBox">
-			<navigator :url="'/subPackages/hotelHomestay/detail?id='+item.id" class="goodItem flex-column" v-for="(item,index) in list" :key="index">
+			<view class="goodItem flex-column" v-for="(item,index) in list" :key="index" @click="viewDetail(item)">
 				<view class="left-image flex-shrink-0 relative">
 					<image class="left-image " :src="showImg(item.image)" mode="aspectFill"></image>
 					<view class="collect" @click.stop="like(item)">
@@ -38,7 +38,7 @@
 
 					
 				</view>
-			</navigator>
+			</view>
 		</view>
 		<!-- <view class="finished-text" v-if="finished">没有更多数据了</view> -->
 	</view>
@@ -133,6 +133,13 @@
 					}
 				})
 			},
+
+			viewDetail (item) {
+				this.goOtherDetail(item)
+				uni.navigateTo({
+					url: '/subPackages/hotelHomestay/detail?id=' + item.id
+				});
+			}
 		},
 		onReachBottom() {
 			setTimeout(() => {
diff --git a/subPackages/techan/techanList.vue b/subPackages/techan/techanList.vue
index 598c6ef..3e6614d 100644
--- a/subPackages/techan/techanList.vue
+++ b/subPackages/techan/techanList.vue
@@ -3,7 +3,7 @@
 		<span class="iconfont topLeft" @click="goBack">&#xe660;</span>
 		<img :src="showImg('/uploads/20240826/53bbad9d231e7e0eb2404efb0c0903f4.png')" class="topImg" />
 		<view class="box">
-			<view class="item" v-for="item in list" :key="item.id" @click="goDetail(item)">
+			<view class="item" v-for="item in list" :key="item.id" @click="viewDetail(item)">
 				<image class="item-img" :src="showImg(item.image)" mode=""></image>
 				<view class="content">
 					<view class="title text-overflowRows">{{item.title}}</view>
@@ -46,7 +46,7 @@
 					}
 				})
 			},
-			goDetail(item) {
+			viewDetail(item) {
 				uni.navigateTo({
 					url: '/subPackages/techan/detail?id=' + item.id
 				})