From cab195341adb1590d3a8bd3edc6c9a427fed4cb6 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Sun, 25 May 2025 12:24:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js                       |  40 +-
 pages/index/index.wxml                     |   2 +-
 pages/order/pay/index.js                   |   2 +-
 pages/pbService/web/index.js               |  36 +-
 pages/user/order/movieOrderInfo/index.js   |  10 +
 pages/user/order/movieOrderInfo/index.wxml |   6 +-
 project.private.config.json                |  13 +-
 subPackages/index/index.js                 | 869 ++++++++++-----------
 subPackages/index/index.wxml               | 432 +++-------
 subPackages/index/index.wxss               | 123 +--
 utils/https.js                             |   8 +-
 11 files changed, 664 insertions(+), 877 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 2a73d54..104a24f 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -6,6 +6,7 @@ import userApi from "../../utils/https/user"
 import util from "../../utils/util"
 Page({
 	data: {
+        fullAdvTimer: null,  // 全屏timer
 		banner: [],
 		xiaobanner: [],
 		height: 0,
@@ -122,6 +123,7 @@ Page({
 	},
     onLoad: function(options) {
             //全屏广告
+            let _this = this
             commonApi._post("adv/getAdv", {
                 position: 2,
                 type_id: 3
@@ -148,26 +150,21 @@ Page({
                         this.setData({
                             showTime: true
                         })
-                        var timer = setInterval(() => {
-                            this.setData({
-                                time: this.data.time - 1
-                            })
-                            if (this.data.time === 0) {
-                                var opacityTimer = setInterval(() => {
-                                    this.setData({
-                                        opacity: this.data.opacity - 0.3
-                                    })
-                                }, 100)
+                        this.data.fullAdvTimer = setInterval(() => {
+                            _this.data.time-=0.5
+                            if (Number.isInteger(_this.data.time)) {
+                                _this.setData({time: _this.data.time})
                             }
-                            if (this.data.time == -1) {
-                                clearInterval(timer)
-                                clearInterval(opacityTimer)
+                            if (_this.data.time <= 0) {
+								// 可以css 优化
+                                _this.setData({opacity: 0})
+                            }
+                            if (_this.data.time <= -1) {
+                                clearInterval(_this.data.fullAdvTimer)
                                 wx.showTabBar() //倒计时结束清除定时器显示导航栏
-                                this.setData({
-                                    showFullAdv: false
-                                })
+                                _this.setData({showFullAdv: false})
                             }
-                        }, 1000)
+                        }, 500)
                     } else {
                         // 视频
                     }
@@ -461,7 +458,8 @@ Page({
 	closeFullAdv: function() {
 		this.setData({
 			showFullAdv: false
-		})
+        })
+        clearInterval(this.data.fullAdvTimer)
 		if (!this.data.alertSwipeList.length > 0) {
 			wx.showTabBar({
 				animation: true,
@@ -759,9 +757,11 @@ Page({
 				this.setData({
 					lat: res.latitude,
 					lon: res.longitude
-				})
+                })
 				this.getList()
-				this.getHdrlList()
+                this.getHdrlList()
+                let tempData = JSON.stringify({lat: res.latitude,lon: res.longitude})
+                wx.setStorageSync('lonAndLat', tempData)
 			},
 			fail: (err) => {
 				this.getList()
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 78bcb3b..f98c8e3 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -123,7 +123,7 @@
             <image  src="https://static.ticket.sz-trip.com/uploads/20250429/77bf17a7cf31614720bd8b1932b32473.png" mode="widthFix"></image>
             <view class="text">一日游</view>
           </view>
-          <view bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/LearningTravel" data-event="one_card" data-title="户外游"  class="pbservice-item">
+          <view bindtap="gotoUrl" data-url="https://test.m.cloud.sz-trip.com/movies" data-event="one_card" data-title="户外游"  class="pbservice-item">
             <image  src="https://static.ticket.sz-trip.com/uploads/20250430/4329eb909a6660062235f4a6cc7b2963.png" mode="widthFix"></image>
             <view class="text">户外游</view>
           </view>
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index ccf51c9..0492ed4 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -151,7 +151,7 @@ Page({
           info:res.data,
           activePay: Object.keys(res.data.coupon_activity).length === 0 ?false:true,
           SUBWALLET:res.data.coupon_activity.pay_type.includes('SUBWALLET') || !res.data.coupon_activity.pay_type,
-          wxPay:res.data.coupon_activity.pay_type.includes('WEIXIN') || !res.data.coupon_activity.pay_type,
+          wxPay:res.data.coupon_activity.pay_type.includes('ICBC_WECHAT') || !res.data.coupon_activity.pay_type,
           payIndex:Object.keys(res.data.coupon_activity).length === 0 ?-1:0,
         })
         console.log(this.data.wxPay);
diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index 0731d7d..7b848f7 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -85,11 +85,43 @@ Page({
             } else {
                 weburl += '?token='+token
             }
-        } 
+        }
+        let _this = this
+        try {
+            let lonAndLat = (wx.getStorageSync('lonAndLat'))
+            if (lonAndLat && JSON.parse(lonAndLat)) {
+                lonAndLat = JSON.parse(lonAndLat)
+                if (Object.keys(webParam).length>0 || token) {
+                    weburl+=`&lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`
+                } else {
+                    weburl+=`?lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`
+                }
+                this.setUrl(weburl)
+                return
+            } else {
+                wx.getLocation({
+                    type: 'gcj02',
+                    success: (res) => {
+                        let lonAndLat = JSON.stringify({lat: res.latitude,lon: res.longitude})
+                        wx.setStorageSync('lonAndLat', lonAndLat)
+                        if (Object.keys(webParam).length>0 || token) {
+                            weburl+=`&lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`
+                        } else {
+                            weburl+=`?lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`
+                        }
+                        _this.setUrl(weburl)
+                    },
+                    fail: (err) => {
+                        _this.setUrl(weburl)
+                    }
+                })
+            }
+        } catch(e) {
+            this.setUrl(weburl)
+        }
         // this.setData({
         //     webUrl:weburl
         // })
-        this.setUrl(weburl)
     } else {
         // this.setData({
         //     webUrl:weburl
diff --git a/pages/user/order/movieOrderInfo/index.js b/pages/user/order/movieOrderInfo/index.js
index 62c78fa..f59e2f6 100644
--- a/pages/user/order/movieOrderInfo/index.js
+++ b/pages/user/order/movieOrderInfo/index.js
@@ -34,6 +34,16 @@ Page({
     })
     
   },
+  gotoLocation:function(){
+    let info = this.data.info;
+    if(info && info.lat && info.lon){
+      wx.openLocation({
+        latitude: Number(info.lat),
+        longitude: Number(info.lon)
+      })
+    }
+  },
+
   getCodeImg:function(){
     let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[];
     qrcode.map((item,index)=>{
diff --git a/pages/user/order/movieOrderInfo/index.wxml b/pages/user/order/movieOrderInfo/index.wxml
index 948f2f2..97deb1d 100644
--- a/pages/user/order/movieOrderInfo/index.wxml
+++ b/pages/user/order/movieOrderInfo/index.wxml
@@ -110,6 +110,8 @@
   </view>
   <view class="detail-item" style="height:auto">
     <text>商家地址：{{info.order_product_list[0].scene_detail.address}}</text>
+    <!-- <view class="iconfont icon-daohang" style="color: red;" bindtap="gotoLocation"></view> -->
+
   </view>
 </view>
 <view class="box" wx:if="{{info}}">
@@ -123,8 +125,8 @@
   <view class="detail-item" wx:if="{{info.pay_at}}">
     <text>支付时间：{{info.pay_at}}</text>
   </view>
-  <view class="detail-item" wx:if="{{info.pay_method}}">
-    <text>支付方式：{{pay_methods[info.pay_method]}}</text>
+  <view class="detail-item" wx:if="{{info.pay_method_text}}">
+    <text>支付方式：{{info.pay_method_text}}</text>
   </view>
   <!-- <view class="detail-item">
     <text>付款时间：{{info.create_time}}</text>
diff --git a/project.private.config.json b/project.private.config.json
index 0660e02..b200949 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/order/joinOrder/index",
+          "pathName": "pages/order/pay/index",
+          "query": "id=28182505231709189176&token=0b62878b-b30c-41d8-a91f-119f8365d86e",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/user/order/movieOrderInfo/index",
           "pathName": "pages/activity/year2020/index",
@@ -108,12 +115,6 @@
           "query": "",
           "scene": null
         },
-        {
-          "name": "pages/order/joinOrder/index",
-          "pathName": "pages/order/joinOrder/index",
-          "query": "oid=59532109231539023692&id=336&uid=24",
-          "scene": null
-        },
         {
           "name": "",
           "pathName": "pages/order/payresult/index",
diff --git a/subPackages/index/index.js b/subPackages/index/index.js
index 835e1a0..2265f05 100644
--- a/subPackages/index/index.js
+++ b/subPackages/index/index.js
@@ -10,12 +10,129 @@ import https from "../../utils/https.js"
 
 Page({
 	data: {
-        bannerInterver: 1000*60,
+        
+        // bannerInterver: 5*1000,  // 动态更改banner时间
 		banner: [],
 		xiaobanner: [],
-		height: 0,
-		padHeight: 0,
-		right: 0,
+		activeBannerIndex: 0,
+        smBannerIndex: 0,
+		systemStyle: {
+			height: 0,
+			padHeight: 0,
+			right: 0,
+		},
+		// banner上的金刚区
+		bannerDataList: [
+			{
+				title: "景点门票",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				path: "/pages/list/scene/index",
+			},
+			{
+				title: "活动日历",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/2453c4f3e932172905ed883190ef1356.png",
+				path: "/pages/list/activitynew/index",
+			},
+			{
+				title: "将意真品",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/8e675fc57ea4b9e45f2fa7736bc03e7d.png",
+				path: "/subPackages/techanNew/index",
+			},
+			{
+				title: "领券中心",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				path: "/pages/list/scene/index",
+			},
+		],
+		// 金刚区
+		mainTypeList: [
+			{
+				title: "非遗专卖",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				path: "/subPackages/feiyiNew/index",
+			},
+			{
+				title: "场馆预约",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				path: "/pages/list/museum/index",
+			},
+			{
+				title: "一日游",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				weburl:"https://m.cloud.sz-trip.com/OneDayTravelNew",
+			},
+			{
+				title: "户外游",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				weburl:"https://m.cloud.sz-trip.com/LearningTravel",
+			},
+			{
+				title: "电影购票",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				weburl:"https://m.cloud.sz-trip.com/movies",
+			},
+			{
+                type: 'hotel', // 特殊标识方便查找 更新weburl
+				title: "酒店住宿",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				weburl: '',
+				path: '/pages/list/hotel/index'
+			},
+			{
+				title: "水上游",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				path: '/pages/list/night/index'
+			},
+			{
+				title: "剧场演出",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				path: '/pages/list/theatre/index'
+			},
+		],
+
+		xpth: {}, // 新品特惠
+		XPathBannerIndex: 0,
+		// 公共服务
+		publicSerivce: [
+			{
+				title: "高峰预警",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+				weburl: "https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy",
+				eventName: "comfort_click",
+			},
+			{
+				title: "实时路况",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+				weburl: "https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/",
+				eventName: "sslk",
+			},
+			{
+				title: "行李直送",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+				appId: 'wx757dd1ee184e75e9',
+          		pagePath: "pages/tabBar/index/index"
+			},
+			{
+				title: "行李寄存",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+				weburl: "https://weixin.2500sz.net/zt/2023/07/luggage_storage/",
+				eventName: "xljc",
+			},
+			{
+				title: "找厕所",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+				path: "/pages/pbService/bike/index?type=1",
+			},
+			{
+				title: "找厕所",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+				weburl: "",
+			},
+			
+        ], 
+        
+        fullAdvTimer: null,  // 全屏timer
+
 		weather: null,
 		saleProduct: null,
 		roadProduct: null,
@@ -36,9 +153,8 @@ Page({
 		videoPrize: false,
 		prizeInfo: null,
 		otherPlat: null,
-		activeBannerIndex: 0,
-        smBannerIndex: 0,
-        XPathBannerIndex: 0,
+		
+        
 		indexSeason: {},
 		// startList: [], // 启动页广告
 		startList: {
@@ -50,9 +166,9 @@ Page({
 		opacity: 1,
 		time: 3, //全屏广告剩余时间
 		showTime: false,
-		xpth: {}, // 元旦新增 新品特惠和sqjNew
-		djs: null, // 元旦新增 新品特惠倒计时
-        djsTime: null,
+		
+
+
         area_ids: ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
 		sqjNew: [
             'https://static.ticket.sz-trip.com/uploads/20241012/df831b80bc445aef8dc439ef8f9761a2.png',// 常熟
@@ -66,24 +182,16 @@ Page({
             'https://static.ticket.sz-trip.com/uploads/20241012/db5fcb0df2d8d326bd2b8d055b9284d2.png',// 姑苏
 			'https://static.ticket.sz-trip.com/uploads/20241012/279e21d3e876379140bf77d01410b07d.png',// 高新区
 		],
-		viewHeight: "0px",
+
 		isMuted: true,
         videoPlay: false,
 
         // 页面图片
         imageSourceList:imageSource,
 
-        // 酒店住宿配置链接   /pages/pbService/web/index?weburl=https://m.cloud.sz-trip.com/carPurchase
-        hotelUrl: ''
 	},
 	onLoad: function(options) {
-        console.log('onload')
-
-        wx.getLocation({type: 'gcj02'})
-           
-		console.log('options',options)
-		// 相城小程序跳转获取用户信息
-		if(options && options.szxcCode) {
+        if(options && options.szxcCode) {
 			commonApi._post("uservice/user/loginByXC", {
 				code: options.szxcCode
 			}).then(res => {
@@ -91,67 +199,20 @@ Page({
 				  https.set_logininfo(res);
 				}
 			})
-		}
-		this.getHeight()
-		//全屏广告
-		wx.hideTabBar() //这里隐藏了底部导航栏
-		commonApi._post("adv/getAdv", {
-			position: 2,
-			type_id: 3
-		}).then(res => {
-			if (res.data.length > 0) {
-				let length = res.data.length
-				if (res.data.length > 1) {
-					let num = Math.floor(Math.random() * length);
-					this.setData({
-						startList: res.data[num]
-					})
-				} else {
-					this.setData({
-						startList: res.data[0]
-					})
-				}
-
-				// 图片
-				if (this.data.startList.media_type) {
-					this.setData({
-						showTime: true
-					})
-					var timer = setInterval(() => {
-						this.setData({
-							time: this.data.time - 1
-						})
-						if (this.data.time === 0) {
-							var opacityTimer = setInterval(() => {
-								this.setData({
-									opacity: this.data.opacity - 0.3
-								})
-							}, 100)
-						}
-						if (this.data.time == -1) {
-							clearInterval(timer)
-							clearInterval(opacityTimer)
-							wx.showTabBar() //倒计时结束清除定时器显示导航栏
-							this.setData({
-								showFullAdv: false
-							})
-						}
-					}, 1000)
-				} else {
-					// 视频
-				}
-			} else {
-				this.setData({
-					showFullAdv: false
-				})
-			}
-		})
-		if (options.from) {
+        }
+        if (options.from) {
 			app.globalData.from = options.from;
 		}
-		let systemInfo = wx.getSystemInfoSync(),
-			rect = wx.getMenuButtonBoundingClientRect();
-		let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
+		return
+
+        wx.getLocation({type: 'gcj02'})
+           
+		console.log('options',options)
+		// 相城小程序跳转获取用户信息
+		
+		
+		
+		
 		wx.getLocation({
 			type: 'gcj02',
 			success: (res) => {
@@ -165,11 +226,7 @@ Page({
 				this.getList()
 			}
 		})
-		this.setData({
-			height: height,
-			padHeight: systemInfo.statusBarHeight,
-			right: (systemInfo.screenWidth - rect.right) + rect.width
-		})
+		
 
 		commonApi._post("pbservice/Other/getClientConfig", {
 			unique_key: "urltopage"
@@ -180,7 +237,7 @@ Page({
 			})
 		})
 		this.getTwoProduct()
-		this.getBanner()
+		
 		this.getWeather()
 		// 获取今天的日期
 		let today = new Date();
@@ -188,92 +245,288 @@ Page({
 			month: (this.data.months[today.getMonth()]).toUpperCase(),
 			date: today.getDate()
         })
-        // 调用接口如果token过期会导致一进入就要登陆
-		// this.getVideoPrize()
-		this.getXpthList()
+
+    },
+
+	onReady: function() {
+		this.getHeight()
+		this.getBanner()
+        // 活动日历
+        // this.getFourProduct()
+
+		this.getXpthList() // 限时特惠
+
+
 	},
+    // 获取系统信息
 	getHeight() {
-		let that = this
-		wx.getSystemInfo({
-			success(res) {
-				that.setData({
-					viewHeight: res.windowHeight + 'px'
+        let systemInfo = wx.getSystemInfoSync(),
+			rect = wx.getMenuButtonBoundingClientRect();
+        let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
+        let systemStyle = {
+            height: height, // 导航栏
+            padHeight: systemInfo.statusBarHeight,  // 状态栏
+            right: (systemInfo.screenWidth - rect.right) + rect.width // 右侧胶囊
+        }
+        this.setData({
+			systemStyle: systemStyle,
+		})
+    },
+    //获取季节配置
+	getIndexSeason() {
+        let mainTypeList = this.data.mainTypeList
+        let hotelData = mainTypeList.find(v=>v.type == hotel)
+
+        if (app.globalData.configJson.indexSeason) {
+            hotelData.weburl = app.globalData.configJson.hotelUrl
+            this.setData({
+                indexHot: app.globalData.configJson.indexHot,
+                isTest: app.globalData.configJson.isTest,
+                otherPlat: app.globalData.configJson.otherPlats,
+                // 正式数据
+                indexSeason: app.globalData.configJson.indexSeason,
+                // 开发数据
+                // indexSeason: imageSource.testImgs.indexSeason,
+                mainTypeList: mainTypeList
+            })
+        } else {
+            commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
+                let obj = {}
+                res.data.content.forEach(item => {
+                    obj[item.id] = item.image
+                });
+                app.globalData.configJson.indexSeason = obj 
+                app.globalData.loadIndexSeason = true
+                hotelData.weburl = app.globalData.configJson.hotelUrl
+                this.setData({
+                    indexHot: app.globalData.configJson.indexHot,
+                    isTest: app.globalData.configJson.isTest,
+                    otherPlat: app.globalData.configJson.otherPlats,
+                    indexSeason: app.globalData.configJson.indexSeason,
+                    mainTypeList: mainTypeList
+                })
+            })
+        }
+        console.log(this.data)
+	},
+    // --------------------banner 相关---------------------------
+    // 获取banner
+    getBanner: function() {
+        let _this = this
+        //全屏广告
+		commonApi._post("adv/getAdv", {position: 2,type_id: 3}).then(res => {
+			if (res.data.length > 0) {
+				let length = res.data.length
+                let num = Math.floor(Math.random() * length);
+                this.setData({startList: res.data[num]})
+				// 图片
+				if (this.data.startList.media_type) {
+                    wx.hideTabBar() //这里隐藏了底部导航栏
+					this.setData({showTime: true})
+					this.data.fullAdvTimer = setInterval(() => {
+                        _this.data.time-=0.5
+                        if (Number.isInteger(_this.data.time)) {
+                            _this.setData({time: _this.data.time})
+                        }
+						if (_this.data.time <= 0) {
+							_this.setData({opacity: _this.data.opacity - 0.3})
+						}
+						if (_this.data.time <= -1) {
+							clearInterval(_this.data.fullAdvTimer)
+							wx.showTabBar() //倒计时结束清除定时器显示导航栏
+							_this.setData({showFullAdv: false})
+						}
+					}, 500)
+				} else {
+					// 视频
+				}
+			} else {
+				this.setData({showFullAdv: false})
+			}
+		})
+
+
+		commonApi._post("adv/getAdv", {position: 0,type_id: 3}).then(res => {
+			this.setData({banner: res.data || []})
+		})
+		commonApi._post("adv/getAdv", {position: 1,type_id: 3}).then(res => {
+			this.setData({xiaobanner: res.data || []})
+		})
+		//弹窗广告
+		commonApi._post("adv/getAdv", {position: 3,type_id: 3}).then(res => {
+			if (res.data.length > 0) {
+				this.setData({
+					alertSwipeList: res.data || [],
+					showAdv: true
 				})
 			}
 		})
 	},
+
+    // 统一的banner change 需要时可以放开
+	changeBannerIndex: function(e) {
+        return
+        let keyname = e.currentTarget.dataset.keyname
+		this.setData({
+            [keyname]: e.detail.current,
+		})
+    },
+
+	// 轮播图点击
+	bannerClick: function(e) {
+		if (this.data.isTest) return;
+		let item = e.currentTarget.dataset.item;
+		this.pagePoint({
+			event: "banner_click",
+			type: 'banner'
+		}, 1)
+		switch (item.jump_type) {
+			case 0:
+				break;
+			case 1:
+				util.gotoDetail(item.product_model)
+				break;
+			case 2:
+				if (item.front_model && item.front_model.mini) {
+					wx.navigateTo({
+						url: "/" + item.front_model.mini
+					})
+				}
+				break;
+			case 3:
+				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
+					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
+					// 外部h5
+					app.globalData.weburl = item.tdata.url;
+					wx.navigateTo({
+						url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
+							.url)
+					})
+				} else {
+					let page = item.tdata.url.split("/");
+					page = page[page.length - 1].split("?")
+					let url = this.data.urltopage[page[0]];
+					if (url && url.indexOf('map') != -1) {
+						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
+								'cinema', 'academes'
+							],
+							type = page[1] ? page[1].split("=") : [];
+						wx.reLaunch({
+							url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) :
+								null)
+						})
+					} else if (url) {
+						wx.navigateTo({
+							url: url,
+						})
+					} else {
+						app.globalData.weburl = item.tdata.url;
+						wx.navigateTo({
+							url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item
+								.tdata.url)
+						})
+					}
+				}
+				break;
+			case 4:
+				if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+					// 如果是苏心游的小程序 直接把authCode带过去
+					userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+						let weburl = item.tdata.page
+						if (weburl.indexOf('?') != -1) {
+							weburl += '&authCode=' + res.data;
+						} else {
+							weburl += '?authCode=' + res.data
+						}
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: weburl
+						})
+					}).catch(err => {
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: item.tdata.page
+						})
+					})
+				} else {
+					wx.navigateToMiniProgram({
+						appId: item.tdata.appid,
+						path: item.tdata.page
+					})
+				}
+				break;
+			default:
+				break;
+		}
+		return;
+
+	},
+    
+    //------------------------金刚区点击-------------------------------------
+	mainIconClick: function(e) {
+		let item = e.currentTarget.dataset.item
+		// 埋点
+		if (item.eventName) {
+			this.pagePoint({event: item.eventName,}, 1)
+		}else if (item.title) {
+			commonApi._post("browse/burying_point", {
+				uuid: app.globalData.uuid,
+				drive: "mini",
+				title: item.title
+			})
+		}
+
+		if (item.appId) {
+			wx.navigateToMiniProgram({
+				appId: item.appId,
+				path: item.pagePath,
+			})
+			return
+		}
+		if (item.path) {
+			wx.navigateTo({
+				url: item.path
+			})
+			return
+		}
+		if (item.weburl) {
+			wx.navigateTo({
+				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.weburl)
+			})
+			return
+		}
+		
+    },
+
+	// 滚动监听
+	listenScroll(e) {
+		console.log(e.detail.scrollLeft)
+		this.setData({
+			scrollLeft: e.detail.scrollLeft
+		})
+	},
+    
+    // -----------------------------------------------------------------------
+    
+    // 新品特惠
 	getXpthList: function() {
-		// 元旦新增 新品特惠
 		commonApi._post("product/get_product_indulgence", {
 			tag_id: 275,
             typeId: 3,
             type: 1, // 返回数组
 		}).then(res => {
-            // res.data.adv = [res.data.adv]
-			this.setData({
-				xpth: res.data,
-				djsTime: res.data.time
-			})
-			let time = setInterval(() => {
-				this.setData({
-					djsTime: this.data.djsTime - 1
-				})
-				this.formatDate(this.data.djsTime)
-			}, 1000)
-			if (this.data.djsTime == 0) {
-				clearInterval(time)
-			}
-		})
-	},
-	// 元旦新品特惠 倒计时 
-	formatDate: function(oTime) {
-		let h = parseInt(oTime / 3600)
-		let m = parseInt((oTime % 3600) / 60)
-		let s = parseInt(oTime % 60)
-		h = h < 10 ? "0" + h : h;
-		m = m < 10 ? "0" + m : m;
-		s = s < 10 ? "0" + s : s;
-		this.setData({
-			djs: {
-				h: h,
-				m: m,
-				s: s
-			}
+			this.setData({xpth: res.data,})
 		})
-		return
 	},
+
 	goFeiyi: function() {
 		app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
 		wx.navigateTo({
 			url: "/pages/pbService/web/index"
 		})
 	},
-	onTabItemTap: function(e) {
-		console.log(e, 99999999)
-	},
-	changeBannerIndex: function(e) {
-		this.setData({
-            activeBannerIndex: e.detail.current,
-            bannerInterver: 5000
-		})
-	},
-	changeSmBannerIndex: function(e) {
-		this.setData({
-			smBannerIndex: e.detail.current
-		})
-    },
-    changeXPathBannerIndex: function(e) {
-		this.setData({
-			XPathBannerIndex: e.detail.current
-		})
-    },
-    xlzs: function (e) {
-
-        wx.navigateToMiniProgram({
-          appId: 'wx757dd1ee184e75e9',
-          page: "pages/tabBar/index/index"
-        })
-      },
+    
+ 
 	// 一城百馆
 	city: function() {
 		wx.navigateToMiniProgram({
@@ -295,71 +548,8 @@ Page({
 		})
 		this.getFourProduct()
 	},
-	getBanner: function() {
-		// commonApi._post("adv/getAdvByKey",{
-		//   key:"xcxBanner"
-		// }).then(res=>{
-		//   console.log(res)
-		//   this.setData({
-		//     banner:res.data.content || []
-		//   })
-		// })
-		// commonApi._post("adv/getAdvByKey",{
-		//   key:"xiaobanner"
-		// }).then(res=>{
-		//   this.setData({
-		//     xiaobanner:res.data.content || []
-		//   })
-		// })
-		// return;
-		commonApi._post("adv/getAdv", {
-			position: 0,
-			type_id: 3
-		}).then(res => {
-			this.setData({
-				banner: res.data || []
-			})
-		})
-		commonApi._post("adv/getAdv", {
-			position: 1,
-			type_id: 3
-		}).then(res => {
-			this.setData({
-				xiaobanner: res.data || []
-			})
-		})
-		//弹窗广告
-		commonApi._post("adv/getAdv", {
-			position: 3,
-			type_id: 3
-		}).then(res => {
-			if (res.data.length > 0) {
-				this.setData({
-					alertSwipeList: res.data || [],
-					showAdv: true
-				})
-			} else if (!this.data.showFullAdv) {
-				wx.showTabBar({
-					animation: true,
-				})
-			}
-		})
+	
 
-	},
-	//获取季节配置
-	getIndexSeason() {
-		this.setData({
-			indexHot: app.globalData.configJson.indexHot,
-			isTest: app.globalData.configJson.isTest,
-            otherPlat: app.globalData.configJson.otherPlats,
-            // 正式数据
-            indexSeason: app.globalData.configJson.indexSeason,
-            // 开发数据
-            // indexSeason: imageSource.testImgs.indexSeason
-		})
-        this.getFourProduct()
-        console.log(this.data)
-	},
 	//关闭弹窗广告
 	closeAdv: function() {
 		this.setData({
@@ -371,13 +561,10 @@ Page({
 	},
 	//关闭全屏广告
 	closeFullAdv: function() {
-		this.setData({
-			showFullAdv: false
-		})
+        this.setData({showFullAdv: false})
+        clearInterval(this.data.fullAdvTimer)
 		if (!this.data.alertSwipeList.length > 0) {
-			wx.showTabBar({
-				animation: true,
-			})
+			wx.showTabBar({animation: true})
 		}
 	},
 	// 是否静音
@@ -502,19 +689,7 @@ Page({
 		util.gotoDetail(item)
 	},
 	gotoPath: function(e) {
-		// if (e.currentTarget.dataset.event) {
-		//   if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
-		//     wx.navigateToMiniProgram({
-		//       appId: 'wxd323e63a10aa6865',
-		//       path: 'pages/home/index'
-		//     })
-		//     return
-		//   }else{
-		//     this.pagePoint({
-		//       event: e.currentTarget.dataset.event
-		//     }, 1)
-		//   }
-		// }
+
 		if (e.currentTarget.dataset.title == '书香借阅') {
 			wx.navigateToMiniProgram({
 				appId: 'wx165d4f1727f6bdb0',
@@ -527,12 +702,6 @@ Page({
 				path: 'pages/index/index'
 			})
 			return;
-		// } else if (e.currentTarget.dataset.event == 'wuzhong_click') {
-		// 	wx.navigateToMiniProgram({
-		// 		appId: 'wxdd39069b9a91dbfe',
-		// 		path: 'pages/index/index'
-		// 	})
-		// 	return;
 		} else if (e.currentTarget.dataset.title == 'e读书') {
 			wx.navigateToMiniProgram({
 				appId: 'wx26e6f4c0baba005b',
@@ -718,95 +887,7 @@ Page({
 			path: "hotel/pages/h5/index?q=https%3A%2F%2Ffenxiao.meituan.com%2Fopdtor%2Fh5%2Fhotel%2Fsearch%3FpartnerId%3D16829"
 		})
 	},
-	// 轮播图点击
-	bannerClick: function(e) {
-		if (this.data.isTest) return;
-		let item = e.currentTarget.dataset.item;
-		this.pagePoint({
-			event: "banner_click",
-			type: 'banner'
-		}, 1)
-		switch (item.jump_type) {
-			case 0:
-				break;
-			case 1:
-				util.gotoDetail(item.product_model)
-				break;
-			case 2:
-				if (item.front_model && item.front_model.mini) {
-					wx.navigateTo({
-						url: "/" + item.front_model.mini
-					})
-				}
-				break;
-			case 3:
-				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
-					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
-					// 外部h5
-					app.globalData.weburl = item.tdata.url;
-					wx.navigateTo({
-						url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
-							.url)
-					})
-				} else {
-					let page = item.tdata.url.split("/");
-					page = page[page.length - 1].split("?")
-					let url = this.data.urltopage[page[0]];
-					if (url && url.indexOf('map') != -1) {
-						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
-								'cinema', 'academes'
-							],
-							type = page[1] ? page[1].split("=") : [];
-						wx.reLaunch({
-							url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) :
-								null)
-						})
-					} else if (url) {
-						wx.navigateTo({
-							url: url,
-						})
-					} else {
-						app.globalData.weburl = item.tdata.url;
-						wx.navigateTo({
-							url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item
-								.tdata.url)
-						})
-					}
-				}
-				break;
-			case 4:
-				if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
-					// 如果是苏心游的小程序 直接把authCode带过去
-					userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
-						let weburl = item.tdata.page
-						if (weburl.indexOf('?') != -1) {
-							weburl += '&authCode=' + res.data;
-						} else {
-							weburl += '?authCode=' + res.data
-						}
-						wx.navigateToMiniProgram({
-							appId: item.tdata.appid,
-							path: weburl
-						})
-					}).catch(err => {
-						wx.navigateToMiniProgram({
-							appId: item.tdata.appid,
-							path: item.tdata.page
-						})
-					})
-				} else {
-					wx.navigateToMiniProgram({
-						appId: item.tdata.appid,
-						path: item.tdata.page
-					})
-				}
-				break;
-			default:
-				break;
-		}
-		return;
 
-	},
 	//博物馆跳转  直接跳君到苏州H5
 	goH5: function(e) {
 		let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
@@ -816,77 +897,9 @@ Page({
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(weburl),
 		})
 	},
-	bannerClick2: function(e) {
-		let item = e.currentTarget.dataset.item;
-		if (item.action == 'href') {
-			if (item.href.indexOf(",") != -1) {
-				let info = item.href.split(",");
-				wx.navigateToMiniProgram({
-					appId: info[0],
-					path: info[1]
-				})
-			} else if (item.href.indexOf('map/index') != -1) {
-				wx.reLaunch({
-					url: item.href
-				})
-			} else {
-				wx.navigateTo({
-					url: item.href,
-				})
-			}
-		} else if (item.action == "web") {
-			app.globalData.weburl = item.href;
-			wx.navigateTo({
-				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
-			})
-		}
-	},
-	// 监听文旅查询的scroll
-	listenScroll(e) {
-		this.setData({
-			scrollLeft: e.detail.scrollLeft
-		})
-	},
-	// 获取短视频大赛是否中奖 中奖详情
-	getVideoPrize() {
-		let user_id = wx.getStorageSync('jstrip_userid');
-        if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
-		commonApi.user_post('actonline/video_act/getRaffle', {
-			act_id: 5
-		}).then(res => {
-			this.setData({
-				videoPrize: res.data
-			})
-		})
-	},
-	noMoreTip() {
-		wx.setStorageSync('indexPriceNoTip', true)
-		this.closePrice()
-	},
-	closePrice() {
-		this.setData({
-			videoPrize: false,
-			prizeInfo: null
-		})
-	},
-	// 抽奖
-	choosePrize() {
-		commonApi.user_post('actonline/video_act/luckyDraw', {
-			act_id: 5
-		}).then(res => {
-			this.setData({
-				prizeInfo: res.data
-			})
-			if (res.data.type != 'none') {
-				// 抽奖成功的话 弹框
-				wx.showModal({
-					title: "提示",
-					content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
-					showCancel: false
-				})
-			}
-		})
-	},
+
+
+
 	bannerJumpNew(item) {
 		let that = this
 		item = item.currentTarget.dataset.item
@@ -972,10 +985,7 @@ Page({
 		}
 		return
 	},
-	onReady: function() {
-
-
-	},
+	
 	gotoOther: function(e) {
 		let item = e.currentTarget.dataset.item;
 		if (item.type == 'h5') {
@@ -998,47 +1008,20 @@ Page({
 		util.pagePoint(e, type)
 	},
 	onShow: function() {
+		// console.log(app.globalData)
+		// if (app.globalData.loadIndexSeason) {
+		// 	this.getIndexSeason()
+		// } else {
+		// 	let t = setInterval(() => {
+		// 		if (app.globalData.loadIndexSeason) {
+		// 			this.getIndexSeason()
+		// 			clearInterval(t)
+		// 			t = null
+		// 		}
+		// 	}, 500)
+		// }
 
-		if (app.globalData.loadIndexSeason) {
-			this.getIndexSeason()
-		} else {
-			let t = setInterval(() => {
-				if (app.globalData.loadIndexSeason) {
-					this.getIndexSeason()
-					clearInterval(t)
-					t = null
-				}
-			}, 500)
-		}
-
-		this.pagePoint({
-			event: 'home_view'
-        }, 1)
-        
-        if(!this.data.hotelUrl) {
-        commonApi._post("pbservice/Other/getClientConfig", {
-            unique_key: "wechatxcx"
-          }).then(res => {
-              try {
-                let data = JSON.parse(res.data);
-                if (data.hotelUrl) {
-                    this.setData({
-                        hotelUrl: data.hotelUrl
-                    })
-                }
-              } catch(e) {
-                this.setData({
-                    hotelUrl: '/pages/list/hotel/index'
-                })
-              }
-          }).catch(err => {
-              this.setData({
-                  hotelUrl: '/pages/list/hotel/index'
-              })
-          })
-        }
-
-		// this.data.time!=5?wx.showTabBar():1
+		this.pagePoint({event: 'home_view'}, 1)
 	},
 
 	/**
diff --git a/subPackages/index/index.wxml b/subPackages/index/index.wxml
index 3eb48fc..bc09170 100644
--- a/subPackages/index/index.wxml
+++ b/subPackages/index/index.wxml
@@ -1,146 +1,60 @@
 <!--index.wxml-->
-<title title="君到苏州（文化旅游总入口）"></title>
-<!-- <view class="old-btn">关怀模式</view> -->
-<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flowerbg.png" mode="widthFix"></image> -->
-<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flower.gif" mode="widthFix"></image> -->
-<!-- 后台获取的季节动图 -->
+
+
 <view wx:if="{{!isTest}}">
-    <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
-    <view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
-    <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
-    <view class="weather-num">{{weather.max_temp}}°</view>
-    <view class="weather">{{weather.weather}}</view>
-    <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index" data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png" mode="aspectFill"></image>
-    <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index" src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
-    <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
-        data-event="customer_service_click" src="https://static.ticket.sz-trip.com/xcxImages/spring22/service.png"
-        mode="aspectFill"></image>
-    <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
-        src="https://static.ticket.sz-trip.com/xcxImages/spring22/msg.png" mode="aspectFill"></image> -->
-    </view>
-    <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
-    <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
-        <!-- <view class="iconfont icon-sousuo"></view> -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20250312/656b4dde65f4237b2d7fe0ef65baa850.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
-        <view class="textOver" >搜索想要的旅游产品或服务</view>
-    </navigator>
-    </view>
     <view style="position:relative;z-index: 1;">
-    <swiper class="swiper" autoplay="{{true}}" interval="{{bannerInterver}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
-        <block wx:for="{{banner}}" wx:key="index">
-        <swiper-item bindtap="bannerClick" data-item="{{item}}">
-            <image src="{{item.head_img}}" mode="scaleToFill"></image>
-        </swiper-item>
-        </block>
-    </swiper>
-    <view class="com-flex dot-list">
-        <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
-    </view>
-    </view>
+        <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+            bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular>
+            <block wx:for="{{banner}}" wx:key="index">
+            <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                <image src="{{item.head_img}}" mode="scaleToFill"></image>
+            </swiper-item>
+            </block>
+        </swiper>
+        <!-- <view class="com-flex dot-list">
+            <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
+        </view> -->
 
- 
-    <view class="top-icons" wx:if="{{!isTest}}">
-        <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[0]}}" mode="widthFix"></image>
-            <view class="top-icon-text">活动日历</view>
-        </view>
-        <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[1]}}" mode="widthFix"></image>
-            <view class="top-icon-text">场馆预约</view>
-        </view>
-        <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[2]}}" mode="widthFix"></image>
-            <view class="top-icon-text">非遗专卖</view>
+        <view class="top-box" style="top: {{systemStyle.padHeight}}px;right:{{systemStyle.right+20}}px">
+            <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
+                <image src="https://static.ticket.sz-trip.com/uploads/20250312/656b4dde65f4237b2d7fe0ef65baa850.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
+                <view class="textOver" >搜索想要的旅游产品或服务</view>
+            </navigator>
         </view>
 
-        <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[3]}}" mode="widthFix"></image>
-            <view class="top-icon-text">剧场演出</view>
-        </view>
-        <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[4]}}" mode="widthFix"></image>
-            <view class="top-icon-text">文创特产</view>
-        </view>
-        <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[5]}}" mode="widthFix"></image>
-            <view class="top-icon-text">景点门票</view>
-        </view>
-        <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="{{hotelUrl}}" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
-            <view class="top-icon-text">酒店住宿</view>
-        </view>
-        <!-- 临时跳转专题页 -->
-        <!-- <view bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/carPurchase" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
-            <view class="top-icon-text">酒店住宿</view>
-        </view> -->
-        <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[7]}}" mode="widthFix"></image>
-            <view class="top-icon-text">水上游</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[8]}}" mode="widthFix"></image>
-            <view class="top-icon-text">一日游</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="movie" data-title="户外游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[9]}}" mode="widthFix"></image>
-            <view class="top-icon-text">户外游</view>
+        <view class="banner-main">
+            <view catchtap="mainIconClick" class="banner-main-item" wx:for="{{bannerDataList}}" wx:key="index" data-item="{{item}}">
+                <image src="{{item.img}}" ></image>
+            </view>
         </view>
     </view>
-    <view class="content">
-        <view class="sale-road-boxes" wx:if="{{false}}">
-            <view class="sale-box" bindtap="gotoPath" data-event="discount_click" data-title="特惠新品" data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index">
-            <view class="sale-title"><text>特惠新品</text>超值商品限时抢购</view>
-            <view class="sale-product">
-                <view class="sale-product-bg"></view>
-                <image mode="aspectFill" class="sale-img" src="https://static.ticket.sz-trip.com/uploads/20211022/0c90b027b5572b559b34c219eaf257ba.jpg"></image>
-                <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/sale.png" mode="aspectFill">
-                </image>
-                <view class="sale-info">
-                <view class="sale-product-title textOver2">
-                    <view>限时特惠</view>
-                    <view>新品推荐</view>
-                </view>
-                <view class="sale-price" style="color:#F44747" wx:if="{{saleProduct}}">
-                    ￥{{saleProduct.price?saleProduct.price/100:0}}起</view>
-                </view>
-            </view>
-            </view>
-            <view class="sale-box" bindtap="gotoPath" data-event="route_click" data-title="精品线路" data-path="/pages/list/road/index">
-            <view class="sale-title"><text>精品线路</text>带你轻松玩转苏州</view>
-            <view class="sale-product">
-                <view class="sale-product-bg road-product-bg"></view>
-                <common-image class="sale-img" width="173rpx" height="165rpx" src="https://static.ticket.sz-trip.com/uploads/20211022/f8d9b54fa477b9ad8bf14e119664455e.jpg" mode="aspectFill"></common-image>
-                <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/road.png" mode="aspectFill">
-                </image>
-                <view class="sale-info">
-                <view class="sale-product-title textOver2">
-                    <view>四季苏州</view>
-                    <view>最是江南</view>
-                </view>
-                <view class="sale-price" style="color:rgb(0, 153, 137)" wx:if="{{roadProduct}}">
-                    ￥{{roadProduct.price?roadProduct.price/100:0}}起</view>
+
+   
+   
+    <view class="main-content">
+         <!-- 金刚区 -->
+        <view>
+            <scroll-view scroll-x style="height:200rpx" bindscroll="listenScroll" data-keyname="mainTypeLeft">
+                <view  class="top-icons no-scrollbar">
+                    <view bindtap="mainIconClick" class="top-icon-item" wx:for="{{mainTypeList}}" wx:key="index" data-item="{{item}}">
+                        <image src="{{imageSourceList.mainFunImgs[3]}}" mode="widthFix"></image>
+                        <view class="top-icon-text">{{item.title}}</view>
+                    </view>
                 </view>
-            </view>
-            </view>
-        </view>
-        <!-- ai避高峰 -->
-        <view style="display: flex;margin-top: 30rpx;justify-content: space-between;">
-            <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
-            <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
-            <image src="{{indexSeason.ai}}" mode=""/>
-            </view>
-            <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
-            <image src="{{indexSeason.avoid}}" mode=""/>
+            </scroll-view>
+            <view class="scroll-line">
+                <view class="scroll-line-bg" wx:if="{{scrollLeft <= 5}}" style="width:37rpx;"></view>
+                <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
             </view>
         </view>
+        
+    </view>
+    
+    <view class="content">
 
-        <!-- 小banner 五一修改 一张banner不滚动 -->
-        <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
-            <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%;height: 100%;" src="{{xiaobanner[0].head_img}}" mode="aspectFill"></image>
-        </view>
-        <view class="small-swiper-box" wx:else>
-            <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
+        <view class="small-swiper-box" >
+            <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+            bindchange="changeBannerIndex" data-keyname="smBannerIndex">
             <block wx:for="{{xiaobanner}}" wx:key="index">
                 <swiper-item bindtap="bannerClick" data-item="{{item}}">
                 <!-- 原 圆角77rpx，现改为13rpx -->
@@ -148,92 +62,94 @@
                 </swiper-item>
             </block>
             </swiper>
-            <view class="dot-list com-flex sm-dot-list">
-            <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
-            </view>
+            <!-- <view class="dot-list com-flex sm-dot-list">
+                <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
+            </view> -->
         </view>
-    
+
         <!-- 限时特惠--新版-->
-        <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{false}}">
+        <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" >
             <!-- 上方标题部分 -->
             <view class="xsth-title">
-            <view class="xsth-left" style="display: flex;">
-                <image mode="heightFix" style="height:100rpx" src="{{indexSeason.xpth}}"></image>
-            </view>
-            <view class="time-box" style="z-index: 2;flex-shrink: 0;">
-                倒计时
-                <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
-                <text>:</text>
-                <view class="xsth-time">{{djs.m}}</view>
-                <text>:</text>
-                <view class="xsth-time">{{djs.s}}</view>
-            </view>
-
+                <view class="xsth-left" style="display: flex;">
+                    <image mode="heightFix" style="height:100rpx" src="{{indexSeason.xpth}}"></image>
+                </view>
             </view>
             <!-- 商品部分 -->
             <view class="xpth-product">
-            <!-- 左边的2个产品 -->
-            <view class="xpth-left">
-                <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
-                <image src="{{item.headimg}}" mode="" />
-                <view class="xpth-item-content">
-                    <view class="xpth-item-title textOver2">{{item.title}}</view>
-                    <!-- <view class="xpth-tag">唇齿留香</view> -->
-                    <view class="xpth-item-bottom">
-                    <view class="xpth-item-price">{{item.price/100}}</view>
-                    <!-- <view class="xpth-item-buy">立即抢购</view> -->
+                <!-- 左边的2个产品 -->
+                <view class="xpth-left">
+                    <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
+                    <image src="{{item.headimg}}" mode="" />
+                    <view class="xpth-item-content">
+                        <view class="xpth-item-title textOver2">{{item.title}}</view>
+                        <view class="xpth-item-bottom">
+                        <view class="xpth-item-price">{{item.price/100}}</view>
+                        </view>
+                    </view>
                     </view>
                 </view>
+                <!-- 右边的banner -->
+                <view class="xpth-banner" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
+                    <swiper class="xpth-banner-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+                    bindchange="changeBannerIndex" data-keyname="XPathBannerIndex">
+                    <block wx:for="{{xpth.adv}}" wx:key="index">
+                        <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                        <image style="border-radius:13rpx" src="{{item.head_img}}"></image>
+                        </swiper-item>
+                    </block>
+                    </swiper>
+                    <view class="xpth-banner-dot-list">
+                        <view class="dot{{XPathBannerIndex==index?' active':''}}" wx:for="{{xpth.adv}}" wx:key="index"></view>
+                    </view>
                 </view>
             </view>
-            <!-- 右边的banner -->
-            <view class="xpth-banner" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
-                <swiper class="xpth-banner-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeXPathBannerIndex">
-                <block wx:for="{{xpth.adv}}" wx:key="index">
-                    <swiper-item bindtap="bannerClick" data-item="{{item}}">
-                    <image style="border-radius:13rpx" src="{{item.head_img}}"></image>
-                    </swiper-item>
-                </block>
-                </swiper>
-                <view class="xpth-banner-dot-list">
-                    <view class="dot{{XPathBannerIndex==index?' active':''}}" wx:for="{{xpth.adv}}" wx:key="index"></view>
-                </view>
-            </view>
-            <!-- <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" /> -->
-            </view>
         </view>
 
-        <!-- 热门推荐-->
-        <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
-            <!-- 上方标题部分 -->
-            <view class="xsth-title">
-            <view class="xsth-left" style="display: flex;">
-                <image mode="heightFix" style="height:100rpx" src="{{indexSeason.xpth}}"></image>
-            </view>
-            <view class="time-box" style="z-index: 2;flex-shrink: 0;"></view>
-
-            </view>
-            <!-- 商品部分 -->
-            <view class="xpth-product" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
-            <!-- 左边的2个产品 -->
-            <view class="xpth-left" >
-                <view class="xpth-item"  bindtap="bannerClick" data-item="{{xpth.adv[0]}}" style="background: none;">
-                    <image src="{{xpth.adv[0].head_img}}" mode="" style="width: 100%;border-radius: 0;object-fit: unset;"/>
-                </view>
-                <view class="xpth-item"  bindtap="bannerClick" data-item="{{xpth.adv[1]}}"  style="background: none;">
-                    <image src="{{xpth.adv[1].head_img}}" mode="" style="width: 100%;border-radius: 0;object-fit: unset"/>
+        <!-- 公共服务 -->
+        <view class="sale-road-boxes" style="margin-top:0;">
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.ggfw}}"></image>
+            <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
+                <view style="height: 40rpx;line-height: 40rpx;">更多</view>
+                <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20241225/a59cd4103d0ba9a9de7498304bf24544.png" mode="" />
+            </navigator>
+        </view>
+        <view>
+            <!-- 元旦修改 ggfw为新增类名 -->
+            <view class="ggfw-list" style="width:100%;margin-top: 43rpx;">
+                <view class="ggfw" wx:for="{{publicSerivce}}" wx:key="index" data-item="{{item}}" bindtap="mainIconClick">
+                    <image src="{{imageSourceList.GGFW[2]}}"></image>
                 </view>
             </view>
-            <!-- 右边的banner -->
-            <view class="xpth-banner" style="background: none;" >
-                <view class="xpth-banner-swiper"  bindtap="bannerClick" data-item="{{xpth.adv[2]}}"  style="border-radius: 0">
-                    <image src="{{xpth.adv[2].head_img}}" style="border-radius: 0;object-fit: unset"></image>
-                </view>
+        </view>
+
+        <!-- 旅游助手 -->
+        <view class="sale-road-boxes" style="margin-top:0">
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.lyzs}}"></image>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 100rpx;"/>
+        </view>
+        <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
+            <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" 
+            src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image> -->
+            <image class="new-pic" bindtap="gotoPath"  data-path="/subPackageCheckPoint/pages/index/index"
+            src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" 
+            src="{{imageSourceList.LVZS[1]}}" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="audioGuide" data-event="voice_click" 
+            src="{{imageSourceList.LVZS[2]}}" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" 
+            src="{{imageSourceList.LVZS[3]}}" mode="aspectFill"></image>
+        </view>
 
+        <!-- ai避高峰 -->
+        <!-- <view style="display: flex;margin-top: 30rpx;justify-content: space-between;">
+            <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
+                <image src="{{indexSeason.ai}}" mode=""/>
             </view>
-            <!-- <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" /> -->
+            <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
+                <image src="{{indexSeason.avoid}}" mode=""/>
             </view>
-        </view>
+        </view> -->
 
 
         <!-- 数字文旅-->
@@ -307,63 +223,6 @@
             </view>
         </view>
 
-        <!-- 旅游助手 -->
-        <view class="sale-road-boxes" style="margin-top:0">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.lyzs}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 100rpx;"/>
-        </view>
-        <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-            <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" 
-            src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image> -->
-            <image class="new-pic" bindtap="gotoPath"  data-path="/subPackageCheckPoint/pages/index/index"
-            src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image>
-            <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" 
-            src="{{imageSourceList.LVZS[1]}}" mode="aspectFill"></image>
-            <image class="new-pic" bindtap="audioGuide" data-event="voice_click" 
-            src="{{imageSourceList.LVZS[2]}}" mode="aspectFill"></image>
-            <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" 
-            src="{{imageSourceList.LVZS[3]}}" mode="aspectFill"></image>
-        </view>
-
-        <!-- 公共服务 -->
-        <view class="sale-road-boxes" style="margin-top:0;">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.ggfw}}"></image>
-            <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
-                <view style="height: 40rpx;line-height: 40rpx;">更多</view>
-                <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20241225/a59cd4103d0ba9a9de7498304bf24544.png" mode="" />
-            </navigator>
-            
-        </view>
-        <view style="overflow-x:auto">
-            <!-- 元旦修改 ggfw为新增类名 -->
-            <view class="pbservice ggfw-list" style="width:100%;margin-top: 43rpx;">
-                <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
-                    data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" >
-                <image src="{{imageSourceList.GGFW[0]}}" mode="widthFix"></image>
-                <view>高峰预警</view>
-                </view>
-                <view bindtap="gotoUrl" data-event="xlqc"
-                data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-                <image src="{{imageSourceList.GGFW[1]}}" mode="widthFix"></image>
-                <view>实时路况</view>
-                </view>
-                <view bindtap="xlzs"  class="pbservice-item ggfw" >
-                <image src="{{imageSourceList.GGFW[2]}}" mode="widthFix"></image>
-                <view>行李直送</view>
-                </view>
-                <view bindtap="gotoUrl" data-event="xlqc"
-                data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-                <image src="{{imageSourceList.GGFW[3]}}" mode="widthFix"></image>
-                <view>行李寄存</view>
-                </view>
-                <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
-                    data-path="/pages/pbService/bike/index?type=1">
-                    <image src="{{imageSourceList.GGFW[4]}}" mode="widthFix"></image>
-                    <view>找厕所</view>
-                </view>
-            </view>
-        </view>
-
         <!-- 十全十美 -->
         <view class="sale-road-boxes">
             <image mode="heightFix" style="height:100rpx" src="{{indexSeason.sqj}}"></image>
@@ -447,56 +306,7 @@
         <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view>
     </view>
 
-    <view class="mask prizeMask" wx:if="{{videoPrize}}">
-    <view class="mask-bg"></view>
-    <view class="mask-content" style="width:100%;display:flex;flex-direction:column;background:none;border-radius:0;align-items:center">
-        <!-- 中奖的卡券 -->
-        <view style="position:relative" wx:if="{{prizeInfo && prizeInfo.type=='coupon'}}">
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
-        <view class="prize-name">{{prizeInfo.prize_name}}</view>
-        <view class="prize-img">
-            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-        </view>
-        <!-- <view class="btn-box">
-            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-            <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
-        </view> -->
-        </view>
-        <!-- 中奖的产品 -->
-        <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='product'}}">
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
-        <view class="prize-name">{{prizeInfo.prize_name}}</view>
-        <view class="prize-img">
-            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-        </view>
-        <!-- <view class="btn-box">
-            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-            <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
-        </view> -->
-        </view>
-        <!-- 未中奖 -->
-        <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='none'}}">
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/sorrytext.png" mode="widthFix" class="prize-tip-text"></image>
-        <view class="prize-name">您与奖品擦肩而过期待下次参与</view>
-        <view class="prize-img">
-            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-        </view>
-        <view class="btn-box">
-            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-            <view bindtap="closePrice">我知道了</view>
-        </view>
-        </view>
-        <!-- 未抽奖状态 -->
-        <view style="position:relative" wx:else>
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allbg.png" mode="widthFix"></image>
-        <view class="nomore-tip-btn" bindtap="noMoreTip"></view>
-        </view>
-        <image bindtap="closePrice" style="width:80rpx;margin-top:40rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allclose.png" mode="widthFix"></image>
-    </view>
-    </view>
+
     <!-- 广告弹窗 -->
     <view class="zzc" bindtap="closeAdv" wx:if="{{showAdv}}"></view>
     <view class="alertavd" wx:if="{{showAdv}}">
@@ -528,15 +338,7 @@
         <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
     </view>
     </view>
-    <!-- <view class="topBox">
-        <view class="Qtop" :style="{height:height}">
-        <image style="width: 100%;height:{{height}}" src="{{startList.head_img}}" mode=""/>
-        </view>
-        <view class="jumpBox">
-        <view class="time">{{time}}s</view>
-        <view bind:tap="gotoIndex">跳过</view>
-        </view>
-    </view> -->
+
 </view>
 
 <view wx:else>
diff --git a/subPackages/index/index.wxss b/subPackages/index/index.wxss
index 7b46194..78713d2 100644
--- a/subPackages/index/index.wxss
+++ b/subPackages/index/index.wxss
@@ -1,31 +1,22 @@
 /**index.wxss**/
 /* 元旦修改 */
 page {
-  /* background: #9DDCF5; */
   padding-bottom: 36.67rpx;
-  
-  /* background-image: url('https://static.ticket.sz-trip.com/uploads/20241225/79918a9171dcf85365935419e4717519.jpg');
-  background-repeat: repeat-y;
-  background-size: 100% 100%; */
-  background: #F3FBFB;
 }
 .swiper,.swiper image {
-  width: 697rpx;
+  width: 100%;
   display: block;
-  height: 335rpx;
-  border-radius: 27rpx;
-}
-.swiper {
-  margin: 0 auto;
+  height: 600rpx;
 }
+
 .top-box {
   display: flex;
   padding: 10rpx 0;
   align-items: center;
-  margin: 0 30rpx;
   justify-content: flex-start;
-  position: relative;
-  z-index: 1;
+  position: absolute;
+  left: 30rpx;
+  z-index: 2;
 }
 .top-box image {
   flex-shrink: 0;
@@ -57,35 +48,35 @@ page {
   margin-right: 20rpx;
   /* color: #72674E; */
 }
-.top-box .weather-num,.top-box .weather {
-  flex-shrink: 0;
-  color: #333;
-  /* color: #72674E; */
+
+.banner-main{
+    position: absolute;
+    z-index: 3;
+    width: 100%;
+    left: 0;
+    bottom: 20rpx;
+    right: 0;
+    display: flex;
+    justify-content: space-between;
+    padding: 0 30rpx;
+    box-sizing: border-box;
 }
-.top-box .weather-num {
-  font-size: 29rpx;
-  margin-bottom: 10rpx;
-  margin-left: 4rpx;
+.banner-main image{
+    width: 150rpx;
+    height: 100rpx;
 }
-.top-box .weather {
-  font-size: 19rpx;
-  margin-top: 20rpx;
-  margin-left: -4rpx;
-  margin-right: 30rpx;
+
+.main-content{
+    background: white;
+    margin-top: -10rpx;
+    border-radius: 20rpx;
+    position: relative;
+    z-index: 4;
 }
+
 .top-icons {
-  border-radius: 0 0 27rpx 27rpx;
-  width: 697rpx;
-  margin: 0 auto;
-  position: relative;
-  z-index: 0;
   display: flex;
-  padding: 34rpx 0;
-  padding-bottom: 29.33rpx;
-  justify-content: space-between;
-  flex-wrap: wrap;
-  margin-top: -50rpx;
-  padding-top: 84rpx;
+  padding: 20rpx;
 }
 .top-icon-item {
   margin-bottom: 20rpx;
@@ -812,40 +803,8 @@ page {
   position: relative;
   flex-direction: column;
 }
-/* 元旦修改新增样式 */
-.time-box {
-  font-size: 27rpx;
-  font-family: DIN;
-  font-weight: 500;
-  /* color: #54504D; */
-  color: #000000;
-  display: flex;
-  align-items: center;
-  height: 37px;
-  margin-left: -50rpx;
-  z-index: 9;
-  flex-wrap: nowrap;
 
-  position: relative;
-  left: -150rpx;
-}
-/* 元旦修改新增样式 */
-.xsth-time {
-  /* width: 43rpx; */
-  height: 43rpx;
-  padding: 0 7rpx;
-  line-height: 43rpx;
-  border-radius: 13rpx;
-  font-size: 27rpx;
-  font-family: DIN;
-  font-weight: 500;
-  color: #D62828;
-  text-align: center;
-}
-.time-box text {
-  width: 18rpx;
-  text-align: center;
-}
+
 /* 元旦修改新增样式 */
 .xpth-left {
   width: 393rpx;
@@ -1030,19 +989,19 @@ page {
 }
 
 .ggfw-list {
-  justify-content: space-around !important;
-}
-.ggfw-list .pbservice-item{
-    margin-right: 0;
-    color: #111111;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
 }
-.ggfw {
-  width: auto;
+
+.ggfw-list .ggfw {
+  width: 30%;
+  height: 70rpx;
+  margin-bottom: 20rpx;
 }
 .ggfw image{
-  margin-bottom: 16.67rpx;
-  width: 93rpx !important;
-  height: 93rpx !important;
+  width: 100%;
+  height: 100%;
 }
 
 .six-box-new {
diff --git a/utils/https.js b/utils/https.js
index fd37f47..67031b4 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -172,7 +172,7 @@ function user_post_new(url, data = {}, type) {
   return new Promise((resolved, rejected) => {
     // 判断是否登录
     // 没有登录就跳转到登录页面
-    if (!token || !userId) {
+    if (!token) {
       wx.hideLoading();
       // 去登陆
       console.log("去登陆去登陆去登陆去登陆去登陆去登陆去登陆")
@@ -330,10 +330,8 @@ const checkLogin = () => {
         appData = getApp()
     }
     console.log(appData,page)
-    if(appData.globalData.configJson.isTest) {
-        
-            return
-        
+    if(appData.globalData.configJson&&appData.globalData.configJson.isTest) {
+        return
     }