diff --git a/app.json b/app.json index deaf6de..e52187c 100644 --- a/app.json +++ b/app.json @@ -85,6 +85,7 @@ "pages/list/minitrip/index", "pages/list/oneday/index", "pages/pbService/index", + "pages/pbService/PRpark/index", "pages/pbService/sceneComfort/index", "pages/pbService/gym/index", "pages/pbService/gym/info/index", diff --git a/pages/activity/spring2021/index.wxml b/pages/activity/spring2021/index.wxml index a862739..dd676af 100644 --- a/pages/activity/spring2021/index.wxml +++ b/pages/activity/spring2021/index.wxml @@ -1,5 +1,5 @@ - + @@ -14,9 +14,8 @@ - - - + + @@ -28,9 +27,7 @@ - - - + @@ -43,4 +40,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/pages/activity/springten/index.wxml b/pages/activity/springten/index.wxml index bd179b8..82fcc59 100644 --- a/pages/activity/springten/index.wxml +++ b/pages/activity/springten/index.wxml @@ -9,7 +9,7 @@ - + {{item}} diff --git a/pages/ask/index.wxml b/pages/ask/index.wxml index ca8d1b8..f9256e6 100644 --- a/pages/ask/index.wxml +++ b/pages/ask/index.wxml @@ -1,17 +1,17 @@ <navigator url="my/index" class="ask-top-right" style="right:{{menuWidth}}px"> - <image src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/ask/my.png" mode="widthFix"></image> + <image src="https://static.ticket.sz-trip.com/xcxImages/ask/my.png" mode="widthFix"></image> <view>我的问答</view> </navigator> - + {{item.question_name}} - + {{item.answer && item.answer.lastest_answer?item.answer.lastest_answer.answer:"暂无回答"}} diff --git a/pages/ask/info/index.wxml b/pages/ask/info/index.wxml index 3986f97..58f1dc7 100644 --- a/pages/ask/info/index.wxml +++ b/pages/ask/info/index.wxml @@ -6,14 +6,14 @@ - + {{info.question_name}} {{info.created_time}}提问 - + 共{{total}}个回答 暂无回答 diff --git a/pages/ask/my/index.wxml b/pages/ask/my/index.wxml index bb3bd56..f21c886 100644 --- a/pages/ask/my/index.wxml +++ b/pages/ask/my/index.wxml @@ -11,11 +11,11 @@ - + {{item.question_name}} - + {{item.answers && item.answers.rows && item.answers.rows[0]?item.answers.rows[0].answer:"暂无回答"}} diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 9fa639f..730876b 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -16,48 +16,48 @@ 搜索想要的旅游产品或服务 - - + + - + 活动日历 - + 景点门票 - + 酒店住宿 - + 姑苏八点半 - + 一卡游苏州 - + 场馆预约 - + 非遗专卖 - + 剧场演出 - + 文创特产 - + 电影购票 @@ -68,7 +68,7 @@ - + {{saleProduct.sku.product.title+saleProduct.sku.sku_name}} ¥{{saleProduct.price/100}}起 @@ -76,8 +76,8 @@ - - + + 限时特惠 @@ -93,7 +93,7 @@ - + {{roadProduct.title}} ¥{{roadProduct.price/100}}起 @@ -111,109 +111,88 @@ - - + - - - - + + + + - - + + 更多 - + 找厕所 - + 停车场 - + 安全服务 - + 公共自行车 - + 书香借阅 - + 非遗传承 - + 投资导引图 - + 文物查询 - + 在线鉴赏 - - + - + 垃圾分类 - + - + - + @@ -221,7 +200,7 @@ - + {{date}} {{month}} {{item.ext.display_tags[0]}} @@ -257,7 +236,7 @@ {{item}} - {{item.ext.price/100}} + {{item.ext.price/100}} diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 4a2e2fe..22438a6 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -157,8 +157,9 @@ } .sale-tip-img { position: absolute; - width: 180rpx; - left: 157rpx; + width: 200rpx; + height: 165rpx; + left: 0; top: 0; } .small-swiper { @@ -305,7 +306,7 @@ flex-direction: column; } .pbservice-item image { - width: 63rpx; + width: 60rpx; margin-bottom: 20rpx; margin-top: 50rpx; } diff --git a/pages/info/activityInfo/index.wxml b/pages/info/activityInfo/index.wxml index e39ed60..2bacd26 100644 --- a/pages/info/activityInfo/index.wxml +++ b/pages/info/activityInfo/index.wxml @@ -14,11 +14,11 @@ {{info.name}} - + 活动时间:{{info.begin_date}} ~ {{info.end_date}} - + 活动地点:{{info.detail_address}} diff --git a/pages/info/hotelProductInfo/index.wxml b/pages/info/hotelProductInfo/index.wxml index a51ef33..a4ebd72 100644 --- a/pages/info/hotelProductInfo/index.wxml +++ b/pages/info/hotelProductInfo/index.wxml @@ -56,7 +56,7 @@ {{item.low_price>0?item.low_price/100:'0'}} - + @@ -82,7 +82,7 @@ - + {{item.question_name}} {{item.answer.total}}个回答 暂无回答 diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml index 6cee6f7..ed55744 100644 --- a/pages/info/sceneProductInfo/index.wxml +++ b/pages/info/sceneProductInfo/index.wxml @@ -1,10 +1,10 @@ - + @@ -63,13 +63,13 @@ - + {{item.question_name}} {{item.answer.total}}个回答 暂无回答 - + diff --git a/pages/list/card/index.wxss b/pages/list/card/index.wxss index d2d3bd6..4260079 100644 --- a/pages/list/card/index.wxss +++ b/pages/list/card/index.wxss @@ -67,7 +67,7 @@ left: 0; right: 0; bottom: 0; - background: url(https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/card/bg.png) repeat-y; + background: url(https://static.ticket.sz-trip.com/xcxImages/card/bg.png) repeat-y; background-size: 100%; z-index: -1; height: 100%; diff --git a/pages/list/comments/index.wxml b/pages/list/comments/index.wxml index 1583f11..1d3db29 100644 --- a/pages/list/comments/index.wxml +++ b/pages/list/comments/index.wxml @@ -12,6 +12,6 @@ {{item.content}} - + 暂无内容 \ No newline at end of file diff --git a/pages/list/feiyi/index.wxml b/pages/list/feiyi/index.wxml index ec51252..940a461 100644 --- a/pages/list/feiyi/index.wxml +++ b/pages/list/feiyi/index.wxml @@ -1,8 +1,8 @@ - + - + @@ -27,5 +27,5 @@ - + diff --git a/pages/list/feiyi/index.wxss b/pages/list/feiyi/index.wxss index 878bf30..76e134e 100644 --- a/pages/list/feiyi/index.wxss +++ b/pages/list/feiyi/index.wxss @@ -1,6 +1,6 @@ /* pages/list/feiyi/index.wxss */ page { - background: url(https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/feiyi/feiyinew_03.jpg); + background: url(https://static.ticket.sz-trip.com/xcxImages/feiyi/feiyinew_03.jpg); background-repeat: repeat-y; background-size: 100%; } diff --git a/pages/list/food/index.wxml b/pages/list/food/index.wxml index 2df2a11..0029940 100644 --- a/pages/list/food/index.wxml +++ b/pages/list/food/index.wxml @@ -5,7 +5,7 @@ {{types[typeIndex]}} - + @@ -25,10 +25,10 @@ 立即预定 - + - + 暂无内容 \ No newline at end of file diff --git a/pages/list/haoxing/index.wxml b/pages/list/haoxing/index.wxml index da41277..a50b0d1 100644 --- a/pages/list/haoxing/index.wxml +++ b/pages/list/haoxing/index.wxml @@ -1,8 +1,8 @@ - + - + diff --git a/pages/list/hotel/index.wxml b/pages/list/hotel/index.wxml index 012c28f..abd735a 100644 --- a/pages/list/hotel/index.wxml +++ b/pages/list/hotel/index.wxml @@ -1,6 +1,9 @@ - + + + + 精品酒店 舒适酒店 @@ -10,7 +13,7 @@ - + TOP{{index+1}} diff --git a/pages/list/hotel/index.wxss b/pages/list/hotel/index.wxss index 48062a1..921dc51 100644 --- a/pages/list/hotel/index.wxss +++ b/pages/list/hotel/index.wxss @@ -90,7 +90,7 @@ display: flex; align-items: center; justify-content: center; - background: url(https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/listtop/hotel_top_bg.png); + background: url(https://static.ticket.sz-trip.com/xcxImages/listtop/hotel_top_bg.png); background-size: cover; } .top-bg text { @@ -98,4 +98,11 @@ font-size: 23rpx; color: #333; font-weight: bold; +} +.hotelimg { + position: absolute; + width: 405rpx; + display: block; + left: 165rpx; + top: 42rpx; } \ No newline at end of file diff --git a/pages/list/message/index.wxml b/pages/list/message/index.wxml index 7b15a52..175e768 100644 --- a/pages/list/message/index.wxml +++ b/pages/list/message/index.wxml @@ -8,6 +8,6 @@ 查看详情>> - + 暂无内容 diff --git a/pages/list/minitrip/index.wxml b/pages/list/minitrip/index.wxml index f71386f..107360f 100644 --- a/pages/list/minitrip/index.wxml +++ b/pages/list/minitrip/index.wxml @@ -1,19 +1,19 @@ - + 综合 价格 - - + + 销量 @@ -28,12 +28,12 @@ {{item}} - {{item.supplier_name}} + {{item.supplier_name}} {{item.price/100}} - + 暂无内容 \ No newline at end of file diff --git a/pages/list/minitrip/index.wxss b/pages/list/minitrip/index.wxss index 2a6e949..ff02ede 100644 --- a/pages/list/minitrip/index.wxss +++ b/pages/list/minitrip/index.wxss @@ -125,3 +125,6 @@ pages { font-size: 23rpx; color: #A3A3A3; } +.price { + flex-shrink: 0; +} \ No newline at end of file diff --git a/pages/list/movieticket/index.wxml b/pages/list/movieticket/index.wxml index a9f2831..276c8b7 100644 --- a/pages/list/movieticket/index.wxml +++ b/pages/list/movieticket/index.wxml @@ -37,7 +37,7 @@ {{areas[areaIndex].area_title}} - + 离我最近 @@ -60,6 +60,6 @@ - + 暂无内容 diff --git a/pages/list/movieticket/list/cinema/index.wxml b/pages/list/movieticket/list/cinema/index.wxml index 6c56679..8c03f56 100644 --- a/pages/list/movieticket/list/cinema/index.wxml +++ b/pages/list/movieticket/list/cinema/index.wxml @@ -31,6 +31,6 @@ - + 暂无内容 \ No newline at end of file diff --git a/pages/list/movieticket/list/seats/index.js b/pages/list/movieticket/list/seats/index.js index b543a9f..a44f10f 100644 --- a/pages/list/movieticket/list/seats/index.js +++ b/pages/list/movieticket/list/seats/index.js @@ -6,7 +6,7 @@ const seatTypeList = [ "name": "可选", "type": "0", "seats": 1, - "icon": "https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/movie/image1.png", + "icon": "https://static.ticket.sz-trip.com/xcxImages/movie/image1.png", "isShow": "1", "position": "up" }, @@ -14,7 +14,7 @@ const seatTypeList = [ "name": "已选", "type": "0-1", "seats": 1, - "icon": "https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/movie/image0.png", + "icon": "https://static.ticket.sz-trip.com/xcxImages/movie/image0.png", "isShow": "1", "position": "up" }, @@ -22,7 +22,7 @@ const seatTypeList = [ "name": "已售", "type": "0-2", "seats": 1, - "icon": "https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/movie/image2.png", + "icon": "https://static.ticket.sz-trip.com/xcxImages/movie/image2.png", "isShow": "1", "position": "up" }, @@ -30,7 +30,7 @@ const seatTypeList = [ "name": "维修", "type": "0-3", "seats": 1, - "icon": "https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/movie/image3.png", + "icon": "https://static.ticket.sz-trip.com/xcxImages/movie/image3.png", "isShow": "1", "position": "up" }, @@ -38,7 +38,7 @@ const seatTypeList = [ "name": "情侣首座可选", "type": "1", "seats": 1, - "icon": "https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/movie/image4.png", + "icon": "https://static.ticket.sz-trip.com/xcxImages/movie/image4.png", "isShow": "0", "position": "up" }, @@ -46,7 +46,7 @@ const seatTypeList = [ "name": "情侣首座已选", "type": "1-1", "seats": 1, - "icon": "https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/movie/image5.png", + "icon": "https://static.ticket.sz-trip.com/xcxImages/movie/image5.png", "isShow": "0", "position": "up" }, @@ -54,7 +54,7 @@ const seatTypeList = [ "name": "情侣首座已售", "type": "1-2", "seats": 1, - "icon": "https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/movie/image6.png", + "icon": "https://static.ticket.sz-trip.com/xcxImages/movie/image6.png", "isShow": "0", "position": "up" }, @@ -62,7 +62,7 @@ const seatTypeList = [ "name": "情侣首座维修", "type": "1-3", "seats": 1, - "icon": "https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/movie/image7.png", + "icon": "https://static.ticket.sz-trip.com/xcxImages/movie/image7.png", "isShow": "0", "position": "up" }, @@ -70,7 +70,7 @@ const seatTypeList = [ "name": "情侣次座可选", "type": "2", "seats": 1, - "icon": "https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/movie/image8.png", + "icon": "https://static.ticket.sz-trip.com/xcxImages/movie/image8.png", "isShow": "0", "position": "up" }, @@ -78,7 +78,7 @@ const seatTypeList = [ "name": "情侣次座已选", "type": "2-1", "seats": 1, - "icon": "https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/movie/image9.png", + "icon": "https://static.ticket.sz-trip.com/xcxImages/movie/image9.png", "isShow": "0", "position": "up" }, @@ -86,7 +86,7 @@ const seatTypeList = [ "name": "情侣次座已售", "type": "2-2", "seats": 1, - "icon": "https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/movie/image10.png", + "icon": "https://static.ticket.sz-trip.com/xcxImages/movie/image10.png", "isShow": "0", "position": "up" }, @@ -94,7 +94,7 @@ const seatTypeList = [ "name": "情侣次座维修", "type": "2-3", "seats": 1, - "icon": "https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/movie/image11.png", + "icon": "https://static.ticket.sz-trip.com/xcxImages/movie/image11.png", "isShow": "0", "position": "up" }, @@ -102,7 +102,7 @@ const seatTypeList = [ "name": "情侣座", "type": "5", "seats": 2, - "icon": "https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/movie/image12.png", + "icon": "https://static.ticket.sz-trip.com/xcxImages/movie/image12.png", "isShow": "1", "position": "up" } @@ -327,8 +327,8 @@ Page({ element.nowIcon = seatType[key].icon element.defautIcon = seatType[key].icon; if(element.type==0) { - element.nowIcon = 'https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/movie/image1-'+(element.area_level % 5)+'.png' - element.defautIcon = 'https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/movie/image1-'+(element.area_level % 5)+'.png' + element.nowIcon = 'https://static.ticket.sz-trip.com/xcxImages/movie/icon1-'+(element.area_level % 5)+'.png' + element.defautIcon = 'https://static.ticket.sz-trip.com/xcxImages/movie/icon1-'+(element.area_level % 5)+'.png' } } // 根据首字母找到对应的被选中图标 diff --git a/pages/list/movieticket/list/seats/index.wxml b/pages/list/movieticket/list/seats/index.wxml index a038aa9..cf9f850 100644 --- a/pages/list/movieticket/list/seats/index.wxml +++ b/pages/list/movieticket/list/seats/index.wxml @@ -16,7 +16,7 @@ - + {{item.price/100}} diff --git a/pages/list/movieticket/list/ticket/index.wxml b/pages/list/movieticket/list/ticket/index.wxml index 07110f6..55e4b3c 100644 --- a/pages/list/movieticket/list/ticket/index.wxml +++ b/pages/list/movieticket/list/ticket/index.wxml @@ -11,7 +11,7 @@ {{areas[areaIndex].area_title}} - + 离我最近 @@ -40,7 +40,7 @@ - + 暂无内容 \ No newline at end of file diff --git a/pages/list/museum/index.wxml b/pages/list/museum/index.wxml index 87c047c..887b247 100644 --- a/pages/list/museum/index.wxml +++ b/pages/list/museum/index.wxml @@ -12,6 +12,6 @@ - + 暂无内容 \ No newline at end of file diff --git a/pages/list/night/index.wxml b/pages/list/night/index.wxml index 2b9e28e..e0144be 100644 --- a/pages/list/night/index.wxml +++ b/pages/list/night/index.wxml @@ -19,6 +19,6 @@ - + 暂无内容 diff --git a/pages/list/oneday/index.wxml b/pages/list/oneday/index.wxml index 6521f23..e3d9502 100644 --- a/pages/list/oneday/index.wxml +++ b/pages/list/oneday/index.wxml @@ -1,19 +1,19 @@ - + 综合 价格 - - + + 销量 @@ -34,6 +34,6 @@ - + 暂无内容 \ No newline at end of file diff --git a/pages/list/road/index.wxml b/pages/list/road/index.wxml index 26dd697..20b5f62 100644 --- a/pages/list/road/index.wxml +++ b/pages/list/road/index.wxml @@ -1,19 +1,19 @@ - + {{type==null?'选择类型':types[type].type_name}} - + 综合 价格 - - + + 销量 @@ -34,6 +34,6 @@ - + 暂无内容 \ No newline at end of file diff --git a/pages/list/sale/index.wxml b/pages/list/sale/index.wxml index 944e580..f252ae2 100644 --- a/pages/list/sale/index.wxml +++ b/pages/list/sale/index.wxml @@ -6,7 +6,7 @@ - 【{{activity.start_time_text}}】{{activity.title}} + {{activity.title}} 活动已结束 距结束 @@ -21,7 +21,7 @@ - + @@ -40,6 +40,6 @@ - + 暂无内容 \ No newline at end of file diff --git a/pages/list/scene/index.wxml b/pages/list/scene/index.wxml index 88dd4e3..2b9e6ca 100644 --- a/pages/list/scene/index.wxml +++ b/pages/list/scene/index.wxml @@ -23,6 +23,6 @@ - + 暂无内容 \ No newline at end of file diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml index 7246e28..a4cd9b9 100644 --- a/pages/list/six/index.wxml +++ b/pages/list/six/index.wxml @@ -25,6 +25,6 @@ - + 暂无内容 \ No newline at end of file diff --git a/pages/list/store/index.wxml b/pages/list/store/index.wxml index d2f179a..c9ba429 100644 --- a/pages/list/store/index.wxml +++ b/pages/list/store/index.wxml @@ -25,6 +25,6 @@ - + 暂无内容 \ No newline at end of file diff --git a/pages/list/strategy/index.wxml b/pages/list/strategy/index.wxml index d61f593..7cea830 100644 --- a/pages/list/strategy/index.wxml +++ b/pages/list/strategy/index.wxml @@ -1,10 +1,10 @@ - + {{item.title}} - + {{item.subtitle}} @@ -17,7 +17,7 @@ - + 暂无内容 \ No newline at end of file diff --git a/pages/list/techan/index.js b/pages/list/techan/index.js index c39985f..dc27795 100644 --- a/pages/list/techan/index.js +++ b/pages/list/techan/index.js @@ -38,13 +38,18 @@ Page({ getList:function(){ let list = this.data.list; if(list.length>=this.data.total) return; - commonApi._post("product/get_product_by_tag",{ - tag_id:this.data.type, + commonApi._post("supplier/get_supplier_by_tag_id",{ + tag_id:1, limit:10, offset:list.length, sort:"weight", title:this.data.keywords }).then(res=>{ + res.data.list.map(item=>{ + item.display_tags = item.display_tags?item.display_tags.split(","):[]; + item.display_tags = item.display_tags.splice(0,2); + item.product = item.product?item.product.splice(0,3):[] + }) this.setData({ list:list.concat(res.data.list), total:res.data.total diff --git a/pages/list/techan/index.wxml b/pages/list/techan/index.wxml index 1c85150..65e5056 100644 --- a/pages/list/techan/index.wxml +++ b/pages/list/techan/index.wxml @@ -2,26 +2,35 @@ - - - 文创 - 特产 + + + + + - - - - - - - {{item.title}} - - ¥{{item.price/100}}¥{{item.linethroughPrice/100}} - 抢购 + + + + + + {{item.supplier_name}} + + {{item}} + + {{item.address}} + {{item.start_price/100}} - + + + + {{item.title}} + {{item.price/100}}{{item.market_price/100}} + + + + + + 暂无内容 + - - - 暂无内容 - \ No newline at end of file diff --git a/pages/list/techan/index.wxss b/pages/list/techan/index.wxss index 13ed13f..554cf32 100644 --- a/pages/list/techan/index.wxss +++ b/pages/list/techan/index.wxss @@ -1,103 +1,113 @@ /* pages/feiyi/list/index.wxss */ .heaimg { display: block; - margin: 25rpx; - margin-bottom: 0; - width: calc(100% - 50rpx); + width: 100% } page { - background: #f9f9f9; + background: #FFD99E; } -.night-types { - display: flex; - justify-content: space-around; - align-items: center; - height: 86rpx; - font-size: 29rpx; - color: #333; - z-index: 1; -} -.night-type { - position: relative; - width: 25%; - text-align: center; - height: 86rpx; - line-height: 86rpx; -} -.night-type.active { - color: #000; - font-size: 33rpx; - font-weight: 500; -} -.night-type.active::after { - content: "1"; - font-size: 0; +.classimg { + margin-left: 13rpx; + width: 710rpx; display: block; +} +.type-text { position: absolute; - width: 46rpx; - height: 5rpx; - background: #0B898E; - border-radius: 3rpx; - left: 50%; - margin-left: -23rpx; + left: 130rpx; + padding: 30rpx 30rpx; bottom: 0; -} -.feiyi-list { - margin: 22rpx; + line-height: 60rpx; + font-size: 40rpx; + font-weight: bold; + background: linear-gradient(-57deg, #FFE1A2 53.1494140625%, #FFE8C0 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + z-index: 1; + color: #fff; + width: 120rpx; display: flex; justify-content: space-between; - flex-wrap: wrap; + z-index: 1; } -.feiyi-item { - width: 340rpx; - background: white; - box-shadow:0px 0px 6rpx 0px rgba(7,0,2,0.2); - border-radius:10rpx; - margin-bottom: 28rpx; +.item { + background: url(https://static.ticket.sz-trip.com/xcxImages/techan/bg.png); + background-size: 100% 100%; + width: 694rpx; + height: 571rpx; + margin: 0 auto; + margin-bottom: 15rpx; + color: #704436; } -.main-img { +.list { + background: url(https://static.ticket.sz-trip.com/xcxImages/techan/bg1.png); + background-size: 100%; + background-repeat: repeat-y; +} +.top-info { + display: flex; + padding: 30rpx; + align-items: center; +} +.top-info image { + width: 136rpx; + height: 136rpx; display: block; - width: 340rpx; - border-top-left-radius: 10rpx; - border-top-right-radius: 10rpx; - height: 224rpx; - overflow: hidden; -} -.info-box { - margin: 10rpx 20rpx; -} -.info-box .title { - font-size: 30rpx; - display: -webkit-box; - line-height: 42rpx; - height: 84rpx; - -webkit-box-orient: vertical; - -webkit-line-clamp: 2; - overflow: hidden; - margin-bottom: 10rpx; -} -.price-box { + flex-shrink: 0; + margin-right: 12rpx; +} +.supplier-info { display: flex; - justify-content: space-between; - padding-bottom: 10rpx; + flex-direction: column; + height: 136rpx; + justify-content: space-around; + flex: 1; +} +.supplier-tags { + display: flex; +} +.supplier-tag { + padding: 0 20rpx; + font-size: 20rpx; + border: 1rpx solid; + border-radius: 15rpx; + line-height: 28rpx; + margin-right: 20rpx; +} +.supplier-address { + font-size: 20rpx; + margin-top: 10rpx; +} +.supplier-address .iconfont { + margin-right: 8rpx; + font-size: 20rpx; +} +.supplier-price { + color: #CC3320; + font-size: 20rpx; +} +.supplier-price text:nth-child(2){ + font-size: 40rpx; + font-weight: bold; +} +.product-list { + display: flex; + margin: 0 30rpx; +} +.product-item { + width: 200rpx; + font-size: 28rpx; + margin-right: 19rpx; +} +.product-item:nth-child(3){ + margin-right: 0; } -.price-box-left { - font-size: 32rpx; - color: #D62828; +.product-item image { + width: 200rpx; + height: 200rpx; } -.old-price { - font-size: 22rpx; - color: #999; +.market_price { + color: #C6937F; + font-size: 24rpx; + margin-left: 10rpx; text-decoration: line-through; - margin-left: 6rpx; -} -.btn { - width: 108rpx; - height: 44rpx; - line-height: 44rpx; - border-radius: 22rpx; - text-align: center; - background: #D62828; - color: white; - font-size: 30rpx; } \ No newline at end of file diff --git a/pages/list/theatre/index.wxml b/pages/list/theatre/index.wxml index 85ee8e3..61ded54 100644 --- a/pages/list/theatre/index.wxml +++ b/pages/list/theatre/index.wxml @@ -19,6 +19,6 @@ - + 暂无内容 \ No newline at end of file diff --git a/pages/map/index.js b/pages/map/index.js index 3a5f88e..b81bc63 100644 --- a/pages/map/index.js +++ b/pages/map/index.js @@ -138,7 +138,7 @@ Page({ mapItem.longitude = Number(item.lon); mapItem.id = index; mapItem.info = item; - mapItem.iconPath = "https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/map/"+item.type+".png"; + mapItem.iconPath = "https://static.ticket.sz-trip.com/xcxImages/map/"+item.type+".png"; mapItem.width = 20; mapItem.height=23; if(mapItem.latitude<40){ diff --git a/pages/map/index.wxml b/pages/map/index.wxml index ed91ecb..ed44586 100644 --- a/pages/map/index.wxml +++ b/pages/map/index.wxml @@ -6,7 +6,7 @@ {{areas[areaIndex].area_title}} - + diff --git a/pages/order/hotel/index.wxml b/pages/order/hotel/index.wxml index e82be48..604c477 100644 --- a/pages/order/hotel/index.wxml +++ b/pages/order/hotel/index.wxml @@ -41,7 +41,7 @@ - + diff --git a/pages/order/roadOrder/index.wxml b/pages/order/roadOrder/index.wxml index 87a92af..c0c0354 100644 --- a/pages/order/roadOrder/index.wxml +++ b/pages/order/roadOrder/index.wxml @@ -32,7 +32,7 @@ + + + + + {{item.name}} + 距离定位{{item.distance}}公里共{{item.nums}}车位 + + + + + 免费 + + + 优惠 + {{item.benifit_policy}} + + + 收费 + {{item.charge_standard}} + + \ No newline at end of file diff --git a/pages/pbService/PRpark/index.wxss b/pages/pbService/PRpark/index.wxss new file mode 100644 index 0000000..e2d4375 --- /dev/null +++ b/pages/pbService/PRpark/index.wxss @@ -0,0 +1,51 @@ +/* pages/pbService/PRpark/index.wxss */ +page { + background: #EDEDED; +} +.park-item { + margin: 30rpx; + background: white; + border-radius: 20rpx; + padding: 0 20rpx; + color: #333; + font-size: 30rpx; + padding-bottom: 30rpx; +} +.park-top { + display: flex; + align-items: center; + min-height: 98rpx; + padding: 20rpx 0; + justify-content: space-between; + border-bottom: 1rpx solid #D8D8D8; +} +.park-item image { + width: 80rpx; + flex-shrink: 0; + margin-left: 20rpx; +} +.park-tips { + font-size: 26rpx; + margin-top: 20rpx; +} +.park-tips text { + color: #FC9132; + margin-right: 70rpx; + margin-left: 10rpx; +} +.park-box { + display: flex; + font-size: 26rpx; + margin-top: 20rpx; +} +.park-bg { + width: 80rpx; + line-height: 40rpx; + height: 40rpx; + background: #FC9132; + border-radius: 20rpx; + color: #fff; + text-align: center; + flex-shrink: 0; + margin-right: 20rpx; +} \ No newline at end of file diff --git a/pages/pbService/bike/index.js b/pages/pbService/bike/index.js index 095f5ee..2965965 100644 --- a/pages/pbService/bike/index.js +++ b/pages/pbService/bike/index.js @@ -88,7 +88,7 @@ Page({ } mapItem.id = index; mapItem.info = item; - mapItem.iconPath = "https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/other/bike"+this.data.type+".png"; + mapItem.iconPath = "https://static.ticket.sz-trip.com/xcxImages/other/bike"+this.data.type+".png"; mapItem.width = 40; mapItem.height=40; if(mapItem.latitude<40){ diff --git a/pages/pbService/bus/index.wxml b/pages/pbService/bus/index.wxml index 6a92216..8cc2b16 100644 --- a/pages/pbService/bus/index.wxml +++ b/pages/pbService/bus/index.wxml @@ -11,7 +11,7 @@ 附近公交点 - + {{item.Name}} diff --git a/pages/pbService/bus/lineinfo/index.wxml b/pages/pbService/bus/lineinfo/index.wxml index 398652c..a568e84 100644 --- a/pages/pbService/bus/lineinfo/index.wxml +++ b/pages/pbService/bus/lineinfo/index.wxml @@ -17,16 +17,16 @@ {{item.SName}} - + {{item.SName}} - + {{item.SName}} {{item.BusInfo}} - + \ No newline at end of file diff --git a/pages/pbService/bus/search/index.wxml b/pages/pbService/bus/search/index.wxml index 425a517..74549cb 100644 --- a/pages/pbService/bus/search/index.wxml +++ b/pages/pbService/bus/search/index.wxml @@ -9,16 +9,16 @@ - + {{item.LName}} - {{item.LFStdName}} {{item.LEStdName}} + {{item.LFStdName}} {{item.LEStdName}} - + {{item.Name}} {{item.Direct}} diff --git a/pages/pbService/gym/index.wxml b/pages/pbService/gym/index.wxml index 16d7c84..3671093 100644 --- a/pages/pbService/gym/index.wxml +++ b/pages/pbService/gym/index.wxml @@ -12,11 +12,11 @@ {{item.mName}}-{{item.sName}} - + {{item.open_time}} - + {{item.address}} {{item.distance}} diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml index fb16c2b..495f404 100644 --- a/pages/pbService/index.wxml +++ b/pages/pbService/index.wxml @@ -4,19 +4,19 @@ 游玩助手 - + 安全服务 - + 找厕所 - + 景区舒适度 @@ -25,56 +25,60 @@ 交通出行 - + 停车场 - + 公共自行车 - + 接送机 + + + P+R停车场 + 文体查询 - + 投资导引图 - + 非遗传承 - + 文物查询 - + 在线鉴赏 - + 书香借阅 - + 体育场馆 - + 垃圾分类 diff --git a/pages/pbService/library/getpoint/index.wxml b/pages/pbService/library/getpoint/index.wxml index d743ce5..7ccf892 100644 --- a/pages/pbService/library/getpoint/index.wxml +++ b/pages/pbService/library/getpoint/index.wxml @@ -5,7 +5,7 @@ 地址:{{now.address}} {{now.description}} 是否开放:{{item.isopen==1?'是':'否'}} - + 其他借书点 diff --git a/pages/pbService/sceneComfort/index.wxml b/pages/pbService/sceneComfort/index.wxml index 1289851..de32e12 100644 --- a/pages/pbService/sceneComfort/index.wxml +++ b/pages/pbService/sceneComfort/index.wxml @@ -35,9 +35,9 @@ {{item.third_scene_name}} - + {{areaObj[item.area]}} - + {{sceneLevelObj[item.scene_level]}} diff --git a/pages/pbService/wbdw/index.wxml b/pages/pbService/wbdw/index.wxml index ee12ac6..d31225a 100644 --- a/pages/pbService/wbdw/index.wxml +++ b/pages/pbService/wbdw/index.wxml @@ -30,7 +30,7 @@ {{item.name}} - + {{item.address}} \ No newline at end of file diff --git a/pages/search/list/index.wxml b/pages/search/list/index.wxml index 9eb05f8..a536eed 100644 --- a/pages/search/list/index.wxml +++ b/pages/search/list/index.wxml @@ -15,7 +15,7 @@ {{item.title}} - + {{item.ext.subtitle}} @@ -54,7 +54,7 @@ {{item}} - + {{item.supplier_name}} {{item.ext.price/100}} @@ -124,6 +124,6 @@ - + 暂无内容 \ No newline at end of file diff --git a/pages/user/cartlist/list.wxml b/pages/user/cartlist/list.wxml index e62d369..21284c7 100644 --- a/pages/user/cartlist/list.wxml +++ b/pages/user/cartlist/list.wxml @@ -24,7 +24,7 @@ 删除 - + 暂无内容 diff --git a/pages/user/coupon/index.wxml b/pages/user/coupon/index.wxml index a5e7c81..9cd1416 100644 --- a/pages/user/coupon/index.wxml +++ b/pages/user/coupon/index.wxml @@ -29,6 +29,6 @@ 前往领券中心 - + 暂无内容 \ No newline at end of file diff --git a/pages/user/coupon/index.wxss b/pages/user/coupon/index.wxss index c8c1862..e26f303 100644 --- a/pages/user/coupon/index.wxss +++ b/pages/user/coupon/index.wxss @@ -38,7 +38,7 @@ page { } .coupon-item { margin: 20rpx 30rpx; - background: url(https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/user/coupon.png) no-repeat; + background: url(https://static.ticket.sz-trip.com/xcxImages/user/coupon.png) no-repeat; background-size: 100% 100%; height: 300rpx; position: relative; diff --git a/pages/user/couponCenter/index.wxml b/pages/user/couponCenter/index.wxml index 7d1071f..afbacc7 100644 --- a/pages/user/couponCenter/index.wxml +++ b/pages/user/couponCenter/index.wxml @@ -1,6 +1,6 @@ - + 【兑换优惠券】 diff --git a/pages/user/likes/index.wxml b/pages/user/likes/index.wxml index 50a91af..0706c65 100644 --- a/pages/user/likes/index.wxml +++ b/pages/user/likes/index.wxml @@ -29,6 +29,6 @@ - + 暂无内容 \ No newline at end of file diff --git a/pages/user/order/activityOrderInfo/index.wxml b/pages/user/order/activityOrderInfo/index.wxml index dd103fc..bd4bd17 100644 --- a/pages/user/order/activityOrderInfo/index.wxml +++ b/pages/user/order/activityOrderInfo/index.wxml @@ -82,7 +82,7 @@ - 联系客服 + 联系客服 diff --git a/pages/user/order/couponOrderInfo/index.wxml b/pages/user/order/couponOrderInfo/index.wxml index 0b352e1..3830389 100644 --- a/pages/user/order/couponOrderInfo/index.wxml +++ b/pages/user/order/couponOrderInfo/index.wxml @@ -93,7 +93,7 @@ - 联系客服 + 联系客服 diff --git a/pages/user/order/foodOrderInfo/index.wxml b/pages/user/order/foodOrderInfo/index.wxml index 1897a28..f4cb6c1 100644 --- a/pages/user/order/foodOrderInfo/index.wxml +++ b/pages/user/order/foodOrderInfo/index.wxml @@ -99,7 +99,7 @@ --> - 联系客服 + 联系客服 diff --git a/pages/user/order/hotelOrderInfo/index.wxml b/pages/user/order/hotelOrderInfo/index.wxml index a0a4671..304d2fa 100644 --- a/pages/user/order/hotelOrderInfo/index.wxml +++ b/pages/user/order/hotelOrderInfo/index.wxml @@ -71,7 +71,7 @@ - 联系客服 + 联系客服 diff --git a/pages/user/order/lineOrderInfo/index.wxml b/pages/user/order/lineOrderInfo/index.wxml index 2b64c97..12c8a49 100644 --- a/pages/user/order/lineOrderInfo/index.wxml +++ b/pages/user/order/lineOrderInfo/index.wxml @@ -84,7 +84,7 @@ - 联系客服 + 联系客服 diff --git a/pages/user/order/list.wxml b/pages/user/order/list.wxml index d1fdd29..8bcbd2d 100644 --- a/pages/user/order/list.wxml +++ b/pages/user/order/list.wxml @@ -42,6 +42,6 @@ - + 还没有订单,赶快去下单吧~ \ No newline at end of file diff --git a/pages/user/order/movieOrderInfo/index.wxml b/pages/user/order/movieOrderInfo/index.wxml index 2d12012..78a66b5 100644 --- a/pages/user/order/movieOrderInfo/index.wxml +++ b/pages/user/order/movieOrderInfo/index.wxml @@ -139,7 +139,7 @@ - 联系客服 + 联系客服 diff --git a/pages/user/order/museumOrderInfo/index.wxml b/pages/user/order/museumOrderInfo/index.wxml index d661487..e04a2e3 100644 --- a/pages/user/order/museumOrderInfo/index.wxml +++ b/pages/user/order/museumOrderInfo/index.wxml @@ -93,7 +93,7 @@ - 联系客服 + 联系客服 diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml index 7a3029b..f34f0c1 100644 --- a/pages/user/order/postOrderInfo/index.wxml +++ b/pages/user/order/postOrderInfo/index.wxml @@ -84,7 +84,7 @@ - 联系客服 + 联系客服 diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml index 497c4d8..5a8eddd 100644 --- a/pages/user/order/sceneOrderInfo/index.wxml +++ b/pages/user/order/sceneOrderInfo/index.wxml @@ -82,7 +82,7 @@ --> - 联系客服 + 联系客服 diff --git a/pages/user/service/index.wxml b/pages/user/service/index.wxml index d5b1b2f..8cb1cfa 100644 --- a/pages/user/service/index.wxml +++ b/pages/user/service/index.wxml @@ -2,7 +2,7 @@ - + 你好,欢迎来到苏州,您可点击以下问题列表自助查询相关信息 diff --git a/pages/user/user.wxml b/pages/user/user.wxml index d13da0f..b0930e7 100644 --- a/pages/user/user.wxml +++ b/pages/user/user.wxml @@ -1,11 +1,11 @@ - + - {{info.nickname}} + {{info.nickname}} id:{{info.id}} @@ -16,27 +16,27 @@ - + 待付款 - + 待发货 - + 待出行 - + 待收货 - + 待评价 - + 退货/退款 diff --git a/pages/user/verify/index.wxml b/pages/user/verify/index.wxml index 0c61cfb..475f900 100644 --- a/pages/user/verify/index.wxml +++ b/pages/user/verify/index.wxml @@ -1,6 +1,6 @@ - + 姓名: diff --git a/project.private.config.json b/project.private.config.json index 54f4646..c80aceb 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -13,9 +13,8 @@ "miniprogram": { "list": [ { - "id": 0, - "name": "pages/user/bindtel/index", - "pathName": "pages/user/bindtel/index", + "name": "pages/list/techan/index", + "pathName": "pages/list/techan/index", "query": "id=0000000000LINELINEINFO18082257199008", "scene": null }, @@ -38,9 +37,8 @@ "scene": null }, { - "id": -1, - "name": "一日游", - "pathName": "pages/list/oneday/index", + "name": "pages/list/haoxing/index", + "pathName": "pages/list/haoxing/index", "query": "", "scene": null }, @@ -51,8 +49,8 @@ "scene": null }, { - "name": "pages/map/index", - "pathName": "pages/map/index", + "name": "PRPark", + "pathName": "pages/pbService/PRpark/index", "query": "type=2", "scene": null } diff --git a/utils/util.js b/utils/util.js index 717429c..c3098b4 100644 --- a/utils/util.js +++ b/utils/util.js @@ -152,6 +152,11 @@ const checkLocation = function(){ const gotoDetail = (item) =>{ console.log(item) switch(item.type){ + case "tenscenic": + wx.navigateTo({ + url: '/pages/info/foodInfo/index?id='+(item.scene_id || item.id) + }) + break; case "ticket": // 产品 产品票务 wx.navigateTo({