diff --git a/pages/activity/springten/index.js b/pages/activity/springten/index.js
index 8abb360..f5f420b 100644
--- a/pages/activity/springten/index.js
+++ b/pages/activity/springten/index.js
@@ -64,7 +64,7 @@ Page({
else {
item.isYunHe = false;
}
- item.brief_intro = item.brief_intro.replace(/<\/?.+?>/g,"");
+ item.brief_intro = item.brief_intro?item.brief_intro.replace(/<\/?.+?>/g,""):"";
item.display_tags = item.display_tags?item.display_tags.split(","):[];
item.display_tags = item.display_tags.splice(0,2);
})
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 730876b..05256bc 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,5 +1,16 @@
+
+
+ {{weather.max_temp}}°
+ {{weather.weather}}
+
+
+ 搜索想要的旅游产品或服务
+
+
+
+
@@ -8,17 +19,6 @@
-
-
- {{weather.max_temp}}°
- {{weather.weather}}
-
-
- 搜索想要的旅游产品或服务
-
-
-
-
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 22438a6..bc639fb 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,16 +1,18 @@
/**index.wxss**/
.swiper,.swiper image {
- width: 100%;
+ width: 700rpx;
display: block;
- height: 367rpx;
+ height: 335rpx;
+ border-radius: 13rpx;
+}
+.swiper {
+ margin: 0 auto;
}
.top-box {
- position: absolute;
display: flex;
+ padding: 14rpx 0;
align-items: center;
- left: 9rpx;
- margin-right: 19rpx;
- top: 14rpx;
+ margin: 0 20rpx;
justify-content: space-between;
}
.top-box image {
@@ -22,24 +24,24 @@
}
.search-box {
flex: 1;
- width: 423rpx;
- height: 54rpx;
- background: #F6F6F6;
- border-radius: 27rpx;
+ width: 440rpx;
+ height: 64rpx;
+ background: #F4F4F4;
+ border-radius: 32rpx;
display: flex;
align-items: center;
- color: #999999;
- font-size: 23rpx;
- margin: 0 30rpx;
+ color: #333;
+ font-size: 25rpx;
+ margin: 0 20rpx;
}
.search-box .iconfont {
- font-size: 28rpx;
+ font-size: 30rpx;
margin-left: 20rpx;
margin-right: 10rpx;
}
.top-box .weather-num,.top-box .weather {
flex-shrink: 0;
- color: #fff;
+ color: #333;
}
.top-box .weather-num {
font-size: 29rpx;
@@ -52,11 +54,10 @@
margin-left: -4rpx;
}
.top-icons {
- background: #FFFFFF;
- box-shadow: 0px 3rpx 26rpx 0px rgba(6, 0, 1, 0.13);
+ /* background: #FFFFFF; */
+ /* box-shadow: 0px 3rpx 26rpx 0px rgba(6, 0, 1, 0.13); */
border-radius: 27rpx;
margin: 0 20rpx;
- margin-top: -20rpx;
position: relative;
z-index: 1;
display: flex;
@@ -89,7 +90,7 @@
.sale-road-boxes {
display: flex;
justify-content: space-between;
- margin-top: 60rpx;
+ margin-top: 40rpx;
}
.sale-box {
flex-shrink: 0;
@@ -273,7 +274,7 @@
.pic-list {
display: flex;
justify-content: space-between;
- margin: 90rpx 0;
+ margin: 60rpx 0;
}
.pic-list image {
width: 160rpx;
@@ -292,7 +293,7 @@
display: flex;
margin-top: 20rpx;
flex-wrap: wrap;
- margin-bottom: 100rpx;
+ margin-bottom: 60rpx;
}
.pbservice-item {
width: 175rpx;
@@ -313,7 +314,7 @@
.six-box {
margin-top: 43rpx;
display: flex;
- margin-bottom: 80rpx;
+ margin-bottom: 60rpx;
flex-wrap: wrap;
justify-content: space-between;
}
diff --git a/pages/info/museumInfo/index.js b/pages/info/museumInfo/index.js
index 884cb27..51c1725 100644
--- a/pages/info/museumInfo/index.js
+++ b/pages/info/museumInfo/index.js
@@ -45,6 +45,16 @@ Page({
page_no:1,
page_num:100
}).then(res=>{
+ let now = new Date().getTime();
+ res.data.rows.map(item=>{
+ let endTime = this.getMyTime(item.end_date+" 23:59:59");
+ if(endTime场馆介绍
-
@@ -38,9 +37,11 @@
+ 已结束
暂无活动
+
参观预约
diff --git a/pages/info/museumInfo/index.wxss b/pages/info/museumInfo/index.wxss
index 5a17e7b..137bcad 100644
--- a/pages/info/museumInfo/index.wxss
+++ b/pages/info/museumInfo/index.wxss
@@ -98,8 +98,22 @@
font-size: 24rpx;
color: #999999;
padding: 22rpx;
+ position: relative;
justify-content: space-between;
}
+.end-box {
+ position: absolute;
+ right: 22rpx;
+ top: 22rpx;
+ width: 287rpx;
+ height: 193rpx;
+ background: rgba(0, 0, 0, 0.5);
+ z-index: 1;
+ text-align: center;
+ line-height: 193rpx;
+ color: #fff;
+ font-size: 36rpx;
+}
.activity-item .textOver2 {
font-size: 31rpx;
color: #333;
diff --git a/pages/list/museum/index.js b/pages/list/museum/index.js
index f8eba63..a705821 100644
--- a/pages/list/museum/index.js
+++ b/pages/list/museum/index.js
@@ -36,7 +36,7 @@ Page({
commonApi._post("scene/get_scene_by_tag",{
tag_id:9,
offset:list.length,
- limit:10,
+ limit:30,
sort:"weight",
title:this.data.keywords
}).then(res=>{
diff --git a/pages/map/index.js b/pages/map/index.js
index b81bc63..0bdc406 100644
--- a/pages/map/index.js
+++ b/pages/map/index.js
@@ -9,6 +9,7 @@ Page({
* 页面的初始数据
*/
data: {
+ showAllMask:false,
seachHeight:height,
topHeight:rect.top,
areas:['姑苏','吴江','苏州'],
@@ -19,7 +20,12 @@ Page({
keywords:"",
list:[],
showInfo:false,
- info:null
+ info:null,
+ menus:[],
+ menuIndex:-1,
+ productList:[],
+ productPage:1,
+ productTotal:1
},
/**
@@ -46,11 +52,12 @@ Page({
})
that.setData({
areas:res.data,
- areaIndex:0
+ areaIndex:0,
+ longitude:r.longitude,
+ latitude:r.latitude
})
}
})
-
commonApi._post("pbservice/Other/getClientConfig",{
unique_key:"wechatxcx"
}).then(res=>{
@@ -87,20 +94,184 @@ Page({
},
onTapMarker:function(e){
console.log(e)
+ let info = this.data.list[e.detail.markerId];
+ if(info.info.type=='tenscenic'){
+ // 运河十景需要先获取景点详情
+ commonApi._post("scene/detail",{
+ id:info.info.id
+ }).then(res=>{
+ if(res.data){
+ res.data.display_tags = res.data.display_tags?res.data.display_tags.split(","):[];
+ res.data.display_tags = res.data.display_tags.slice(0,2);
+ }
+ info.info = res.data;
+ this.setData({
+ info:info,
+ showInfo:true,
+ showAllMask:true,
+ menus:[],
+ menuIndex:-1,
+ productList:[],
+ productTotal:1,
+ productPage:1
+ })
+ })
+ // 运河十景还需要获取是否有购票、线路、住宿、攻略菜单栏 如果没有的话菜单栏要隐藏
+ let ajaxes = [commonApi._post("product/get_product_by_type",{
+ type:"ticket",
+ type_id:"",
+ tenscenic_id:info.info.id,
+ offset:0,
+ limit:10
+ }),
+ commonApi._post("product/get_product_by_type",{
+ type:"line",
+ type_id:"",
+ tenscenic_id:info.info.id,
+ offset:0,
+ limit:10
+ }),
+ commonApi._post("scene/get_scene_by_type",{
+ type_id:"2",
+ tenscenic_id:info.info.id,
+ offset:0,
+ limit:10
+ }),
+ commonApi._post("travels/getList",{
+ tenscenic_id:info.info.id,
+ page_no:1,
+ page_num:10
+ })]
+ Promise.all(ajaxes).then(res=>{
+ let menus = [],menuIndex=-1;
+ if(res[0].data.total>0){
+ menuIndex = 0;
+ menus[0] = "购票"
+ }
+ if(res[1].data.total>0){
+ if(menuIndex==-1) menuIndex = 1;
+ menus[1] = "线路"
+ }
+ if(res[2].data.total>0){
+ if(menuIndex==-1) menuIndex = 2;
+ menus[2] = "住宿"
+ }
+ if(res[3].data.total>0){
+ if(menuIndex==-1) menuIndex = 3;
+ menus[3] = "攻略"
+ }
+ this.setData({
+ menus:menus,
+ menuIndex:menuIndex
+ })
+ this.getProductList()
+ })
+ return;
+ }
+ this.setData({
+ info:info,
+ showInfo:true,
+ showAllMask:false
+ })
+ },
+ changeMenu:function(e){
+ let index = e.currentTarget.dataset.index;
+ if(this.data.menuIndex==index) return;
+ this.setData({
+ menuIndex:index,
+ productPage:1,
+ productTotal:1,
+ productList:[]
+ })
+ this.getProductList();
+ },
+ // 获取运河实景的产品、景点、攻略列表
+ getProductList:function(){
+ let info = this.data.info;
+ if(info && info.info && info.info.id && this.data.showInfo && info.info.type=='tenscenic'){
+ // 如果是运河十景的话
+ // 如果已经到底了
+ if(this.data.productList.length>=this.data.productTotal) return;
+ let menu = this.data.menus[this.data.menuIndex],data={
+ type:"ticket",
+ type_id:"",
+ tenscenic_id:info.info.id,
+ offset:this.data.productList.length,
+ limit:10,
+ page_no:this.data.productPage,
+ page_num:10,
+ lon:this.data.longitude,
+ lat:this.data.latitude
+ },service="product/get_product_by_type";
+ switch(menu){
+ case "购票":
+ break;
+ case "线路":
+ data.type="line";
+ break;
+ case "住宿":
+ data.type_id="2";
+ data.type=null;
+ service="scene/get_scene_by_type";
+ break;
+ case "攻略":
+ delete data.type;
+ delete data.type_id;
+ delete data.offset;
+ delete data.limit;
+ service="travels/getList";
+ break;
+ }
+ commonApi._post(service,data).then(res=>{
+ let list = res.data.list || res.data.rows;
+ list.map(item=>{
+ item.display_tags = item.display_tags?item.display_tags.split(","):[];
+ item.display_tags = item.display_tags.slice(0,2);
+ if(item.distance){
+ if(item.distance>=1000){
+ item.distance = item.distance/1000+"km"
+ }
+ else {
+ item.distance = item.distance+"m"
+ }
+ }
+ })
+ this.setData({
+ productTotal:res.data.productTotal,
+ productPage:this.data.productPage+1,
+ productList:this.data.productList.concat(list)
+ })
+ })
+ }
+ },
+ gotoDetail:function(e){
+ let item = e.currentTarget.dataset.item;
+ util.gotoDetail(item);
+ },
+ showImages:function(e){
+ let index = e.currentTarget.dataset.index,info = this.data.info;
+ wx.previewImage({
+ urls: info.info.listimg,
+ current:info.info.listimg[index]
+ })
+ },
+ closeMask:function(){
this.setData({
- info:this.data.list[e.detail.markerId],
- showInfo:true
+ showAllMask:false
})
},
hideInfo:function(){
this.setData({
info:null,
- showInfo:false
+ showInfo:false,
+ showAllMask:false
})
},
changeType:function(e){
this.setData({
- type:e.currentTarget.dataset.type
+ type:e.currentTarget.dataset.type,
+ showInfo:false,
+ info:null
})
this.getList()
},
diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index ed44586..27d4194 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -43,7 +43,7 @@
江南小书场
-
+
@@ -51,4 +51,56 @@
地址：{{info.info.address}}
查看详情
+
+
+
+
+ {{info.info.title}}
+ 地址：{{info.info.address}}
+ {{item}}
+ 开放时间：{{info.info.open_time}}
+ 景区图片
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+ {{item}}
+
+ {{item.address}}
+
+
+ {{item.distance?('距您直线距离'+item.distance):'请开启定位'}}
+ ￥{{item.price/100}}
+
+
+
+
+ {{item.title}}
+ {{item.subtitle}}
+
+
+
+ {{item.nickname}}
+
+
+ {{item.like_number}}
+
+ {{item.view_number}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/map/index.wxss b/pages/map/index.wxss
index f638149..c1a2733 100644
--- a/pages/map/index.wxss
+++ b/pages/map/index.wxss
@@ -108,6 +108,7 @@
top: 50%;
margin-top: -100rpx;
}
+
.map-item image {
display: block;
width: 200rpx;
@@ -121,12 +122,12 @@
flex-direction: column;
justify-content: space-between;
}
-.map-item .info .title {
+.map-item .info .title,.map-item1 .title {
font-size: 33rpx;
color: #0E050B;
font-weight: 500;
}
-.map-item .subtitle {
+.map-item .subtitle,.map-item1 .subtitle {
font-size: 25rpx;
color: #666;
margin: 10rpx 0;
@@ -148,4 +149,183 @@
}
.title-header .icon-fanhui1 {
display: none;
+}
+.map-item1 {
+ position: absolute;
+ left: 20rpx;
+ right: 20rpx;
+ height: 70%;
+ bottom: 0;
+ border-radius: 20rpx 20rpx 0 0;
+ background:white;
+ box-shadow: 0px 0px 9px 0px rgba(0, 0, 0, 0.2);
+ padding: 0 25rpx;
+ padding-top: 35rpx;
+ overflow-y: auto;
+ z-index: 100;
+ transition: all .3s;
+}
+.map-item1 .icon-ic_searchclosed {
+ right: 20rpx;
+ top: 20rpx;
+}
+.sign-pic-list {
+ display: flex;
+ align-items: center;
+ overflow: auto;
+}
+.sign-pic-list image {
+ display: block;
+ width: 235rpx;
+ height: 145rpx;
+ margin-right: 20rpx;
+ flex-shrink: 0;
+}
+.map-item1 .subtitle {
+ color: #999;
+ line-height: 42rpx;
+}
+.map-item-tip {
+ font-size: 32rpx;
+ margin: 20rpx 0;
+}
+.map-item-menus {
+ margin-top: 20rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ height: 84rpx;
+ line-height: 84rpx;
+ border-bottom: 1rpx solid #ccc;
+}
+.map-item-menu {
+ width: 25%;
+ text-align: center;
+ position: relative;
+ font-size: 33rpx;
+ color: #575757;
+}
+.map-item-menu.active {
+ color: #0B898E;
+}
+.map-item-menu.active::after {
+ content: "1";
+ font-size: 0;
+ display: block;
+ position: absolute;
+ width: 40rpx;
+ height: 4rpx;
+ background: #0B898E;
+ border-radius: 2rpx;
+ left: 50%;
+ margin-left: -20rpx;
+ bottom: 0;
+}
+.item {
+ display: flex;
+ padding: 20rpx 0;
+ border-bottom: 1rpx solid #ccc;
+}
+.item image {
+ display: block;
+ width: 233rpx;
+ height: 233rpx;
+ flex-shrink: 0;
+ border-radius: 11rpx;
+ margin-right: 20rpx;
+}
+.right-info {
+ width: 400rpx;
+ flex: 1;
+}
+.product-tags {
+ display: flex;
+ align-items: center;
+ color: #0B898E;
+ font-size: 20rpx;
+ margin-top: 10rpx;
+ margin-bottom: 20rpx;
+}
+.product-tag {
+ position: relative;
+ margin-right: 20rpx;
+}
+.product-tags .product-tag:last-child {
+ margin-right: 0;
+}
+.product-tag::after {
+ content: "1";
+ font-size: 0;
+ position: absolute;
+ display: block;
+ left: 0;
+ right: 0;
+ height: 8rpx;
+ bottom: -6rpx;
+ background: #DAF3E9;
+}
+.product-address {
+ color: #A3A3A3;
+ font-size: 24rpx;
+ margin-bottom: 5rpx;
+}
+.product-bottom {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ font-size: 24rpx;
+ color: #323232;
+}
+.product-price {
+ color: #D62828;
+}
+.product-price text {
+ font-size: 33rpx;
+ font-weight: 500;
+}
+.product-price::after {
+ content: "起";
+ font-size: 20rpx;
+ color: #8D8D8D;
+}
+.list .item:last-child {
+ border: none;
+}
+.returnImg {
+ position: absolute;
+ display: block;
+ width: 82rpx;
+ height: 18rpx;
+ bottom: 70%;
+ margin-bottom: 80rpx;
+}
+.strategy-item {
+ width: 100%;
+ padding: 20rpx 0;
+ border-bottom: 1rpx solid #ccc;
+}
+.strategy-item .title {
+ margin-bottom: 10rpx;
+}
+.strategy-item .product-bottom {
+ height: 40rpx;
+ margin-top: 30rpx;
+ font-size: 24rpx;
+ color: #999;
+}
+.strategy-item .product-bottom image {
+ width: 30rpx;
+ height: 30rpx;
+ border-radius: 50%;
+ flex-shrink: 0;
+}
+.strategy-item .product-bottom .username {
+ flex: 1;
+ font-size: 26rpx;
+ color: #666;
+}
+.strategy-item .product-bottom .iconfont {
+ margin-left: 50rpx;
+ flex-shrink: 0;
+ margin-right: 8rpx;
}
\ No newline at end of file
diff --git a/pages/pbService/appreciate/index.js b/pages/pbService/appreciate/index.js
index cc6a963..4e64978 100644
--- a/pages/pbService/appreciate/index.js
+++ b/pages/pbService/appreciate/index.js
@@ -93,7 +93,6 @@ Page({
keyword:""
}).then(res=>{
let list = this.data.type==1?res.data.videolist:res.data.photolist;
- console.log(this.data.type,res,list)
this.setData({
total:res.data.totalpage,
list:this.data.list.concat(list),
@@ -102,8 +101,14 @@ Page({
})
},
gotoDetail:function(e){
- if(this.data.type==2) return;
let info = e.currentTarget.dataset.info;
+ if(this.data.type==2) {
+ wx.previewImage({
+ urls: [info.Pic],
+ current:info.Pic
+ })
+ return;
+ }
info = JSON.stringify(info);
info = encodeURIComponent(info);
wx.navigateTo({
diff --git a/pages/pbService/wwcx/index.js b/pages/pbService/wwcx/index.js
index 8685b9c..80de2ab 100644
--- a/pages/pbService/wwcx/index.js
+++ b/pages/pbService/wwcx/index.js
@@ -113,7 +113,7 @@ Page({
data.type_name = this.data.relicTypeIndex==0?'':this.data.relicType[this.data.relicTypeIndex];
}
else {
- data.area = this.data.areas[this.data.areaIndex].area_code;
+ data.area = this.data.areas[this.data.areaIndex]?this.data.areas[this.data.areaIndex].area_code:'';
data.level_name = this.data.levelIndex==0?'':this.data.levels[this.data.levelIndex];
}
commonApi._post(service,data).then(res=>{
diff --git a/pages/search/list/index.wxml b/pages/search/list/index.wxml
index a536eed..e70d080 100644
--- a/pages/search/list/index.wxml
+++ b/pages/search/list/index.wxml
@@ -113,11 +113,11 @@
{{item.title}}
- {{item.ext.subtitle || item.ext.sub_title}}
+ {{item.ext.subtitle || item.ext.sub_title}}
{{item}}
- ￥{{item.ext.price/100}}起
+ ￥{{item.ext.price/100}}起
diff --git a/pages/user/order/activityOrderInfo/index.wxml b/pages/user/order/activityOrderInfo/index.wxml
index bd4bd17..04741d0 100644
--- a/pages/user/order/activityOrderInfo/index.wxml
+++ b/pages/user/order/activityOrderInfo/index.wxml
@@ -42,7 +42,7 @@
-￥{{info.preference_money/100}}
- 实付款
+ 需付款
{{info.paid_money/100}}
diff --git a/pages/user/order/couponOrderInfo/index.wxml b/pages/user/order/couponOrderInfo/index.wxml
index 3830389..22c7321 100644
--- a/pages/user/order/couponOrderInfo/index.wxml
+++ b/pages/user/order/couponOrderInfo/index.wxml
@@ -41,7 +41,7 @@
-￥{{info.preference_money/100}}
- 实付款
+ 需付款
{{info.paid_money/100}}
diff --git a/pages/user/order/foodOrderInfo/index.wxml b/pages/user/order/foodOrderInfo/index.wxml
index f4cb6c1..ba0d726 100644
--- a/pages/user/order/foodOrderInfo/index.wxml
+++ b/pages/user/order/foodOrderInfo/index.wxml
@@ -44,7 +44,7 @@
-￥{{info.preference_money/100}}
- 实付款
+ 需付款
{{info.paid_money/100}}
diff --git a/pages/user/order/lineOrderInfo/index.wxml b/pages/user/order/lineOrderInfo/index.wxml
index 12c8a49..fa23281 100644
--- a/pages/user/order/lineOrderInfo/index.wxml
+++ b/pages/user/order/lineOrderInfo/index.wxml
@@ -64,7 +64,7 @@
出行人
{{item.sku_name}} {{index+1}}
-
+
diff --git a/pages/user/order/list.wxml b/pages/user/order/list.wxml
index 8bcbd2d..d862331 100644
--- a/pages/user/order/list.wxml
+++ b/pages/user/order/list.wxml
@@ -31,7 +31,13 @@
x{{item.product_num}}
- 共{{item.orderNum}}件商品合计 ￥{{item.total_money/100}}
+
+ 共{{item.orderNum}}件商品
+
+
+ 总价 ￥{{item.total_money/100}}需付款 ￥{{item.paid_money/100}}
+
+
再次购买
立即评价
diff --git a/pages/user/order/movieOrderInfo/index.wxml b/pages/user/order/movieOrderInfo/index.wxml
index 78a66b5..e5a57fe 100644
--- a/pages/user/order/movieOrderInfo/index.wxml
+++ b/pages/user/order/movieOrderInfo/index.wxml
@@ -44,7 +44,7 @@
-￥{{info.preference_money/100}}
- 实付款
+ 需付款
{{info.paid_money/100}}
diff --git a/pages/user/order/museumOrderInfo/index.js b/pages/user/order/museumOrderInfo/index.js
index 1b918d4..1057590 100644
--- a/pages/user/order/museumOrderInfo/index.js
+++ b/pages/user/order/museumOrderInfo/index.js
@@ -29,6 +29,7 @@ Page({
this.setData({
id:options.id
})
+
},
getCodeImg:function(){
let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[];
@@ -174,7 +175,7 @@ Page({
let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000);
this.daojishi(time);
}
- let state = ""
+ let state = "";
res.data.order_product_list.map(order=>{
order.qrcode.map(item=>{
item.stateText = app.globalData.codeState[item.state];
@@ -188,6 +189,43 @@ Page({
product_model:res.data.order_product_list[0].product_model
})
this.getCodeImg()
+ // 获取行程规划
+ let that = this;
+ wx.getLocation({
+ type: 'gcj02',
+ success: function (r) {
+ let ajaxes=[];
+ res.data.order_product_list.map(item=>{
+ ajaxes.push(commonApi.user_post("order/tripplan",{
+ point_type:"gd",
+ child_order_id:item.child_order_id,
+ lon:r.longitude,
+ lat:r.latitude
+ }))
+ })
+ Promise.all(ajaxes).then(r=>{
+ console.log(r)
+ let orderInfo = that.data.info;
+ r.map((item,index)=>{
+ if(item && item.data && item.data.url){
+ orderInfo.order_product_list[index].btnUrl = item.data.url;
+ }
+ })
+ that.setData({
+ info:orderInfo
+ })
+ })
+ }
+ })
+
+ })
+ },
+ // 行程规划
+ leadRoad:function(e){
+ let url = e.currentTarget.dataset.url;
+ app.globalData.weburl = url;
+ wx.navigateTo({
+ url: '/pages/pbService/web/index'
})
},
diff --git a/pages/user/order/museumOrderInfo/index.wxml b/pages/user/order/museumOrderInfo/index.wxml
index e04a2e3..54c8422 100644
--- a/pages/user/order/museumOrderInfo/index.wxml
+++ b/pages/user/order/museumOrderInfo/index.wxml
@@ -41,10 +41,11 @@
-￥{{info.preference_money/100}}
- 实付款
+ 需付款
{{info.paid_money/100}}
+ 行程规划
退款详情
再次购买
取消订单
diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml
index f34f0c1..a26f89c 100644
--- a/pages/user/order/postOrderInfo/index.wxml
+++ b/pages/user/order/postOrderInfo/index.wxml
@@ -41,7 +41,7 @@
-￥{{info.preference_money/100}}
- 实付款
+ 需付款
{{info.paid_money/100}}
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index ebecd64..8c64c1e 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -216,6 +216,42 @@ Page({
product_model:res.data.order_product_list[0].product_model
})
this.getCodeImg()
+ // 获取行程规划
+ let that = this;
+ wx.getLocation({
+ type: 'gcj02',
+ success: function (r) {
+ let ajaxes=[];
+ res.data.order_product_list.map(item=>{
+ ajaxes.push(commonApi.user_post("order/tripplan",{
+ point_type:"gd",
+ child_order_id:item.child_order_id,
+ lon:r.longitude,
+ lat:r.latitude
+ }))
+ })
+ Promise.all(ajaxes).then(r=>{
+ console.log(r)
+ let orderInfo = that.data.info;
+ r.map((item,index)=>{
+ if(item && item.data && item.data.url){
+ orderInfo.order_product_list[index].btnUrl = item.data.url;
+ }
+ })
+ that.setData({
+ info:orderInfo
+ })
+ })
+ }
+ })
+ })
+ },
+ // 行程规划
+ leadRoad:function(e){
+ let url = e.currentTarget.dataset.url;
+ app.globalData.weburl = url;
+ wx.navigateTo({
+ url: '/pages/pbService/web/index'
})
},
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 5a8eddd..969769e 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -33,6 +33,7 @@
剩余时间：00:{{minute}}:{{second}}
再次购买
+ 行程规划
退款详情
取消预订
取消预订
diff --git a/pages/user/service/info/index.wxml b/pages/user/service/info/index.wxml
index d32bb37..81759d7 100644
--- a/pages/user/service/info/index.wxml
+++ b/pages/user/service/info/index.wxml
@@ -3,7 +3,7 @@
{{info.question_name}}
{{info.answer}}
- 以上答案是否解决您的问题? 有用({{info.useful_num>99?'99+':info.useful_num}}) 没用({{info.unuseful_num>99?'99+':info.unuseful_num}})
+ 以上答案是否解决您的问题? 有用({{info.useful_num}}) 没用({{info.unuseful_num}})
可能您还想问
diff --git a/project.private.config.json b/project.private.config.json
index 2018df8..9393637 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -55,8 +55,8 @@
"scene": null
},
{
- "name": "pages/info/museumInfo/index",
- "pathName": "pages/info/museumInfo/index",
+ "name": "pages/user/order/list",
+ "pathName": "pages/user/order/list",
"query": "id=10973",
"scene": null
}