diff --git a/app.js b/app.js
index 5cf47f2..3470599 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
// 获取前端配置文件
commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
let data = JSON.parse(res.data);
- data.isTest = data.isTest126? true : false;
+ data.isTest = data.isTest132? true : false;
data.indexSeason = null
this.globalData.configJson = data
}).then(() => {
diff --git a/pages/activity/artfestival/index.wxml b/pages/activity/artfestival/index.wxml
index a340838..89f9877 100644
--- a/pages/activity/artfestival/index.wxml
+++ b/pages/activity/artfestival/index.wxml
@@ -1,40 +1,40 @@
-
-
+
+
点击体验VR观展
-
+
{{item.title}}
-
+
{{item.title}}
没有更多数据了
-
-
+
+
\ No newline at end of file
diff --git a/pages/activity/autumnten/index.wxml b/pages/activity/autumnten/index.wxml
index 2b78fa5..22df12c 100644
--- a/pages/activity/autumnten/index.wxml
+++ b/pages/activity/autumnten/index.wxml
@@ -1,6 +1,6 @@
-
+
{{areas[areaIndex].area_title}}
@@ -9,7 +9,7 @@
-
+
{{item}}
@@ -17,11 +17,11 @@
-
-
+
+
-
+
{{item.title}}
上榜理由：{{item.brief_intro}}
diff --git a/pages/activity/autumnten/list/index.wxml b/pages/activity/autumnten/list/index.wxml
index 7a83e50..c788c6c 100644
--- a/pages/activity/autumnten/list/index.wxml
+++ b/pages/activity/autumnten/list/index.wxml
@@ -7,6 +7,6 @@
{{item.title}}
{{item.address}}
-
+
diff --git a/pages/activity/graduate/index.wxml b/pages/activity/graduate/index.wxml
index 7e09944..9efb905 100644
--- a/pages/activity/graduate/index.wxml
+++ b/pages/activity/graduate/index.wxml
@@ -1,6 +1,6 @@
-
+
-
+
-
+
{{item.title}}
{{item}}
￥{{item.price/100}}
-
+
-
-
+
+
\ No newline at end of file
diff --git a/pages/activity/huawei/form/index.wxml b/pages/activity/huawei/form/index.wxml
index b881647..e4a0c2e 100644
--- a/pages/activity/huawei/form/index.wxml
+++ b/pages/activity/huawei/form/index.wxml
@@ -1,8 +1,8 @@
-
+
-
+
姓名
@@ -24,6 +24,6 @@
-
+
\ No newline at end of file
diff --git a/pages/activity/huawei/index.wxml b/pages/activity/huawei/index.wxml
index 774ee39..e4be85a 100644
--- a/pages/activity/huawei/index.wxml
+++ b/pages/activity/huawei/index.wxml
@@ -5,9 +5,9 @@
规则
线上报名时间：{{info.sign_begin_time}} - {{info.sign_end_time}}
线上投票时间：{{info.begin_time}} - {{info.end_time}}
-
-
-
+
+
+
{{info.sub_title}}
diff --git a/pages/activity/huawei/list/index.wxml b/pages/activity/huawei/list/index.wxml
index 3b18059..dbb0d71 100644
--- a/pages/activity/huawei/list/index.wxml
+++ b/pages/activity/huawei/list/index.wxml
@@ -6,7 +6,7 @@
{{list[0].title}}
-
+
{{list[0].user.nickname}}
作品id：{{list[0].id}}
@@ -16,7 +16,7 @@
{{list[0].status_text}}
拒绝理由：{{list[0].refund_msg}}
-
+
当前得票：{{list[0].votes}}
投票
@@ -25,13 +25,13 @@
{{list[0].desc}}
规则
-
+
-
+
投票已开始，无法上传作品！
-
+
diff --git a/pages/activity/huawei/result/index.wxml b/pages/activity/huawei/result/index.wxml
index 3f7b432..c322998 100644
--- a/pages/activity/huawei/result/index.wxml
+++ b/pages/activity/huawei/result/index.wxml
@@ -1,7 +1,7 @@
-
+
恭喜您已报名成功！
点击下方按钮开始进行作品上传
-
-
+
+
diff --git a/pages/activity/huawei/upload/index.wxml b/pages/activity/huawei/upload/index.wxml
index 49aa817..f35bff1 100644
--- a/pages/activity/huawei/upload/index.wxml
+++ b/pages/activity/huawei/upload/index.wxml
@@ -1,6 +1,6 @@
-
+
作品标题
@@ -30,9 +30,9 @@
上传图片
-
-
+
+
作品描述
-
+
一个分类的作品多次提交，平台只保留最近上传的作品
\ No newline at end of file
diff --git a/pages/activity/huawei/uploadres/index.wxml b/pages/activity/huawei/uploadres/index.wxml
index 14e0cd8..76a59da 100644
--- a/pages/activity/huawei/uploadres/index.wxml
+++ b/pages/activity/huawei/uploadres/index.wxml
@@ -1,8 +1,8 @@
-
+
恭喜您的作品已上传完成！
-
-
+
+
通过第一轮评审的摄影作品将在9月1号后
进行线上展示，请注意查看平台通知
\ No newline at end of file
diff --git a/pages/activity/newarrival/index.wxml b/pages/activity/newarrival/index.wxml
index 1b11062..9b9a3f1 100644
--- a/pages/activity/newarrival/index.wxml
+++ b/pages/activity/newarrival/index.wxml
@@ -1,10 +1,10 @@
-
+
景点门票
新品来袭 爆款推荐
-
+
{{item.title}}
{{item}}
@@ -20,7 +20,7 @@
甄选好货 口碑之选
-
+
{{item.title}}
{{item}}
@@ -36,7 +36,7 @@
精湛演出 生动体验
-
+
{{item.title}}
{{item}}
@@ -52,7 +52,7 @@
精挑细选 好物推荐
-
+
{{item.title}}
{{item}}
@@ -63,5 +63,5 @@
-
+
\ No newline at end of file
diff --git a/pages/activity/redlist/index.wxml b/pages/activity/redlist/index.wxml
index c5c99de..45afe6e 100644
--- a/pages/activity/redlist/index.wxml
+++ b/pages/activity/redlist/index.wxml
@@ -1,7 +1,7 @@
-
+
-
+
{{item.title}}
@@ -13,4 +13,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/pages/activity/spring2021/index.wxml b/pages/activity/spring2021/index.wxml
index dd676af..5cb3f15 100644
--- a/pages/activity/spring2021/index.wxml
+++ b/pages/activity/spring2021/index.wxml
@@ -1,10 +1,10 @@
-
+
-
+
{{item.title}}
{{item.price/100}}
@@ -14,11 +14,11 @@
-
+
-
+
{{item.title}}
{{item.price/100}}
@@ -27,11 +27,11 @@
-
+
-
+
{{item.title}}
{{item.price/100}}
@@ -40,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 5eb19f4..06d2bb9 100644
--- a/pages/activity/springten/index.wxml
+++ b/pages/activity/springten/index.wxml
@@ -1,6 +1,6 @@
-
+
{{areas[areaIndex].area_title}}
@@ -9,7 +9,7 @@
-
+
{{item}}
@@ -17,7 +17,7 @@
-
+
{{item.title}}
上榜理由：{{item.brief_intro}}
diff --git a/pages/activity/springten/list/index.wxml b/pages/activity/springten/list/index.wxml
index 644c35e..ff03706 100644
--- a/pages/activity/springten/list/index.wxml
+++ b/pages/activity/springten/list/index.wxml
@@ -5,5 +5,5 @@
{{item.title}}
{{item.address}}
-
+
diff --git a/pages/activity/subway/index.wxml b/pages/activity/subway/index.wxml
index d1208cb..85b9479 100644
--- a/pages/activity/subway/index.wxml
+++ b/pages/activity/subway/index.wxml
@@ -1,20 +1,20 @@
-
+
{{index+1}}号线
-
-
+
+
- {{item.name}}
+ {{item.name}}
-
+
{{item.title}}
{{item.brief_intro}}
@@ -24,10 +24,10 @@
点击查看更多 >>
-
+
-
+
-
+
顶部
\ No newline at end of file
diff --git a/pages/activity/suyear/index.wxml b/pages/activity/suyear/index.wxml
index 9d2886c..6b3f3bc 100644
--- a/pages/activity/suyear/index.wxml
+++ b/pages/activity/suyear/index.wxml
@@ -1,18 +1,18 @@
-
+
-
+
-
-
-
-
+
+
+
+
{{item.title}}
-
+
\ No newline at end of file
diff --git a/pages/activity/tenscenic/index.wxml b/pages/activity/tenscenic/index.wxml
index 2fa8c10..1226cfb 100644
--- a/pages/activity/tenscenic/index.wxml
+++ b/pages/activity/tenscenic/index.wxml
@@ -6,9 +6,9 @@
-
+
-
+
@@ -21,7 +21,7 @@
横塘驿站
宝带桥
-
+
浒墅关
枫桥夜泊
@@ -44,7 +44,7 @@
必玩 -->
-
+
{{item.title}}
上榜理由：{{item.brief_intro}}
@@ -54,6 +54,6 @@
没有更多了
-
+
顶部
\ No newline at end of file
diff --git a/pages/activity/year2020/index.wxml b/pages/activity/year2020/index.wxml
index 833d935..1371d73 100644
--- a/pages/activity/year2020/index.wxml
+++ b/pages/activity/year2020/index.wxml
@@ -1,34 +1,34 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
{{item.title}}
{{item.subtitle}}
@@ -38,7 +38,7 @@
￥
{{item.price/100}}
-
+
diff --git a/pages/ask/index.wxml b/pages/ask/index.wxml
index 51950ae..e496f9f 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://static.ticket.sz-trip.com/xcxImages/ask/my.png" mode="widthFix"></image>
+ <image lazy-load 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 58f1dc7..8cd9267 100644
--- a/pages/ask/info/index.wxml
+++ b/pages/ask/info/index.wxml
@@ -6,14 +6,14 @@
-
+
{{info.question_name}}
{{info.created_time}}提问
-
+
共{{total}}个回答
暂无回答
@@ -22,7 +22,7 @@
-
+
{{item.nickname}}
{{item.answer}}
diff --git a/pages/ask/my/index.wxml b/pages/ask/my/index.wxml
index b64c779..dc2c42d 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/component/commonImage/index.wxml b/pages/component/commonImage/index.wxml
index ce03897..d3e287a 100644
--- a/pages/component/commonImage/index.wxml
+++ b/pages/component/commonImage/index.wxml
@@ -1,3 +1,3 @@
-
-
+
+
diff --git a/pages/component/newCalendar/index.wxml b/pages/component/newCalendar/index.wxml
index 02d248a..15ed6c6 100644
--- a/pages/component/newCalendar/index.wxml
+++ b/pages/component/newCalendar/index.wxml
@@ -3,7 +3,7 @@
-
+
上一月
上一周
@@ -13,13 +13,13 @@
下一月
下一周
-
+
-
+
{{item}}
@@ -57,11 +57,11 @@
-
+
\ No newline at end of file
diff --git a/pages/component/orderAdv/orderAdv.wxml b/pages/component/orderAdv/orderAdv.wxml
index dbbb929..1715ac8 100644
--- a/pages/component/orderAdv/orderAdv.wxml
+++ b/pages/component/orderAdv/orderAdv.wxml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/pages/component/proRec/proRec.js b/pages/component/proRec/proRec.js
index 0150cb1..e76f3c7 100644
--- a/pages/component/proRec/proRec.js
+++ b/pages/component/proRec/proRec.js
@@ -33,7 +33,7 @@ Component({
'ids': function(newVal,oldVal){
console.log('newVal--------',newVal)
console.log('oldVal--------',oldVal)
- if (newVal) {
+ if (newVal && this.data.tjList.length<=0) {
this.getTj(newVal)
}
}
@@ -102,6 +102,14 @@ Component({
type: item.type
}
}, 1)
+
+ if (item.goods_jump_type == "changshu" || item.goods_jump_type == "yjks") {
+ util.goProdInOtherPlatform(item)
+ return
+ }
+
+
+
if (item.type == 'travels') {
// 游记做特殊处理 其他都按照原来的来
wx.navigateTo({
diff --git a/pages/component/proRec/proRec.wxml b/pages/component/proRec/proRec.wxml
index cd6fe91..86fb248 100644
--- a/pages/component/proRec/proRec.wxml
+++ b/pages/component/proRec/proRec.wxml
@@ -4,7 +4,7 @@
-
+
{{item.title}}
diff --git a/pages/culture/index.wxml b/pages/culture/index.wxml
index f9e4564..2e17fad 100644
--- a/pages/culture/index.wxml
+++ b/pages/culture/index.wxml
@@ -12,7 +12,7 @@
-
+
@@ -26,7 +26,7 @@
-
+
{{item.name}}
{{item.activity_date}}-{{item.activity_end_date}}
diff --git a/pages/culture/info/index.wxml b/pages/culture/info/index.wxml
index a2c3cbd..2966740 100644
--- a/pages/culture/info/index.wxml
+++ b/pages/culture/info/index.wxml
@@ -2,15 +2,15 @@
-
+
{{info.name}}
-
+
活动时间：{{info.begin_date}} ~ {{info.end_date}}
-
+
活动地点：{{info.address}}
diff --git a/pages/group/apply/index.wxml b/pages/group/apply/index.wxml
index 3d9aae5..d5e98f7 100644
--- a/pages/group/apply/index.wxml
+++ b/pages/group/apply/index.wxml
@@ -35,7 +35,7 @@
- 信息提交成功
+ 信息提交成功
姓名： {{applyInfo.apply_user}}
手机号码：{{applyInfo.mobile}}
机构名称：{{applyInfo.organization_name}}
@@ -45,7 +45,7 @@
- 申请被拒绝
+ 申请被拒绝
拒绝原因：
{{applyInfo.refund_msg}}
diff --git a/pages/group/index.wxml b/pages/group/index.wxml
index 1a17067..4d52b01 100644
--- a/pages/group/index.wxml
+++ b/pages/group/index.wxml
@@ -1,9 +1,9 @@
- 热门团购
+ 热门团购
-
+
{{item.title+item.sku_name}}
@@ -15,9 +15,9 @@
- 精品团购
+ 精品团购
-
+
{{item.gp_num}}人团
@@ -51,12 +51,12 @@
{{ingGroup[0].s}}
-
+
-
+
-
+
\ No newline at end of file
diff --git a/pages/group/info/index.wxml b/pages/group/info/index.wxml
index 174a6f5..482163b 100644
--- a/pages/group/info/index.wxml
+++ b/pages/group/info/index.wxml
@@ -2,7 +2,7 @@
-
+
{{info.gp_num}}人团
@@ -29,16 +29,16 @@
{{myIngList.s}}
-
+
-
+
-
+
团购未满规定人数 已失败
原价购买
@@ -47,7 +47,7 @@
-
+
团购活动已人满 团购成功
再开一单
@@ -55,7 +55,7 @@
-
+
团购活动已结束
查看其它活动
@@ -69,7 +69,7 @@
拼团规则
-
+
{{item.nickname}}
还差{{item.team_num}}人
@@ -88,7 +88,7 @@
-
+
{{item.title+item.sku_name}}
@@ -113,18 +113,18 @@
-
+
-
+
保存图片到相册
-
+
-
+
-
+
微信识别二维码
-
+
保存到相册
diff --git a/pages/group/mine/index.wxml b/pages/group/mine/index.wxml
index 75c35f7..e81f69b 100644
--- a/pages/group/mine/index.wxml
+++ b/pages/group/mine/index.wxml
@@ -8,7 +8,7 @@
我发起的
-
+
{{item.title+item.sku_name}}
@@ -34,7 +34,7 @@
我参与的
-
+
{{item.title+item.sku_name}}
@@ -59,7 +59,7 @@
-
+
您暂时还未参加拼团活动
您暂时还未参团成功
立即前往
diff --git a/pages/index/index.js b/pages/index/index.js
index 34ff738..4ac7827 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -410,6 +410,7 @@ Page({
hotIndex: 0,
indexHot: [],
weather: null,
+ showMore: false,
// 页面图片
// imageSourceList:imageSource,
@@ -462,6 +463,7 @@ Page({
})
this.getUrlToPage()
+ this.getShowMore()
},
showImg (img) {
@@ -588,6 +590,14 @@ Page({
})
},
+ getShowMore () {
+ commonApi._post("multimedia/detail", {id: 2462}).then(res => {
+ this.setData({
+ showMore: res.data.company_name ==1?true:false
+ })
+ })
+ },
+
// --------------------banner 相关---------------------------
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index c8bbb02..7cd195b 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -9,7 +9,7 @@
indicator-dots indicator-active-color="#fff">
-
+
@@ -22,18 +22,18 @@
{{weather.max_temp}}°
{{weather.weather}}
-
-
+
搜索您想要的
-
+
@@ -44,7 +44,7 @@
-
+
@@ -89,12 +89,12 @@
-
-
+
+
-
-
+
+
@@ -104,14 +104,14 @@
-
+
{{item.title}}
￥{{item.price/100}}起
-
+
@@ -122,14 +122,14 @@
-
+
{{item.title}}
{{item.price/100}}
-
+
@@ -138,9 +138,9 @@
bindchange="changeBannerIndex" data-keyname="XPathBannerIndex">
-
+
-
+
@@ -157,8 +157,8 @@
-
-
+
+
@@ -169,52 +169,52 @@
-
-
+
+
更多 >
-
+
-
+
-
-
+
+
-
-
-
+
+
-
+
@@ -228,36 +228,36 @@
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
{{item.title}}
@@ -289,29 +289,29 @@
-
+
-
+
{{time}}s跳过
-
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -325,7 +325,7 @@
bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular>
-
+
@@ -337,7 +337,7 @@
-
+
@@ -352,7 +352,7 @@
-
+
@@ -366,7 +366,7 @@
-
+
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 018081a..8f9ea1c 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -760,15 +760,16 @@
.ggfw-list {
- display: flex;
- flex-wrap: wrap;
+ display: grid;
+ grid-template-columns: repeat(4, 166rpx);
+ row-gap: 23rpx;
justify-content: space-between;
}
.ggfw-list .ggfw {
- width: 220rpx;
- height: 106.67rpx;
- margin-bottom: 20rpx;
+ width: 166rpx;
+ height: 133rpx;
+ /* margin-bottom: 23rpx; */
}
.ggfw image{
width: 100%;
diff --git a/pages/info/activityInfo/index.wxml b/pages/info/activityInfo/index.wxml
index 938db6c..a0653ae 100644
--- a/pages/info/activityInfo/index.wxml
+++ b/pages/info/activityInfo/index.wxml
@@ -6,20 +6,20 @@
autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
-
+
-->
-
+
{{info.name}}
-
+
活动时间：{{info.begin_date}} ~ {{info.end_date}}
-
+
活动地点：{{info.detail_address}}
@@ -36,12 +36,12 @@
-
+
{{info.scene_data.title}}
预订
-
+
{{info.scene_data.address}}
@@ -56,24 +56,24 @@
-
+
-
+
保存图片到相册
-
+
-
-
+
微信识别二维码
-
+
diff --git a/pages/info/cardInfo/index.wxml b/pages/info/cardInfo/index.wxml
index 8957aa8..397eb8d 100644
--- a/pages/info/cardInfo/index.wxml
+++ b/pages/info/cardInfo/index.wxml
@@ -6,7 +6,7 @@
autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
-
+
@@ -62,18 +62,18 @@
-
+
-
+
保存图片到相册
-
+
-
+
-
+
微信识别二维码
-
+
保存到相册
diff --git a/pages/info/culturalUnitInfo/index.wxml b/pages/info/culturalUnitInfo/index.wxml
index 076edc7..6a0c9b1 100644
--- a/pages/info/culturalUnitInfo/index.wxml
+++ b/pages/info/culturalUnitInfo/index.wxml
@@ -6,32 +6,32 @@
{{info.company_name}}
-
+
地址：{{info.address}}
-
+
电话：{{info.mobile}}
-
+
-
-
-
-
+
+
+
+
{{info.company_name}}
-
+
-
-
+
+
-
+
@@ -32,7 +32,7 @@
-
+
预订须知
@@ -46,6 +46,6 @@
-
+
拨打酒店电话：{{tel}}
\ No newline at end of file
diff --git a/pages/info/hotelProductInfo/index.wxml b/pages/info/hotelProductInfo/index.wxml
index bfe3e6c..aac90cc 100644
--- a/pages/info/hotelProductInfo/index.wxml
+++ b/pages/info/hotelProductInfo/index.wxml
@@ -6,7 +6,7 @@
autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
-
+
@@ -35,7 +35,7 @@
-
+
{{item.product.title+item.sku_name}}
{{item.sku_model.area}} {{item.sku_model.bed_type}} {{item.sku_model.breakfast}}
@@ -58,7 +58,7 @@
{{item.low_price>0?item.low_price/100:'0'}}
-
+
@@ -84,7 +84,7 @@
-
+
{{item.question_name}}
{{item.answer.total}}个回答
暂无回答
@@ -105,7 +105,7 @@
暂无活动
@@ -76,24 +76,24 @@
-
+
-
+
保存图片到相册
-
+
-
-
+
微信识别二维码
-
+
diff --git a/pages/info/newsInfo/index.wxml b/pages/info/newsInfo/index.wxml
index 363e773..41ee3b5 100644
--- a/pages/info/newsInfo/index.wxml
+++ b/pages/info/newsInfo/index.wxml
@@ -1,7 +1,7 @@
-
+
{{info.title}}
来源：{{info.source}}
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 7d8f92f..5ad5c2b 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -829,11 +829,16 @@ Page({
})
this.drawImg()
})
- commonApi.user_post('cart/get_list', {}).then(res => {
+ // commonApi.user_post('cart/get_list', {}).then(res => {
+ // this.setData({
+ // cartCount: res.data.length
+ // })
+ // })
+ commonApi.user_post('cart/get_count', {noLogin: true}).then(res => {
this.setData({
- cartCount: res.data.length
+ cartCount: res.data //1
})
- })
+ })
} else {
setTimeout(() => {
this.onShow()
diff --git a/pages/info/redmapInfo/index.wxml b/pages/info/redmapInfo/index.wxml
index 6693ea8..43692a1 100644
--- a/pages/info/redmapInfo/index.wxml
+++ b/pages/info/redmapInfo/index.wxml
@@ -6,22 +6,22 @@
{{info.title}}
-
+
地址：{{info.address}}
-
+
电话：{{info.mobile}}
-
+
-
-
-
-
+
+
+
+
中共苏州市委党史工作办公室
苏州市文化广电和旅游局
@@ -29,10 +29,10 @@
-
+
-
-
+
+
中共苏州市委党史工作办公室
苏州市文化广电和旅游局
@@ -40,5 +40,5 @@
-
+
\ No newline at end of file
diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js
index 1fab188..35a79f9 100644
--- a/pages/info/roadInfo/index.js
+++ b/pages/info/roadInfo/index.js
@@ -165,7 +165,6 @@ Page({
order: function () {
// todo 判断组合产品
// if (this.data.info.is_compose == 1) {
- // if (true) {
// // 打开规格弹窗
// this.setData({skuFlag: true})
// return
diff --git a/pages/info/roadInfo/index.wxml b/pages/info/roadInfo/index.wxml
index 7e1118c..7269190 100644
--- a/pages/info/roadInfo/index.wxml
+++ b/pages/info/roadInfo/index.wxml
@@ -6,7 +6,7 @@
autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
-
+
@@ -73,7 +73,7 @@
diff --git a/pages/list/movieticket/list/ticket/index.wxml b/pages/list/movieticket/list/ticket/index.wxml
index 622fdb0..e48d1b3 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 @@
-
+
暂无内容
diff --git a/pages/list/museum/index.wxml b/pages/list/museum/index.wxml
index 56b57e9..b7b94f3 100644
--- a/pages/list/museum/index.wxml
+++ b/pages/list/museum/index.wxml
@@ -3,7 +3,7 @@
-
+
{{item.garden_flag_text}}
@@ -30,6 +30,6 @@
-
+
暂无内容
\ No newline at end of file
diff --git a/pages/list/night/index.wxml b/pages/list/night/index.wxml
index cc536d0..4e1bed2 100644
--- a/pages/list/night/index.wxml
+++ b/pages/list/night/index.wxml
@@ -8,9 +8,9 @@
-->
-
+
-
+
{{item.title}}
@@ -20,6 +20,6 @@
-
+
暂无内容
diff --git a/pages/list/oneday/index.wxml b/pages/list/oneday/index.wxml
index e3d9502..5d13c45 100644
--- a/pages/list/oneday/index.wxml
+++ b/pages/list/oneday/index.wxml
@@ -1,26 +1,26 @@
-
+
综合
价格
-
-
+
+
销量
好评
-
+
{{item.title}}
{{item.rate}}分月销{{item.sales_number}}份
@@ -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 a992dba..0393a9c 100644
--- a/pages/list/road/index.wxml
+++ b/pages/list/road/index.wxml
@@ -3,27 +3,27 @@
{{item.type_name}}
-
+
综合
价格
-
-
+
+
销量
好评
-
+
{{item.title}}
{{item.rate}}分月销{{item.sales_number}}份
@@ -37,6 +37,6 @@
-
+
暂无内容
\ No newline at end of file
diff --git a/pages/list/sale/index.wxml b/pages/list/sale/index.wxml
index 43f1465..f974489 100644
--- a/pages/list/sale/index.wxml
+++ b/pages/list/sale/index.wxml
@@ -22,8 +22,8 @@
-
-
+
+
{{item.sku.product.title +item.sku.sku_name}}
@@ -44,8 +44,8 @@
-
-
+
+
{{item.title}}
@@ -63,6 +63,6 @@
-
+
暂无内容
\ No newline at end of file
diff --git a/pages/list/scene/index.wxml b/pages/list/scene/index.wxml
index d54e890..081da4c 100644
--- a/pages/list/scene/index.wxml
+++ b/pages/list/scene/index.wxml
@@ -5,10 +5,10 @@
产品产品产
-->
-
+
-
+
{{item.name}}
@@ -16,7 +16,7 @@
-
+
@@ -37,6 +37,6 @@
-
+
暂无内容
\ No newline at end of file
diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml
index 3085b3c..74e84bb 100644
--- a/pages/list/six/index.wxml
+++ b/pages/list/six/index.wxml
@@ -2,8 +2,8 @@
-
-
+
+
@@ -21,54 +21,54 @@
文旅服务
-
+
活动日历
-
+
景点门票
-
+
酒店住宿
公共服务
-
+
景区舒适度
-
+
停车场
-
+
公共自行车
周边推荐
-
+
{{item.title}}
{{item.address}}
￥{{item.price/100}}起
@@ -76,7 +76,7 @@
￥0.00起
-
+
暂无内容
\ No newline at end of file
diff --git a/pages/list/store/index.wxml b/pages/list/store/index.wxml
index 4a0f479..f9e4cd8 100644
--- a/pages/list/store/index.wxml
+++ b/pages/list/store/index.wxml
@@ -13,7 +13,7 @@
-
+
{{item.title}}
@@ -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 33e3f1b..10f15a7 100644
--- a/pages/list/strategy/index.wxml
+++ b/pages/list/strategy/index.wxml
@@ -5,19 +5,19 @@
搜索
-
+
-
-
-
+
+
+
达人攻略
-
-
-
+
+
+
官方手册
@@ -25,11 +25,11 @@
{{item.title}}
-
+
{{item.subtitle}}
-
+
{{item.nickname}}
{{item.like_number}}
@@ -42,7 +42,7 @@
{{item.title}}
-
+
diff --git a/pages/list/techan/index.wxml b/pages/list/techan/index.wxml
index afaad8a..2544553 100644
--- a/pages/list/techan/index.wxml
+++ b/pages/list/techan/index.wxml
@@ -2,9 +2,9 @@
-
+
-
+
特产
文创
@@ -31,14 +31,14 @@
-
+
{{item.title}}
￥{{(item.price/100)}}{{item.market_price/100}}
-
+
暂无内容
diff --git a/pages/list/theatre/index.wxml b/pages/list/theatre/index.wxml
index 097052b..f1f11b7 100644
--- a/pages/list/theatre/index.wxml
+++ b/pages/list/theatre/index.wxml
@@ -2,7 +2,7 @@
-
+
{{item.title}}
@@ -291,7 +295,7 @@
{{item.title}}
{{item.subtitle}}
-
+
{{item.nickname}}
@@ -308,7 +312,7 @@
-
+
@@ -319,21 +323,21 @@
-
+
电子社保卡
-
+
景区舒适度
-
+
行李寄存
-
+
实时路况
diff --git a/pages/map/index.wxss b/pages/map/index.wxss
index 7c6d54b..9faef2f 100644
--- a/pages/map/index.wxss
+++ b/pages/map/index.wxss
@@ -583,7 +583,7 @@
display: flex;
/* justify-content: space-around; */
flex-wrap: wrap;
- width: calc(170rpx * 8);
+ width: calc(170rpx * 7);
margin: 0 20rpx;
}
diff --git a/pages/old/index.wxml b/pages/old/index.wxml
index fd03ba0..e6a2432 100644
--- a/pages/old/index.wxml
+++ b/pages/old/index.wxml
@@ -2,11 +2,11 @@
-
+
首页
-
+
我的
diff --git a/pages/old/profile/index.wxml b/pages/old/profile/index.wxml
index 847c008..9acbf72 100644
--- a/pages/old/profile/index.wxml
+++ b/pages/old/profile/index.wxml
@@ -5,7 +5,7 @@
头像
-
+
diff --git a/pages/old/user/index.wxml b/pages/old/user/index.wxml
index 58f8b6b..0866069 100644
--- a/pages/old/user/index.wxml
+++ b/pages/old/user/index.wxml
@@ -1,14 +1,14 @@
-
+
{{info.nickname}}
-
+
-
+
切换常规模式
@@ -18,28 +18,28 @@
我的订单
-
-
+
+
出行人信息
-
-
+
+
联系客服
-
-
+
+
-
+
首页
-
+
我的
diff --git a/pages/order/WineSceneOrder/index.wxml b/pages/order/WineSceneOrder/index.wxml
index e5971bf..e2f5348 100644
--- a/pages/order/WineSceneOrder/index.wxml
+++ b/pages/order/WineSceneOrder/index.wxml
@@ -17,10 +17,10 @@
{{product.sku.price/100}}
-
-
+
+
{{productNum}}
-
+
diff --git a/pages/order/comment/index.wxml b/pages/order/comment/index.wxml
index 3f59adc..5958fd6 100644
--- a/pages/order/comment/index.wxml
+++ b/pages/order/comment/index.wxml
@@ -2,7 +2,7 @@
-
+
{{item.product_title}}
{{item.sku_name}}
@@ -20,12 +20,12 @@
-
+
- 上传图片
+ 上传图片
@@ -38,12 +38,12 @@
提交
-
+
-
+
{{item.title}}
diff --git a/pages/order/components/contact/index.wxml b/pages/order/components/contact/index.wxml
index 5e9d430..fd9496b 100644
--- a/pages/order/components/contact/index.wxml
+++ b/pages/order/components/contact/index.wxml
@@ -19,7 +19,7 @@
-
+
出行人{{index+1}}
点击填写1位出行人信息
-
+
-
+
出行人1
点击填写1位出行人信息
-
+
diff --git a/pages/order/components/date/index.js b/pages/order/components/date/index.js
index 4c17eb6..c6f7149 100644
--- a/pages/order/components/date/index.js
+++ b/pages/order/components/date/index.js
@@ -51,16 +51,23 @@ Component({
afterTom:util.formatHou(new Date()),
skuName:'',
monthList:[],
- scrollLeft: 0
+ scrollLeft: 0,
+ refundTag: "",
},
lifetimes: {
attached: function () {
console.log(app.globalData.product);
let skuName = app.globalData.product.sku.sku_name
+ let refundTag = "";
+ if (app.globalData.product&&app.globalData.product.sku&&app.globalData.product.sku.sku_model) {
+ if(app.globalData.product.sku.sku_model.is_auto_refund == 1) refundTag = "过期自动退";
+ if(app.globalData.product.sku.sku_model.is_auto_refund == 2) refundTag = "过期自动核销";
+ }
this.setData({
kjIdCom: app.globalData.kjId,
gpIdCom: app.globalData.gp_id || app.globalData.team_id,
- skuName
+ skuName,
+ refundTag: refundTag
})
// 在组件实例进入页面节点树时执行
let product = app.globalData.product, today = util.formatDate(new Date()), end_date = util.formatDate(new Date(new Date().getTime() + this.properties.endDays * 24 * 60 * 60 * 1000));
diff --git a/pages/order/components/date/index.wxml b/pages/order/components/date/index.wxml
index 2e274ec..79ec513 100644
--- a/pages/order/components/date/index.wxml
+++ b/pages/order/components/date/index.wxml
@@ -23,7 +23,8 @@
-->
{{skuName}}
-
+ {{refundTag}}
+
使用日期
diff --git a/pages/order/components/date/index.wxss b/pages/order/components/date/index.wxss
index b954718..4c5d8e8 100644
--- a/pages/order/components/date/index.wxss
+++ b/pages/order/components/date/index.wxss
@@ -128,4 +128,18 @@
font-weight: 500;
font-size: 27rpx;
color: #000000;
+}
+.refund-tag{
+ margin-left: 20rpx;
+ background: rgba(241, 34, 34, 0.1);
+ border-radius: 7rpx;
+ height: 37rpx;
+ line-height: 37rpx;
+ padding: 0 10rpx;
+ font-weight: 500;
+ font-size: 24rpx;
+ color: #F12222;
+ width: fit-content;
+
+
}
\ No newline at end of file
diff --git a/pages/order/components/wxqrCode/index.wxml b/pages/order/components/wxqrCode/index.wxml
index 36bf915..f907229 100644
--- a/pages/order/components/wxqrCode/index.wxml
+++ b/pages/order/components/wxqrCode/index.wxml
@@ -1,7 +1,7 @@
-
+
扫码关注【君到苏州】 微信公众号
@@ -9,5 +9,5 @@
查看更多旅游资讯
-
+
\ No newline at end of file
diff --git a/pages/order/coupon/index.wxml b/pages/order/coupon/index.wxml
index 3a169d0..7bca12b 100644
--- a/pages/order/coupon/index.wxml
+++ b/pages/order/coupon/index.wxml
@@ -15,6 +15,6 @@
确定
-
+
暂无优惠券
\ No newline at end of file
diff --git a/pages/order/food/index.wxml b/pages/order/food/index.wxml
index ba82d4b..36b7601 100644
--- a/pages/order/food/index.wxml
+++ b/pages/order/food/index.wxml
@@ -2,7 +2,7 @@
-
+
{{product.product.title+product.sku.sku_name}}
diff --git a/pages/order/hotel/index.wxml b/pages/order/hotel/index.wxml
index 94eea6a..6bad614 100644
--- a/pages/order/hotel/index.wxml
+++ b/pages/order/hotel/index.wxml
@@ -41,7 +41,7 @@
-
+
diff --git a/pages/order/joinOrder/success/index.wxml b/pages/order/joinOrder/success/index.wxml
index ebb3316..245ea05 100644
--- a/pages/order/joinOrder/success/index.wxml
+++ b/pages/order/joinOrder/success/index.wxml
@@ -1,6 +1,6 @@
-
+
提交成功
团长确认后请前往公众号
君到苏州-个人中心 凭码入园
diff --git a/pages/order/movie/index.wxml b/pages/order/movie/index.wxml
index 4733428..c67f738 100644
--- a/pages/order/movie/index.wxml
+++ b/pages/order/movie/index.wxml
@@ -2,7 +2,7 @@
-
+
{{product.info.movieName}}
{{product.info.show_date}} {{product.info.show_time}}-{{product.info.close_time}} {{'('+product.info.show_version+')'}}
@@ -15,13 +15,13 @@
-
+
不支持退票
-
+
不支持改签
@@ -76,7 +76,7 @@
-
+
退改须知
@@ -84,7 +84,7 @@
该产品一经购买，不支持退票/改签， 您的订单页面会显示【不支持退票】【不支持改签】提示，此时 平台无法为您处理退。 请您提前规划好出行时间，按时观影。
-
+
我已认可此规则
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index af07a1f..387593c 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -50,6 +50,24 @@ Page({
isPaying: false,
+ sku_model_type: "",
+ templateIds: {
+ "ticket": [
+ // 订单状态变化通知
+ "cgeAlh1IzNlCua-q0UInEHzWaZdqvpfiVq1eBo-Oj4o",
+ //出票结果通知
+ "zdh2DYFLJ8M-jwiW6EXfhJ4qPpreWp1rHIMd0jrLWII",
+ // 订单支付成功通知
+ // "KFtX7CPbFkYTbxowaLC0-bEdeGdzfWpaOXCTOOWS_NM",
+ ],
+ "post": [
+ // 订单支付成功通知
+ // "KFtX7CPbFkYTbxowaLC0-bEdeGdzfWpaOXCTOOWS_NM",
+ // 订单发货通知
+ "zyoVCQnrhXYojldRffIgz8O4uEeuJvbhWBxqNbhrPMU"
+ ],
+ }
+
},
/**
@@ -141,9 +159,6 @@ Page({
commonApi.user_post("order/query",{
order_id:this.data.id
}).then(res=>{
-
-
-
// 书券产品
if(res.data.order_product_list[0].product_id == 75012 ||
res.data.order_product_list[0].product_id == 75013 ||
@@ -156,7 +171,7 @@ Page({
isBook:true,
payIndex:1
})
- }
+ }
if(res.data.create_time && res.data.auto_close_time && res.data.state=='UNPAID'){
let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000);
this.daojishi(time);
@@ -199,6 +214,7 @@ Page({
carCouponTip:carCouponTip,
info: res.data,
MTTip: MTTip,
+ sku_model_type: res.data.order_product_list[0].product_model
})
console.log(this.data.ERMB);
@@ -230,6 +246,7 @@ Page({
})
},
pay:function(){
+ let _this = this;
let arr = []
this.data.info.order_product_list.forEach(item => {
arr.push(item.product_id)
@@ -260,7 +277,6 @@ Page({
}
}
- let _this = this;
if(this.data.payIndex==1) {
this.setData({
showNumMask:true
@@ -289,11 +305,25 @@ Page({
title: '支付成功',
icon:'success'
})
+
+ let templateIds = _this.data.templateIds[_this.data.sku_model_type];
+ if (templateIds && Array.isArray(templateIds) && templateIds.length>0) {
+ wx.requestSubscribeMessage({
+ tmplIds: templateIds,
+ complete (res) {
+ wx.redirectTo({
+ url: '../payresult/index?tid='+_this.data.id+'&ids='+_this.data.ids.join(',')
+ })
+ }
+ })
+ return
+ }
+
setTimeout(()=>{
// 支付成功不还原isPaying redirectTo 会删掉当前页面触发unload
// _this.data.isPaying = false
wx.redirectTo({
- url: '../payresult/index?tid='+_this.data.id+'&ids='+_this.data.ids.join(',')
+ url: '../payresult/index?tid='+_this.data.id+'&ids='+_this.data.ids.join(',')
})
},1000)
},
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index e798803..e943460 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -16,12 +16,12 @@
-
+
数字人民币
-
+
君到苏州现已支持数字人民币支付，请至数字人民币app中绑定授权
@@ -34,12 +34,12 @@
-
+
数字人民币
-
+
君到苏州现已支持数字人民币支付，请至数字人民币app中绑定授权
@@ -53,7 +53,7 @@
¥{{info.paid_money/100}}
-
+
{{item.bank_name}}
diff --git a/pages/order/payresult/index.js b/pages/order/payresult/index.js
index 79d9fee..642090c 100644
--- a/pages/order/payresult/index.js
+++ b/pages/order/payresult/index.js
@@ -47,6 +47,13 @@ Page({
},
gotoDetail:function(e){
let item = e.currentTarget.dataset.item;
+ // todo 区县跳转
+ if (item.goods_jump_type == "changshu" || item.goods_jump_type == "yjks") {
+ util.goProdInOtherPlatform(item)
+ return
+ }
+
+
util.gotoDetail(item)
},
gotoOrderList:function(){
diff --git a/pages/order/payresult/index.wxml b/pages/order/payresult/index.wxml
index ea70e50..16fd439 100644
--- a/pages/order/payresult/index.wxml
+++ b/pages/order/payresult/index.wxml
@@ -1,19 +1,19 @@
-
+
订单正在处理中
具体出票/发货状态
将会通过短信/订单状态进行通知
查看订单
-
+
-
+
{{item.title}}
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index d6949c5..fced9b1 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -6,7 +6,7 @@
供应商：{{item.product.supplier_name}}
-
+
{{item.product.title}}
@@ -30,13 +30,13 @@
-
+
一次性收货
-
+
分批收货(共{{item.sku.batch_count}}次)
@@ -70,7 +70,7 @@
惠民补贴
-￥{{allowance_price / 100}}
-
diff --git a/pages/order/roadOrder/index.wxml b/pages/order/roadOrder/index.wxml
index f81629e..52331d5 100644
--- a/pages/order/roadOrder/index.wxml
+++ b/pages/order/roadOrder/index.wxml
@@ -32,7 +32,7 @@
@@ -63,7 +63,7 @@
惠民补贴
-￥{{allowance_price / 100}}
-
@@ -135,7 +135,10 @@
-
+
+
+
+
合计: {{price}}
diff --git a/pages/order/scene/index.wxss b/pages/order/scene/index.wxss
index 649d9ab..c3e18f0 100644
--- a/pages/order/scene/index.wxss
+++ b/pages/order/scene/index.wxss
@@ -409,7 +409,7 @@ page {
display: flex;
justify-content: space-between;
align-items: center;
- position: absolute;
+ position: fixed;
left: 0;
right: 0;
bottom: 0;
diff --git a/pages/order/sceneCart/index.wxml b/pages/order/sceneCart/index.wxml
index ba74161..c6f5e6e 100644
--- a/pages/order/sceneCart/index.wxml
+++ b/pages/order/sceneCart/index.wxml
@@ -28,7 +28,7 @@
惠民补贴
-￥{{allowance_price / 100}}
-
diff --git a/pages/order/show/index.wxml b/pages/order/show/index.wxml
index 119a2f1..e7bda80 100644
--- a/pages/order/show/index.wxml
+++ b/pages/order/show/index.wxml
@@ -26,7 +26,7 @@
-
+
暂无场次
@@ -52,7 +52,7 @@
-
+
暂无场次
@@ -77,7 +77,7 @@
diff --git a/pages/order/showOrderNew/index.wxml b/pages/order/showOrderNew/index.wxml
index 9891d53..380b633 100644
--- a/pages/order/showOrderNew/index.wxml
+++ b/pages/order/showOrderNew/index.wxml
@@ -23,10 +23,10 @@
{{product.sku.price/100}}
-
-
+
+
{{productNum}}
-
+
diff --git a/pages/order/showSeat/index.wxml b/pages/order/showSeat/index.wxml
index 1b8e79c..d671975 100644
--- a/pages/order/showSeat/index.wxml
+++ b/pages/order/showSeat/index.wxml
@@ -9,7 +9,7 @@
-
+
diff --git a/pages/pbService/PRpark/index.wxml b/pages/pbService/PRpark/index.wxml
index fe0ed54..a8d0f9d 100644
--- a/pages/pbService/PRpark/index.wxml
+++ b/pages/pbService/PRpark/index.wxml
@@ -6,7 +6,7 @@
{{item.name}}
距离定位{{item.distance}}公里共{{item.nums}}车位
-
+
免费
diff --git a/pages/pbService/activity/index.wxml b/pages/pbService/activity/index.wxml
index 5e3fbf3..143e4b9 100644
--- a/pages/pbService/activity/index.wxml
+++ b/pages/pbService/activity/index.wxml
@@ -1,6 +1,6 @@
-
+
{{ item.title }}
@@ -11,8 +11,8 @@
-
-
+
+
{{item.title}}
{{item.desc}}
diff --git a/pages/pbService/appreciate/index.wxml b/pages/pbService/appreciate/index.wxml
index e25de35..ca8d319 100644
--- a/pages/pbService/appreciate/index.wxml
+++ b/pages/pbService/appreciate/index.wxml
@@ -14,12 +14,12 @@
-
+
{{item.Name}}
{{item.CatalogName || item.Tag}}
\ No newline at end of file
diff --git a/pages/pbService/bus/index.wxml b/pages/pbService/bus/index.wxml
index 8cc2b16..1448bab 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 a568e84..2de38ff 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 74549cb..61b91fc 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/feiyi/index.wxml b/pages/pbService/feiyi/index.wxml
index a0b2b03..6ebfc62 100644
--- a/pages/pbService/feiyi/index.wxml
+++ b/pages/pbService/feiyi/index.wxml
@@ -8,7 +8,7 @@
-
+
{{item.title}}
{{item.protect_office}}
diff --git a/pages/pbService/feiyi/info/index.wxml b/pages/pbService/feiyi/info/index.wxml
index 92c7901..13678c7 100644
--- a/pages/pbService/feiyi/info/index.wxml
+++ b/pages/pbService/feiyi/info/index.wxml
@@ -2,17 +2,17 @@
-
+
{{info.title}}
-
-
- 地址：{{info.protect_office || "暂无"}}
+
+
+ 地址：{{info.protect_office || "暂无"}}
非遗介绍:
-
+
-
+
\ No newline at end of file
diff --git a/pages/pbService/group/index.wxml b/pages/pbService/group/index.wxml
index 78d5528..b34183f 100644
--- a/pages/pbService/group/index.wxml
+++ b/pages/pbService/group/index.wxml
@@ -9,7 +9,7 @@
-
+
{{item.title}}（团体预约）
电话：{{item.tel}}
diff --git a/pages/pbService/gym/index.wxml b/pages/pbService/gym/index.wxml
index 3671093..4f05918 100644
--- a/pages/pbService/gym/index.wxml
+++ b/pages/pbService/gym/index.wxml
@@ -8,15 +8,15 @@
-
+
{{item.mName}}-{{item.sName}}
-
+
{{item.open_time}}
-
+
{{item.address}}
{{item.distance}}
diff --git a/pages/pbService/gym/info/index.wxml b/pages/pbService/gym/info/index.wxml
index ba6b0af..f6e6afa 100644
--- a/pages/pbService/gym/info/index.wxml
+++ b/pages/pbService/gym/info/index.wxml
@@ -5,7 +5,7 @@
autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
-
+
@@ -22,36 +22,36 @@
{{info.name}}
-
+
地址：{{info.address}}
-
+
电话：{{info.telephone}}
-
+
-
-
-
+
+
+
{{info.name}}
-
+
-
-
+
+
开放时间
-
+
-
-
+
+
-
+
-->
\ No newline at end of file
diff --git a/pages/pbService/index.js b/pages/pbService/index.js
index 6da1e5b..bf04a97 100644
--- a/pages/pbService/index.js
+++ b/pages/pbService/index.js
@@ -8,105 +8,198 @@ Page({
* 页面的初始数据
*/
data: {
- jsj: null
+ jsj: null,
+ // 交通助手
+ trafficHelper: [
+ {
+ title: "高峰预警",
+ img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png",
+ weburl: "https://wlsjzx.zdhxwl.cn/kt_h5/index.html?userEncry=FQqP774V6H3PacOWYqJLykUBBywTAZEWMu9Nz9tzrOZUIf/Zto2OvXmirAi7/FSOkZg1uwNpcK0kdZgK0FjuzEZKYBjL/1RXp3XpQhxv9H91g9c737NfSxRcfYUHo2SGLX8kAlAiAbt72AoEfG++i+WTjbTo57sunVEzn/nF7n55StkcgfesDKjXOm+txOYbEc0tH32A5Mn",
+ // path: "/pages/pbService/sceneComfort/index?title=高峰预警"
+ },
+ {
+ title: "行李直送",
+ img: "https://static.ticket.sz-trip.com/uploads/20250115/1628737d70e74613fc12e9fdbd8c192f.png",
+ appId: 'wx757dd1ee184e75e9',
+ page: "pages/tabBar/index/index",
+ },
+ {
+ title: "行李寄存",
+ img: "https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png",
+ weburl: "https://weixin.2500sz.net/zt/2023/07/luggage_storage/"
+ },
+ {
+ title: "找厕所",
+ img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb3.png",
+ path: "/pages/pbService/bike/index?type=1"
+ },
+ {
+ title: "Suzhou Tour",
+ img: "https://m.cloud.sz-trip.com/static/images/serve/isuzhou.png",
+ weburl: "https://traveltosuzhou.wglj.suzhou.gov.cn/"
+ },
+ {
+ title: "安全服务",
+ img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb2.png",
+ path: "/pages/pbService/security/index"
+ },
+ // {
+ // title: "体育场馆",
+ // img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb14.png",
+ // path: "/pages/pbService/gym/index"
+ // },
+ {
+ title: "垃圾分类",
+ img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb16.png",
+ appId: 'wx13be821f3b1afed3',
+ path: 'pages/home/home'
+ },
+ // {
+ // title: "文化配送",
+ // img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb20.png",
+ // path: "/pages/culture/index"
+ // },
+ {
+ title: "附近图书馆",
+ img: "https://static.ticket.sz-trip.com/uploads/20231031/858e6ced1edaf072aa7879ee6ff5204f.png",
+ weburl: "https://www.szlib.com/szlibposition"
+ },
+ {
+ title: "12348",
+ img: "https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png",
+ appId: 'wxcdfd45c001466ba3',
+ path: 'pages/index/index'
+ },
+ {
+ title: "文化场馆查询",
+ img: "https://static.ticket.sz-trip.com/uploads/20250812/ed95e68969c28c75e1ed348a56d4c198.png",
+ weburl: "https://m.cloud.sz-trip.com/Museum"
+ },
+ ],
+ // 交通出行
+ transportation: [
+ // {
+ // title: "实时公交",
+ // img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb6.png",
+ // path: "/pages/pbService/bus/index"
+ // },
+ {
+ title: "停车场",
+ img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb5.png",
+ weburl: "https://m.cloud.sz-trip.com/ParkingArea"
+ },
+ {
+ title: "公共自行车",
+ img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb7.png",
+ path: "/pages/pbService/bike/index?type=0"
+ },
+ {
+ title: "接送机",
+ img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb18.png",
+ appId: "wxd4d86d58fcf658ff",
+ path: "/subpages/product/airport/index"
+ },
+ {
+ title: "P+R停车场",
+ img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb8.png",
+ path: "/pages/pbService/PRpark/index"
+ },
+ {
+ title: "实时路况",
+ img: "https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png",
+ weburl: "https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/"
+ },
+ {
+ title: "实时打车",
+ img: "https://static.ticket.sz-trip.com/jundaosuzhou/images/gdImg.png",
+ appId: 'wxbc0cf9b963bd3550',
+ page: "onlineCar/online_index/page/Home/Home?gd_from=taizhouwenlv"
+ },
+
+
+ ],
},
/**
* 生命周期函数--监听页面加载
*/
- onLoad: function (options) {
+onLoad: function (options) {
commonApi._post("pbservice/Other/getClientConfig", {
- unique_key: "wechatxcx"
+ unique_key: "wechatxcx"
}).then(res => {
- let data = JSON.parse(res.data);
- console.log(data)
- this.setData({
+ let data = JSON.parse(res.data);
+ console.log(data)
+ this.setData({
jsj: data.jiesongji
- })
- console.log(data)
+ })
+ console.log(data)
})
- },
- gotoPath: function (e) {
- if (e.currentTarget.dataset.event) {
- util.pagePoint({ event: e.currentTarget.dataset.event }, 1)
+},
+mainIconClick: function(e) {
+ let item = e.currentTarget.dataset.item
+ console.log(item)
+ if (item.pagePoint) {
+ this.newPagePoint(item.pagePoint)
}
- if (e.currentTarget.dataset.title == '12348') {
- wx.navigateToMiniProgram({
- appId: 'wxcdfd45c001466ba3',
- path: 'pages/index/index'
- })
- return;
+
+ if (item.appId) {
+ wx.navigateToMiniProgram({
+ appId: item.appId,
+ path: item.pagePath,
+ })
+ return
}
- wx.navigateTo({
- url: e.currentTarget.dataset.path,
- })
- if (e.currentTarget.dataset.title) {
- commonApi._post("browse/burying_point", {
- uuid: app.globalData.uuid,
- drive: "mini",
- title: e.currentTarget.dataset.title
- }).then(res => {
-
- })
+ if (item.path) {
+ wx.navigateTo({
+ url: item.path
+ })
+ return
}
- },
- jiesongji: function (e) {
- if (!this.data.jsj) return;
- if (e.currentTarget.dataset.event) {
- util.pagePoint({ event: e.currentTarget.dataset.event }, 1)
+ if (item.weburl) {
+ wx.navigateTo({
+ url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.weburl)
+ })
+ return
}
- wx.navigateToMiniProgram({
- appId: this.data.jsj, // 之前后台的appid wx336dcaf6a1ecf632
- page: "subpages/product/airport/index"
- })
- // wx.navigateToMiniProgram({
- // appId: this.data.jsj,
- // page: "page/home/webview/webview?hideShare=0&src=https%3A%2F%2Fopen.weixin.qq.com%2Fconnect%2Foauth2%2Fauthorize%3Fappid%3Dwx3827070276e49e30%26redirect_uri%3Dhttps%3A%2F%2Fwx.17u.cn%2Fflight%2Fgetopenid.html%3Furl%3Dhttps%25253A%25252F%25252Fwx.17u.cn%25252Finternalcarrebornwechat%25252Fview%25252Fmain.html%252523%25252FspecialCarIndex%25252FinstantCar%25253Frefid%25253D1563845199%26showwxpaytitle%3D1%26response_type%3Dcode%26scope%3Dsnsapi_base%26state%3D123%26connect_redirect%3D1%23wechat_redirect"
- // })
- },
- gaode: function (e) {
- if (!this.data.jsj) return;
- if (e.currentTarget.dataset.event) {
- util.pagePoint({ event: e.currentTarget.dataset.event }, 1)
- }
- wx.navigateToMiniProgram({
- appId: 'wxbc0cf9b963bd3550',
- page: "onlineCar/online_index/page/Home/Home?gd_from=taizhouwenlv"
+
+},
+
+
+
+jiesongji: function (e) {
+if (!this.data.jsj) return;
+if (e.currentTarget.dataset.event) {
+ util.pagePoint({ event: e.currentTarget.dataset.event }, 1)
+}
+wx.navigateToMiniProgram({
+ appId: this.data.jsj, // 之前后台的appid wx336dcaf6a1ecf632
+ page: "subpages/product/airport/index"
+})
+// wx.navigateToMiniProgram({
+// appId: this.data.jsj,
+// page: "page/home/webview/webview?hideShare=0&src=https%3A%2F%2Fopen.weixin.qq.com%2Fconnect%2Foauth2%2Fauthorize%3Fappid%3Dwx3827070276e49e30%26redirect_uri%3Dhttps%3A%2F%2Fwx.17u.cn%2Fflight%2Fgetopenid.html%3Furl%3Dhttps%25253A%25252F%25252Fwx.17u.cn%25252Finternalcarrebornwechat%25252Fview%25252Fmain.html%252523%25252FspecialCarIndex%25252FinstantCar%25253Frefid%25253D1563845199%26showwxpaytitle%3D1%26response_type%3Dcode%26scope%3Dsnsapi_base%26state%3D123%26connect_redirect%3D1%23wechat_redirect"
+// })
+},
+
+
+gotoSku: function () {
+commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {
+ app.globalData.weburl = res.data.url;
+ wx.navigateTo({
+ url: '/pages/pbService/web/index'
})
- },
- xlzs: function (e) {
+ return;
+})
+},
- wx.navigateToMiniProgram({
- appId: 'wx757dd1ee184e75e9',
- page: "pages/tabBar/index/index"
- })
- },
- gotoUrl: function (e) {
- if (e.currentTarget.dataset.event) {
- util.pagePoint({ event: e.currentTarget.dataset.event }, 1)
- }
- let url = e.currentTarget.dataset.url;
- app.globalData.weburl = url;
- wx.navigateTo({
- url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(url)
- })
- },
- gotoSku: function () {
- commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {
- app.globalData.weburl = res.data.url;
- wx.navigateTo({
- url: '/pages/pbService/web/index'
- })
- return;
- })
- },
- garbage: function () {
- wx.navigateToMiniProgram({
- appId: 'wx13be821f3b1afed3',
- path: 'pages/home/home'
+newPagePoint (param) {
+ commonApi._post("browse/newBuryingPoint", {
+ uuid: app.globalData.uuid,
+ drive: "mini",
+ ...param,
})
- },
+},
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index cbd6b5b..d898c8a 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -1,160 +1,72 @@
-
-
-
-
- 高峰预警
+
+
+ {{item.title}}
-
-
- 行李直送
-
-
-
- 行李寄存
-
-
-
- 找厕所
-
-
-
- Suzhou Tour
-
-
-
- 安全服务
-
-
-
-
- 垃圾分类
-
-
-
-
- 附近图书馆
-
-
-
- 12348
-
-
-
- 文化场馆查询
-
-
-
-
-
-
-
-
-
- 停车场
-
-
-
-
- 公共自行车
-
-
-
- 接送机
-
-
-
- P+R停车场
-
-
-
- 实时路况
+
+
+ {{item.title}}
-
-
- 实时打车
-
\ No newline at end of file
diff --git a/pages/pbService/sceneComfort/index.js b/pages/pbService/sceneComfort/index.js
index d4f67ce..e3a59cf 100644
--- a/pages/pbService/sceneComfort/index.js
+++ b/pages/pbService/sceneComfort/index.js
@@ -32,6 +32,20 @@ Page({
if (options.title) {
this.setData({title: options.title})
}
+ commonApi._post("pbservice/Comfort/getSceneLevel").then(res=>{
+ console.log(res)
+ let sceneLevelObj = {};
+ res.data.map(item=>{
+ sceneLevelObj[item.level] = item.name;
+ })
+ res.data.unshift({
+ name:"不选择"
+ })
+ this.setData({
+ sceneLevel:res.data,
+ sceneLevelObj:sceneLevelObj
+ })
+ })
commonApi._post("pbservice/Comfort/getComfortLevel").then(res=>{
let comfortObj = {}
@@ -48,7 +62,6 @@ Page({
comfortLevel:res.data,
comfortObj:comfortObj
})
- this.getList();
})
commonApi._post('pbservice/Comfort/getComfortAreaList').then(res=>{
let areaObj = {}
@@ -70,21 +83,9 @@ Page({
areas:res.data,
areaObj:areaObj
})
+ this.getList();
})
- commonApi._post("pbservice/Comfort/getSceneLevel").then(res=>{
- console.log(res)
- let sceneLevelObj = {};
- res.data.map(item=>{
- sceneLevelObj[item.level] = item.name;
- })
- res.data.unshift({
- name:"不选择"
- })
- this.setData({
- sceneLevel:res.data,
- sceneLevelObj:sceneLevelObj
- })
- })
+
},
changeArea:function(e){
diff --git a/pages/pbService/sceneComfort/index.wxml b/pages/pbService/sceneComfort/index.wxml
index 803068c..c073991 100644
--- a/pages/pbService/sceneComfort/index.wxml
+++ b/pages/pbService/sceneComfort/index.wxml
@@ -38,19 +38,19 @@
-
+
景区舒适度
-
+
本预测趋势图由AI生成，内容仅供参考。
-
+
{{item.third_scene_name}}
diff --git a/pages/pbService/wbdw/index.wxml b/pages/pbService/wbdw/index.wxml
index d31225a..913f57a 100644
--- a/pages/pbService/wbdw/index.wxml
+++ b/pages/pbService/wbdw/index.wxml
@@ -27,10 +27,10 @@
-
+
{{item.name}}
-
+
{{item.address}}
\ No newline at end of file
diff --git a/pages/pbService/wbdw/info/index.wxml b/pages/pbService/wbdw/info/index.wxml
index 0abf918..205e1fd 100644
--- a/pages/pbService/wbdw/info/index.wxml
+++ b/pages/pbService/wbdw/info/index.wxml
@@ -1,6 +1,6 @@
-
+
{{info.name}}
地址：{{info.address}}
diff --git a/pages/pbService/wwcx/index.wxml b/pages/pbService/wwcx/index.wxml
index 2eb35d0..688f463 100644
--- a/pages/pbService/wwcx/index.wxml
+++ b/pages/pbService/wwcx/index.wxml
@@ -32,7 +32,7 @@
-
+
{{item.name}}
藏于{{item.collection_name}}
diff --git a/pages/pbService/wwcx/info/index.wxml b/pages/pbService/wwcx/info/index.wxml
index febcdf3..bfde060 100644
--- a/pages/pbService/wwcx/info/index.wxml
+++ b/pages/pbService/wwcx/info/index.wxml
@@ -2,17 +2,17 @@
-
+
{{info.name}}
- 年代：{{info.age || "暂无"}}
-
- 地址：{{info.collection_name || "暂无"}}
+ 年代：{{info.age || "暂无"}}
+
+ 地址：{{info.collection_name || "暂无"}}
文物介绍:
{{info.introduction}}
-
+
-
+
\ No newline at end of file
diff --git a/pages/pbService/wwcx/search/index.wxml b/pages/pbService/wwcx/search/index.wxml
index 3488a8e..ece75d0 100644
--- a/pages/pbService/wwcx/search/index.wxml
+++ b/pages/pbService/wwcx/search/index.wxml
@@ -15,7 +15,7 @@
-
+
{{item.name}}
藏于{{item.collection_name}}
diff --git a/pages/search/list/index.wxml b/pages/search/list/index.wxml
index 12cee6b..6fc1997 100644
--- a/pages/search/list/index.wxml
+++ b/pages/search/list/index.wxml
@@ -15,11 +15,11 @@
{{item.title}}
-
+
{{item.ext.subtitle}}
-
+
{{item.ext.user_name}}
{{item.ext.like_number}}
@@ -30,7 +30,7 @@
-
+
{{item.title}}
@@ -46,7 +46,7 @@
-
+
{{item.title}}
{{item.ext.rate}}分月销{{item.ext.sales_number}}份
@@ -54,7 +54,7 @@
{{item}}
-
+
{{item.supplier_name}}
￥{{item.ext.price/100}}起
@@ -62,7 +62,7 @@
-
+
{{item.title}}
@@ -73,7 +73,7 @@
-
+
{{item.title}}
@@ -84,7 +84,7 @@
-
+
{{item.title}}
@@ -98,7 +98,7 @@
-
+
{{item.title}}
@@ -109,7 +109,7 @@
-
+
{{item.title}}
@@ -124,6 +124,6 @@
-
+
暂无内容
\ No newline at end of file
diff --git a/pages/supplier/apply/index.wxml b/pages/supplier/apply/index.wxml
index c05cfca..7dee8bd 100644
--- a/pages/supplier/apply/index.wxml
+++ b/pages/supplier/apply/index.wxml
@@ -43,7 +43,7 @@
门头照
-
+
点击上传
@@ -54,7 +54,7 @@
营业执照
-
+
点击上传
@@ -65,7 +65,7 @@
经营许可证
-
+
点击上传
diff --git a/pages/supplier/good/index.wxml b/pages/supplier/good/index.wxml
index 05f45dc..93b343c 100644
--- a/pages/supplier/good/index.wxml
+++ b/pages/supplier/good/index.wxml
@@ -24,7 +24,7 @@
-
+
删除
@@ -41,7 +41,7 @@
规格图片
-
+
点击上传
@@ -52,7 +52,7 @@
线路详情
-
+
示例
@@ -63,7 +63,7 @@
使用说明
-
+
示例
@@ -74,7 +74,7 @@
费用说明
-
+
示例
@@ -106,7 +106,7 @@
预定须知
-
+
示例
@@ -138,7 +138,7 @@
退款规则
-
+
示例
@@ -148,11 +148,11 @@
{{item.show?'收起':'展开'}}
-
+
-
+
点击添加规格
请添加规格
diff --git a/pages/supplier/index.wxml b/pages/supplier/index.wxml
index 0397708..16baf3a 100644
--- a/pages/supplier/index.wxml
+++ b/pages/supplier/index.wxml
@@ -1,13 +1,13 @@
-
+
-
+
点击填写商户信息
-
+
{{supplier_text[passFlag.audit]}}
@@ -16,16 +16,16 @@
-
+
点击填写商品信息
-
+
点击填写商品信息
-
+
{{goods_text[audit]}}
@@ -37,5 +37,5 @@
查看
-
+
diff --git a/pages/user/address/index.wxml b/pages/user/address/index.wxml
index 6951b66..73b5583 100644
--- a/pages/user/address/index.wxml
+++ b/pages/user/address/index.wxml
@@ -27,7 +27,7 @@
-
+
暂无收货地址
新增收货地址
diff --git a/pages/user/bindtel/index.wxml b/pages/user/bindtel/index.wxml
index 0e252e3..2d12221 100644
--- a/pages/user/bindtel/index.wxml
+++ b/pages/user/bindtel/index.wxml
@@ -9,7 +9,7 @@
图形验证码
-
+
diff --git a/pages/user/cartlist/list.wxml b/pages/user/cartlist/list.wxml
index 0db4975..d05a364 100644
--- a/pages/user/cartlist/list.wxml
+++ b/pages/user/cartlist/list.wxml
@@ -5,7 +5,7 @@
-
+
{{item.product.title}}
@@ -24,7 +24,7 @@
删除
-
+
暂无内容
diff --git a/pages/user/coupon/index.wxml b/pages/user/coupon/index.wxml
index 8eceacb..1fffc3d 100644
--- a/pages/user/coupon/index.wxml
+++ b/pages/user/coupon/index.wxml
@@ -50,6 +50,6 @@
前往领券中心
-
+
暂无内容
\ No newline at end of file
diff --git a/pages/user/couponCenter/index.wxml b/pages/user/couponCenter/index.wxml
index afbacc7..347b155 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 fb366e4..2fcc5b4 100644
--- a/pages/user/likes/index.wxml
+++ b/pages/user/likes/index.wxml
@@ -7,7 +7,7 @@
-
+
{{item.product.title}}
￥{{item.product.price/100}}
@@ -18,7 +18,7 @@
-
+
{{item.scene.title}}
￥{{item.scene.price/100}}
@@ -29,6 +29,6 @@
-
+
暂无内容
\ No newline at end of file
diff --git a/pages/user/linkman/index.wxml b/pages/user/linkman/index.wxml
index 2d34fd9..6706793 100644
--- a/pages/user/linkman/index.wxml
+++ b/pages/user/linkman/index.wxml
@@ -27,7 +27,7 @@
-
+
暂无联系人
新增出游人
diff --git a/pages/user/order/activityOrderInfo/index.wxml b/pages/user/order/activityOrderInfo/index.wxml
index 9c9fb0b..a8f91db 100644
--- a/pages/user/order/activityOrderInfo/index.wxml
+++ b/pages/user/order/activityOrderInfo/index.wxml
@@ -7,7 +7,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
{{item.product_title}}
{{item.sku_name}}
@@ -82,7 +82,7 @@
- 联系客服
+ 联系客服
diff --git a/pages/user/order/couponOrderInfo/index.wxml b/pages/user/order/couponOrderInfo/index.wxml
index 3055269..be4ebc8 100644
--- a/pages/user/order/couponOrderInfo/index.wxml
+++ b/pages/user/order/couponOrderInfo/index.wxml
@@ -7,7 +7,7 @@
-
+
@@ -18,7 +18,7 @@
-
+
{{item.product_title}}
{{item.sku_name}}
@@ -93,7 +93,7 @@
- 联系客服
+ 联系客服
diff --git a/pages/user/order/foodOrderInfo/index.wxml b/pages/user/order/foodOrderInfo/index.wxml
index 30ece10..220255e 100644
--- a/pages/user/order/foodOrderInfo/index.wxml
+++ b/pages/user/order/foodOrderInfo/index.wxml
@@ -7,7 +7,7 @@
-
+
@@ -21,7 +21,7 @@
-
+
{{item.product_title}}
{{item.sku_name}}
@@ -99,7 +99,7 @@
-->
- 联系客服
+ 联系客服
diff --git a/pages/user/order/hotelOrderInfo/index.wxml b/pages/user/order/hotelOrderInfo/index.wxml
index e54ef76..ccfdfa0 100644
--- a/pages/user/order/hotelOrderInfo/index.wxml
+++ b/pages/user/order/hotelOrderInfo/index.wxml
@@ -7,7 +7,7 @@
-
+
@@ -72,7 +72,7 @@
- 联系客服
+ 联系客服
diff --git a/pages/user/order/lineOrderInfo/index.wxml b/pages/user/order/lineOrderInfo/index.wxml
index be5d0da..146f690 100644
--- a/pages/user/order/lineOrderInfo/index.wxml
+++ b/pages/user/order/lineOrderInfo/index.wxml
@@ -7,7 +7,7 @@
-
+
@@ -87,7 +87,7 @@
- 联系客服
+ 联系客服
diff --git a/pages/user/order/list.wxml b/pages/user/order/list.wxml
index 3ecccf1..7d50a4d 100644
--- a/pages/user/order/list.wxml
+++ b/pages/user/order/list.wxml
@@ -24,7 +24,7 @@
{{item.orderStateText?item.orderStateText:orderState[item.state]}}
-
+
{{item.product_model=='movie'?item.product_title:(item.product_title+item.sku_name)}}
￥{{item.product_price/100}}
@@ -49,6 +49,6 @@
-
+
还没有订单，赶快去下单吧~
\ No newline at end of file
diff --git a/pages/user/order/movieOrderInfo/index.wxml b/pages/user/order/movieOrderInfo/index.wxml
index 810f99b..1ba027f 100644
--- a/pages/user/order/movieOrderInfo/index.wxml
+++ b/pages/user/order/movieOrderInfo/index.wxml
@@ -9,12 +9,12 @@
{{info.order_product_list[0].supplier_code == 'syt'?'苏影通' : '淘票票'}}-电影票
-
+
-
+
@@ -28,7 +28,7 @@
-
+
{{item.product_title}}
{{info.order_product_list[0].order_product_extend.seats_list}}
@@ -151,7 +151,7 @@
diff --git a/pages/user/order/museumOrderInfo/index.wxml b/pages/user/order/museumOrderInfo/index.wxml
index 562f1a7..03f2665 100644
--- a/pages/user/order/museumOrderInfo/index.wxml
+++ b/pages/user/order/museumOrderInfo/index.wxml
@@ -7,7 +7,7 @@
-
+
{{item.stateText}}
@@ -23,7 +23,7 @@
-
+
{{item.product_title}}
{{item.sku_name}}
@@ -75,7 +75,7 @@
地址：{{info.order_product_list[0].scene_detail.address}}
-
+
导航
@@ -119,14 +119,14 @@
交通推荐
-
+
{{info.order_product_list[0].product_title}}>
- 联系客服
+ 联系客服
diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml
index f0d8ffc..e7e887a 100644
--- a/pages/user/order/postOrderInfo/index.wxml
+++ b/pages/user/order/postOrderInfo/index.wxml
@@ -18,7 +18,7 @@
-
+
{{item.product_title}}
{{item.sku_name}}
@@ -93,18 +93,21 @@
-
- 快递公司：{{item.post_detail_list[0].express_name}}
-
-
- 快递单号：
-
- {{item.post_detail_list[0].courier_number}} 复制
+
+
+ 快递公司：{{shipment.express_name}}
+
+
+ 快递单号：
+
+ {{shipment.courier_number}} 复制
+
+
+
+ 发货时间：{{shipment.post_time}}
-
- 发货时间：{{item.post_detail_list[0].post_time}}
-
+
@@ -177,7 +180,7 @@
- 联系客服
+ 联系客服
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index f65c46d..bb8e872 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -108,7 +108,8 @@ Page({
console.log(this.data.codeImgs);
},
prevCodeImg:function(){
- let qrcode=this.data.info.order_product_list[0].qrcode,codeIndex = this.data.codeIndex;
+ let qrcode=this.data.codeImgs,codeIndex = this.data.codeIndex;
+ console.log(codeIndex)
if(codeIndex==0){
this.setData({
codeIndex:qrcode.length-1
@@ -119,6 +120,7 @@ Page({
codeIndex:codeIndex-1
})
}
+ console.log(codeIndex)
},
nextCodeImg:function(){
console.log(this.data.codeImgs);
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 118ce54..a1976d8 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -7,7 +7,7 @@
@@ -138,7 +138,7 @@
-
+
{{item.product_title}}
{{item.sku_name}}
@@ -307,7 +307,7 @@
- 联系客服
+ 联系客服
diff --git a/pages/user/order/sceneOrderInfo/index.wxss b/pages/user/order/sceneOrderInfo/index.wxss
index 69d4dcd..4a04db4 100644
--- a/pages/user/order/sceneOrderInfo/index.wxss
+++ b/pages/user/order/sceneOrderInfo/index.wxss
@@ -210,6 +210,7 @@ page {
left: 40rpx;
text-align: center;
margin-top: 125rpx;
+ z-index: 5;
}
.code-box .iconfont.icon-you {
left: auto;
diff --git a/pages/user/order/showOrderInfo/index.wxml b/pages/user/order/showOrderInfo/index.wxml
index c46c547..2cbad7f 100644
--- a/pages/user/order/showOrderInfo/index.wxml
+++ b/pages/user/order/showOrderInfo/index.wxml
@@ -8,7 +8,7 @@
-
+
@@ -131,7 +131,7 @@
- 联系客服
+ 联系客服
diff --git a/pages/user/order/team/list.wxml b/pages/user/order/team/list.wxml
index 4d5100f..05f0b32 100644
--- a/pages/user/order/team/list.wxml
+++ b/pages/user/order/team/list.wxml
@@ -21,7 +21,7 @@
{{orderState[item.team_state]}}
-
+
{{item.product_model=='movie'?item.product_title:(item.product_title+item.sku_name)}}
￥{{item.product_price/100}}
@@ -46,6 +46,6 @@
-
+
还没有订单，赶快去下单吧~
\ No newline at end of file
diff --git a/pages/user/profile/index.wxml b/pages/user/profile/index.wxml
index fa56cfa..8af1f3f 100644
--- a/pages/user/profile/index.wxml
+++ b/pages/user/profile/index.wxml
@@ -7,7 +7,7 @@
头像
-
+
diff --git a/pages/user/retail/goods/index.wxml b/pages/user/retail/goods/index.wxml
index 83f9518..4068303 100644
--- a/pages/user/retail/goods/index.wxml
+++ b/pages/user/retail/goods/index.wxml
@@ -1,7 +1,7 @@
-
+
{{item.product.title+item.sku.sku_name}}
￥{{item.sku.price/100}}起
diff --git a/pages/user/retail/list/index.wxml b/pages/user/retail/list/index.wxml
index b193d5b..bf56902 100644
--- a/pages/user/retail/list/index.wxml
+++ b/pages/user/retail/list/index.wxml
@@ -10,7 +10,7 @@
佣金：{{item.commission_price?item.commission_price/100:0}}
-
+
{{product.product_title+product.sku_name}}
{{product.paid_money?product.paid_money/100:0}}
diff --git a/pages/user/service/index.wxml b/pages/user/service/index.wxml
index 8cb1cfa..e154bee 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 f071022..94f9bdb 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -1,12 +1,12 @@
-
-
+
- {{info.nickname}}{{info.nickname}}
id：{{info.id}}
@@ -19,27 +19,27 @@
-
+
待付款
-
+
待发货
-
+
待出行
-
+
待收货
-
+
待评价
-
+
退货/退款
@@ -47,7 +47,7 @@
-
+
等待付款
剩余时间: {{formatTime[index]}}
diff --git a/pages/user/verify/index.wxml b/pages/user/verify/index.wxml
index 475f900..7bb160b 100644
--- a/pages/user/verify/index.wxml
+++ b/pages/user/verify/index.wxml
@@ -1,6 +1,6 @@
-
+
姓名：
diff --git a/pages/user/videoCoupon/index.wxml b/pages/user/videoCoupon/index.wxml
index c90e803..f657a9b 100644
--- a/pages/user/videoCoupon/index.wxml
+++ b/pages/user/videoCoupon/index.wxml
@@ -1,7 +1,7 @@
-
+
{{item.prize_name}}
获取来源：{{item.act_name}}
diff --git a/project.private.config.json b/project.private.config.json
index ddd41d2..28e2921 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -13,6 +13,13 @@
"launchMode": "default",
"scene": null
},
+ {
+ "name": "pages/info/roadInfo/index",
+ "pathName": "pages/info/roadInfo/index",
+ "query": "id=457643",
+ "scene": null,
+ "launchMode": "default"
+ },
{
"name": "pages/order/pay/index",
"pathName": "pages/order/pay/index",
diff --git a/subPackageCheckPoint/pages/content/index.wxml b/subPackageCheckPoint/pages/content/index.wxml
index 156a968..1f436f9 100644
--- a/subPackageCheckPoint/pages/content/index.wxml
+++ b/subPackageCheckPoint/pages/content/index.wxml
@@ -1 +1 @@
-/{{j}}{{k}}{{m}}{{o}}前往景点前往购票
\ No newline at end of file
+/{{j}}{{k}}{{m}}{{o}}前往景点前往购票
\ No newline at end of file
diff --git a/subPackageCheckPoint/pages/detailsmap/index.wxml b/subPackageCheckPoint/pages/detailsmap/index.wxml
index 192f41d..f8c29b6 100644
--- a/subPackageCheckPoint/pages/detailsmap/index.wxml
+++ b/subPackageCheckPoint/pages/detailsmap/index.wxml
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/subPackageCheckPoint/pages/index/index.wxml b/subPackageCheckPoint/pages/index/index.wxml
index 36c5245..ed52baa 100644
--- a/subPackageCheckPoint/pages/index/index.wxml
+++ b/subPackageCheckPoint/pages/index/index.wxml
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/subPackageCheckPoint/pages/scopemap/index.wxml b/subPackageCheckPoint/pages/scopemap/index.wxml
index d4924f3..02ac2f3 100644
--- a/subPackageCheckPoint/pages/scopemap/index.wxml
+++ b/subPackageCheckPoint/pages/scopemap/index.wxml
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/subPackages/feiyiNew/CGCIndex/index.wxml b/subPackages/feiyiNew/CGCIndex/index.wxml
index e115fe9..cac2b6c 100644
--- a/subPackages/feiyiNew/CGCIndex/index.wxml
+++ b/subPackages/feiyiNew/CGCIndex/index.wxml
@@ -4,7 +4,7 @@
-
+
@@ -14,8 +14,8 @@
@@ -18,14 +18,14 @@
-
+
搜一搜您想要的
-
+
@@ -36,7 +36,7 @@
-
+
{{item.title}}
@@ -56,7 +56,7 @@
-
+
@@ -70,11 +70,11 @@
-
-
+
+
-
-
+
+
@@ -82,14 +82,14 @@
-
+
{{item.title}}
￥{{item.price/100}}起
-
+
@@ -100,7 +100,7 @@
-
+
{{item.title}}
@@ -115,7 +115,7 @@
bindchange="changeBannerIndex" data-keyname="XPathBannerIndex">
-
+
@@ -132,7 +132,7 @@
-
+
@@ -143,52 +143,52 @@
-
+
更多
-
+
-
+
-
-
+
+
-
-
-
+
+
-
+
@@ -202,29 +202,29 @@
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
@@ -263,29 +263,29 @@
-
+
-
+
{{time}}s跳过
-
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/subPackages/indexGQ/index.wxml b/subPackages/indexGQ/index.wxml
index 184d94e..06c7497 100644
--- a/subPackages/indexGQ/index.wxml
+++ b/subPackages/indexGQ/index.wxml
@@ -1,21 +1,21 @@
-
+
-
+
{{weather.max_temp}}°
{{weather.weather}}
-
-
-
+
搜索想要的旅游产品或服务
@@ -23,7 +23,7 @@
-
+
@@ -34,7 +34,7 @@
-
+
更多 >
{{nowDate[0]}}
@@ -52,7 +52,7 @@
-
+
{{item.name}}
@@ -66,7 +66,7 @@
-
+
@@ -83,12 +83,12 @@
-
-
-
@@ -96,57 +96,57 @@
-
+
景点门票
-
+
水上游
-
+
夜游苏州
-
+
剧场演出
-
+
文创特产
-
+
场馆预约
-
+
一日游
-
+
户外游
-
+
非遗专卖
-
+
酒店住宿
-
+
酒店住宿
@@ -164,7 +164,7 @@
bindchange="changeSmBannerIndex">
-
+
@@ -175,54 +175,54 @@
-
+
{{item}}
-
+
-
+
高峰预警
-
+
实时路况
-
+
行李直送
-
+
停车场
-
+
找厕所
@@ -234,28 +234,28 @@
-
-
-
-
-
-
+
-
+
更多 >
@@ -263,7 +263,7 @@
wx:key="id" data-item="{{item}}">
{{index+1}}
-
+
{{item.title}}
@@ -292,7 +292,7 @@
-
+
景点门票
@@ -307,7 +307,7 @@
bindchange="changeSmBannerIndex">
-
+
@@ -318,39 +318,39 @@
-
+
{{item}}
-
+
-
+
电子社保卡
-
+
高峰预警
-
+
行李寄存
-
+
实时路况
@@ -362,14 +362,14 @@
-
-
-
@@ -381,7 +381,7 @@
{{time}}s跳过
-
+
@@ -400,12 +400,12 @@
object-fit="fill"
>
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/subPackages/indexs/index.wxml b/subPackages/indexs/index.wxml
index 1e3582c..1c582b4 100644
--- a/subPackages/indexs/index.wxml
+++ b/subPackages/indexs/index.wxml
@@ -1,15 +1,15 @@
-
+
-
+
{{weather.max_temp}}°
{{weather.weather}}
-
-
@@ -22,7 +22,7 @@
-
+
@@ -33,7 +33,7 @@
-
+
更多 >
@@ -45,7 +45,7 @@
-
+
{{item.name}}
{{item.begin_date}}-{{item.end_date}}
@@ -58,7 +58,7 @@
-
+
{{item.title}}
@@ -73,44 +73,44 @@
-
-
+
-
+
景点门票
-
+
夜游苏州
-
+
文创特产
-
+
场馆预约
-
+
剧场演出
-
+
一日游
-
+
一卡游
-
+
非遗专卖
@@ -127,7 +127,7 @@
bindchange="changeSmBannerIndex">
-
+
@@ -138,33 +138,33 @@
-
+
{{item}}
-
+
-
+
安全服务
-
+
高峰预警
-
+
行李寄存
-
+
实时路况
@@ -174,35 +174,35 @@
-
-
-
-
-
+
-
+
-
+
更多 >
{{index+1}}
-
+
{{item.title}}
@@ -219,7 +219,7 @@
{{index+1}}
-
+
{{item.title}}
@@ -236,7 +236,7 @@
{{index+1}}
-
+
{{item.title}}
@@ -253,7 +253,7 @@
{{index+1}}
-
+
{{item.title}}
@@ -277,7 +277,7 @@
{{time}}s跳过
-
+
@@ -296,12 +296,12 @@
object-fit="fill"
>
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/subPackages/postSearch/index.wxml b/subPackages/postSearch/index.wxml
index 9408dc4..e6bcff6 100644
--- a/subPackages/postSearch/index.wxml
+++ b/subPackages/postSearch/index.wxml
@@ -16,7 +16,7 @@
-
+
{{item.title}}
@@ -26,14 +26,14 @@
{{item.price/100}}
{{item.market_price/100}}
-
+
-
+
暂无搜索结果
@@ -43,8 +43,8 @@
-
-
+
+
{{cartCount}}
@@ -52,8 +52,8 @@
明细
-
-
+
+
@@ -65,7 +65,7 @@
-
+
{{info.sku[skuIndex].price/100}}
@@ -100,21 +100,21 @@
-
+
全选
-
+
清空
-
+
-
+
{{item.product.title}}
@@ -123,9 +123,9 @@
{{item.sku.price/100}}
-
+
{{item.num}}
-
+
diff --git a/subPackages/techanCart/index.wxml b/subPackages/techanCart/index.wxml
index 66130c7..0a6471e 100644
--- a/subPackages/techanCart/index.wxml
+++ b/subPackages/techanCart/index.wxml
@@ -5,7 +5,7 @@
-
+
{{item.product.title}}
@@ -24,7 +24,7 @@
删除
-
+
暂无内容
diff --git a/subPackages/techanNew/index.wxml b/subPackages/techanNew/index.wxml
index 3b06131..0a7fe57 100644
--- a/subPackages/techanNew/index.wxml
+++ b/subPackages/techanNew/index.wxml
@@ -18,7 +18,7 @@
-
+
@@ -28,8 +28,8 @@
{{item.title}}
-
-
+
+
@@ -49,7 +49,7 @@
-
+
{{item.title}}
@@ -91,7 +91,7 @@
-
+
{{item.title}}
￥{{(item.price/100)}}{{item.market_price/100}}
@@ -105,7 +105,7 @@
-
+
{{item.title}}
@@ -115,14 +115,14 @@
{{item.price/100}}
{{item.market_price/100}}
-
+
-
+
暂无搜索结果
@@ -135,8 +135,8 @@
-
-
+
+
{{cartCount}}
@@ -144,8 +144,8 @@
明细
-
-
+
+
@@ -159,7 +159,7 @@
-
+
{{info.sku[skuIndex].price/100}}
@@ -194,21 +194,21 @@
-
+
全选
-
+
清空
-
+
-
+
{{item.product.title}}
@@ -217,9 +217,9 @@
{{item.sku.price/100}}
-
+
{{item.num}}
-
+
diff --git a/utils/filter.wxs b/utils/filter.wxs
index 6a3c348..2821b85 100644
--- a/utils/filter.wxs
+++ b/utils/filter.wxs
@@ -52,9 +52,21 @@ var showAllSeldDate = function (date, index,today,tomorrow,afterTom) {
var toFix = function(value) {
return (value / 100).toFixed(2);
};
+
+ var filterTag = function (tagStr, splitStr = "," ,arrNum = 2, needArr=false) {
+ if (!tagStr) return ''; // 处理空值
+ var arr = tagStr.split(splitStr); // 拆分字符串
+ var limited = arr.slice(0, arrNum); // 只取前2个
+ if (needArr) {
+ return limited
+ }
+ return limited.join(' | '); // 拼接成字符串
+ };
+
module.exports = {
formateRichText:formateRichText,
gotoUrl:gotoUrl,
toFix:toFix,
- showAllSeldDate:showAllSeldDate
+ showAllSeldDate:showAllSeldDate,
+ filterTag: filterTag
};
\ No newline at end of file
diff --git a/utils/util.js b/utils/util.js
index 1609034..916616f 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -635,6 +635,103 @@ const orderByShoppingCart = function (listData, app) {
}
+// 产品跳转其他小程序
+const goProdInOtherPlatform = function (item) {
+ let webUrl = "https://m.cloud.sz-trip.com"
+ let platform = item.goods_jump_type;
+ console.log(item)
+
+ let appIdObj = {
+ "changshu": "wxdaf3d5edd07dc7af",
+ "yjks": "wx8888a3fd0862b4c8"
+ }
+
+ switch (item.type) {
+ case 'ticket': // 是产品的 票务
+ webUrl+= `/${platform==='yjks' ? 'ScenicDetailKs' : 'ScenicDetail'}?id=${item.scene_id || item.id}`
+ break;
+ case 'hotel': // 是产品的 酒店
+ webUrl+= `/HotelDetail?id=${item.scene_id || item.id}`
+ break;
+ case 'post': // 是产品的 邮寄
+ webUrl+= `/${platform==='yjks'? 'MailMerchandiseDetailKs' : 'MailMerchandiseDetail'}?id=${item.id}`
+ break;
+ case 'line': // 是产品的 线路
+ webUrl+= `/LineDetail?id=${item.id}`
+ break;
+ case 'coupon': // 是产品的 卡券
+ webUrl+= `/CardDetail?id=${item.id}`
+ break;
+ case 'show': // 是产品的 演出
+ webUrl+= `/PerformDetail?id=${item.id}`
+ break;
+ case 'food': // 是产品的 食品
+ webUrl+= `/FoodDetail?id=${item.id}`
+ break;
+ case 'activity': // 是产品的 活动 todo 这里要弄成是活动的id去跳转的，特别是从 江苏夜游过去的
+ webUrl+= `/ActivityDetail?id=${item.act_calendar_id || item.id}`
+ break;
+ case 'calendar': // ai入口活动日历
+ webUrl+= `/AppointmentDetail?id=${item.id}`
+ break;
+ case 'movie': // 是产品的 电影
+ webUrl+= `/MovieInfo?id=${item.third_id || item.id}`
+ break;
+ case 'scenic': // 是场景的 景点
+ webUrl+= `/${platform===0? 'ScenicDetailKs' : 'ScenicDetail'}?id=${item.scene_id || item.id}`
+ break;
+ case 'room': // 是场景的 酒店
+ webUrl+= `/HotelDetail?id=${item.scene_id || item.id}`
+ break;
+ case 'restaurant': // 是场景 美食
+ webUrl+= `/RestaurantDetail?id=${item.id}`
+ break;
+ case 'tenscenic': // 是场景 十景
+ webUrl+= `/TenScenicDetail?id=${item.id}`
+ break;
+ case 'venue': // 是场景的 场馆
+ webUrl+= `/PavilionDetail?id=${item.scene_id || item.id}`
+ break;
+ case 'cinema': // 是场景的 影院
+ webUrl+= `/CinemaDetail?id=${item.third_id || item.id}`
+ break;
+ case 'relic': // 文物
+ webUrl+= `/ProtectionUnitsInfo?id=${item.id}`
+ break;
+ case 'units': // 文化单位
+ webUrl+= `/CulturalUnitInfo?id=${item.id}`
+ break;
+ case 'red_map': // 红色地图
+ webUrl+= `/RedTouristInfo?id=${item.id}`
+ break;
+ case 'travels': // 红色地图
+ webUrl+= `/TravelNotesIntroductionInfo?id=${item.id}`
+ break;
+ }
+ console.log(appIdObj[platform],webUrl)
+
+
+ // 酒景套餐
+ if(item.is_package == 1) {
+ webUrl+= `/${platform==='yjks' ? 'MailMerchandiseDetailKs' : 'MailMerchandiseDetail'}?id=${item.id}`
+ }
+
+ // 一卡游详情
+ if(item.is_package == 2) {
+ webUrl+= `/OneCardTourDetail?id=${item.scene_id || item.id}`
+ }
+
+
+ wx.navigateToMiniProgram({
+ appId: appIdObj[platform],
+ path: "/subPackages/webPage/webPage?url="+encodeURIComponent(webUrl),
+ })
+
+
+ // return webUrl;
+}
+
+
module.exports = {
formatTime: formatTime,
formatNumber: formatNumber,
@@ -660,4 +757,5 @@ module.exports = {
clearGlobalPagePoint: clearGlobalPagePoint,
detailPagePoint: detailPagePoint,
orderByShoppingCart: orderByShoppingCart,
+ goProdInOtherPlatform: goProdInOtherPlatform,
}
diff --git a/utils/wxParse/wxParse.wxml b/utils/wxParse/wxParse.wxml
index 00fa568..df0c57a 100644
--- a/utils/wxParse/wxParse.wxml
+++ b/utils/wxParse/wxParse.wxml
@@ -18,7 +18,7 @@
-
@@ -27,7 +27,7 @@
{{item.text}}
-
+