diff --git a/app.json b/app.json index c86da7a..8bba4f0 100644 --- a/app.json +++ b/app.json @@ -229,26 +229,26 @@ "sitemapLocation": "sitemap.json", "tabBar": { "color": "#999", - "selectedColor": "#FF6756", + "selectedColor": "#F58812", "borderStyle": "white", "list": [ { "pagePath": "pages/index/index", "iconPath": "/images/home.png", - "selectedIconPath": "/images/index_seld_1.png", + "selectedIconPath": "/images/index_seld_2.png", "text": "首页", "shareTimeline": true }, { "pagePath": "pages/map/index", "iconPath": "/images/map.png", - "selectedIconPath": "/images/map_seld_1.png", + "selectedIconPath": "/images/map_seld_2.png", "text": "图游" }, { "pagePath": "pages/user/user", "iconPath": "/images/user.png", - "selectedIconPath": "/images/user_seld_1.png", + "selectedIconPath": "/images/user_seld_2.png", "text": "我的" } ] diff --git a/images/home.png b/images/home.png index 0911ce1..daff9c3 100755 Binary files a/images/home.png and b/images/home.png differ diff --git a/images/index-selds_1.png b/images/index-selds_1.png deleted file mode 100644 index fa7ca9a..0000000 Binary files a/images/index-selds_1.png and /dev/null differ diff --git a/images/index_seld_2.png b/images/index_seld_2.png new file mode 100644 index 0000000..9929818 Binary files /dev/null and b/images/index_seld_2.png differ diff --git a/images/map.png b/images/map.png index 2099fe7..205703a 100755 Binary files a/images/map.png and b/images/map.png differ diff --git a/images/map_seld_2.png b/images/map_seld_2.png new file mode 100644 index 0000000..cb83501 Binary files /dev/null and b/images/map_seld_2.png differ diff --git a/images/my-selds_1.png b/images/my-selds_1.png deleted file mode 100644 index c5103f6..0000000 Binary files a/images/my-selds_1.png and /dev/null differ diff --git a/images/tuyou-selds_1.png b/images/tuyou-selds_1.png deleted file mode 100644 index b8efcbc..0000000 Binary files a/images/tuyou-selds_1.png and /dev/null differ diff --git a/images/user.png b/images/user.png index 1f0b66e..0404c5f 100755 Binary files a/images/user.png and b/images/user.png differ diff --git a/images/user_seld_2.png b/images/user_seld_2.png new file mode 100644 index 0000000..5e6e54c Binary files /dev/null and b/images/user_seld_2.png differ diff --git a/pages/index/index.js b/pages/index/index.js index 8c339b2..315ced7 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -4,6 +4,7 @@ let app = getApp() import commonApi from "../../utils/https/common" import userApi from "../../utils/https/user" import util from "../../utils/util" +import https from "../../utils/https.js" Page({ data: { banner: [], @@ -17,9 +18,7 @@ Page({ fourProduct: [], hotIndex: 0, indexHot: [], - area_ids: ["zhangjiagang", "changshu", "taicang", "kunshan", "wujiang", "wuzhong", "xiangcheng", "gusu", - "gongyeyuanqu", "gaoxin" - ], + month: "", months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'], date: "", @@ -34,7 +33,8 @@ Page({ prizeInfo: null, otherPlat: null, activeBannerIndex: 0, - smBannerIndex: 0, + smBannerIndex: 0, + XPathBannerIndex: 0, indexSeason: {}, // startList: [], // 启动页广告 startList: { @@ -48,98 +48,36 @@ Page({ showTime: false, xpth: {}, // 元旦新增 新品特惠和sqjNew djs: null, // 元旦新增 新品特惠倒计时 - djsTime: null, + djsTime: null, + area_ids: ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"], sqjNew: [ - 'https://static.ticket.sz-trip.com/uploads/20240428/faede304469bb3e7b9bbf7001008d09a.png', - 'https://static.ticket.sz-trip.com/uploads/20240428/77c3bd6c3f44ee0e3cc483557c1c7462.png', - 'https://static.ticket.sz-trip.com/uploads/20240428/ad2324005ba1ed0cabe990ec62bfec76.png', - 'https://static.ticket.sz-trip.com/uploads/20240428/a90f3ce4519a585cc5cebfe62d8d4043.png', - 'https://static.ticket.sz-trip.com/uploads/20240428/e6fa6cdef2971c8abdb670be1f36d1ca.png', - 'https://static.ticket.sz-trip.com/uploads/20240428/9c8186b8249bf81a2ef4fe4a4194cf2b.png', - 'https://static.ticket.sz-trip.com/uploads/20240428/755ee01ac248aeda8812b025f483a869.png', - 'https://static.ticket.sz-trip.com/uploads/20240428/2d29f0d14e634b0a78d4ef91b28d5999.png', - 'https://static.ticket.sz-trip.com/uploads/20240428/71f7b558c7ca6d42728d48508d01819c.png', - 'https://static.ticket.sz-trip.com/uploads/20240428/23e07551be831036116c2fedbbf7aea5.png', + 'https://static.ticket.sz-trip.com/uploads/20241012/df831b80bc445aef8dc439ef8f9761a2.png',// 常熟 + 'https://static.ticket.sz-trip.com/uploads/20241012/9a5dc85879e87cc21f4d10286c84ac5f.png',// 太仓 + 'https://static.ticket.sz-trip.com/uploads/20241012/fceaa177de4ed13e7884ccfafb75c6ae.png',// 昆山 + 'https://static.ticket.sz-trip.com/uploads/20241012/c55a59f86b49af4ae15f1b1015887678.png',// 吴江 + 'https://static.ticket.sz-trip.com/uploads/20241012/a96c42d843dd1cc4a9ec30b189b35a6f.png',// 工业园区 + 'https://static.ticket.sz-trip.com/uploads/20241012/c1f61d9b2a13377c31561e6b50274c04.png',// 张家港 + 'https://static.ticket.sz-trip.com/uploads/20241012/b26ebd1a1ed1d5737cd22cc2da7e1b54.png',// 吴中 + 'https://static.ticket.sz-trip.com/uploads/20241012/eec299ac968f0344e124195155d88ed1.png',// 相城 + '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, - hdrlNavList:[ - { - type:null, - title:'全部' - }, - { - type:'scene', - title:'景区活动' - }, - { - type:'show', - title:'演出' - }, - { - type:'exhibition', - title:'展览' - }, - { - type:'movie', - title:'电影' - }, - { - type:'other', - title:'其他' - } - ], //活动日历板块导航分类 - hdrlNavIndex:0,//活动日历默认选中第一个全部分类 - today:null, - hdrlList:[], - yszNav:['公共服务','旅游助手'], - yszIndex:0, - bdList:[ - { - bg: 'linear-gradient(172deg, #FFF3E5, #FFD9AD);', - icon:'https://static.ticket.sz-trip.com/uploads/20240923/15ee44a960511cdcf276b5d8df472626.png', //游 景点 - url:'', - path:'/pages/list/scene/index', - list: [], - - }, - { - bg: 'linear-gradient(172deg, #E7F1FF, #ADD1FF);', - icon:'https://static.ticket.sz-trip.com/uploads/20240923/cd652f4bcfcef7f55863bf8587609ca4.png', //非玩不可 景点产品 - path:'/pages/list/night/index', - url:'', - list: [], - - }, - { - bg: 'linear-gradient(172deg, #F0EBFF, #E3D9FF);', - icon:'https://static.ticket.sz-trip.com/uploads/20240923/a0b95152b87215dccbb2e5dfa1bfd145.png', //非看不可 - url:'', - path:'/pages/list/theatre/index', - list: [], - - }, - { - bg: 'linear-gradient(172deg, #FFEDF0, #FFC9D2);', - icon:'https://static.ticket.sz-trip.com/uploads/20240923/799befa78b1d474bfb26004cc2ef817d.png', //非买不可 - path:'/subPackages/techanNew/index', - url:'', - list: [], - - }, - - - ], - list1:[], //游-景点 - list2:[], //非晚-夜游 - list3:[], //非看-剧场演出 - list4:[], //非买-文创 - - nowDate: [('0' + (new Date().getMonth() + 1)).slice(-2) , ('0' + new Date().getDate()).slice(-2)] - + videoPlay: false, }, onLoad: function(options) { + console.log('options',options) + // 相城小程序跳转获取用户信息 + if(options && options.szxcCode) { + commonApi._post("uservice/user/loginByXC", { + code: options.szxcCode + }).then(res => { + if(res.data && res.data.id && res.data.token) { + https.set_logininfo(res); + } + }) + } this.getHeight() //全屏广告 wx.hideTabBar() //这里隐藏了底部导航栏 @@ -151,11 +89,9 @@ 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] @@ -198,21 +134,7 @@ 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; @@ -223,12 +145,10 @@ Page({ lat: res.latitude, lon: res.longitude }) - this.getList() - this.getHdrlList() + this.getList() }, fail: (err) => { - this.getList() - this.getHdrlList() + this.getList() } }) this.setData({ @@ -247,251 +167,90 @@ Page({ }) this.getTwoProduct() this.getBanner() - 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" - } - }) - 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, - }) - }, - // 获取导航栏项目标题高度 + this.getWeather() + // 获取今天的日期 + let today = new Date(); + this.setData({ + month: (this.data.months[today.getMonth()]).toUpperCase(), + date: today.getDate() + }) + this.getVideoPrize() + this.getXpthList() + }, 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, - // }).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) - // } - // }) - // }, + 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 - // } - // }) - // 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 }) - }, - // 小轮播监听方法 + }, changeSmBannerIndex: function(e) { this.setData({ smBannerIndex: e.detail.current }) - }, + }, + changeXPathBannerIndex: function(e) { + this.setData({ + XPathBannerIndex: e.detail.current + }) + }, // 一城百馆 city: function() { wx.navigateToMiniProgram({ @@ -618,7 +377,6 @@ Page({ }, getWeather: function() { commonApi._post('pbservice/Ztfw/getWeather').then(res => { - console.log(res) this.setData({ weather: res.data }) @@ -716,7 +474,6 @@ Page({ util.gotoDetail(item) }, gotoPath: function(e) { - console.log(e) // if (e.currentTarget.dataset.event) { // if (e.currentTarget.dataset.event=='gongyeyuanqu_click') { // wx.navigateToMiniProgram({ @@ -742,13 +499,19 @@ Page({ path: 'pages/index/index' }) return; - } else if (e.currentTarget.dataset.event == 'wuzhong_click') { + // } 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: 'wxdd39069b9a91dbfe', + appId: 'wx26e6f4c0baba005b', 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' @@ -794,15 +557,14 @@ Page({ }, // 元旦 新品特惠部分 goBanner: function(e) { - console.log('新品特惠', e.currentTarget.dataset.url); let url = e.currentTarget.dataset.url; - app.globalData.weburl = url; + app.globalData.weburl = url; + console.log(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 @@ -814,8 +576,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"); @@ -855,7 +617,6 @@ 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' @@ -877,33 +638,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; @@ -954,7 +715,6 @@ 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 @@ -963,7 +723,6 @@ 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', @@ -980,7 +739,6 @@ 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) @@ -1023,7 +781,6 @@ 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({ @@ -1031,186 +788,184 @@ 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 - // 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 - // }, + 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 + }, 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) }, diff --git a/pages/index/index.wxml b/pages/index/index.wxml index ed9f76b..408bb8a 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,399 +1,755 @@ - + + + + - - - - {{weather.max_temp}}° - {{weather.weather}} - - - - - - - 搜索想要的旅游产品或服务 - - - - - - - - - - - - - - - - - - - 更多 > - - {{nowDate[0]}} - 月 - {{nowDate[1]}} - 日 - - - - - {{item.title}} - - - - - - - - - - {{item.name}} - {{item.begin_date}}-{{item.end_date}} - - - - - - - - - - - - - - {{item.title}} - - 去购票 > - - - - - - - - - - - - + + + + + {{weather.max_temp}}° + {{weather.weather}} + + + - - - - - - - 景点门票 - - - - 夜游苏州 - - - - 文创特产 - - - - 剧场演出 - - - - 一日游 - - - - 场馆预约 - - - - - 一卡游 - - - - 非遗专卖 - - - - - - - + + + + 搜索想要的旅游产品或服务 + - - - - - + + + - + - + - - + + - - - - - - - {{item}} - - - - - - - + + + + 活动日历 + + + + 场馆预约 + + + + 非遗专卖 + + - - - 高峰预警 - - - - 实时路况 - - - - 行李寄存 + + + 剧场演出 - - - - 找厕所 + + + + 文创特产 - - - - - - - 查看更多 > - - - - - - - - - - - - - - - - - - - - - 更多 > + + + 景点门票 + + + + 酒店住宿 + + + + 夜游苏州 + + + + 一日游 + + + + 研学游 + - - - {{index+1}} - - - - - {{item.title}} + + + + 特惠新品超值商品限时抢购 + + + + + + + + 限时特惠 + 新品推荐 + + + ￥{{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}}起 + + + - - {{item.price/100}} - - - + 查看更多 + 暂无更多推荐 - - + + + + + + + + {{prizeInfo.prize_name}} + + + + + + + + + + {{prizeInfo.prize_name}} + + + + + + + + + + 您与奖品擦肩而过期待下次参与 + + + + + + 我知道了 + + + + + + + + + + + + + + + + + + + + + + + + + {{time}}s跳过 + + + - + + + - - - - - - - + + + + + + - - - - - - - 景点门票 - - - - 夜游苏州 - - - - - 剧场演出 - - - - - 场馆预约 - - - - - - - - - - - - - - + + + + + + + + - + - + - - + + - - - - - - - {{item}} - - - - - - - - - 电子社保卡 - - - - 高峰预警 - - - - 行李寄存 - - - - 实时路况 - + + + + + + 活动日历 + + + + + + 场馆预约 + - - - - - - 查看更多 > - + + + + + + 剧场演出 - - - - - - - - + + + + + + + 夜游苏州 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + 数字非遗 + + + + 数字博物馆 + + + + + 云上观展 + + + + 云上文博会 + + + + + 文化场馆查询 + + + + + 书仓 + + - - - {{time}}s跳过 - - + + + 数字公共文化 + + + + + + 云游苏州 + + + + 美图鉴赏 + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/pages/index/index.wxss b/pages/index/index.wxss index d9479c5..adcd838 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -1,12 +1,12 @@ -/* pages/indexs/index.wxss */ +/**index.wxss**/ /* 元旦修改 */ page { - height: fit-content; + /* background: #9DDCF5; */ padding-bottom: 36.67rpx; - background: url("https://static.ticket.sz-trip.com/uploads/20240923/69d4d68f5207c84146739951d07dbda4.jpg"); - background-size: 100% 300%; - /* background-repeat: round; */ - background-repeat: no-repeat; + /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/f92942021f97786a25c1cd51de779c7c.png"); */ + background-image: url('https://static.ticket.sz-trip.com/uploads/20241012/abae687010ec0955b70872edd660002a.jpg'); + background-repeat: repeat-y; + background-size: 100% 100%; } .swiper,.swiper image { width: 697rpx; @@ -39,10 +39,18 @@ 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: 32rpx; - color: #000; + /* color: #72674E; */ + color: #333333; + /* background-image: url("https://static.ticket.sz-trip.com//uploads/20240228/10b93c1389ef5dfc02d07c4091af8f2d.png"); + background-size: 100% 100%; */ display: flex; align-items: center; font-size: 25rpx; @@ -51,7 +59,7 @@ page { font-size: 30rpx; margin-left: 20rpx; margin-right: 10rpx; - color: #000; + /* color: #72674E; */ } .top-box .weather-num,.top-box .weather { flex-shrink: 0; @@ -70,8 +78,6 @@ page { margin-right: 30rpx; } .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; @@ -79,12 +85,12 @@ page { z-index: 0; display: flex; padding: 34rpx 0; - padding-bottom: 7rpx; + padding-bottom: 29.33rpx; justify-content: space-between; flex-wrap: wrap; - background: #FFFED6; - margin-top: -20rpx; - padding-top: 54rpx; + margin-top: -50rpx; + padding-top: 84rpx; + background: #FFF1C2; } .top-icon-item { margin-bottom: 20rpx; @@ -105,8 +111,7 @@ page { margin-bottom: 10rpx; } .content { - /* margin: 0 25rpx; */ - margin-top: 20.67rpx; + margin: 0 25rpx; } .sale-road-boxes { display: flex; @@ -196,11 +201,13 @@ page { height: 154rpx; } .small-swiper-box { - margin: 24rpx 26.67rpx 26.67rpx; - /* width: 100%; */ + margin: 50rpx 0; + width: 100%; height: 154rpx; border-radius: 20rpx; + /* border-radius: 77rpx; */ overflow: hidden; + margin-top: 33rpx; position: relative; } .product-tags { @@ -308,56 +315,56 @@ page { } */ /* 元旦修改 以上两个样式为注释掉的 下面的.pic-list是新改的 */ .pic-list { - /* width: 100%; + width: 100%; display: flex; margin-right: 26rpx; display: flex; justify-content: space-between; - flex-wrap: wrap; */ - display: flex; - justify-content: space-between; - margin: 0 28rpx; + flex-wrap: wrap; } .title-more { - font-size: 24rpx; - /* color: #0B898E; */ - /* 元旦修改 */ - color: #54504D; + font-size: 27rpx; + font-weight: 500; + color: #F65D1F; z-index: 9; width: 173rpx; height: 40rpx; - line-height: 40rpx; - background: rgba(255, 255, 255, 0.5); + 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; - background: #FFFED6; - box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2); */ + margin-top: 20rpx; + background: #FFF1C2; border-radius: 27rpx; padding-bottom: 1rpx; - /* margin-bottom: 40rpx; */ + margin-bottom: 40rpx; } .pbservice { - width: calc(160rpx * 8); + /* width: calc(175rpx * 6); */ + /* 元旦修改 */ + width: calc(190rpx * 7); display: flex; - margin-top: 5rpx; - /* flex-wrap: wrap; */ - flex-wrap: nowrap; - /* padding-left: 12rpx; */ - /* overflow-x: scroll; */ + margin-top: 30rpx; + flex-wrap: wrap; + /* margin-bottom: 60rpx; */ + /* 元旦修改 注释margin-bottom */ } .pbservice-item { - width: 106rpx; - margin-bottom: 25rpx; - margin-right: 32.33rpx; + /* 元旦修改 截止到注释的width*/ + width: 120rpx; + margin-bottom: 33.33rpx; + margin-right: 62.33rpx; + /* width: 175rpx; */ text-align: center; - font-size: 27rpx; - color: #000; + font-size: 25rpx; + color: #111111; line-height: 24rpx; display: flex; align-items: center; @@ -372,7 +379,7 @@ page { margin-bottom: 20rpx; margin-top: 50rpx; */ /* 元旦修改 以上都是之前的*/ - width: 80rpx; + width: 106rpx; margin-bottom: 10rpx; } .six-box { @@ -533,21 +540,16 @@ 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 #111; + border: 1px solid #F6591D; border-radius: 35rpx; font-size: 27rpx; font-family: PingFang SC; - font-weight: 500; + font-weight: bold; + color: #F6591D; } .scroll-line { /* height: 6rpx; @@ -556,24 +558,29 @@ page { overflow: hidden; margin: 30rpx auto; */ /* 元旦修改 以上为注释部分 下面为新内容*/ - width: 48rpx !important; - height: 8rpx; + width: 73rpx !important; + height: 7rpx; /* background: #DDCEAC; */ background: #fff; - border-radius: 4rpx; - margin: 15rpx auto 10rpx; + border-radius: 3rpx; + margin: 33.33rpx auto; } .scroll-line-bg { - height: 8rpx; - background: #FF4848; - border-radius: 4rpx; + /* width: 300rpx; + height: 6rpx; + border-radius: 3rpx; + background: #0B898E; */ + /* 元旦修改 以上为注释部分 下面为新内容*/ + height: 7rpx; + background: #F65D1F; + border-radius: 3rpx; } /* 元旦修改 新增样式 */ .scroll-line-bg2 { - margin-left: 24rpx; - background: #FF4848; - height: 8rpx; - border-radius: 4rpx; + margin-left: 37.33rpx; + background: #F65D1F; + height: 7rpx; + border-radius: 3rpx; } .nomore-tip-btn { position: absolute; @@ -679,10 +686,9 @@ page { color: #333333; line-height: 42rpx; flex-wrap: wrap; - background: #FFFED6; + background: #FFF1C2; justify-content: space-around; height: 187rpx; - box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2); border-radius: 27rpx; align-items: center; } @@ -694,7 +700,7 @@ page { } .other-plat { /* 春节新增样式 */ - color: #54504D; + color: #111111; } .other-plat:nth-child(4n){ margin-right: 0; @@ -828,7 +834,7 @@ page { } /* 元旦修改新增样式 */ .time-box { - font-size: 25rpx; + font-size: 27rpx; font-family: DIN; font-weight: 500; /* color: #54504D; */ @@ -842,23 +848,17 @@ page { } /* 元旦修改新增样式 */ .xsth-time { - /* margin: 0 5rpx; */ - /* width: 50rpx; */ - /* height: 33rpx; */ - width: 43rpx; + /* width: 43rpx; */ height: 43rpx; + padding: 0 7rpx; line-height: 43rpx; - background: #4AB648; - /* background: #F9F1DB; */ - /* border-radius: 5rpx; */ + background: #FFF1C2; border-radius: 13rpx; - font-size: 25rpx; + font-size: 27rpx; font-family: DIN; font-weight: 500; - /* color: #D62828; */ - color: white; + color: #ED1C19; text-align: center; - /* line-height: 33rpx; */ } .time-box text { width: 18rpx; @@ -904,44 +904,53 @@ page { } /* 元旦修改新增样式 */ .xpth-product { - /* position: absolute; */ - width: 697rpx; + width: 700rpx; height: 373rpx; - background: #FFFED6; - box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2); border-radius: 27rpx; - padding: 25rpx 15rpx; + padding: 25rpx 13rpx; box-sizing: border-box; - /* left: 0; - bottom: 15.33rpx; - /* width: 710rpx; */ display: flex; justify-content: space-between; + background: #FFF1C2; } /* 元旦修改新增样式 */ .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; - /* 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; + height: 320rpx; + width: 100%; + border-radius: 20rpx; + overflow: hidden; + position: relative; +} +.xpth-banner-swiper{ + height: 100%; } .xpth-banner image { - /* width: 270rpx; */ flex: 1; - height: 319rpx; + height: 100%; + width: 100%; border-radius: 20rpx; - /* 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-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; } /* 元旦修改新增样式 */ .xpth-item { @@ -987,7 +996,7 @@ page { } /* 元旦修改新增样式 */ .xpth-item-title { - width: 230rpx; + width: 210rpx; font-size: 27rpx; font-family: PingFang SC; font-weight: 500; @@ -1010,15 +1019,15 @@ page { } /* 元旦修改新增样式 */ .xpth-item-price { - font-size: 32rpx; + font-size: 31rpx; font-family: PingFang SC; - font-weight: 500; - color: #D62828; + font-weight: bold; + color: #ED1C19; } /* 元旦修改新增样式 */ .xpth-item-price::before { content: "￥"; - font-size: 20rpx; + font-size: 23rpx; } /* 元旦修改新增样式 */ .xpth-item-buy { @@ -1036,22 +1045,24 @@ page { /* 元旦修改新增样式 */ .new-pic { width: 160rpx !important; - height: 255rpx !important; - /* margin-bottom: 26.67rpx; */ + height: 213rpx !important; + margin-bottom: 26.67rpx; } -.ggfw-list{ - display: flex; - justify-content: space-around; +.ggfw-list { + justify-content: space-around !important; +} +.ggfw-list .pbservice-item{ + margin-right: 0; + color: #111111; } .ggfw { width: auto; - margin:0; } .ggfw image{ margin-bottom: 16.67rpx; - width: 113.33rpx !important; - height: 113.33rpx !important; + width: 70rpx !important; + height: 70rpx !important; } .six-box-new { @@ -1078,7 +1089,7 @@ page { } /* 春节金刚区字体颜色样式更换 */ .top-icon-text { - color: #54504D; + color: #111111; } .rmtj-right { @@ -1159,327 +1170,31 @@ page { left: 56.67rpx; bottom: 64rpx; } - -.right-more { - width: 120rpx; - height: 47rpx; - background-color: rgba(255,255,255,.3); - 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,250,245,0.3); - border-radius: 13rpx; - /* border: 1px solid #FFFFFF; */ - - font-size: 32rpx; - color: #FFFFFF; - text-align: center; - line-height: 53rpx; - margin-right: 14rpx; -} -.hdrlNavActive { - background: linear-gradient(180deg, #FFFAF5, #FFE3C2); - font-size: 32rpx; - color: #FF4848; - 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/20240923/d4c9e6e558796b0ff89726d0857a5d03.png"); - background-size: 100% 100%; -} -.hdrlItem-img { - width: 240rpx; - height: 213rpx; - background: #8C8C8C; - border-radius: 13rpx; +.jqssd { + /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/20c06c5bf8d5e498667ebd954a1d95f8.png"); + background-size: 100% 100%; */ + width: 365.33rpx; + height: 166rpx; 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/20240923/0220a6adf111a97a9b12746438e87967.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; +.jqssd image, .sslk image{ + width: 100%; + height: 100%; } .sslk { - 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; + /* background: url("https://static.ticket.sz-trip.com/uploads/20240729/c1554fdd645a0d3a47c8e683186e1a73.png"); + background-size: 100% 100%; */ + width: 365.33rpx; + height: 166rpx; flex-shrink: 0; -} -.ysz-box { - margin: 0 8rpx 15.33rpx; - background-image: url("https://static.ticket.sz-trip.com/uploads/20240923/0220a6adf111a97a9b12746438e87967.png"); - /* padding: 43.33rpx 59rpx 46.67rpx 58rpx; */ - background-size: 100% 100%; - width: 733.33rpx; - height: 320rpx; - padding-top: 33.33rpx; -} -.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: #320000; -} -.ysz-box2 { - /* padding: 20rpx 35rpx; */ - padding-top: 23.33rpx; -} -.tjbd-title { - width: 286.67rpx; - height: 80rpx; + margin-left: -20rpx; } -.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; +.xsth-left{ + /* flex: 1; + width: 1rpx; */ } -.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: #320000; - 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; -} - -.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); -} -.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: #FFEBD5; - color: #111111; - - font-family: PingFang SC; - /* font-weight: bold; */ - font-size: 29rpx; - color: #111111; +.xsth-left>image{ + max-width: 100%; + overflow: hidden; } \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index 0a13832..1c5ca67 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -7,15 +7,15 @@ "miniprogram": { "list": [ { - "name": "首页", - "pathName": "pages/list/six/index", + "name": "subPackages/index/index", + "pathName": "subPackages/index/index", "query": "", "launchMode": "default", "scene": null }, { - "name": "subPackages/indexs/index", - "pathName": "subPackages/indexs/index", + "name": "首页", + "pathName": "pages/list/six/index", "query": "", "launchMode": "default", "scene": null diff --git a/subPackages/indexGQ/index.js b/subPackages/indexGQ/index.js index 4cc4882..8c339b2 100644 --- a/subPackages/indexGQ/index.js +++ b/subPackages/indexGQ/index.js @@ -98,35 +98,46 @@ Page({ bdList:[ { bg: 'linear-gradient(172deg, #FFF3E5, #FFD9AD);', - icon:'https://static.ticket.sz-trip.com/uploads/20240923/15ee44a960511cdcf276b5d8df472626.png', //游 - url:'https://m.cloud.sz-trip.com/OneDayTravelNew', - path:'', + icon:'https://static.ticket.sz-trip.com/uploads/20240923/15ee44a960511cdcf276b5d8df472626.png', //游 景点 + url:'', + path:'/pages/list/scene/index', + list: [], + }, { bg: 'linear-gradient(172deg, #E7F1FF, #ADD1FF);', - icon:'https://static.ticket.sz-trip.com/uploads/20240923/cd652f4bcfcef7f55863bf8587609ca4.png', //非玩不可 - path:'/pages/list/scene/index', + icon:'https://static.ticket.sz-trip.com/uploads/20240923/cd652f4bcfcef7f55863bf8587609ca4.png', //非玩不可 景点产品 + path:'/pages/list/night/index', url:'', + list: [], + }, { bg: 'linear-gradient(172deg, #F0EBFF, #E3D9FF);', icon:'https://static.ticket.sz-trip.com/uploads/20240923/a0b95152b87215dccbb2e5dfa1bfd145.png', //非看不可 url:'', path:'/pages/list/theatre/index', + list: [], + }, { bg: 'linear-gradient(172deg, #FFEDF0, #FFC9D2);', icon:'https://static.ticket.sz-trip.com/uploads/20240923/799befa78b1d474bfb26004cc2ef817d.png', //非买不可 - path:'/pages/list/techan/index', + path:'/subPackages/techanNew/index', url:'', + list: [], + }, ], - list1:[], //非玩-景点 - list2:[], //非买-文创 - list3:[], //非游-一日游 - list4:[], //非看-剧场演出 + list1:[], //游-景点 + list2:[], //非晚-夜游 + list3:[], //非看-剧场演出 + list4:[], //非买-文创 + + nowDate: [('0' + (new Date().getMonth() + 1)).slice(-2) , ('0' + new Date().getDate()).slice(-2)] + }, onLoad: function(options) { this.getHeight() @@ -239,15 +250,15 @@ Page({ this.getWeather() }, gobdDetail(e) { - console.log(e); - let url = e.currentTarget.dataset.url - wx.navigateTo({ - url: url - }) + 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, @@ -258,6 +269,7 @@ Page({ title:'', area_id:'' }).then(res=>{ + console.log('景点', res) res.data.list.map(item => { if (item.distance || item.distance == 0) { if (item.distance >= 1000) { @@ -267,30 +279,36 @@ Page({ } } }) + bdList[0].list = res.data.list this.setData({ - list1:res.data.list + list1:res.data.list, + bdList: bdList }) }) // 非买不可--文创 commonApi._post('product/get_product_by_tag',{ - tag_id: 326, + product_model: 'post', offset: 0, limit: 6, }).then(res=>{ + bdList[3].list = res.data.list this.setData({ - list2:res.data.list + list4:res.data.list, + bdList: bdList }) }) // 非游不可--线路一日游 commonApi._post('product/get_product_by_tag',{ - type_id: 23, - tag_id:17, + // type_id: 23, + tag_id: "10,11,12", offset: 0, limit: 6, sort: 'weight' }).then(res=>{ + bdList[1].list = res.data.list this.setData({ - list3:res.data.list + list2:res.data.list, + bdList: bdList }) }) // 非看不可--剧场演出 @@ -304,8 +322,10 @@ Page({ lon:this.data.lon, title:'' }).then(res=>{ + bdList[2].list = res.data.list this.setData({ - list4:res.data.list + list3:res.data.list, + bdList: bdList }) }) }, @@ -369,6 +389,11 @@ Page({ 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" + } + }) this.setData({ hdrlList:res.data.rows }) diff --git a/subPackages/indexGQ/index.wxml b/subPackages/indexGQ/index.wxml index f36a82d..ed9f76b 100644 --- a/subPackages/indexGQ/index.wxml +++ b/subPackages/indexGQ/index.wxml @@ -20,21 +20,27 @@ - + - + - + - - + + 更多 > + + {{nowDate[0]}} + 月 + {{nowDate[1]}} + 日 + @@ -43,9 +49,10 @@ - + - + + {{item.name}} {{item.begin_date}}-{{item.end_date}} @@ -56,10 +63,12 @@ - + - - + + + + {{item.title}} 去购票 > @@ -80,8 +89,8 @@ - - + + 景点门票 @@ -90,7 +99,7 @@ 夜游苏州 - + 文创特产 @@ -111,7 +120,7 @@ 一卡游 - + 非遗专卖 @@ -127,14 +136,14 @@ - + - + @@ -149,25 +158,32 @@ - - + + + data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" + class="pbservice-item ggfw" > 高峰预警 + + + 实时路况 + 行李寄存 - - - 实时路况 + + + + 找厕所 - + - - 更多 > + + 更多 > - - + + {{index+1}} @@ -218,70 +235,136 @@ {{item.price/100}} - {{item.distance}} + - - - {{index+1}} - - - - - {{item.title}} - - - {{item.price/100}} - {{(item.distance/1000)}}km - + + + + + + + + + + + + + + + + + + + + + 景点门票 + + + + 夜游苏州 + + + + 剧场演出 + + + + + 场馆预约 + + + + + + + - - - {{index+1}} - - - - - {{item.title}} - - - {{item.price/100}} - {{(item.distance/1000)}}km - - - + + + + + + + + + + + + + + + + + + + + {{item}} - - - {{index+1}} - - - - - {{item.title}} - - - {{item.price/100}} - {{(item.distance/1000)}}km - - + + + + + + + + 电子社保卡 + + + + 高峰预警 + + + + 行李寄存 + + + 实时路况 + + + + + + + + 查看更多 > + + + + + + + + + - - - - + {{time}}s跳过 diff --git a/subPackages/indexGQ/index.wxss b/subPackages/indexGQ/index.wxss index 66c98e6..d9479c5 100644 --- a/subPackages/indexGQ/index.wxss +++ b/subPackages/indexGQ/index.wxss @@ -571,7 +571,7 @@ page { /* 元旦修改 新增样式 */ .scroll-line-bg2 { margin-left: 24rpx; - background: #078565; + background: #FF4848; height: 8rpx; border-radius: 4rpx; } @@ -1040,10 +1040,13 @@ page { /* margin-bottom: 26.67rpx; */ } - +.ggfw-list{ + display: flex; + justify-content: space-around; +} .ggfw { - width: 132rpx; - margin:0 22rpx; + width: auto; + margin:0; } .ggfw image{ margin-bottom: 16.67rpx; @@ -1182,7 +1185,7 @@ page { height: 53rpx; background: rgba(255,250,245,0.3); border-radius: 13rpx; - border: 1px solid #FFFFFF; + /* border: 1px solid #FFFFFF; */ font-size: 32rpx; color: #FFFFFF; @@ -1205,12 +1208,13 @@ page { background-size: 100% 100%; } .hdrlItem-img { - width: 280rpx; + width: 240rpx; height: 213rpx; background: #8C8C8C; border-radius: 13rpx; flex-shrink: 0; margin-right: 12rpx; + overflow: hidden; } .hdrlItem-content { display: flex; @@ -1445,4 +1449,37 @@ page { } .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: #FFEBD5; + color: #111111; + + font-family: PingFang SC; + /* font-weight: bold; */ + font-size: 29rpx; + color: #111111; } \ No newline at end of file