diff --git a/app.js b/app.js index dd03f9a..72de0a2 100644 --- a/app.js +++ b/app.js @@ -21,7 +21,7 @@ App({ unique_key: "wechatxcx" }).then(res => { let data = JSON.parse(res.data); - data.isTest = data.isTest97? true : false; + data.isTest = data.isTest98? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/app.json b/app.json index a1a1761..7b89e99 100644 --- a/app.json +++ b/app.json @@ -213,26 +213,26 @@ "sitemapLocation": "sitemap.json", "tabBar": { "color": "#999", - "selectedColor": "#0B898E", + "selectedColor": "#D02E25", "borderStyle": "white", "list": [ { "pagePath": "pages/index/index", "iconPath": "/images/home.png", - "selectedIconPath": "/images/homeSel.png", + "selectedIconPath": "/images/index-seld.png", "text": "首页", "shareTimeline": true }, { "pagePath": "pages/map/index", "iconPath": "/images/map.png", - "selectedIconPath": "/images/mapSeld.png", + "selectedIconPath": "/images/tuyou-seld.png", "text": "图游" }, { "pagePath": "pages/user/user", "iconPath": "/images/user.png", - "selectedIconPath": "/images/userSel.png", + "selectedIconPath": "/images/my-seld.png", "text": "我的" } ] diff --git a/images/index-seld.png b/images/index-seld.png new file mode 100644 index 0000000..c45cad0 Binary files /dev/null and b/images/index-seld.png differ diff --git a/images/my-seld.png b/images/my-seld.png new file mode 100644 index 0000000..3a88c5c Binary files /dev/null and b/images/my-seld.png differ diff --git a/images/tuyou-seld.png b/images/tuyou-seld.png new file mode 100644 index 0000000..ff577b2 Binary files /dev/null and b/images/tuyou-seld.png differ diff --git a/pages/index/index.js b/pages/index/index.js index 0d6d7c9..e9b6c89 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -40,6 +40,21 @@ Page({ showFullAdv: true, //全屏广告开关 time: 5, //全屏广告剩余时间 showTime:false, + xpth:{}, // 元旦新增 新品特惠和sqjNew + djs:null, // 元旦新增 新品特惠倒计时 + djsTime:null, + sqjNew:[ + 'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-zjg.png', + 'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-cs.png', + 'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-tc.png', + 'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-ks.png', + 'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-wj.png', + 'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-wzs.png', + 'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-xc.png', + 'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-gs.png', + 'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-gyyq.png', + 'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-gxq.png', + ] }, onLoad: function (options) { //全屏广告 @@ -120,6 +135,42 @@ Page({ date: today.getDate() }) this.getVideoPrize() + this.getXpthList() + }, + getXpthList:function () { + // 元旦新增 新品特惠 + commonApi._post("product/get_product_indulgence", { + tag_id: 275, + typeId:3, + }).then(res => { + console.log('data',res.data); + this.setData({ + xpth: res.data, + djsTime: res.data.time + }) + let time = setInterval(()=>{ + this.setData({ + djsTime:this.data.djsTime-1 + }) + this.formatDate(this.data.djsTime) + },1000) + if(this.data.djsTime==0) { + clearInterval(time) + } + }) + }, + // 元旦新品特惠 倒计时 + formatDate: function (oTime) { + let h = parseInt(oTime/3600) + let m = parseInt((oTime%3600)/60) + let s = parseInt(oTime%60) + // h=h<10?"0"+h:h; + // m=m<10?"0"+m:m; + s=s<10?"0"+s:s; + this.setData({ + djs:{h:h,m:m,s:s} + }) + return }, goFeiyi: function () { app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons' @@ -405,6 +456,15 @@ Page({ }) } }, + // 元旦 新品特惠部分 + goBanner: function(e) { + console.log('新品特惠',e.currentTarget.dataset.url); + let url = e.currentTarget.dataset.url; + app.globalData.weburl = url; + wx.navigateTo({ + url: "/pages/pbService/web/index" + }) + }, gotoUrl: function (e) { console.log(e) if (e.currentTarget.dataset.event) { diff --git a/pages/index/index.wxml b/pages/index/index.wxml index cd8d20c..b727e0f 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -3,6 +3,7 @@ + @@ -44,12 +45,16 @@ - + + + 活动日历 - + + + 场馆预约 @@ -57,42 +62,58 @@ data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item"> --> - + + + 非遗专卖 - + + + 剧场演出 - + + + 文创特产 - + + + 景点门票 - + + + 酒店住宿 - + + + 夜游苏州 - + + + 一日游 - + + + 研学游 @@ -153,14 +174,55 @@ + + + + + + + + {{djs.h}}: + {{djs.m}}: + {{djs.s}} + + + + 更多 + + + + + + + + + + {{item.title}} + + {{item.price/100}} + 立即抢购 + + + + + + + + + + + - + + - - 非遗鉴赏 + + + - - 文化场馆查询 + + + - - 数字博物馆 + + + - - 云上文博会 + + + - - 投资导引图 + + + - - 文旅单位 + + + - - 苏影通 + + + - - 云上观展 + + + - - 精彩回顾 + + + - - 视觉中心 + + + - - 书香借阅 + + + - - 公共文化资源库 + + + - + + + + - + + + + + + @@ -285,29 +384,39 @@ class="iconfont icon-you"> - + + - - + + + + + 安全服务 - + data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw"> + + + 景区舒适度 - + data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw"> + + + 行李寄存 - + data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw"> + + + 实时路况 + + + + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 5858b74..5a6535b 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -1,4 +1,8 @@ /**index.wxss**/ +/* 元旦修改 */ +page { + background: #FFF6E8; +} .swiper,.swiper image { width: 690rpx; display: block; @@ -275,7 +279,7 @@ font-size: 31rpx; font-weight: 500; } -.pic-list { +/* .pic-list { display: flex; justify-content: space-between; margin: 60rpx 0; @@ -284,23 +288,41 @@ width: 155.33rpx; height: 200rpx; display: block; +} */ +/* 元旦修改 以上两个样式为注释掉的 下面的.pic-list是新改的 */ +.pic-list { + width: 100%; + display: flex; + margin-right: 26rpx; + display: flex; + justify-content: space-between; + flex-wrap: wrap; } .title-more { font-size: 27rpx; - color: #0B898E; + /* color: #0B898E; */ + /* 元旦修改 */ + color: #D02E25; } .title-more .iconfont { font-size: 22rpx; } .pbservice { - width: calc(175rpx * 6); + /* width: calc(175rpx * 6); */ + /* 元旦修改 */ + width: calc(239.33rpx * 6); display: flex; margin-top: 20rpx; flex-wrap: wrap; - margin-bottom: 60rpx; + /* margin-bottom: 60rpx; */ + /* 元旦修改 注释margin-bottom */ } .pbservice-item { - width: 175rpx; + /* 元旦修改 截止到注释的width*/ + width: 220rpx; + margin-bottom: 33.33rpx; + margin-right: 19.33rpx; + /* width: 175rpx; */ text-align: center; font-size: 25rpx; color: #333; @@ -311,9 +333,11 @@ flex-direction: column; } .pbservice-item image { - width: 60rpx; + /* width: 60rpx; margin-bottom: 20rpx; - margin-top: 50rpx; + margin-top: 50rpx; */ + /* 元旦修改 以上都是之前的*/ + width: 220rpx; } .six-box { margin-top: 43rpx; @@ -482,17 +506,34 @@ margin: 20rpx auto; } .scroll-line { - height: 6rpx; + /* height: 6rpx; border-radius: 3rpx; background: #ccc; overflow: hidden; - margin: 30rpx auto; + margin: 30rpx auto; */ + /* 元旦修改 以上为注释部分 下面为新内容*/ + width: 73rpx !important; + height: 7rpx; + background: #FFDA9F; + border-radius: 3rpx; + margin: 33.33rpx auto; } .scroll-line-bg { - width: 300rpx; + /* width: 300rpx; height: 6rpx; border-radius: 3rpx; - background: #0B898E; + background: #0B898E; */ + /* 元旦修改 以上为注释部分 下面为新内容*/ + height: 7rpx; + background: #D02E25; + border-radius: 3rpx; +} +/* 元旦修改 新增样式 */ +.scroll-line-bg2 { + margin-left: 37.33rpx; + background: #D02E25; + height: 7rpx; + border-radius: 3rpx; } .nomore-tip-btn { position: absolute; @@ -724,4 +765,197 @@ text-align: center; line-height: 60rpx; z-index: 1002; +} + +/* 元旦修改新增样式 */ +.xpth { + /* width: 697rpx; */ + height: 462rpx; + background: linear-gradient(-90deg, #FF9B6A, #D02E25); + border-radius: 20rpx; + padding: 22.67rpx 18rpx 15.33rpx; + position: relative; +} +/* 元旦修改新增样式 */ +.time-box { + font-size: 25rpx; + font-family: DIN; + font-weight: 500; + color: #FDEBC6; + display: flex; + align-items: center; + height: 37px; + margin-left: -50rpx; +} +/* 元旦修改新增样式 */ +.xsth-time { + margin: 0 5rpx; + width: 50rpx; + height: 33rpx; + background: #FFF0D7; + border-radius: 5rpx; + font-size: 25rpx; + font-family: DIN; + font-weight: 500; + color: #E63100; + text-align: center; + line-height: 33rpx; +} +/* 元旦修改新增样式 */ +.xpth-left { + display: flex; + flex-direction: column; + justify-content: space-between; +} +/* 元旦修改新增样式 */ +.xsth-title { + display: flex; + justify-content: space-between; + width: 100%; +} +/* 元旦修改新增样式 */ +.xsth-more { + margin-top: 19.33rpx; + font-size: 27rpx; + font-family: HYZhongYuan; + font-weight: normal; + color: #FFE7C0; +} +/* 元旦修改新增样式 */ +.xsth-more image { + margin-left: 14.67rpx; + width: 12.67rpx; + height: 22.67rpx; + vertical-align: middle; +} +/* 元旦修改新增样式 */ +.yanhua { + height: 104rpx; + width: 104rpx; + position: absolute; + right: 120rpx; + z-index: 999; +} +/* 元旦修改新增样式 */ +.xpth-product { + position: absolute; + right: 18rpx; + bottom: 15.33rpx; + display: flex; + width: 670rpx; + justify-content: space-between; +} +/* 元旦修改新增样式 */ +.xpth-banner { + width: 248rpx; + height: 353rpx; + background: #FFFFFF; + border-radius: 20rpx; +} +/* 元旦修改新增样式 */ +.xpth-item { + width: 413rpx; + height: 170rpx; + background: #FFFFFF; + border-radius: 20rpx; + display: flex; +} +/* 元旦修改新增样式 */ +.xpth-item image { + width: 160rpx; + height: 160rpx; + background: #FFE7C0; + border-radius: 13rpx; + margin-right: 15.33rpx; + flex-shrink: 0; +} +/* 元旦修改新增样式 */ +.xpth-item-content { + width: 100%; + display: flex; + flex-direction: column; + justify-content: space-around; + +} +/* 元旦修改新增样式 */ +.xpth-item-title { + font-size: 27rpx; + font-family: PingFang SC; + font-weight: 500; + color: #333333; + margin-right: 18rpx; + height: 80rpx; +} +/* 元旦修改新增样式 */ +.xpth-item-bottom { + display: flex; + justify-content: space-between; + align-items: center; + padding-right: 13.33rpx; +} +/* 元旦修改新增样式 */ +.xpth-item-price { + font-size: 32rpx; + font-family: PingFang SC; + font-weight: 500; + color: #E63100; +} +/* 元旦修改新增样式 */ +.xpth-item-price::before { + content: "￥"; + font-size: 20rpx; +} +/* 元旦修改新增样式 */ +.xpth-item-buy { + width: 111rpx; + height: 36rpx; + background: linear-gradient(180deg, #FF9B6A, #E63100); + border-radius: 18rpx; + font-size: 21rpx; + font-family: PingFang SC; + font-weight: 500; + color: #FFE7C0; + text-align: center; + line-height: 36rpx; +} +/* 元旦修改新增样式 */ +.new-pic { + width: 335.33rpx !important; + height: 120.67rpx !important; + margin-bottom: 26.67rpx; +} + +.ggfw-list { + justify-content: space-around !important; +} +.ggfw { + width: auto; + margin-bottom: 54rpx; +} +.ggfw image{ + margin-bottom: 16.67rpx; + width: 93.33rpx !important; + height: 93.33rpx !important; +} + +.six-box-new { + width: 697rpx; + height: 285rpx; + background: linear-gradient(-90deg, #FF9B6A, #D02E25); + border-radius: 20rpx; + display: flex; + justify-content: space-between; + align-items: center; + padding-left: 13.33rpx; + overflow: scroll; + margin-bottom: 53.33rpx; +} + +.six-box-new image { + width: 192rpx; + height: 258rpx; + background: #FFE7C0; + border-radius: 20rpx; + flex-shrink: 0; + margin-right: 13.33rpx; } \ No newline at end of file diff --git a/pages/info/activityInfo/index.wxml b/pages/info/activityInfo/index.wxml index e5770bc..88057ff 100644 --- a/pages/info/activityInfo/index.wxml +++ b/pages/info/activityInfo/index.wxml @@ -40,7 +40,7 @@ {{info.scene_data.title}} - 查看 + 预订 {{info.scene_data.address}} diff --git a/pages/info/hotelInfo/index.js b/pages/info/hotelInfo/index.js index 877d9c3..e4e62bd 100644 --- a/pages/info/hotelInfo/index.js +++ b/pages/info/hotelInfo/index.js @@ -13,7 +13,8 @@ Page({ fixed:false, type:1, top:0, - info:null + info:null, + tel:null }, /** @@ -30,7 +31,8 @@ Page({ id:options.id }).then(res=>{ this.setData({ - info:res.data + info:res.data, + tel:(res.data.tel.indexOf('/') == -1)?res.data.tel:res.data.tel.split('/')[0] }) this.BroswerRecord() }) @@ -53,6 +55,12 @@ Page({ } },500) }, + call:function(e){ + let num = e.currentTarget.dataset.num; + wx.makePhoneCall({ + phoneNumber: num, + }) + }, changeMenu:function(e){ let index = e.currentTarget.dataset.index,that = this; const query=wx.createSelectorQuery(); //创建节点查询器 diff --git a/pages/info/hotelInfo/index.wxml b/pages/info/hotelInfo/index.wxml index 33838b7..5e752a9 100644 --- a/pages/info/hotelInfo/index.wxml +++ b/pages/info/hotelInfo/index.wxml @@ -4,18 +4,24 @@ 介绍 - 设施与服务 - 预定须知 + + 预订须知 + + {{info.title}} + - 介绍 + + + 酒店介绍 + - + - + - 预定须知 + + + 预订须知 + + + + + 拨打酒店电话：{{tel}} \ No newline at end of file diff --git a/pages/info/hotelInfo/index.wxss b/pages/info/hotelInfo/index.wxss index c1d14a2..69011dc 100644 --- a/pages/info/hotelInfo/index.wxss +++ b/pages/info/hotelInfo/index.wxss @@ -1,6 +1,7 @@ /* pages/info/hotelProductInfo/index.wxss */ page { - background: #f2f2f2; + /* background: #f2f2f2; */ + padding-bottom: 171rpx; } .swiper { width: 100%; @@ -300,6 +301,8 @@ page { .scroll-menu-item { position: relative; line-height: 84rpx; + width: 300rpx; + text-align: center; } .scroll-menu-item.active::after { content: "1"; @@ -359,3 +362,39 @@ page { border-radius: 39rpx; text-align: center; } + +.hotel-name { + width: 750rpx; + height: 121rpx; + background: rgba(11,137,142, .08); + padding-left: 26.67rpx; + font-size: 35rpx; + font-family: PingFang SC; + font-weight: bold; + color: #0B898E; + line-height: 121rpx; +} + +.icon-img { + width: 32rpx; + height: 32rpx; + margin-right: 8.67rpx; + vertical-align: middle; +} + +.call-phone { + width: 653rpx; + height: 80rpx; + background: #0B898E; + border-radius: 40rpx; + font-size: 32rpx; + font-family: PingFang SC; + font-weight: 500; + color: #FFFFFF; + text-align: center; + line-height: 80rpx; + margin: auto; + position: fixed; + left: 50rpx; + bottom: 50rpx; +} diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml index 9514af6..1bffe7b 100644 --- a/pages/order/orderList/index.wxml +++ b/pages/order/orderList/index.wxml @@ -49,7 +49,7 @@ 出行人信息 姓名：{{items.name}} - 身份证：{{items.id_number}} + 证件号：{{items.id_number}} 手机号：{{items.tel}} diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml index 032d64a..0094b6e 100644 --- a/pages/order/scene/index.wxml +++ b/pages/order/scene/index.wxml @@ -71,7 +71,7 @@ {{item.name}} - 身份证： + 证件号： {{item.id_number}}