diff --git a/app.json b/app.json index 3fa2a3a..9b8bc0d 100644 --- a/app.json +++ b/app.json @@ -230,8 +230,8 @@ "style": "v2", "sitemapLocation": "sitemap.json", "tabBar": { - "color": "#999", - "selectedColor": "#F58812", + "color": "#97D0EC", + "selectedColor": "#5184B0", "borderStyle": "white", "list": [ { diff --git a/images/home.png b/images/home.png index daff9c3..1b46e08 100755 Binary files a/images/home.png and b/images/home.png differ diff --git a/images/index_seld.png b/images/index_seld.png deleted file mode 100644 index a2d2381..0000000 Binary files a/images/index_seld.png and /dev/null differ diff --git a/images/index_seld_1.png b/images/index_seld_1.png deleted file mode 100644 index d8fdc23..0000000 Binary files a/images/index_seld_1.png and /dev/null differ diff --git a/images/index_seld_2.png b/images/index_seld_2.png index 9929818..768c5d9 100644 Binary files a/images/index_seld_2.png and b/images/index_seld_2.png differ diff --git a/images/map.png b/images/map.png index 205703a..41f62a8 100755 Binary files a/images/map.png and b/images/map.png differ diff --git a/images/map_seld.png b/images/map_seld.png deleted file mode 100644 index 6c7632c..0000000 Binary files a/images/map_seld.png and /dev/null differ diff --git a/images/map_seld_1.png b/images/map_seld_1.png deleted file mode 100644 index c972214..0000000 Binary files a/images/map_seld_1.png and /dev/null differ diff --git a/images/map_seld_2.png b/images/map_seld_2.png index cb83501..3ce5d86 100644 Binary files a/images/map_seld_2.png and b/images/map_seld_2.png differ diff --git a/images/user.png b/images/user.png index 0404c5f..2557982 100755 Binary files a/images/user.png and b/images/user.png differ diff --git a/images/user_seld.png b/images/user_seld.png deleted file mode 100644 index 4a87d31..0000000 Binary files a/images/user_seld.png and /dev/null differ diff --git a/images/user_seld_1.png b/images/user_seld_1.png deleted file mode 100644 index 10da26c..0000000 Binary files a/images/user_seld_1.png and /dev/null differ diff --git a/images/user_seld_2.png b/images/user_seld_2.png index 5e6e54c..29078cc 100644 Binary files a/images/user_seld_2.png and b/images/user_seld_2.png differ diff --git a/pages/index/imgSource.js b/pages/index/imgSource.js new file mode 100644 index 0000000..588f666 --- /dev/null +++ b/pages/index/imgSource.js @@ -0,0 +1,113 @@ +const imageSource = { + // 活动日历、场馆预约等 + mainFunImgs: [ + "https://static.ticket.sz-trip.com/uploads/20241225/9a472382adcb3793e6c61ad3ea2fbb05.png", + "https://static.ticket.sz-trip.com/uploads/20241225/ba19e78aaa629e3ece995d599526d08c.png", + "https://static.ticket.sz-trip.com/uploads/20241225/9fc20afb60e1e647b511d9973e96bd4b.png", + "https://static.ticket.sz-trip.com/uploads/20241225/7030de3a317567442f5141d833e5f752.png", + "https://static.ticket.sz-trip.com/uploads/20241225/fb7ce8cc732bb34bf881dd7129f1e708.png", + "https://static.ticket.sz-trip.com/uploads/20241225/1faaa62c2d0bd9b912950e742347b0b6.png", + "https://static.ticket.sz-trip.com/uploads/20241225/661fcc7e02d2c5d734a43d5dbbe79363.png", + "https://static.ticket.sz-trip.com/uploads/20241225/f0e901bc9ab4c988295e4a2f88cb3ffe.png", + "https://static.ticket.sz-trip.com/uploads/20241225/ebb4be1738d227f6deb3f895db663eed.png", + "https://static.ticket.sz-trip.com/uploads/20241225/1c847b7edcee6fec2928da4280ef19ca.png", + ], + // 数字文旅 + SZWL: [ + // 非遗,博物馆,名人馆,云上,云上文博,精彩回顾,文化场馆 + // 苏影通 书仓 e读书 数字公共文化 云游苏州 美图鉴赏 + "https://static.ticket.sz-trip.com/uploads/20241225/70e78a734c5f1ec7f9461c071ce05a6b.png", + "https://static.ticket.sz-trip.com/uploads/20241225/a4a7e0487b417c5ed2140d5e2341da43.png", + "https://static.ticket.sz-trip.com/uploads/20241225/f7a2d28af1be501b0c104e8f831f3c36.png", + "https://static.ticket.sz-trip.com/uploads/20241225/003cb24afb80aeef891d73bfeeab4359.png", + + "https://static.ticket.sz-trip.com/uploads/20241225/8f4ab6d79b0b2851cd4f7ceff92155f6.png", + "https://static.ticket.sz-trip.com/uploads/20241225/845592de452a60ad5d9a51cb8cf73d99.png", + "https://static.ticket.sz-trip.com/uploads/20241225/71e21d53580b8c1dcd1ec6b8f2c1f959.png", + + "https://static.ticket.sz-trip.com/uploads/20241225/dd691cdd5cf61f4172a9ee179bab8bc2.png", + "https://static.ticket.sz-trip.com/uploads/20241225/eae7eed9a19bc1f0c5296da5c3a8c6e2.png", + "https://static.ticket.sz-trip.com/uploads/20241225/73ce0d4057cca77dbcaaa6b858d84e33.png", + "https://static.ticket.sz-trip.com/uploads/20241225/1efa141c778d55b471ad950fa886119b.png", + + "https://static.ticket.sz-trip.com/uploads/20241225/02be10405480f0139b75fe355f9a8df8.png", + "https://static.ticket.sz-trip.com/uploads/20241225/2d7514ce60a3843ae04b98660ed2d622.png", + + ], + // 旅游助手 + LVZS: [ + "https://static.ticket.sz-trip.com/uploads/20241225/73567ffad3e927a0ce5a5dab8c13963e.png", + "https://static.ticket.sz-trip.com/uploads/20241225/96d36ec8e1794d9873ba0687beed9288.png", + "https://static.ticket.sz-trip.com/uploads/20241225/973b2cc8b0614b28400b6cc04c3c8495.png", + "https://static.ticket.sz-trip.com/uploads/20241225/200277a64244c067e260da28511a6420.png", + ], + // 公共服务 + GGFW: [ + "https://static.ticket.sz-trip.com/uploads/20241225/dd917bfef53fa2fd54d733dad8e435b5.png", + "https://static.ticket.sz-trip.com/uploads/20241225/d9551507d901dff803b0f06ab545c74f.png", + "https://static.ticket.sz-trip.com/uploads/20241225/c44aadc6e054f3a2ac9cfcefdad048ea.png", + "https://static.ticket.sz-trip.com/uploads/20241225/826c8084cde314a4f8b46e91bcd77acc.png", + ], + + // 十全十美 + SQSM: [ + // ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"], + "https://static.ticket.sz-trip.com/uploads/20241225/1a963a3b3a6cf9a4dca822cce6574e3f.png", + "https://static.ticket.sz-trip.com/uploads/20241225/21fba8904ce6ae5fe7d6a64a2794d93b.png", + "https://static.ticket.sz-trip.com/uploads/20241225/98b19eb35e6621818b1ba78def011778.png", + "https://static.ticket.sz-trip.com/uploads/20241225/24f59b0e143a249fec891b2ef22800ef.png", + "https://static.ticket.sz-trip.com/uploads/20241225/73f11fcdf9e7a3236815a5935ab70253.png", + "https://static.ticket.sz-trip.com/uploads/20241225/f48f42f53e2a53f0b978684bcbd1b8c5.png", + "https://static.ticket.sz-trip.com/uploads/20241225/de5ae5de54a255a72f404d688c2ceb3e.png", + "https://static.ticket.sz-trip.com/uploads/20241225/9be62fc5347411ada17ec9f4b3ea8c28.png", + "https://static.ticket.sz-trip.com/uploads/20241225/2fcea197a5d9ac98d29cb194d9ab45db.png", + "https://static.ticket.sz-trip.com/uploads/20241225/d4d91992a844af511498af07e39cab45.png", + + ], + + // 长三角文旅平台 + CSJWLPT: [ + "https://static.ticket.sz-trip.com/uploads/20241225/ef61d89d6d0f5ca84f56917920a162f2.png", + "https://static.ticket.sz-trip.com/uploads/20241225/8368833b47ccfe9bc34a395eea74efb4.png", + "https://static.ticket.sz-trip.com/uploads/20241225/7cc0f4a931bb969f7a063ea6e00325e6.png", + ], + + // 导航标题侧边图片 + CBTP: [ + "https://static.ticket.sz-trip.com/uploads/20241225/4e4d8c6b8fad6afb7fd3fc2e04dd3fda.png", + "https://static.ticket.sz-trip.com/uploads/20241225/caeb000298ff47c053574a60f87ced6e.png", + "https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png", + "https://static.ticket.sz-trip.com/uploads/20241225/1d9433deead99749beacc38be93a79a0.png", + "https://static.ticket.sz-trip.com/uploads/20241225/7df57b4bd1bb784e6c085c89e9ef883a.png", + ], + + // 其他后台配置的图片,开发时使用 + testImgs: { + indexSeason : { + // 头图 + topBac: "https://static.ticket.sz-trip.com/uploads/20241225/f039e6b753c4c7fbd3ba78aa89f0b0fe.png", + // ai伴你游 + ai: "https://static.ticket.sz-trip.com/uploads/20241225/164406bfa707e66e6aa5d2e2dd5364d1.png", + // ai避高峰 + avoid: "https://static.ticket.sz-trip.com/uploads/20241225/2f7600e95027686eb71ac499abfe14cc.png", + // 新品特惠 + xpth: "https://static.ticket.sz-trip.com/uploads/20241225/4df3cd8bda55d743d597706efa5fd50a.png", + // 文旅鉴赏 + wlcx: "https://static.ticket.sz-trip.com/uploads/20241225/6cee0a7fce7873444824bc56dc452085.png", + // 出行助手 + lyzs: "https://static.ticket.sz-trip.com/uploads/20241225/6b3ed3f6533470b45bffe44447ed8f86.png", + // 公共服务 + ggfw: "https://static.ticket.sz-trip.com/uploads/20241225/6a9d7e1d968961cbe1aaf9bef994518a.png", + // 十全十美 + sqj: "https://static.ticket.sz-trip.com/uploads/20241225/c7ce89fec139ff7a530a5d68ef2f56c8.png", + // 长三角文旅平台 + csjwlpt: "https://static.ticket.sz-trip.com/uploads/20241225/a38194b30ce9a956aa9701a65dc68aea.png", + // 热门推荐 + rmtj: "https://static.ticket.sz-trip.com/uploads/20241225/b31bfd4ff8cca2071928a1edeab4e818.png", + + } + }, +} + + +module.exports = imageSource \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index b82fe47..78aeb41 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -1,6 +1,8 @@ //index.js //获取应用实例 let app = getApp() +import imageSource from "./imgSource" + import commonApi from "../../utils/https/common" import userApi from "../../utils/https/user" import util from "../../utils/util" @@ -65,7 +67,10 @@ Page({ ], viewHeight: "0px", isMuted: true, - videoPlay: false, + videoPlay: false, + + // 页面图片 + imageSourceList:imageSource, }, onLoad: function(options) { wx.getLocation({type: 'gcj02'}) @@ -332,10 +337,14 @@ Page({ this.setData({ indexHot: app.globalData.configJson.indexHot, isTest: app.globalData.configJson.isTest, - otherPlat: app.globalData.configJson.otherPlats, - indexSeason: app.globalData.configJson.indexSeason - }) - this.getFourProduct() + otherPlat: app.globalData.configJson.otherPlats, + // 正式数据 + // indexSeason: app.globalData.configJson.indexSeason, + // 开发数据 + indexSeason: imageSource.testImgs.indexSeason + }) + this.getFourProduct() + console.log(this.data) }, //关闭弹窗广告 closeAdv: function() { diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 8305409..91cdd96 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -20,8 +20,9 @@ - - 搜索想要的旅游产品或服务 + + + 搜索想要的旅游产品或服务 @@ -37,64 +38,47 @@ - + - + 活动日历 - + 场馆预约 - + 非遗专卖 - + - + 剧场演出 - - + 文创特产 - - + 景点门票 - + 酒店住宿 - + 夜游苏州 - + 一日游 - + 研学游 @@ -136,7 +120,7 @@ - + @@ -169,7 +153,7 @@ - + 倒计时 @@ -179,10 +163,7 @@ : {{djs.s}} - - + @@ -216,120 +197,69 @@ - - - - + + + + + - + 数字非遗 - + 数字博物馆 - + 数字名人馆 - + 云上观展 - + 云上文博会 - + 精彩回顾 - + 文化场馆查询 - + 苏影通 - + 书仓 - + e读书 - - + 数字公共文化 - - - + 云游苏州 - + 美图鉴赏 - - - - - - - - @@ -342,75 +272,81 @@ - - + + - - - - - + + + + - + - 查看全部 - + 更多 + - + - + 高峰预警 - + 实时路况 - + 行李寄存 - + 找厕所 + + - - + + - - - + + + - - + + - - + {{item.name}} + + - - + + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index adcd838..e2d5f3f 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -3,8 +3,8 @@ page { /* background: #9DDCF5; */ padding-bottom: 36.67rpx; - /* 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-image: url('https://static.ticket.sz-trip.com/uploads/20241225/79918a9171dcf85365935419e4717519.jpg'); background-repeat: repeat-y; background-size: 100% 100%; } @@ -45,8 +45,8 @@ page { /* color: #666; */ /* height: 70.67rpx; */ height: 64rpx; - background: rgba(255,255,255,0.7); - border-radius: 32rpx; + /* 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"); @@ -54,11 +54,15 @@ page { 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: 10rpx; + margin-right: 20rpx; /* color: #72674E; */ } .top-box .weather-num,.top-box .weather { @@ -90,7 +94,6 @@ page { flex-wrap: wrap; margin-top: -50rpx; padding-top: 84rpx; - background: #FFF1C2; } .top-icon-item { margin-bottom: 20rpx; @@ -105,7 +108,7 @@ page { margin-right: 0; } .top-icon-item image { - width: 113rpx; + width: 86rpx; display: block; margin: 0 auto; margin-bottom: 10rpx; @@ -119,7 +122,6 @@ page { margin-top: 40rpx; position: relative; align-items: flex-end; - margin-bottom: 28rpx; } .sale-box { flex-shrink: 0; @@ -325,11 +327,10 @@ page { .title-more { font-size: 27rpx; font-weight: 500; - color: #F65D1F; + color: #29305A; z-index: 9; width: 173rpx; - height: 40rpx; - background: rgba(255,255,255,0.5); + height: 80rpx; border-radius: 20rpx; text-align: center; display: flex; @@ -341,7 +342,6 @@ page { } .slide-out-box { margin-top: 20rpx; - background: #FFF1C2; border-radius: 27rpx; padding-bottom: 1rpx; margin-bottom: 40rpx; @@ -544,41 +544,30 @@ page { width: 200rpx; height: 67rpx; line-height: 67rpx; - border: 1px solid #F6591D; - border-radius: 35rpx; + border: 1px solid #5184B0; font-size: 27rpx; font-family: PingFang SC; - font-weight: bold; - color: #F6591D; + font-weight: 500; + color: #5184B0; } .scroll-line { - /* height: 6rpx; - border-radius: 3rpx; - background: #ccc; - overflow: hidden; - margin: 30rpx auto; */ - /* 元旦修改 以上为注释部分 下面为新内容*/ + width: 73rpx !important; height: 7rpx; /* background: #DDCEAC; */ - background: #fff; + background: #97D0EC; border-radius: 3rpx; margin: 33.33rpx auto; } .scroll-line-bg { - /* width: 300rpx; - height: 6rpx; - border-radius: 3rpx; - background: #0B898E; */ - /* 元旦修改 以上为注释部分 下面为新内容*/ height: 7rpx; - background: #F65D1F; + background: #5184B0; border-radius: 3rpx; } /* 元旦修改 新增样式 */ .scroll-line-bg2 { margin-left: 37.33rpx; - background: #F65D1F; + background: #5184B0; height: 7rpx; border-radius: 3rpx; } @@ -686,16 +675,15 @@ page { color: #333333; line-height: 42rpx; flex-wrap: wrap; - background: #FFF1C2; justify-content: space-around; height: 187rpx; border-radius: 27rpx; align-items: center; } .other-plats image { - width: 80rpx; + width: 106rpx; display: block; - height: 80rpx; + height: 106rpx; margin-bottom: 15rpx; } .other-plat { @@ -845,6 +833,9 @@ page { margin-left: -50rpx; z-index: 9; flex-wrap: nowrap; + + position: relative; + left: -150rpx; } /* 元旦修改新增样式 */ .xsth-time { @@ -852,12 +843,11 @@ page { height: 43rpx; padding: 0 7rpx; line-height: 43rpx; - background: #FFF1C2; border-radius: 13rpx; font-size: 27rpx; font-family: DIN; font-weight: 500; - color: #ED1C19; + color: #FF6A57; text-align: center; } .time-box text { @@ -911,17 +901,19 @@ page { box-sizing: border-box; display: flex; justify-content: space-between; - background: #FFF1C2; } /* 元旦修改新增样式 */ .xpth-banner { flex: 1; margin-left: 15rpx; - height: 320rpx; + height: 322rpx; width: 100%; - border-radius: 20rpx; + border-radius: 1rpx; 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%; @@ -954,19 +946,13 @@ page { } /* 元旦修改新增样式 */ .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; - /* margin-bottom: 10rpx; */ - /* clip-path: polygon(5% 0, 95% 0, 100% 10%, 100% 90%, 95% 100%, 5% 100%, 0 90%, 0 10%); */ - /* padding: 5rpx; */ + background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/d469064b1bcf6c2f7cd59786e66fc249.png"); + background-size: 100% 100%; + padding: 1rpx; } .xpth-item:last-child { margin-bottom: 0; @@ -1045,7 +1031,7 @@ page { /* 元旦修改新增样式 */ .new-pic { width: 160rpx !important; - height: 213rpx !important; + height: 220rpx !important; margin-bottom: 26.67rpx; } @@ -1061,8 +1047,8 @@ page { } .ggfw image{ margin-bottom: 16.67rpx; - width: 70rpx !important; - height: 70rpx !important; + width: 93rpx !important; + height: 93rpx !important; } .six-box-new { @@ -1173,8 +1159,8 @@ page { .jqssd { /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/20c06c5bf8d5e498667ebd954a1d95f8.png"); background-size: 100% 100%; */ - width: 365.33rpx; - height: 166rpx; + width: 344.33rpx; + height: 160rpx; flex-shrink: 0; } .jqssd image, .sslk image{ @@ -1184,10 +1170,9 @@ page { .sslk { /* background: url("https://static.ticket.sz-trip.com/uploads/20240729/c1554fdd645a0d3a47c8e683186e1a73.png"); background-size: 100% 100%; */ - width: 365.33rpx; - height: 166rpx; + width: 344rpx; + height: 160rpx; flex-shrink: 0; - margin-left: -20rpx; } .xsth-left{ diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js index 4b41d22..23d01e0 100644 --- a/pages/info/sceneProductInfo/index.js +++ b/pages/info/sceneProductInfo/index.js @@ -40,7 +40,11 @@ Page({ time: "", showDate:false, showPrice:0, - showDate2:false + showDate2:false, + + skuDoms: [], // sku 节点Dom + activeIndex: 0, // sku 侧边栏 + scrollHeight: 0, }, /** @@ -839,6 +843,117 @@ Page({ }, + changeMenu: function (e) { + let index = e.currentTarget.dataset.index, + that = this; + + if (Array.isArray(this.data.skuDoms) && this.data.skuDoms.length>0) { + console.log('进入暂存数据') + try { + let res = this.data.skuDoms + let target0 = res[0][0] + let targetDom = res[0][index] + let scrollTop = that.data.scrollHeight + console.log(targetDom) + + if (target0&&targetDom) { + scrollTop = targetDom.top - target0.top // title高度87 + } + console.log(scrollTop) + that.setData({ + activeIndex: index, + scrollHeight: scrollTop, + }) + } catch(e) { + console.log(e) + } + } else { + const query = wx.createSelectorQuery(); //创建节点查询器 + query.selectAll(".scroll-item-top").boundingClientRect() //选择toViewid获取位置信息 + query.exec(function (res) { + try { + let target0 = res[0][0] + let targetDom = res[0][index] + let scrollTop = that.data.scrollHeight + console.log(targetDom) + + if (target0&&targetDom) { + scrollTop = targetDom.top - target0.top // title高度87 + } + console.log(scrollTop) + that.setData({ + activeIndex: index, + scrollHeight: scrollTop, + skuDoms: res, + }) + } catch(e) { + console.log(e) + } + }) + } + }, + + skuScroll: function (e) { + let that = this + let domSctollTop = e.detail.scrollTop + if (Array.isArray(this.data.skuDoms) && this.data.skuDoms.length>0) { + console.log('进入暂存数据') + try { + let res = this.data.skuDoms + let target0 = res[0][0] + let topHeightArr = [] + + res[0].forEach(v=>{ + topHeightArr.push(v.top - target0.top) + }) + + // 找到第一个大于domSctollTop的下标再-1 如果返回-1 就是最后一个 + // 预留50px + let findIndex = topHeightArr.findIndex(v=>v-50>=domSctollTop) + if (findIndex<0) { + findIndex = topHeightArr.length-1 + } else if(findIndex>=1) { + findIndex-- + } + + console.log(topHeightArr,domSctollTop,findIndex) + that.setData({ + activeIndex: findIndex, + skuDoms: res, + }) + } catch(e) { + console.log(e) + } + } else { + const query = wx.createSelectorQuery(); //创建节点查询器 + query.selectAll(".scroll-item-top").boundingClientRect() //选择toViewid获取位置信息 + query.exec(function (res) { + try { + let target0 = res[0][0] + let topHeightArr = [] + res[0].forEach(v=>{ + topHeightArr.push(v.top - target0.top) + }) + // 找到第一个大于domSctollTop的下标再-1 如果返回-1 就是最后一个 + // 预留50px + let findIndex = topHeightArr.findIndex(v=>v-50>=domSctollTop) + if (findIndex<0) { + findIndex = topHeightArr.length-1 + } else if(findIndex>=1) { + findIndex-- + } + + that.setData({ + activeIndex: findIndex, + }) + } catch(e) { + console.log(e) + } + }) + } + }, + + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml index 02470b1..2c2022f 100644 --- a/pages/info/sceneProductInfo/index.wxml +++ b/pages/info/sceneProductInfo/index.wxml @@ -26,33 +26,51 @@ {{info.garden_flag_text}} - - - 补贴价 - ¥{{ info.allowance.mini_price / 100 }}起 - 单品最高补贴{{ info.allowance.max_price / 100 }}元 - - - {{item.title}} - - - {{sku.sku_name}} - - - - {{item}} + + + + + + {{item.title}} - 预订须知>> - - - {{sku.price?sku.price/100:0}} - - 预订 - - + + + + + 补贴价 + ¥{{ info.allowance.mini_price / 100 }}起 + 单品最高补贴{{ info.allowance.max_price / 100 }}元 + + + {{item.title}} + + + + {{sku.sku_name}} + + + + {{item}} + + 预订须知>> + + + {{sku.price?sku.price/100:0}} + + 预订 + + + + + + + + + @@ -160,9 +178,11 @@ 这里空空如也,快去向大家提问吧! 去提问 --> - - - + + + + + 问大家 @@ -191,7 +211,7 @@ 查看全部问答 - + 游客点评{{info.rate}}分 共{{commentTotal}}条 > diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss index 742b30c..44d3b80 100644 --- a/pages/info/sceneProductInfo/index.wxss +++ b/pages/info/sceneProductInfo/index.wxss @@ -1,6 +1,6 @@ /* pages/info/sceneProductInfo/index.wxss */ page { - background: #f2f2f2; + background: #f8f8f8; } .swiper { @@ -920,4 +920,41 @@ page { position: absolute; top: 30rpx; right: 30rpx; +} + + +.sku-type-container{ + display: flex; + margin-top: 20rpx; +} +.left-type-container{ + width: 147rpx; + flex-shrink: 0; + background: #F8F8F8; + display: flex; + flex-direction: column; +} +.left-type-container .sku-type{ + padding: 38rpx 12rpx; + font-weight: 500; + font-size: 24rpx; + color: #000000; +} +.left-type-container .sku-type.active{ + background: #FFFFFF; + font-weight: bold; + color: #0B898E; +} +.sku-type-container .right-container{ + background: #FFFFFF; + flex: 1; + width: 1rpx; + max-height: 1100rpx; + padding-bottom: 20rpx; +} + +.box-gb-20241216{ + background: #FFF; + margin: 20rpx 0; + padding:0 20rpx; } \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index b5b645b..184d71d 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -8,8 +8,8 @@ "list": [ { "name": "pages/pbService/web/index", - "pathName": "pages/pbService/web/index", - "query": "weburl=https%253A%252F%252Fm.cloud.sz-trip.com%252FpetYou2024%253FcnylCode%253D123456=", + "pathName": "subPackages/index/index", + "query": "", "launchMode": "default", "scene": null }, diff --git a/subPackages/index/index.js b/subPackages/index/index.js index fb73f07..b82fe47 100644 --- a/subPackages/index/index.js +++ b/subPackages/index/index.js @@ -5,6 +5,7 @@ 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: [], @@ -18,7 +19,7 @@ Page({ fourProduct: [], hotIndex: 0, indexHot: [], - area_ids: [ "changshu", "taicang", "kunshan", "wujiang", "gongyeyuanqu", "zhangjiagang", "wuzhong", "xiangcheng", "gusu", "gaoxin"], + month: "", months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'], date: "", @@ -33,7 +34,8 @@ Page({ prizeInfo: null, otherPlat: null, activeBannerIndex: 0, - smBannerIndex: 0, + smBannerIndex: 0, + XPathBannerIndex: 0, indexSeason: {}, // startList: [], // 启动页广告 startList: { @@ -47,24 +49,27 @@ 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/20240617/3acf736c1dc9c7af08d3363833669896.png',// 常熟 - 'https://static.ticket.sz-trip.com/uploads/20240617/4f33191399b2ec1b6b8af77a9d976389.png',// 太仓 - 'https://static.ticket.sz-trip.com/uploads/20240617/7c62e1438242fc6db47f96cff8a43e9b.png',// 昆山 - 'https://static.ticket.sz-trip.com/uploads/20240617/4ac7bd7e59edef07d5079bb802dae99b.png',// 吴江 - 'https://static.ticket.sz-trip.com/uploads/20240617/fc20f4d0582ac8611dc9ce7a933deda3.png',// 工业园区 - 'https://static.ticket.sz-trip.com/uploads/20240617/09325c6e6d94e1b23c1019f95ec05f3f.png',// 张家港 - 'https://static.ticket.sz-trip.com/uploads/20240617/56ccaab57aaf050bb6feccc3a70983bb.png',// 吴中 - 'https://static.ticket.sz-trip.com/uploads/20240617/fbb3b7bdaa0cafed88015aa3f8d3da96.png',// 相城 - 'https://static.ticket.sz-trip.com/uploads/20240617/d83cb13156ad76bb8051dbc2b60126af.png',// 姑苏 - 'https://static.ticket.sz-trip.com/uploads/20240617/b28afa0861eb54f5f3d483a7c08fdbda.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, }, onLoad: function(options) { + wx.getLocation({type: 'gcj02'}) + console.log('options',options) // 相城小程序跳转获取用户信息 if(options && options.szxcCode) { @@ -171,8 +176,9 @@ Page({ this.setData({ month: (this.data.months[today.getMonth()]).toUpperCase(), date: today.getDate() - }) - this.getVideoPrize() + }) + // 调用接口如果token过期会导致一进入就要登陆 + // this.getVideoPrize() this.getXpthList() }, getHeight() { @@ -189,8 +195,10 @@ Page({ // 元旦新增 新品特惠 commonApi._post("product/get_product_indulgence", { tag_id: 275, - typeId: 3, + typeId: 3, + type: 1, // 返回数组 }).then(res => { + // res.data.adv = [res.data.adv] this.setData({ xpth: res.data, djsTime: res.data.time @@ -241,7 +249,12 @@ Page({ this.setData({ smBannerIndex: e.detail.current }) - }, + }, + changeXPathBannerIndex: function(e) { + this.setData({ + XPathBannerIndex: e.detail.current + }) + }, // 一城百馆 city: function() { wx.navigateToMiniProgram({ @@ -549,7 +562,8 @@ Page({ // 元旦 新品特惠部分 goBanner: function(e) { 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) }) @@ -812,7 +826,7 @@ Page({ // 获取短视频大赛是否中奖 中奖详情 getVideoPrize() { let user_id = wx.getStorageSync('jstrip_userid'); - if (!user_id || wx.getStorageSync('indexPriceNoTip')) return; + if (!user_id || wx.getStorageSync('indexPriceNoTip')) return; commonApi.user_post('actonline/video_act/getRaffle', { act_id: 5 }).then(res => { diff --git a/subPackages/index/index.wxml b/subPackages/index/index.wxml index c6b19ef..8305409 100644 --- a/subPackages/index/index.wxml +++ b/subPackages/index/index.wxml @@ -26,14 +26,14 @@ - + - + @@ -46,484 +46,428 @@ --> - - - - - 活动日历 - - - - - - 场馆预约 - - - - - - 非遗专卖 - - - - - - - 剧场演出 - - - - - 文创特产 - - - - - - - 景点门票 - - - - - - 酒店住宿 - - - - - - 夜游苏州 - - - - - - 一日游 - - - - - - 研学游 - - - - - - 特惠新品超值商品限时抢购 - - - - - - - - 限时特惠 - 新品推荐 - - - ¥{{saleProduct.price?saleProduct.price/100:0}}起 - + + + 活动日历 + + + + 场馆预约 + + + + 非遗专卖 + + + + + 剧场演出 + + + + + 文创特产 + + + + + 景点门票 + + + 酒店住宿 - - 精品线路带你轻松玩转苏州 - - - - - - - - 四季苏州 - 最是江南 - - - ¥{{roadProduct.price?roadProduct.price/100:0}}起 - + + + 夜游苏州 + + + 一日游 - - - - - - - - - - - - - - - - + + + 研学游 - - - - - - - - - - - - - - - - - - - 倒计时 - {{djs.h}} - : - {{djs.m}} - : - {{djs.s}} - - - - - - - - - - - - {{item.title}} - - - {{item.price/100}} - + + + + 特惠新品超值商品限时抢购 + + + + + + + + 限时特惠 + 新品推荐 + + + ¥{{saleProduct.price?saleProduct.price/100:0}}起 - - - - - - - - - - - - - - - - - 数字非遗 - - - - 数字博物馆 - - - - 数字名人馆 + + 精品线路带你轻松玩转苏州 + + + + + + + + 四季苏州 + 最是江南 + + + ¥{{roadProduct.price?roadProduct.price/100:0}}起 + - - - 云上观展 - - - 云上文博会 + + + + + + - - - 精彩回顾 + + - - - 文化场馆查询 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 倒计时 + {{djs.h}} + : + {{djs.m}} + : + {{djs.s}} + + + - - - 苏影通 + + + + + + + + {{item.title}} + + + {{item.price/100}} + + + + - - - 书仓 + + + + + + + + + + + + - - - e读书 + + + + + + - - - 数字公共文化 - - - - - - 云游苏州 + + + + + + + + 数字非遗 + + + + 数字博物馆 + + + + 数字名人馆 + + + + 云上观展 + + + + 云上文博会 + + + + 精彩回顾 + + + + 文化场馆查询 + + + + 苏影通 + + + + 书仓 + + + + 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.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}} + + - - - 查看更多 - 暂无更多推荐 + 查看更多 + 暂无更多推荐 + @@ -578,7 +522,7 @@ - + @@ -653,7 +597,7 @@ - + diff --git a/subPackages/index/index.wxss b/subPackages/index/index.wxss index 34cd243..adcd838 100644 --- a/subPackages/index/index.wxss +++ b/subPackages/index/index.wxss @@ -4,9 +4,9 @@ page { /* background: #9DDCF5; */ padding-bottom: 36.67rpx; /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/f92942021f97786a25c1cd51de779c7c.png"); */ - background: #9DDCF5 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: contain; + background-size: 100% 100%; } .swiper,.swiper image { width: 697rpx; @@ -78,10 +78,8 @@ 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: 710rpx; + width: 697rpx; margin: 0 auto; position: relative; z-index: 0; @@ -90,11 +88,9 @@ page { padding-bottom: 29.33rpx; justify-content: space-between; flex-wrap: wrap; - /* background: #FFFED6; */ margin-top: -50rpx; padding-top: 84rpx; - background: url('https://static.ticket.sz-trip.com/uploads/20240606/80bc185bf83b276b114415d670eaa57f.png'); - background-size: 100% 100%; + background: #FFF1C2; } .top-icon-item { margin-bottom: 20rpx; @@ -211,7 +207,7 @@ page { border-radius: 20rpx; /* border-radius: 77rpx; */ overflow: hidden; - margin-bottom: 33rpx; + margin-top: 33rpx; position: relative; } .product-tags { @@ -327,15 +323,13 @@ page { 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; @@ -347,13 +341,10 @@ page { } .slide-out-box { margin-top: 20rpx; - background: #FFFED6; - box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2); + background: #FFF1C2; border-radius: 27rpx; padding-bottom: 1rpx; margin-bottom: 40rpx; - background: url('https://static.ticket.sz-trip.com/uploads/20240606/88feacc675386ac7c8144633ccbd6f76.png'); - background-size: 100% 100%; } .pbservice { /* width: calc(175rpx * 6); */ @@ -373,9 +364,7 @@ page { /* width: 175rpx; */ text-align: center; font-size: 25rpx; - /* color: #333; */ - /* 春节调整颜色改版 */ - color: #54504D; + color: #111111; line-height: 24rpx; display: flex; align-items: center; @@ -551,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; @@ -588,13 +572,13 @@ page { background: #0B898E; */ /* 元旦修改 以上为注释部分 下面为新内容*/ height: 7rpx; - background: #56A5EA; + background: #F65D1F; border-radius: 3rpx; } /* 元旦修改 新增样式 */ .scroll-line-bg2 { margin-left: 37.33rpx; - background: #56A5EA; + background: #F65D1F; height: 7rpx; border-radius: 3rpx; } @@ -702,14 +686,11 @@ 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; - background: url('https://static.ticket.sz-trip.com/uploads/20240606/e1c3f60baf65787d593c6a7c79f881c7.png'); - background-size: 100% 100%; } .other-plats image { width: 80rpx; @@ -719,7 +700,7 @@ page { } .other-plat { /* 春节新增样式 */ - color: #54504D; + color: #111111; } .other-plat:nth-child(4n){ margin-right: 0; @@ -853,7 +834,7 @@ page { } /* 元旦修改新增样式 */ .time-box { - font-size: 25rpx; + font-size: 27rpx; font-family: DIN; font-weight: 500; /* color: #54504D; */ @@ -867,15 +848,16 @@ page { } /* 元旦修改新增样式 */ .xsth-time { - width: 43rpx; + /* width: 43rpx; */ height: 43rpx; + padding: 0 7rpx; line-height: 43rpx; - background: #FFEF47; + background: #FFF1C2; border-radius: 13rpx; - font-size: 25rpx; + font-size: 27rpx; font-family: DIN; font-weight: 500; - color: #000; + color: #ED1C19; text-align: center; } .time-box text { @@ -922,46 +904,53 @@ page { } /* 元旦修改新增样式 */ .xpth-product { - /* position: absolute; */ width: 700rpx; height: 373rpx; - /* background: #FFFED6; */ - box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2); border-radius: 27rpx; - padding: 25rpx; + padding: 25rpx 13rpx; box-sizing: border-box; - /* left: 0; - bottom: 15.33rpx; - /* width: 710rpx; */ display: flex; justify-content: space-between; - background-image: url('https://static.ticket.sz-trip.com/uploads/20240606/88feacc675386ac7c8144633ccbd6f76.png'); - background-size: 100% 100%; + 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 { @@ -1030,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 { @@ -1055,14 +1044,18 @@ page { } /* 元旦修改新增样式 */ .new-pic { - width: 158.67rpx !important; - height: 218.67rpx !important; + width: 160rpx !important; + height: 213rpx !important; margin-bottom: 26.67rpx; } .ggfw-list { justify-content: space-around !important; } +.ggfw-list .pbservice-item{ + margin-right: 0; + color: #111111; +} .ggfw { width: auto; } @@ -1096,7 +1089,7 @@ page { } /* 春节金刚区字体颜色样式更换 */ .top-icon-text { - color: #54504D; + color: #111111; } .rmtj-right { @@ -1196,3 +1189,12 @@ page { flex-shrink: 0; margin-left: -20rpx; } + +.xsth-left{ + /* flex: 1; + width: 1rpx; */ +} +.xsth-left>image{ + max-width: 100%; + overflow: hidden; +} \ No newline at end of file diff --git a/utils/https.js b/utils/https.js index 58ee3a1..50f43f4 100644 --- a/utils/https.js +++ b/utils/https.js @@ -1,8 +1,8 @@ var app = getApp(); import util from "../utils/util" // import userApi from "../utils/https/user.js"; -const baseUrl = "https://test.api.cloud.sz-trip.com/api/"; -// let baseUrl = "https://api.cloud.sz-trip.com/api/"; +// const baseUrl = "https://test.api.cloud.sz-trip.com/api/"; +let baseUrl = "https://api.cloud.sz-trip.com/api/"; const env = wx.getAccountInfoSync().miniProgram.envVersion if (env == 'develop1') { baseUrl = "https://test.api.cloud.sz-trip.com/api/"