From bd6bdc98e4e82aa850c88221f58765549295f188 Mon Sep 17 00:00:00 2001 From: jiazhipeng Date: Mon, 20 Jan 2025 15:00:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=A5=E5=AD=A3=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 2 +- app.json | 16 +- images/aindex.png | Bin 0 -> 4169 bytes images/aindex_seld.png | Bin 0 -> 5008 bytes images/amap.png | Bin 0 -> 5939 bytes images/amap_seld.png | Bin 0 -> 7571 bytes images/auser.png | Bin 0 -> 4396 bytes images/auser_seld.png | Bin 0 -> 5503 bytes pages/index/index.js | 887 ++++++++++++++++----------- pages/index/index.wxml | 1022 ++++++++++++-------------------- pages/index/index.wxss | 629 +++++++++++++++----- pages/order/pay/index.js | 2 +- subPackages/indexGQ/index.js | 15 +- subPackages/indexGQ/index.wxml | 10 +- subPackages/indexGQ/index.wxss | 14 +- 15 files changed, 1431 insertions(+), 1166 deletions(-) create mode 100644 images/aindex.png create mode 100644 images/aindex_seld.png create mode 100644 images/amap.png create mode 100644 images/amap_seld.png create mode 100644 images/auser.png create mode 100644 images/auser_seld.png diff --git a/app.js b/app.js index 8aa3646..170af3f 100644 --- a/app.js +++ b/app.js @@ -21,7 +21,7 @@ App({ unique_key: "wechatxcx" }).then(res => { let data = JSON.parse(res.data); - data.isTest = data.isTest156? true : false; + data.isTest = data.isTest? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/app.json b/app.json index 9b8bc0d..44e570e 100644 --- a/app.json +++ b/app.json @@ -230,27 +230,27 @@ "style": "v2", "sitemapLocation": "sitemap.json", "tabBar": { - "color": "#97D0EC", - "selectedColor": "#5184B0", + "color": "#999999", + "selectedColor": "#FF4848", "borderStyle": "white", "list": [ { "pagePath": "pages/index/index", - "iconPath": "/images/home.png", - "selectedIconPath": "/images/index_seld_2.png", + "iconPath": "/images/aindex.png", + "selectedIconPath": "/images/aindex_seld.png", "text": "首页", "shareTimeline": true }, { "pagePath": "pages/map/index", - "iconPath": "/images/map.png", - "selectedIconPath": "/images/map_seld_2.png", + "iconPath": "/images/amap.png", + "selectedIconPath": "/images/amap_seld.png", "text": "图游" }, { "pagePath": "pages/user/user", - "iconPath": "/images/user.png", - "selectedIconPath": "/images/user_seld_2.png", + "iconPath": "/images/auser.png", + "selectedIconPath": "/images/auser_seld.png", "text": "我的" } ] diff --git a/images/aindex.png b/images/aindex.png new file mode 100644 index 0000000000000000000000000000000000000000..456edd2b0072c2de8b08ac572193a603d2871999 GIT binary patch literal 4169 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 TMfRBO00000NkvXXu0mjfTi6uK literal 0 HcmV?d00001 diff --git a/images/aindex_seld.png b/images/aindex_seld.png new file mode 100644 index 0000000000000000000000000000000000000000..7e422ec27ecec4c4ff106004849d6e407cf7f51f GIT binary patch literal 5008 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 V`{F6RXGj15002ovPDHLkV1k0aYu5k( literal 0 HcmV?d00001 diff --git a/images/amap_seld.png b/images/amap_seld.png new file mode 100644 index 0000000000000000000000000000000000000000..d4af3f5a74a1633829299f46c26029daa1500e59 GIT binary patch literal 7571 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 { - if(res.data && res.data.id && res.data.token) { - https.set_logininfo(res); - } - }) - } this.getHeight() //全屏广告 wx.hideTabBar() //这里隐藏了底部导航栏 @@ -100,9 +151,11 @@ Page({ let length = res.data.length if (res.data.length > 1) { let num = Math.floor(Math.random() * length); + console.log('num', num); this.setData({ startList: res.data[num] }) + console.log(this.data.startList.head_img); } else { this.setData({ startList: res.data[0] @@ -145,7 +198,21 @@ Page({ }) if (options.from) { app.globalData.from = options.from; - } + } + // 获取今天的日期 + let today = new Date(); + this.setData({ + month: (this.data.months[today.getMonth()]).toUpperCase(), + date: today.getDate() + }) + let d = new Date(); + let month = d.getMonth() + 1, + day = d.getDate(); + month = month > 10 ? month : ("0" + month); + day = day > 10 ? day : ("0" + day); + this.setData({ + today: d.getFullYear() + "-" + month + "-" + day + }) let systemInfo = wx.getSystemInfoSync(), rect = wx.getMenuButtonBoundingClientRect(); let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height; @@ -156,10 +223,12 @@ Page({ lat: res.latitude, lon: res.longitude }) - this.getList() + this.getList() + this.getHdrlList() }, fail: (err) => { - this.getList() + this.getList() + this.getHdrlList() } }) this.setData({ @@ -178,99 +247,258 @@ Page({ }) this.getTwoProduct() this.getBanner() - this.getWeather() - // 获取今天的日期 - let today = new Date(); - this.setData({ - month: (this.data.months[today.getMonth()]).toUpperCase(), - date: today.getDate() + this.getWeather() + }, + gobdDetail(e) { + let item = e.currentTarget.dataset.item + // wx.navigateTo({ + // url: url + // }) + util.gotoDetail(item) + }, + getList() { + let bdList = this.data.bdList + // 游--景点 + commonApi._post("scene/get_scene_by_tag",{ + tag_id:"4", + limit:6, + lon:this.data.lon, + lat:this.data.lat, + offset:0, + sort:"weight", + title:'', + area_id:'' + }).then(res=>{ + console.log('景点', res) + res.data.list.map(item => { + if (item.distance || item.distance == 0) { + if (item.distance >= 1000) { + item.distance = (item.distance / 1000).toFixed(2) + 'km'; + } else { + item.distance = (item.distance).toFixed(2) + 'm'; + } + } + }) + bdList[0].list = res.data.list + this.setData({ + list1:res.data.list, + bdList: bdList + }) + }) + // 非买不可--文创 + commonApi._post('product/get_product_by_tag',{ + product_model: 'post', + offset: 0, + limit: 6, + }).then(res=>{ + bdList[3].list = res.data.list + this.setData({ + list4:res.data.list, + bdList: bdList + }) + }) + // 非游不可--线路一日游 + commonApi._post('product/get_product_by_tag',{ + // type_id: 23, + tag_id: "10,11,12", + offset: 0, + limit: 6, + sort: 'weight' + }).then(res=>{ + bdList[1].list = res.data.list + this.setData({ + list2:res.data.list, + bdList: bdList + }) + }) + // 非看不可--剧场演出 + commonApi._post("product/get_product_by_tag",{ + tag_id:"6", + offset:0, + limit:6, + sort:'', + order:'', + lat:this.data.lat, + lon:this.data.lon, + title:'' + }).then(res=>{ + bdList[2].list = res.data.list + this.setData({ + list3:res.data.list, + bdList: bdList + }) + }) + }, + goDetail(e) { + let item = e.currentTarget.dataset.item; + let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type + if (type == 'movie') { + wx.navigateTo({ + url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + }) + }else { + wx.navigateTo({ + url: '/pages/info/activityInfo/index?id=' + item.id, + }) + } + }, + // 分类为电影时调这个接口 + getMovieList() { + let service = "Cinema/getHotMovieList"; + let data = { + page: 1, + pageSize: 5 + }; + commonApi._post(service, data).then(res => { + console.log(res.data); + this.setData({ + hdrlList: res.data + }) + }) + console.log(this.data.hdrlList); + }, + // 推荐榜单更多跳转 + moreBtn(e) { + let item = e.currentTarget.dataset.item + if (item.path!='') { + wx.navigateTo({ + url: item.path, + }) + } else { + // if (e.currentTarget.dataset.event) { + // this.pagePoint({ + // event: e.currentTarget.dataset.event + // }, 1) + // } + let url = item.url; + app.globalData.weburl = url; + wx.navigateTo({ + url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url), + }) + } + }, + // 活动日历下的列表 + getHdrlList() { + commonApi._post('pbservice/Actcalendar/getActList', { + page_no: 1, + date: this.data.today, + category: this.data.hdrlNavList[this.data.hdrlNavIndex].type, + keywords: '', + area_key: '', + lat: this.data.lat, + lon: this.data.lon, + page_num: 5 + }).then(res => { + res.data.rows.forEach(v=>{ + if (!v.post_url) { + v.post_url = "https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" + } }) - // 调用接口如果token过期会导致一进入就要登陆 - // this.getVideoPrize() - this.getXpthList() - }, + this.setData({ + hdrlList:res.data.rows + }) + }) + }, + // 切换活动日历分类 + changeHdrlNav(e) { + console.log(e.currentTarget.dataset); + this.setData({ + hdrlList:[], + hdrlNavIndex:e.currentTarget.dataset.index, + }) + if (this.data.hdrlNavIndex == 4) { + this.getMovieList() + } else { + this.getHdrlList() //切换分类重新获取活动日历列表 + } + }, + // 游苏州下的公共服务和旅游助手切换 + changeType(e) { + this.setData({ + yszIndex:e.currentTarget.dataset.index, + }) + }, + xlzs: function (e) { + + wx.navigateToMiniProgram({ + appId: 'wx757dd1ee184e75e9', + page: "pages/tabBar/index/index" + }) + }, + // 获取导航栏项目标题高度 getHeight() { let that = this wx.getSystemInfo({ success(res) { + console.log(res) that.setData({ viewHeight: res.windowHeight + 'px' }) + console.log(that.data.viewHeight) } }) }, - 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) - } - }) - }, + // getXpthList: function() { + // // 元旦新增 新品特惠 + // commonApi._post("product/get_product_indulgence", { + // tag_id: 275, + // typeId: 3, + // }).then(res => { + // console.log('data', res.data); + // 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 - } - }) - 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) - }, + // 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 + // } + // }) + // 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 + activeBannerIndex: e.detail.current }) - }, + }, + // 小轮播监听方法 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({ @@ -348,14 +576,10 @@ Page({ 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 + otherPlat: app.globalData.configJson.otherPlats, + indexSeason: app.globalData.configJson.indexSeason }) - this.getFourProduct() - console.log(this.data) + this.getFourProduct() }, //关闭弹窗广告 closeAdv: function() { @@ -401,6 +625,7 @@ Page({ }, getWeather: function() { commonApi._post('pbservice/Ztfw/getWeather').then(res => { + console.log(res) this.setData({ weather: res.data }) @@ -498,6 +723,7 @@ Page({ util.gotoDetail(item) }, gotoPath: function(e) { + console.log(e) // if (e.currentTarget.dataset.event) { // if (e.currentTarget.dataset.event=='gongyeyuanqu_click') { // wx.navigateToMiniProgram({ @@ -523,19 +749,13 @@ 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读书') { + } else if (e.currentTarget.dataset.event == 'wuzhong_click') { wx.navigateToMiniProgram({ - appId: 'wx26e6f4c0baba005b', + appId: 'wxdd39069b9a91dbfe', path: 'pages/index/index' }) return; - }else if (e.currentTarget.dataset.event == 'kunshan_click') { + } else if (e.currentTarget.dataset.event == 'kunshan_click') { wx.navigateToMiniProgram({ appId: 'wx8888a3fd0862b4c8', path: 'pages/index/index' @@ -581,14 +801,15 @@ Page({ }, // 元旦 新品特惠部分 goBanner: function(e) { + console.log('新品特惠', e.currentTarget.dataset.url); let url = e.currentTarget.dataset.url; - app.globalData.weburl = url; - console.log(url) + app.globalData.weburl = url; wx.navigateTo({ url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(url) }) }, gotoUrl: function(e) { + console.log(e) if (e.currentTarget.dataset.event) { this.pagePoint({ event: e.currentTarget.dataset.event @@ -600,8 +821,8 @@ Page({ // url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://m.cloud.sz-trip.com/Cloudperform2022'), url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url), }) - }, - // 实时路况跳转外链 + }, + // 实时路况跳转外链 gotoUrls() { // 判断是否登录 var token = wx.getStorageSync("jstrip_token"), userId = wx.getStorageSync("jstrip_userid"); @@ -641,6 +862,7 @@ Page({ }, gotoSku: function() { commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => { + console.log(res) app.globalData.weburl = res.data.url; wx.navigateTo({ url: '/pages/pbService/web/index' @@ -662,33 +884,33 @@ Page({ }) }, // 热门推荐 去掉经纬度 接口排序方式变更（韩阳） - getList: function() { - if (!this.data.listMore) return; - commonApi._post("search/recommend", { - offset: this.data.list.length, - limit: 16 - }).then(res => { - res.data.map(item => { - if (item.ext.display_tags) { - item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2) - } else { - item.ext.display_tags = [] - } - }) - if (res.data.length < 15) { - this.setData({ - listMore: false - }) - } - this.setData({ - list: this.data.list.concat(res.data) - }) - }) - }, + // getList: function() { + // if (!this.data.listMore) return; + // commonApi._post("search/recommend", { + // offset: this.data.list.length, + // limit: 16 + // }).then(res => { + // res.data.map(item => { + // if (item.ext.display_tags) { + // item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2) + // } else { + // item.ext.display_tags = [] + // } + // }) + // if (res.data.length < 15) { + // this.setData({ + // listMore: false + // }) + // } + // this.setData({ + // list: this.data.list.concat(res.data) + // }) + // }) + // }, onReachBottom: function() { - if (this.data.list.length < 30) { - this.getList() - } + // if (this.data.list.length < 30) { + // this.getList() + // } }, gotoDetail: function(e) { let item = e.currentTarget.dataset.item; @@ -739,6 +961,7 @@ Page({ if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) && item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) { // 外部h5 + console.log(111, item.tdata) app.globalData.weburl = item.tdata.url; wx.navigateTo({ url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata @@ -747,6 +970,7 @@ Page({ } else { let page = item.tdata.url.split("/"); page = page[page.length - 1].split("?") + console.log(page[0]) let url = this.data.urltopage[page[0]]; if (url && url.indexOf('map') != -1) { let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic', @@ -763,6 +987,7 @@ Page({ }) } else { app.globalData.weburl = item.tdata.url; + console.log(2222, item.tdata.url, app.globalData.weburl) wx.navigateTo({ url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item .tdata.url) @@ -805,6 +1030,7 @@ Page({ }, //博物馆跳转 直接跳君到苏州H5 goH5: function(e) { + console.log(e.currentTarget.dataset.path); let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path; // app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path; wx.navigateTo({ @@ -812,189 +1038,190 @@ 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), - }) - } - }, + // 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 - }) - }, + // // 获取短视频大赛是否中奖 中奖详情 + // 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 - if (item.tdata == '') return - that.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" - }) - } 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" - }) - } - } - 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 - }, + // 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 + // if (item.tdata == '') return + // that.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 + // console.log(item.tdata) + // app.globalData.weburl = item.tdata.url; + // wx.navigateTo({ + // url: "/pages/pbService/web/index" + // }) + // } else { + // let page = item.tdata.url.split("/"); + // page = page[page.length - 1].split("?") + // console.log(page[0]) + // 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" + // }) + // } + // } + // 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 + // }, onReady: function() { }, - gotoOther: function(e) { - let item = e.currentTarget.dataset.item; - if (item.type == 'h5') { - app.globalData.weburl = item.url - wx.navigateTo({ - url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url) - }) - } else if (item.type == 'mini') { - wx.navigateToMiniProgram({ - appId: item.appid, - path: item.path - }) - } else if (item.type == 'page') { - wx.navigateTo({ - url: item.page, - }) - } - }, + // gotoOther: function(e) { + // let item = e.currentTarget.dataset.item; + // if (item.type == 'h5') { + // app.globalData.weburl = item.url + // wx.navigateTo({ + // url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url) + // }) + // } else if (item.type == 'mini') { + // wx.navigateToMiniProgram({ + // appId: item.appid, + // path: item.path + // }) + // } else if (item.type == 'page') { + // wx.navigateTo({ + // url: item.page, + // }) + // } + // }, pagePoint: function(e, type) { util.pagePoint(e, type) }, onShow: function() { - if (app.globalData.loadIndexSeason) { this.getIndexSeason() } else { diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 3445f12..fc06ec0 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,691 +1,403 @@ - + - - - - - - - - {{weather.max_temp}}° - {{weather.weather}} - - - + + + + {{weather.max_temp}}° + {{weather.weather}} + + + + + + + 搜索想要的旅游产品或服务 + + + + + + + + + + + + + + + + + + + 更多 > + + {{nowDate[0]}} + 月 + {{nowDate[1]}} + 日 + + + + + {{item.title}} + + + + + + + + + + {{item.name}} + {{item.begin_date}}-{{item.end_date}} + + + + + + + + + + + + + + {{item.title}} + + 去购票 > + + + + - - - - - 搜索想要的旅游产品或服务 - + + + + + + + - - - + + + + + + + 景点门票 + + + + 夜游苏州 + + + + 文创特产 + + + + 剧场演出 + + + + 一日游 + + + + 场馆预约 + + + + + 一卡游 + + + + 非遗专卖 + + + + + + + + + + + + + - + - + - - + + + + + + + + + {{item}} + - - - - - - 活动日历 - - - - 场馆预约 - - - - 非遗专卖 - - - - - 剧场演出 - - - - 文创特产 - - - - 景点门票 - - - - 酒店住宿 - - - - - - 夜游苏州 - - - - 一日游 - - - - 研学游 - - - - - - 特惠新品超值商品限时抢购 - - - - - - - - 限时特惠 - 新品推荐 - - - ￥{{saleProduct.price?saleProduct.price/100:0}}起 - - - - - 精品线路带你轻松玩转苏州 - - - - - - - - 四季苏州 - 最是江南 - - - ￥{{roadProduct.price?roadProduct.price/100:0}}起 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 倒计时 - {{djs.h}} - : - {{djs.m}} - : - {{djs.s}} - - - - - - - - - - - {{item.title}} - - - {{item.price/100}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 数字非遗 - - - - 数字博物馆 - - - - 数字名人馆 - - - - 云上观展 - - - - 云上文博会 - - - - 精彩回顾 - - - - 文化场馆查询 - - - - 苏影通 - - - - 书仓 - - - - e读书 - - - - 数字公共文化 - - - - 云游苏州 - - - - 美图鉴赏 - - - - - - - - - - - - - - - - - - - - - - - - - - - - 更多 - - - - - - - - - - 高峰预警 - - - - 实时路况 - - - + + + 高峰预警 + + + + 实时路况 + + + 行李直送 - - - - 行李寄存 - - - - 找厕所 - - - - - - - - - - - + + + 行李寄存 - - - - - - - - - - {{item.name}} - + + + + 找厕所 - - - - - - - - - - - - - {{date}} {{month}} - - - {{item.ext.display_tags[0]}} - {{item.title}} - - - - - - {{item.ext.subtitle}} - - - {{item.title}} - - - - {{item.ext.like_number}} - - - - {{item.ext.view_number}} - - - - - - - - - - - {{item.title}} - - - ￥{{item.ext.price/100}}起 - - - - - - - 查看更多 - 暂无更多推荐 - - - - - - - - - - {{prizeInfo.prize_name}} - - - - - - - - - - {{prizeInfo.prize_name}} - - - - - - - - - - 您与奖品擦肩而过期待下次参与 - - - - - - 我知道了 - - - - - - - - + + + + + 查看更多 > + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + 更多 > - - - {{time}}s跳过 - - + + + {{index+1}} + + + + + {{item.title}} + + + {{item.price/100}} + + + + + - - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + 景点门票 + + + + 夜游苏州 + + + + + 剧场演出 + + + + + 场馆预约 + + + + + + + + + + + + + + + - + - + - - - - - - - - - - 活动日历 + + - - - - - 场馆预约 + + + + + + + {{item}} + - - - - - - - 剧场演出 - - - - - - - - 夜游苏州 - - - - - - - - - - - - - - - - - - - + + + + + + + + 电子社保卡 + + + + 高峰预警 + + + + 行李寄存 + + + + 实时路况 - - - - - + + + + + + 查看更多 > + - - - - - - - - 数字非遗 - - - - 数字博物馆 - - - - - 云上观展 - - - - 云上文博会 - - - - - 文化场馆查询 - - - - - 书仓 - - - - - - 数字公共文化 - - - - - - 云游苏州 - - - - 美图鉴赏 - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - + + + {{time}}s跳过 + + - \ No newline at end of file + + + + + + + + + + + + + + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index b543000..abaade5 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -1,12 +1,12 @@ -/**index.wxss**/ +/* pages/indexs/index.wxss */ /* 元旦修改 */ page { - /* background: #9DDCF5; */ + height: fit-content; 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: url("https://static.ticket.sz-trip.com/uploads/20250120/b42c1ac742bee3ddff35151ecd860f81.jpg"); + background-size: 100% auto; + /* background-repeat: round; */ + background-repeat: no-repeat; } .swiper,.swiper image { width: 697rpx; @@ -39,31 +39,19 @@ page { .search-box { flex: 1; width: 100%; - /* height: 64rpx; */ - /* background: rgba(255, 255, 255, 0.6); */ - /* border-radius: 32rpx; */ - /* color: #666; */ - /* height: 70.67rpx; */ height: 64rpx; - /* background: rgba(255,255,255,0.7); */ - border-radius: 0rpx; - /* color: #72674E; */ - color: #333333; - /* background-image: url("https://static.ticket.sz-trip.com//uploads/20240228/10b93c1389ef5dfc02d07c4091af8f2d.png"); - background-size: 100% 100%; */ + background: rgba(255,255,255,0.7); + border-radius: 32rpx; + color: #000; display: flex; align-items: center; font-size: 25rpx; - background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/510a67a1e78a9eb1aeb6e049348d4701.png"); - background-size: 100% 100%; - padding: 2rpx 5rpx; - box-sizing: border-box; } .search-box .iconfont { font-size: 30rpx; margin-left: 20rpx; - margin-right: 20rpx; - /* color: #72674E; */ + margin-right: 10rpx; + color: #000; } .top-box .weather-num,.top-box .weather { flex-shrink: 0; @@ -74,14 +62,18 @@ page { font-size: 29rpx; margin-bottom: 10rpx; margin-left: 4rpx; + color: white; } .top-box .weather { font-size: 19rpx; margin-top: 20rpx; margin-left: -4rpx; margin-right: 30rpx; + color: white; } .top-icons { + /* background: #FFFFFF; */ + /* box-shadow: 0px 3rpx 26rpx 0px rgba(6, 0, 1, 0.13); */ border-radius: 0 0 27rpx 27rpx; width: 697rpx; margin: 0 auto; @@ -89,11 +81,12 @@ page { z-index: 0; display: flex; padding: 34rpx 0; - padding-bottom: 29.33rpx; + padding-bottom: 7rpx; justify-content: space-between; flex-wrap: wrap; - margin-top: -50rpx; - padding-top: 84rpx; + background: #FFFED6; + margin-top: -20rpx; + padding-top: 54rpx; } .top-icon-item { margin-bottom: 20rpx; @@ -108,13 +101,14 @@ page { margin-right: 0; } .top-icon-item image { - width: 86rpx; + width: 113rpx; display: block; margin: 0 auto; margin-bottom: 10rpx; } .content { - margin: 0 25rpx; + /* margin: 0 25rpx; */ + margin-top: 20.67rpx; } .sale-road-boxes { display: flex; @@ -122,6 +116,7 @@ page { margin-top: 40rpx; position: relative; align-items: flex-end; + margin-bottom: 28rpx; } .sale-box { flex-shrink: 0; @@ -203,13 +198,11 @@ page { height: 154rpx; } .small-swiper-box { - margin: 50rpx 0; - width: 100%; + margin: 24rpx 26.67rpx 26.67rpx; + /* width: 100%; */ height: 154rpx; border-radius: 20rpx; - /* border-radius: 77rpx; */ overflow: hidden; - margin-top: 33rpx; position: relative; } .product-tags { @@ -317,54 +310,56 @@ page { } */ /* 元旦修改 以上两个样式为注释掉的 下面的.pic-list是新改的 */ .pic-list { - width: 100%; + /* width: 100%; display: flex; margin-right: 26rpx; display: flex; justify-content: space-between; - flex-wrap: wrap; + flex-wrap: wrap; */ + display: flex; + justify-content: space-between; + margin: 0 28rpx; } .title-more { - font-size: 27rpx; - font-weight: 500; - color: #29305A; + font-size: 24rpx; + /* color: #0B898E; */ + /* 元旦修改 */ + color: #54504D; z-index: 9; width: 173rpx; - height: 80rpx; + height: 40rpx; + line-height: 40rpx; + background: rgba(255, 255, 255, 0.5); border-radius: 20rpx; text-align: center; - display: flex; - align-items: center; - justify-content: center; } .title-more .iconfont { font-size: 22rpx; } .slide-out-box { - margin-top: 20rpx; + /* margin-top: 20rpx; + background: #FFFED6; + box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2); */ border-radius: 27rpx; padding-bottom: 1rpx; - margin-bottom: 40rpx; + /* margin-bottom: 40rpx; */ } .pbservice { - /* width: calc(175rpx * 6); */ - /* 元旦修改 */ - width: calc(190rpx * 7); + width: calc(160rpx * 8); display: flex; - margin-top: 30rpx; - flex-wrap: wrap; - /* margin-bottom: 60rpx; */ - /* 元旦修改 注释margin-bottom */ + margin-top: 5rpx; + /* flex-wrap: wrap; */ + flex-wrap: nowrap; + /* padding-left: 12rpx; */ + /* overflow-x: scroll; */ } .pbservice-item { - /* 元旦修改 截止到注释的width*/ - width: 120rpx; - margin-bottom: 33.33rpx; - margin-right: 62.33rpx; - /* width: 175rpx; */ + width: 106rpx; + margin-bottom: 25rpx; + margin-right: 32.33rpx; text-align: center; - font-size: 25rpx; - color: #111111; + font-size: 27rpx; + color: #000; line-height: 24rpx; display: flex; align-items: center; @@ -379,7 +374,7 @@ page { margin-bottom: 20rpx; margin-top: 50rpx; */ /* 元旦修改 以上都是之前的*/ - width: 106rpx; + width: 80rpx; margin-bottom: 10rpx; } .six-box { @@ -540,36 +535,47 @@ page { } .more-btn-text { text-align: center; + /* color: #0b898e; + font-size: 27rpx; + width: 200rpx; + line-height: 65rpx; + border: 1px solid #0b898e; + border-radius: 33rpx; */ margin: 20rpx auto; width: 200rpx; height: 67rpx; line-height: 67rpx; - border: 1px solid #5184B0; + border: 1px solid #111; + border-radius: 35rpx; font-size: 27rpx; font-family: PingFang SC; font-weight: 500; - color: #5184B0; } .scroll-line { - - width: 73rpx !important; - height: 7rpx; - /* background: #DDCEAC; */ - background: #97D0EC; + /* height: 6rpx; border-radius: 3rpx; - margin: 33.33rpx auto; + background: #ccc; + overflow: hidden; + margin: 30rpx auto; */ + /* 元旦修改 以上为注释部分 下面为新内容*/ + width: 48rpx !important; + height: 8rpx; + /* background: #DDCEAC; */ + background: #fff; + border-radius: 4rpx; + margin: 15rpx auto 10rpx; } .scroll-line-bg { - height: 7rpx; - background: #5184B0; - border-radius: 3rpx; + height: 8rpx; + background: #FF4848; + border-radius: 4rpx; } /* 元旦修改 新增样式 */ .scroll-line-bg2 { - margin-left: 37.33rpx; - background: #5184B0; - height: 7rpx; - border-radius: 3rpx; + margin-left: 24rpx; + background: #FF4848; + height: 8rpx; + border-radius: 4rpx; } .nomore-tip-btn { position: absolute; @@ -675,20 +681,22 @@ page { color: #333333; line-height: 42rpx; flex-wrap: wrap; + background: #FFFED6; justify-content: space-around; height: 187rpx; + box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2); border-radius: 27rpx; align-items: center; } .other-plats image { - width: 106rpx; + width: 80rpx; display: block; - height: 106rpx; + height: 80rpx; margin-bottom: 15rpx; } .other-plat { /* 春节新增样式 */ - color: #111111; + color: #54504D; } .other-plat:nth-child(4n){ margin-right: 0; @@ -822,7 +830,7 @@ page { } /* 元旦修改新增样式 */ .time-box { - font-size: 27rpx; + font-size: 25rpx; font-family: DIN; font-weight: 500; /* color: #54504D; */ @@ -833,22 +841,26 @@ page { margin-left: -50rpx; z-index: 9; flex-wrap: nowrap; - - position: relative; - left: -150rpx; } /* 元旦修改新增样式 */ .xsth-time { - /* width: 43rpx; */ + /* margin: 0 5rpx; */ + /* width: 50rpx; */ + /* height: 33rpx; */ + width: 43rpx; height: 43rpx; - padding: 0 7rpx; line-height: 43rpx; + background: #4AB648; + /* background: #F9F1DB; */ + /* border-radius: 5rpx; */ border-radius: 13rpx; - font-size: 27rpx; + font-size: 25rpx; font-family: DIN; font-weight: 500; - color: #FF6A57; + /* color: #D62828; */ + color: white; text-align: center; + /* line-height: 33rpx; */ } .time-box text { width: 18rpx; @@ -894,67 +906,60 @@ page { } /* 元旦修改新增样式 */ .xpth-product { - width: 700rpx; + /* position: absolute; */ + width: 697rpx; height: 373rpx; + background: #FFFED6; + box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2); border-radius: 27rpx; - padding: 25rpx 13rpx; + padding: 25rpx 15rpx; box-sizing: border-box; + /* left: 0; + bottom: 15.33rpx; + /* width: 710rpx; */ display: flex; justify-content: space-between; } /* 元旦修改新增样式 */ .xpth-banner { + /* width: 270rpx; */ + /* height: 333rpx; */ + /* height: 340rpx; */ + /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png"); */ + /* background-size: 100% 100%; */ + border-radius: 20rpx; flex: 1; margin-left: 15rpx; - height: 322rpx; - width: 100%; - border-radius: 0rpx; - overflow: hidden; - position: relative; - background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/ba525775a8361dd502c88a4e46552483.png"); - background-size: 100% 100%; - padding: 3rpx; -} -.xpth-banner-swiper{ - height: 100%; - border-radius: 20rpx; - overflow: hidden; + /* padding: 4rpx; + background: #72674e; + clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */ + height: 319rpx; } .xpth-banner image { + /* width: 270rpx; */ flex: 1; - height: 100%; - width: 100%; + height: 319rpx; border-radius: 20rpx; -} -.xpth-banner-dot-list{ - position: absolute; - right: 0; - bottom: 10rpx; - padding: 10rpx; - display: flex; - align-items: center; - justify-content: flex-end; -} -.xpth-banner-dot-list .xpth-dot{ - width: 9rpx; - height: 9rpx; - background: #FFFFFF; - border-radius: 50%; - opacity: 0.6; - margin: 0 4rpx; -} -.xpth-banner-dot-list .xpth-dot.active{ - opacity: 1; + /* height: 333rpx; */ + /* height: 340rpx; */ + /* clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */ + /* border-radius: 20rpx; */ } /* 元旦修改新增样式 */ .xpth-item { + /* width: 413rpx; + height: 160rpx; */ + /* background: #FFFFFF; */ + /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png"); + background-size: 100% 100%; */ border-radius: 20rpx; height: 153rpx; + background: #FFFFFF; display: flex; margin-bottom: 13rpx; - background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/d469064b1bcf6c2f7cd59786e66fc249.png"); - background-size: 100% 100%; - padding: 1rpx; + /* margin-bottom: 10rpx; */ + /* clip-path: polygon(5% 0, 95% 0, 100% 10%, 100% 90%, 95% 100%, 5% 100%, 0 90%, 0 10%); */ + /* padding: 5rpx; */ } .xpth-item:last-child { margin-bottom: 0; @@ -984,7 +989,7 @@ page { } /* 元旦修改新增样式 */ .xpth-item-title { - width: 210rpx; + width: 230rpx; font-size: 27rpx; font-family: PingFang SC; font-weight: 500; @@ -1007,15 +1012,15 @@ page { } /* 元旦修改新增样式 */ .xpth-item-price { - font-size: 31rpx; + font-size: 32rpx; font-family: PingFang SC; - font-weight: bold; - color: #ED1C19; + font-weight: 500; + color: #D62828; } /* 元旦修改新增样式 */ .xpth-item-price::before { content: "￥"; - font-size: 23rpx; + font-size: 20rpx; } /* 元旦修改新增样式 */ .xpth-item-buy { @@ -1033,24 +1038,22 @@ page { /* 元旦修改新增样式 */ .new-pic { width: 160rpx !important; - height: 220rpx !important; - margin-bottom: 26.67rpx; + height: 255rpx !important; + /* margin-bottom: 26.67rpx; */ } -.ggfw-list { - justify-content: space-around !important; -} -.ggfw-list .pbservice-item{ - margin-right: 0; - color: #111111; +.ggfw-list{ + display: flex; + justify-content: space-around; } .ggfw { width: auto; + margin:0; } .ggfw image{ margin-bottom: 16.67rpx; - width: 93rpx !important; - height: 93rpx !important; + width: 113.33rpx !important; + height: 113.33rpx !important; } .six-box-new { @@ -1077,7 +1080,7 @@ page { } /* 春节金刚区字体颜色样式更换 */ .top-icon-text { - color: #111111; + color: #54504D; } .rmtj-right { @@ -1158,30 +1161,340 @@ page { left: 56.67rpx; bottom: 64rpx; } -.jqssd { - /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/20c06c5bf8d5e498667ebd954a1d95f8.png"); - background-size: 100% 100%; */ - width: 344.33rpx; - height: 160rpx; + +.right-more { + width: 120rpx; + height: 47rpx; + background: rgba(255,208,165,0.4); + border-radius: 23rpx; + font-weight: 500; + font-size: 27rpx; + color: #FFFFFF; + text-align: center; + line-height: 47rpx; +} + +.hdrlNavList { + display: flex; + margin: 28rpx 26.67rpx 10rpx; + overflow-x: scroll; + flex-wrap: nowrap; +} +.hdrlNav { flex-shrink: 0; + /* width: 160rpx; */ + padding: 0 20rpx; + height: 53rpx; + background: rgba(255,208,165,0.4); + border-radius: 13rpx; + /* border: 1px solid #FFFFFF; */ + min-width: 133rpx; + + font-size: 32rpx; + color: #FFFFFF; + text-align: center; + line-height: 53rpx; + margin-right: 14rpx; + box-sizing: border-box; } -.jqssd image, .sslk image{ - width: 100%; - height: 100%; +.hdrlNavActive { + background: linear-gradient(180deg, #FFECD9, #FFBD7A); + font-size: 32rpx; + color: #E6201C; + border: none; +} +.hdrlItem { + flex-shrink: 0; + padding: 26.67rpx 22rpx 26.67rpx 20rpx; + /* width: 593.33rpx; */ + display: flex; + background: url("https://static.ticket.sz-trip.com/uploads/20250117/8d7f5ce0ecafbc2f836342e4226ec364.png"); + background-size: 100% 100%; +} +.hdrlItem-img { + width: 240rpx; + height: 213rpx; + background: #8C8C8C; + border-radius: 13rpx; + flex-shrink: 0; + margin-right: 12rpx; + overflow: hidden; +} +.hdrlItem-content { + display: flex; + flex-direction: column; + justify-content: space-between; + height: 213rpx; +} +.hdrlItem-title { + font-weight: bold; + font-size: 28rpx; + color: #000000; + margin-top: 15.33rpx; +} +.hdrlItem-date { + font-weight: 500; + font-size: 23rpx; + color: #000000; + margin-bottom: 19.33rpx; +} + +.main-box { + background-image: url("https://static.ticket.sz-trip.com/uploads/20250117/98ca9dfa8253e50d624ce64d24295570.png"); + background-size: 100% 100%; + padding: 27.67rpx 20.67rpx 40rpx 20rpx; + margin: 0 8rpx; +} +.main-box-top { + display: flex; + margin-bottom: 5.33rpx; +} +.gfyj,.sslk { + width: 369.33rpx; + height: 146rpx; + flex-shrink: 0; } .sslk { - /* background: url("https://static.ticket.sz-trip.com/uploads/20240729/c1554fdd645a0d3a47c8e683186e1a73.png"); - background-size: 100% 100%; */ - width: 344rpx; - height: 160rpx; + margin-left: -48rpx; +} + +.movieItem { + padding: 26.67rpx 26rpx 26.67rpx 20rpx; + background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png"); + background-size: 100% 100%; + flex-shrink: 0; + height: 206.67rpx; +} +.movieItem-img { + width: 213rpx; + height: 213rpx; + border-radius: 18rpx; + margin-right: 18rpx; flex-shrink: 0; } +.ysz-box { + margin: 0 8rpx 15.33rpx; + background-image: url("https://static.ticket.sz-trip.com/uploads/20250117/8efd4c072b3c95fe7c31d1e7b79759d3.png"); + /* padding: 43.33rpx 59rpx 46.67rpx 58rpx; */ + background-size: 100% 100%; + width: 733.33rpx; + height: 320rpx; + padding-top: 33.33rpx; + position: relative; + z-index: 1; +} +.ysz-more { + width: 267rpx; + height: 53rpx; + background: #FFFFFF; + border-radius: 27rpx; + margin: 38rpx auto 0; + text-align: center; + line-height: 53rpx; + font-weight: 500; + font-size: 25rpx; + color: #FF4D48; +} +.ysz-box2 { + /* padding: 20rpx 35rpx; */ + padding-top: 23.33rpx; +} +.tjbd-title { + width: 286.67rpx; + height: 80rpx; +} + +.bd-box { + position: relative; + padding: 36rpx 30.67rpx 44.67rpx 28.67rpx; + margin-left: 26.67rpx; + width: 582rpx; + /* height: 1133rpx; */ + background: linear-gradient(-8deg, #F4F9FF, #B9E1F0); + box-shadow: 0rpx 7rpx 20rpx 0rpx rgba(27,128,97,0.56); + border-radius: 20rpx 80rpx 20rpx 20rpx; +} +.bd-top { + display: flex; + justify-content: space-between; + margin-bottom: 30rpx; + position: relative; +} +.zz { + width: 236.67rpx; + height: 206.67rpx; + position: absolute; + right: 0; + top: 0; + z-index: 2; +} +.bd-type { + width: 125.33rpx; + height: 38.67rpx; +} +.bd-more { + width: 120rpx; + height: 47rpx; + background: rgba(255,255,255,.7); + border-radius: 23rpx; + font-weight: 500; + font-size: 27rpx; + color: #F34017; + z-index: 9; + text-align: center; + line-height: 47rpx; +} +.bd-index { + font-weight: bold; + font-size: 40rpx; + color: #000000; +} +.bd-item { + margin-left: 45.33rpx; + width: 453rpx; + height: 147rpx; + background: #FFFFFF; + border-radius: 13rpx; + display: flex; +} +.bd-item-img { + width: 147rpx; + height: 147rpx; + background: #D9D9D9; + border-radius: 13rpx; + flex-shrink: 0; + margin-right: 12.67rpx; +} +.bd-item-content { + padding: 14rpx 29.33rpx 13.33rpx 0; + display: flex; + flex-direction: column; + justify-content: space-between; +} +.bd-item-title { + font-weight: bold; + font-size: 27rpx; + color: #333333; +} +.bd-item-bottom { + display: flex; + justify-content: space-between; + align-items: baseline; + width: 260rpx; +} +.bd-price { + font-size: 29.33rpx; + color: #F93434; + font-weight: bold; +} +.bd-price:after { + content:'起'; + color: #999999; + font-size: 23rpx; + font-weight: 700; +} +.bd-price::before { + content:'￥'; + font-size: 23rpx; +} +.bd-distance { + font-weight: 500; + font-size: 23rpx; + color: #999999; +} -.xsth-left{ - /* flex: 1; - width: 1rpx; */ +.buyMovie { + width: 160rpx; + height: 56rpx; + background: #FF4848; + color: #fff; + border-radius: 20rpx; + text-align: center; + line-height: 56rpx; +} + +.bg1 { + background: linear-gradient(-8deg, #F4F9FF, #B9E1F0); +} +.bg2 { + background: linear-gradient(-8deg, #F9FFE3, #F3FFC4); } -.xsth-left>image{ - max-width: 100%; - overflow: hidden; +.bg3 { + background: linear-gradient(180deg, #E0F7DC, #A0F292); +} +.bg4 { + background: linear-gradient(-8deg, #F6F2FF, #E3D9FF); +} + +.hdrlNavList::-webkit-scrollbar{ + display:none; +} +.hdrlList::-webkit-scrollbar{ + display:none; +} +.bottom-box::-webkit-scrollbar{ + display:none; +} +.slide-box::-webkit-scrollbar{ + display:none; +} +.pbservice::-webkit-scrollbar{ + display:none; +} +.textOver3 { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 3; + overflow: hidden; +} +.public-box { + width: 593.33rpx; + height: 266.67rpx; + background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png"); + background-size: 100% 100%; +} +.one::-webkit-scrollbar{ + display:none; +} + + +.date-container{ + position: relative; +} +.nowDate{ + display: flex; + position: absolute; + left: 228.77rpx; + bottom: 7.33rpx; +} + +.nowDate>view{ + + width: 44rpx; + height: 44rpx; + border-radius: 7rpx; + text-align: center; + line-height: 44rpx; + font-family: PingFang SC; + font-weight: 500; + font-size: 29rpx; + color: #FFFFFF; +} +.nowDate .num{ + background: #FFD0A5; + color: #111111; + + font-family: PingFang SC; + font-weight: bold; + font-size: 29rpx; + color: #111111; +} + +.ysz-right-img{ + width: 200.8rpx; + height: 207.33rpx; + position: absolute; + right: -26rpx; + top: 0; + z-index:1; } \ No newline at end of file diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js index 757300b..cf67b05 100644 --- a/pages/order/pay/index.js +++ b/pages/order/pay/index.js @@ -102,7 +102,7 @@ Page({ // 书券产品 - if(res.data.order_product_list[0].product_id == 75012 || res.data.order_product_list[0].product_id == 75013 || res.data.order_product_list[0].product_id == 420265|| res.data.order_product_list[0].product_id == 421929 || res.data.order_product_list[0].product_id == 437166){ + if(res.data.order_product_list[0].product_id == 75012 || res.data.order_product_list[0].product_id == 75013 || res.data.order_product_list[0].product_id == 420265|| res.data.order_product_list[0].product_id == 421929 || res.data.order_product_list[0].product_id == 437166 || res.data.order_product_list[0].product_id == 437248){ this.setData({ isBook:true, payIndex:1 diff --git a/subPackages/indexGQ/index.js b/subPackages/indexGQ/index.js index 446bbf6..e420bb4 100644 --- a/subPackages/indexGQ/index.js +++ b/subPackages/indexGQ/index.js @@ -98,7 +98,7 @@ Page({ bdList:[ { bg: 'linear-gradient(172deg, #FDFADC, #FCD6AA);', - icon:'https://static.ticket.sz-trip.com/uploads/20240923/15ee44a960511cdcf276b5d8df472626.png', //游 景点 + icon:'https://static.ticket.sz-trip.com/uploads/20250120/4b46ddaa6f9b66fd33c85b4cd34aa2e3.png', //游 景点 url:'', path:'/pages/list/scene/index', list: [], @@ -106,7 +106,7 @@ Page({ }, { bg: 'linear-gradient(172deg, #FFCBA3, #FF9166);', - icon:'https://static.ticket.sz-trip.com/uploads/20240923/cd652f4bcfcef7f55863bf8587609ca4.png', //非玩不可 景点产品 + icon:'https://static.ticket.sz-trip.com/uploads/20250120/218d224b27b6363e11a5e2ec25990ff2.png', //非玩不可 景点产品 path:'/pages/list/night/index', url:'', list: [], @@ -114,7 +114,7 @@ Page({ }, { bg: 'linear-gradient(172deg, #FDFADC, #FCD6AA);', - icon:'https://static.ticket.sz-trip.com/uploads/20240923/a0b95152b87215dccbb2e5dfa1bfd145.png', //非看不可 + icon:'https://static.ticket.sz-trip.com/uploads/20250120/b53c5039299b3152f72eae11a88b7eae.png', //非看不可 url:'', path:'/pages/list/theatre/index', list: [], @@ -122,7 +122,7 @@ Page({ }, { bg: 'linear-gradient(172deg, #FFCBA3, #FF9166);', - icon:'https://static.ticket.sz-trip.com/uploads/20240923/799befa78b1d474bfb26004cc2ef817d.png', //非买不可 + icon:'https://static.ticket.sz-trip.com/uploads/20250120/307d96f6b88be850eb5cd67ef7942f32.png', //非买不可 path:'/subPackages/techanNew/index', url:'', list: [], @@ -418,6 +418,13 @@ Page({ yszIndex:e.currentTarget.dataset.index, }) }, + xlzs: function (e) { + + wx.navigateToMiniProgram({ + appId: 'wx757dd1ee184e75e9', + page: "pages/tabBar/index/index" + }) + }, // 获取导航栏项目标题高度 getHeight() { let that = this diff --git a/subPackages/indexGQ/index.wxml b/subPackages/indexGQ/index.wxml index 66fa1ca..fc06ec0 100644 --- a/subPackages/indexGQ/index.wxml +++ b/subPackages/indexGQ/index.wxml @@ -1,16 +1,16 @@ - + {{weather.max_temp}}° {{weather.weather}} + src="https://static.ticket.sz-trip.com/uploads/20250120/213c1a6ae49848fa54047d6f9059fec2.png" mode="aspectFill"> @@ -174,6 +174,10 @@ 实时路况 + + + 行李直送 + diff --git a/subPackages/indexGQ/index.wxss b/subPackages/indexGQ/index.wxss index f2d50d9..abaade5 100644 --- a/subPackages/indexGQ/index.wxss +++ b/subPackages/indexGQ/index.wxss @@ -3,8 +3,8 @@ page { height: fit-content; padding-bottom: 36.67rpx; - background: url("https://static.ticket.sz-trip.com/uploads/20240923/69d4d68f5207c84146739951d07dbda4.jpg"); - background-size: 100% 300%; + background: url("https://static.ticket.sz-trip.com/uploads/20250120/b42c1ac742bee3ddff35151ecd860f81.jpg"); + background-size: 100% auto; /* background-repeat: round; */ background-repeat: no-repeat; } @@ -62,12 +62,14 @@ page { font-size: 29rpx; margin-bottom: 10rpx; margin-left: 4rpx; + color: white; } .top-box .weather { font-size: 19rpx; margin-top: 20rpx; margin-left: -4rpx; margin-right: 30rpx; + color: white; } .top-icons { /* background: #FFFFFF; */ @@ -1163,7 +1165,7 @@ page { .right-more { width: 120rpx; height: 47rpx; - background: rgba(255,250,245,0.3); + background: rgba(255,208,165,0.4); border-radius: 23rpx; font-weight: 500; font-size: 27rpx; @@ -1183,7 +1185,7 @@ page { /* width: 160rpx; */ padding: 0 20rpx; height: 53rpx; - background: rgba(255,250,245,0.3); + background: rgba(255,208,165,0.4); border-radius: 13rpx; /* border: 1px solid #FFFFFF; */ min-width: 133rpx; @@ -1279,7 +1281,7 @@ page { height: 320rpx; padding-top: 33.33rpx; position: relative; - z-index: 5; + z-index: 1; } .ysz-more { width: 267rpx; @@ -1494,5 +1496,5 @@ page { position: absolute; right: -26rpx; top: 0; - z-index:3; + z-index:1; } \ No newline at end of file