From 487c179bc7e84ebe07bff3f470335648f4920851 Mon Sep 17 00:00:00 2001 From: jiazhipeng Date: Tue, 24 Sep 2024 16:56:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=BA=86=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 2 +- pages/index/index.js | 43 ++++++++++++++----- pages/index/index.wxml | 81 ++++++++--------------------------- pages/index/index.wxss | 5 ++- pages/list/six/index.js | 8 ++++ pages/list/six/index.wxml | 4 +- pages/pbService/index.wxml | 4 +- project.private.config.json | 12 +++--- subPackages/index/index.wxml | 4 +- subPackages/indexs/index.wxml | 2 +- 10 files changed, 75 insertions(+), 90 deletions(-) diff --git a/app.js b/app.js index 2d8e4ba..8daa8ad 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.isTest149? true : false; + data.isTest = data.isTest148? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/pages/index/index.js b/pages/index/index.js index 068d161..79b0978 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -101,24 +101,32 @@ Page({ 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:'/pages/list/techan/index', + path:'/subPackages/techanNew/index', url:'', + list: [], + }, @@ -242,11 +250,11 @@ 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 @@ -261,7 +269,7 @@ Page({ title:'', area_id:'' }).then(res=>{ - console.log('景点', res) + console.log('景点', res) res.data.list.map(item => { if (item.distance || item.distance == 0) { if (item.distance >= 1000) { @@ -271,8 +279,10 @@ Page({ } } }) + bdList[0].list = res.data.list this.setData({ - list1:res.data.list + list1:res.data.list, + bdList: bdList }) }) // 非买不可--文创 @@ -281,8 +291,10 @@ Page({ offset: 0, limit: 6, }).then(res=>{ + bdList[3].list = res.data.list this.setData({ - list4:res.data.list + list4:res.data.list, + bdList: bdList }) }) // 非游不可--线路一日游 @@ -293,8 +305,10 @@ Page({ limit: 6, sort: 'weight' }).then(res=>{ + bdList[1].list = res.data.list this.setData({ - list2:res.data.list + list2:res.data.list, + bdList: bdList }) }) // 非看不可--剧场演出 @@ -308,8 +322,10 @@ Page({ lon:this.data.lon, title:'' }).then(res=>{ + bdList[2].list = res.data.list this.setData({ - list3:res.data.list + list3:res.data.list, + bdList: bdList }) }) }, @@ -373,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/pages/index/index.wxml b/pages/index/index.wxml index f1d6541..410f917 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -45,7 +45,8 @@ - + + {{item.name}} {{item.begin_date}}-{{item.end_date}} @@ -58,8 +59,10 @@ - - + + + + {{item.title}} 去购票 > @@ -90,7 +93,7 @@ 夜游苏州 - + 文创特产 @@ -111,7 +114,7 @@ 一卡游 - + 非遗专卖 @@ -155,7 +158,8 @@ 电子社保卡 + data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" + class="pbservice-item ggfw" > 高峰预警 @@ -201,14 +205,15 @@ - + - - 更多 > + + 更多 > - - + + {{index+1}} @@ -218,63 +223,13 @@ {{item.price/100}} - {{item.distance}} - - - - - - - - {{index+1}} - - - - - {{item.title}} - - - {{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 + + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 1f87819..3f8a88e 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -571,7 +571,7 @@ page { /* 元旦修改 新增样式 */ .scroll-line-bg2 { margin-left: 24rpx; - background: #078565; + background: #FF4848; height: 8rpx; border-radius: 4rpx; } @@ -1208,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; diff --git a/pages/list/six/index.js b/pages/list/six/index.js index 574d584..e788f1d 100644 --- a/pages/list/six/index.js +++ b/pages/list/six/index.js @@ -37,6 +37,14 @@ Page({ this.getTypes() }) }, + 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), + }) +}, gotoPath:function(e){ console.log(e); if(e.currentTarget.dataset.event.area_key == 'taicang'){ diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml index 8968e3a..9c16788 100644 --- a/pages/list/six/index.wxml +++ b/pages/list/six/index.wxml @@ -39,10 +39,10 @@ 公共服务 - + 景区舒适度 - + 停车场 diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml index 7201975..7177e64 100644 --- a/pages/pbService/index.wxml +++ b/pages/pbService/index.wxml @@ -9,8 +9,8 @@ 苏康码 --> - + 高峰预警 diff --git a/project.private.config.json b/project.private.config.json index 8591e8c..0a13832 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -7,22 +7,22 @@ "miniprogram": { "list": [ { - "name": "subPackages/indexs/index", - "pathName": "subPackages/indexs/index", + "name": "首页", + "pathName": "pages/list/six/index", "query": "", "launchMode": "default", "scene": null }, { - "name": "pages/info/postProductInfo/index", - "pathName": "subPackages/index/index", + "name": "subPackages/indexs/index", + "pathName": "subPackages/indexs/index", "query": "", "launchMode": "default", "scene": null }, { - "name": "首页", - "pathName": "pages/index/index", + "name": "pages/info/postProductInfo/index", + "pathName": "subPackages/index/index", "query": "", "launchMode": "default", "scene": null diff --git a/subPackages/index/index.wxml b/subPackages/index/index.wxml index a8b12df..c6b19ef 100644 --- a/subPackages/index/index.wxml +++ b/subPackages/index/index.wxml @@ -393,8 +393,8 @@ - diff --git a/subPackages/indexs/index.wxml b/subPackages/indexs/index.wxml index b046453..1e3582c 100644 --- a/subPackages/indexs/index.wxml +++ b/subPackages/indexs/index.wxml @@ -73,7 +73,7 @@ -