From c18af5a02c99f73d363b5d003333d91ecf6ee23c Mon Sep 17 00:00:00 2001 From: jiazhipeng Date: Wed, 18 Sep 2024 15:26:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=92=E6=99=AF=E5=A5=97=E9=A4=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 2 +- pages/index/index.wxml | 1374 ++++++++++++++----------- pages/info/postProductInfo/index.js | 26 +- pages/info/postProductInfo/index.wxml | 60 +- pages/info/postProductInfo/index.wxss | 97 +- pages/map/index.js | 34 + pages/map/index.wxml | 31 + pages/map/index.wxss | 43 +- pages/order/orderList/index.wxml | 2 +- pages/order/postOrder/index.wxml | 2 +- 10 files changed, 1069 insertions(+), 602 deletions(-) diff --git a/app.js b/app.js index 8daa8ad..2d8e4ba 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.isTest148? true : false; + data.isTest = data.isTest149? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 41518cc..778d17d 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -4,612 +4,808 @@ - - - - {{weather.max_temp}}° - {{weather.weather}} - - - - - - - - 搜索想要的旅游产品或服务 - - - - + + + + + {{weather.max_temp}}° + {{weather.weather}} + + + + + + + + 搜索想要的旅游产品或服务 + + + + + + + + + + + + + + + + + + + + + + 活动日历 + + + + + + 场馆预约 + + + + + + 非遗专卖 + + + + + + + 剧场演出 + + + + + 文创特产 + + + + + + + 景点门票 + + + + + + 酒店住宿 + + + + + + 夜游苏州 + + + + + + 一日游 + + + + + + 研学游 + + + + + + 特惠新品超值商品限时抢购 + + + + + + + + 限时特惠 + 新品推荐 + + + ￥{{saleProduct.price?saleProduct.price/100:0}}起 + + + + + 精品线路带你轻松玩转苏州 + + + + + + + + 四季苏州 + 最是江南 + + + ￥{{roadProduct.price?roadProduct.price/100:0}}起 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 倒计时 + {{djs.h}} + : + {{djs.m}} + : + {{djs.s}} + + + + + + + + + + + + {{item.title}} + + + {{item.price/100}} + + + + + + + + + + + + + + + + + + + + + 数字非遗 + + + + 数字博物馆 + + + + 数字名人馆 + + + + 云上观展 + + + + 云上文博会 + + + + 精彩回顾 + + + + 文化场馆查询 + + + + 苏影通 + + + + 书仓 + + + + e读书 + - - - - - - - 活动日历 - - - - - - 场馆预约 - - - - - - 非遗专卖 - - - - - - - 剧场演出 - - - - - 文创特产 - - - - - - - 景点门票 - - - - - - 酒店住宿 - - - - - - 夜游苏州 - - - - - - 一日游 - - - - - - 研学游 - - - - - - 特惠新品超值商品限时抢购 - - - - + + + 数字公共文化 + + + + + + 云游苏州 + + + + 美图鉴赏 + + + + + + + + + + + + + + + + + + + + + + + + + + - - - 限时特惠 - 新品推荐 - - - ￥{{saleProduct.price?saleProduct.price/100:0}}起 - - - - - 精品线路带你轻松玩转苏州 - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 倒计时 - {{djs.h}} - : - {{djs.m}} - : - {{djs.s}} - - - - - - - - - - - - {{item.title}} - - - {{item.price/100}} - - - - - - - - - - - - - - - - - - - - - 数字非遗 - - - - 数字博物馆 - - - - 数字名人馆 - - - - 云上观展 - - - - 云上文博会 - - - - 精彩回顾 - - - - 文化场馆查询 - - - - 苏影通 - - - - 书仓 - - - - e读书 + --> + + + + + + + + + 查看全部 - - - - 数字公共文化 - - - - - - 云游苏州 - - - - 美图鉴赏 - - - + + + + + + + - + - + + + 行李寄存 + + + + + + 实时路况 + + - - - + + + + + + + + + + + + + {{item.name}} + + + + + + + + + + + + + + {{date}} {{month}} + + + {{item.ext.display_tags[0]}} + {{item.title}} + + + + + + {{item.ext.subtitle}} + + + {{item.title}} + + + + {{item.ext.like_number}} + + + + {{item.ext.view_number}} + + + + + + + + + + + {{item.title}} + + + ￥{{item.ext.price/100}}起 + + + + + + + 查看更多 + 暂无更多推荐 + + + + + + + + + {{prizeInfo.prize_name}} + + + + - + + + + {{prizeInfo.prize_name}} + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 查看全部 - - - - - - - - - - - - - - - 电子社保卡 - - - - 景区舒适度 - - - - - - 行李寄存 - - - - - - 实时路况 - - - - - - - - - - - - - - - - - - - - - - - - {{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}}起 - - - + + + + + 您与奖品擦肩而过期待下次参与 + + + + + + 我知道了 + + + + + + + + + + + + + + + + + + + + + + + + + {{time}}s跳过 + + - - 查看更多 - 暂无更多推荐 - - - - - - - - - {{prizeInfo.prize_name}} - - - - - - - - - - {{prizeInfo.prize_name}} - - - - - - - - - - 您与奖品擦肩而过期待下次参与 - - - - - - 我知道了 - - - - - - - - - - - - - - - - - - - - - - - - - {{time}}s跳过 - - - - - - + + + - - - - - - - + + + + + + + + + - + + + 活动日历 + + + + + + 场馆预约 + + + + + + + + 剧场演出 + + + + + + + + 夜游苏州 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 数字非遗 + + + + 数字博物馆 + + + + + 云上观展 + + + + 云上文博会 + + + + + 文化场馆查询 + + + + + 书仓 + + + + + + 数字公共文化 + + + + + + 云游苏州 + + + + 美图鉴赏 + + + + + + + + + + + + + + + + + - - {{time}}s - 跳过 + + + + + + + - --> \ No newline at end of file + \ No newline at end of file diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js index da0b4d3..fd88ffb 100644 --- a/pages/info/postProductInfo/index.js +++ b/pages/info/postProductInfo/index.js @@ -73,8 +73,22 @@ Page({ res.data.sku = [sku]; } res.data.flag = res.data.sku.find(item => item.flag == 'on') ? res.data.flag : 0 + + let resData = res.data + if (resData.product_data) { + if (resData.product_data["住"]) { + resData.product_data["住"] = JSON.parse(resData.product_data["住"]) + } + if (resData.product_data["游"]) { + resData.product_data["游"] = JSON.parse(resData.product_data["游"]) + } + if (resData.product_data["食"]) { + resData.product_data["食"] = JSON.parse(resData.product_data["食"]) + } + } + this.setData({ - info: res.data, + info: resData, supplierId: res.data.supplier_id, iShop: res.data.supplier_id ? true : false }) @@ -686,6 +700,16 @@ Page({ util.gotoDetail(item); } }, + + gotolocation: function () { + let info = this.data.info; + wx.openLocation({ + latitude: Number(info.scene_lat), + longitude: Number(info.scene_lon), + name:info.scene_name, + address:info.scene_address + }) + }, /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml index 2f079ba..d6742cc 100644 --- a/pages/info/postProductInfo/index.wxml +++ b/pages/info/postProductInfo/index.wxml @@ -21,15 +21,61 @@ ￥{{ allowance_data.mini_price / 100 }}起 单品最高补贴{{ allowance_data.max_price / 100 }}元 - - {{info.title}} - {{info.subtitle}} - - {{item}} + + + + +
+
{{info.price/100}}￥{{info.market_price/100}}
+
已售{{info.sales_number||0}}份
+
+ + {{info.title}} + + + + {{index}} + + + + + + {{str.title}} + + {{str.unit}} + + + + + + + + + + + {{info.scene_name}} + {{info.scene_address}} + + + + + 去这里 + + + + + + {{info.title}} + {{info.subtitle}} + + {{item}} + + ￥{{info.price/100}}起 + - ￥{{info.price/100}}起 - + + 产品特色 diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss index 4aedf61..7e97fa7 100644 --- a/pages/info/postProductInfo/index.wxss +++ b/pages/info/postProductInfo/index.wxss @@ -938,4 +938,99 @@ page { align-items: center; justify-content: space-between; height: 70rpx; -} \ No newline at end of file +} + + .wineScene-price-container { + width: 750rpx; + height: 100rpx; + background: linear-gradient(-90deg,#FF413B, #FFAB2E); + border-radius: 20rpx 20rpx 0rpx 0rpx; + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 26rpx; + box-sizing: border-box; + color: #FFFFFF; + font-size: 24rpx; + } + + .wineScene-price-container .wineSecne-price { + font-weight: bold; + font-size: 36rpx; + color: #FFFFFF; +} +.wineScene-price-container .wineSecne-money { + font-size: 24rpx; + font-weight: 500; + text-decoration-line: line-through; + padding-left: 14rpx; +} +.wineScene-price-container .wineSecne-price::before { + font-size: 24rpx; + content: '￥'; +} + +.hotel-custom-detail{ + display: flex; + /* justify-content: space-between; */ + height: fit-content; + font-family: PingFang SC; + font-weight: 500; + font-size: 24rpx; + color: #666666; + margin-bottom: 20rpx; +} +.hotel-custom-detail .tip-info{ + width: 33rpx; + position: relative; + display: flex; + justify-content: center; + flex-shrink: 0; +} +.hotel-custom-detail .tip-info .tip{ + font-family: PingFang SC; + font-weight: 500; + font-size: 23rpx; + color: #FFFFFF; + width: 33rpx; + height: 33rpx; + background: #6394FD; + border-radius: 50%; + position: absolute; + top: 0; + left: 0; + text-align: center; + line-height: 33rpx; +} +.hotel-custom-detail .tip-info .info{ + width: 11rpx; + height: 100%; + background: #D0DFFE; + border-radius: 5rpx; +} + +.hotel-custom-right>view{ + margin-bottom: 20rpx; +} +.hotel-custom-right>view:last-of-type{ + margin-bottom: 0; +} +.map-container{ + background-image: url('https://static.ticket.sz-trip.com/jundaosuzhou/images/wineScene/locationBg.png'); + background-size: 100% 100%; + width: 100%; + height: 128rpx; + padding: 30rpx 26rpx; + display: flex; + align-items: center; + justify-content: space-between; + font-family: PingFang SC; + font-weight: 500; + font-size: 24rpx; + color: #666666; + box-sizing: border-box; +} +.map-container image{ + width: 29rpx; + height: 29rpx; +} diff --git a/pages/map/index.js b/pages/map/index.js index 0d73bd3..bfa0fe6 100644 --- a/pages/map/index.js +++ b/pages/map/index.js @@ -759,6 +759,40 @@ Page({ }) }, +// 位页面 gotoUrl 和 gotourls + gotoUrl: function(e) { + let url = e.currentTarget.dataset.url; + app.globalData.weburl = url; + wx.navigateTo({ + // 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"); + if(!token || !userId) { + let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html' + + app.globalData.weburl = url; + wx.navigateTo({ + url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url), + }) + }else { + commonApi.user_post("uservice/user/userEncry").then(res => { + if(res.code == 1) { + let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html?userEncry=' + res.data + + app.globalData.weburl = url; + wx.navigateTo({ + url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url), + }) + } + }) + } +}, + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/map/index.wxml b/pages/map/index.wxml index 8bcf488..99daf15 100644 --- a/pages/map/index.wxml +++ b/pages/map/index.wxml @@ -1,6 +1,8 @@ + + @@ -307,4 +309,33 @@ + + + + + + + + + + + + 电子社保卡 + + + + 景区舒适度 + + + + 行李寄存 + + + + + 实时路况 + + + + \ No newline at end of file diff --git a/pages/map/index.wxss b/pages/map/index.wxss index bde614b..7c6d54b 100644 --- a/pages/map/index.wxss +++ b/pages/map/index.wxss @@ -672,4 +672,45 @@ /* color: #83D851; */ text-align: center; line-height: 40rpx; -} \ No newline at end of file +} + +/* // 位页面 */ +.pbservice { + /* width: calc(175rpx * 6); */ + /* 元旦修改 */ + width: calc(190rpx * 7); + display: flex; + margin-top: 30rpx; + flex-wrap: wrap; + /* margin-bottom: 60rpx; */ + /* 元旦修改 注释margin-bottom */ + justify-content: center; + } + .pbservice-item { + /* 元旦修改 截止到注释的width*/ + width: 120rpx; + margin-bottom: 33.33rpx; + margin-right: 62.33rpx; + /* width: 175rpx; */ + text-align: center; + font-size: 25rpx; + /* color: #333; */ + /* 春节调整颜色改版 */ + color: #54504D; + line-height: 24rpx; + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + } + .text { + width: 200rpx; + } + .pbservice-item image { + /* width: 60rpx; + margin-bottom: 20rpx; + margin-top: 50rpx; */ + /* 元旦修改 以上都是之前的*/ + width: 106rpx; + margin-bottom: 10rpx; + } \ No newline at end of file diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml index 29fc4b1..a488969 100644 --- a/pages/order/orderList/index.wxml +++ b/pages/order/orderList/index.wxml @@ -73,7 +73,7 @@ 合计：¥{{((showPrice + postFee)* coupon.activity.fold/10)>0?((showPrice + postFee)* coupon.activity.fold/10)/100:0}} + class="price">¥{{((postFee+showPrice* coupon.activity.fold/10))/100}} 合计： diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml index f46ff39..fd18ba0 100644 --- a/pages/order/postOrder/index.wxml +++ b/pages/order/postOrder/index.wxml @@ -58,7 +58,7 @@ 合计：¥{{((showPrice + postFee)* coupon.activity.fold/10)>0?((showPrice + postFee)* coupon.activity.fold/10)/100:0}} + class="price">¥{{(postFee+showPrice* coupon.activity.fold/10)/100}}