From d9526a4742ebf37710128c6c8715827f0466df6a Mon Sep 17 00:00:00 2001
From: Tuzki <1720599558@qq.com>
Date: Thu, 13 Jul 2023 10:28:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=AF=E5=8C=BA=E8=AF=A6=E6=83=85=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/param.js                            |  2 +-
 main.js                                    |  2 +-
 pages.json                                 | 19 +++++++++----------
 pages/fuwu/fuwu.vue                        |  2 +-
 pages/scenic/scenicdetial/scenicdetial.vue | 14 +++++++++++++-
 pages/scenic/sceniclist/sceniclist.vue     |  8 +++++---
 6 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/common/param.js b/common/param.js
index d85bd6e..b9c8c65 100644
--- a/common/param.js
+++ b/common/param.js
@@ -5,7 +5,7 @@ module.exports = {
 	clng: 114.489380,   //当前经度
 	clat: 38.042040	    ,//当前纬度
 	update_oauthTime: 1000*60*60*12  ,//更新时间
-	appid: "wxadee3f26be2eb217",
+	appid: "wxdcc562d1cd081331",
 	user_info:null ,//用户信息
 	cityName:"雄安",
 	cityPy:"xiongan",
diff --git a/main.js b/main.js
index 2316f14..838f97d 100644
--- a/main.js
+++ b/main.js
@@ -9,7 +9,7 @@ import util from './common/util'	//工具类
 import param from './common/param'	//默认经纬度
 import Base64 from './common/Base64'	//工具类
 import MD5 from './common/MD5'
-// #ifdef H5
+// #ifdef H5 
 	import wechat from './common/wechat' 
 	 Vue.prototype.$wechat =wechat;  
 // #endif
diff --git a/pages.json b/pages.json
index a178a7a..a369217 100644
--- a/pages.json
+++ b/pages.json
@@ -343,17 +343,16 @@
 			"path": "pages/onlive/onlivedetial/onlivedetial",
 			"style": {}
 		},
+		// {
+		// 	"path": "pages/index/index_html",
+		// 	"style": {
+		// 		"navigationStyle": "custom",
+		// 		"app-plus": {
+		// 			"titleView": false
+		// 		}
+		// 	}
+		// }, 
 		{
-			"path": "pages/index/index_html",
-			"style": {
-				"navigationStyle": "custom",
-				"app-plus": {
-					"titleView": false
-				}
-			}
-		}
-
-		, {
 			"path": "pages/search/search",
 			"style": {
 				"navigationBarTitleText": "搜索"
diff --git a/pages/fuwu/fuwu.vue b/pages/fuwu/fuwu.vue
index 79f9a49..2599761 100644
--- a/pages/fuwu/fuwu.vue
+++ b/pages/fuwu/fuwu.vue
@@ -382,7 +382,7 @@ export default {
 						window.location.href="https://www.baidu.com?url=svg&value="+url;
 						break;
 					default:
-				
+
 						break;
 				}
 			});
diff --git a/pages/scenic/scenicdetial/scenicdetial.vue b/pages/scenic/scenicdetial/scenicdetial.vue
index 2b6c6fd..179e314 100644
--- a/pages/scenic/scenicdetial/scenicdetial.vue
+++ b/pages/scenic/scenicdetial/scenicdetial.vue
@@ -113,7 +113,7 @@
 
 		<view
 			v-if="isShowBuy == 'YES' && isShowLink_st == 'YES'"
-			:class="[scenicDetail.ticketinfo.length != null && scenicDetail.ticketinfo.length > 0 ? 'mt_1' : 'mt_1 btn_open']"
+			:class="[scenicDetail.ticketinfo&&scenicDetail.ticketinfo.length != null && scenicDetail.ticketinfo.length > 0 ? 'mt_1' : 'mt_1 btn_open']"
 			class="piao_box"
 		>
 			<view class="mode_com">
@@ -447,11 +447,16 @@ export default {
 		if(!that.netType){
 			return;
 		}
+	
 		this.$util.hideLoadingByTime();
+		// #ifdef H5
 		const oMeta = document.createElement('meta');
 		oMeta.httpEquiv = "Cache-Control";
 		oMeta.content = "no-cache, no-store, must-revalidate"
 		document.getElementsByTagName('head')[0].appendChild(oMeta);
+		// #endif
+		
+		
 		// this.requestLocation();
 		that.$util.saveOperatorLog(that, 'SCENIC', options.guid);
 		//正常进入详情
@@ -496,6 +501,12 @@ export default {
 		// setTimeout(function() {
 		// 	uni.hideLoading();
 		// }, 500);
+		// // #ifdef MP-WEIXIN
+		// const oMeta = document.createElement('meta');
+		// oMeta.httpEquiv = "Cache-Control";
+		// oMeta.content = "no-cache, no-store, must-revalidate"
+		// document.getElementsByTagName('head')[0].appendChild(oMeta);
+		// // #endif
 	},
 	data() {
 		return {
@@ -619,6 +630,7 @@ export default {
 				guid: guid,
 				userkey: this.$param.userkey
 			};
+			console.log(data,'0-0-0-0')
 			this.$Request.post(this.$config.scenicDetial, data).then(res => {
 				this.info = res.data;
 				this.tickeTlist = res.data.ticketlist;
diff --git a/pages/scenic/sceniclist/sceniclist.vue b/pages/scenic/sceniclist/sceniclist.vue
index 40bb836..312994d 100644
--- a/pages/scenic/sceniclist/sceniclist.vue
+++ b/pages/scenic/sceniclist/sceniclist.vue
@@ -66,8 +66,8 @@
 								</view>
 
 								<view class="category-content">
-									<view class="product-item" v-for="(p_item, p_index) in scenicList.content" :key="p_item.id">
-										<image @tap="gotoDetail(p_item.cid)" class="product-img" :src="p_item.thumb"></image>
+									<view class="product-item" v-for="(p_item, p_index) in scenicList.content" :key="p_index">
+										<image @click="gotoDetail(p_item)" class="product-img" :src="p_item.thumb"></image>
 										<text class="product-title1">{{ p_item.cname }}</text>
 										<text class="product-title">{{ p_item.slevel }}</text>
 										<text class="product-title">{{ p_item.address }}</text>
@@ -396,9 +396,11 @@ export default {
 			}
 		},
 		gotoDetail(e) {
+			console.log(e)
 			uni.navigateTo({
-				url: `/pages/scenic/scenicdetial/scenicdetial?guid=` + e + ``
+				url: `/pages/scenic/scenicdetial/scenicdetial?guid=` + e.cid + ``
 			});
+
 		},
 		getRedisRegion: function() {
 			var that = this;