Myth 5 years ago
parent
commit
7351896a73
  1. 2
      pages/activity/springten/index.js
  2. 22
      pages/index/index.wxml
  3. 45
      pages/index/index.wxss
  4. 14
      pages/info/museumInfo/index.js
  5. 3
      pages/info/museumInfo/index.wxml
  6. 14
      pages/info/museumInfo/index.wxss
  7. 2
      pages/list/museum/index.js
  8. 185
      pages/map/index.js
  9. 54
      pages/map/index.wxml
  10. 184
      pages/map/index.wxss
  11. 9
      pages/pbService/appreciate/index.js
  12. 2
      pages/pbService/wwcx/index.js
  13. 4
      pages/search/list/index.wxml
  14. 2
      pages/user/order/activityOrderInfo/index.wxml
  15. 2
      pages/user/order/couponOrderInfo/index.wxml
  16. 2
      pages/user/order/foodOrderInfo/index.wxml
  17. 2
      pages/user/order/lineOrderInfo/index.wxml
  18. 8
      pages/user/order/list.wxml
  19. 2
      pages/user/order/movieOrderInfo/index.wxml
  20. 40
      pages/user/order/museumOrderInfo/index.js
  21. 3
      pages/user/order/museumOrderInfo/index.wxml
  22. 2
      pages/user/order/postOrderInfo/index.wxml
  23. 36
      pages/user/order/sceneOrderInfo/index.js
  24. 1
      pages/user/order/sceneOrderInfo/index.wxml
  25. 2
      pages/user/service/info/index.wxml
  26. 4
      project.private.config.json

2
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);
})

22
pages/index/index.wxml

@ -1,5 +1,16 @@
<!--index.wxml-->
<title title="君到苏州(文化旅游总入口)"></title>
<view wx:if="{{weather}}" class="top-box">
<image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
<view class="weather-num">{{weather.max_temp}}°</view>
<view class="weather">{{weather.weather}}</view>
<navigator url="/pages/search/index" class="search-box textOver">
<view class="iconfont icon-sousuo"></view>
<view class="textOver">搜索想要的旅游产品或服务</view>
</navigator>
<image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index" src="https://static.ticket.sz-trip.com/xcxImages/index/top_service1.png" mode="aspectFill"></image>
<image bindtap="gotoPath" data-path="/pages/list/message/index" src="https://static.ticket.sz-trip.com/xcxImages/index/top_msg1.png" mode="aspectFill"></image>
</view>
<swiper class="swiper" indicator-dots="{{true}}"
autoplay="{{true}}" interval="{{5000}}" duration="{{300}}">
<block wx:for="{{banner}}" wx:key="*this">
@ -8,17 +19,6 @@
</swiper-item>
</block>
</swiper>
<view wx:if="{{weather}}" class="top-box" style="right:30rpx;top:{{padHeight+height}}px;height:{{height}}px">
<image src="{{weather.icon}}" mode="aspectFill"></image>
<view class="weather-num">{{weather.max_temp}}°</view>
<view class="weather">{{weather.weather}}</view>
<navigator url="/pages/search/index" class="search-box textOver">
<view class="iconfont icon-sousuo"></view>
<view class="textOver">搜索想要的旅游产品或服务</view>
</navigator>
<image bindtap="gotoPath" data-path="/pages/user/service/index" src="https://static.ticket.sz-trip.com/xcxImages/index/top_service.png" mode="aspectFill"></image>
<image bindtap="gotoPath" data-path="/pages/list/message/index" src="https://static.ticket.sz-trip.com/xcxImages/index/top_msg.png" mode="aspectFill"></image>
</view>
<view class="top-icons">
<view bindtap="gotoPath" data-path="/pages/list/activitynew/index" class="top-icon-item">
<image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1.png" mode="widthFix"></image>

45
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;
}

14
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<now) {
item.isEnd = true;
}
else {
item.isEnd = false;
}
})
this.setData({
actList:this.data.actList.concat(res.data.rows),
actTotal:res.data.total
@ -52,6 +62,10 @@ Page({
console.log(res)
})
},
getMyTime(t){
let time = new Date(t.replace(/-/g,'/')).getTime();
return time;
},
changeType:function(e){
this.setData({
type:e.currentTarget.dataset.type

3
pages/info/museumInfo/index.wxml

@ -26,7 +26,6 @@
<view class="detail-title">场馆介绍</view>
<rich-text wx:if="{{info}}" class="detail" nodes="{{tool.formateRichText(info.content)}}"></rich-text>
<!-- <view class="detail" wx:if="{{info}}">{{info.open_time}}</view> -->
<view style="height:104rpx" wx:if="{{info.product_venue && info.product_venue.sku && info.product_venue.sku.length>0}}"></view>
</view>
<view wx:else>
<navigator url="../activityInfo/index?id={{item.id}}" class="activity-item" wx:for="{{actList}}">
@ -38,9 +37,11 @@
</view>
</view>
<image src="{{item.post_url}}" mode="aspectFill"></image>
<view wx:if="{{item.isEnd}}" class="end-box">已结束</view>
</navigator>
<view style="font-size:26rpx;text-align:center;line-height:200rpx;" wx:if="{{actList.length==0}}">暂无活动</view>
</view>
<view style="height:104rpx" wx:if="{{info.product_venue && info.product_venue.sku && info.product_venue.sku.length>0}}"></view>
</view>
<view class="fixed-btn" wx:if="{{info.product_venue && info.product_venue.sku && info.product_venue.sku.length>0}}">
<view bindtap="order" class="btn">参观预约</view>

14
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;

2
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=>{

185
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({
info:this.data.list[e.detail.markerId],
showInfo:true
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({
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()
},

54
pages/map/index.wxml

@ -43,7 +43,7 @@
<text>江南小书场</text>
</view>
</view>
<view class="map-item" wx:if="{{showInfo && info}}">
<view class="map-item" wx:if="{{showInfo && info && info.info.type!='tenscenic'}}">
<view class="iconfont icon-ic_searchclosed" bindtap="hideInfo"></view>
<image wx:if="{{info.info.headimg}}" src="{{info.info.headimg}}" mode="aspectFill"></image>
<view class="info" style="{{info.info.headimg?'':'width:100%'}}">
@ -52,3 +52,55 @@
<view wx:if="{{info.info.type!='academes'}}" bindtap="gotoDetail" class="info-btn">查看详情</view>
</view>
</view>
<!-- 运河十景样式特殊 -->
<view class="map-item1" style="{{showAllMask?'':'height:30%'}}" wx:if="{{showInfo && info && info.info.type=='tenscenic'}}">
<view class="iconfont icon-ic_searchclosed" bindtap="hideInfo"></view>
<view class="title textOver">{{info.info.title}}</view>
<view class="subtitle textOver2">地址:{{info.info.address}}</view>
<view class="subtitle textOver"><text style="margin-right:5rpx" class="textOver" wx:for="{{info.info.display_tags}}">{{item}}</text></view>
<view class="subtitle textOver">开放时间:{{info.info.open_time}}</view>
<view class="map-item-tip">景区图片</view>
<view class="sign-pic-list">
<image bindtap="showImages" data-index="{{index}}" src="{{item}}" wx:for="{{info.info.listimg}}" mode="aspectFill"></image>
</view>
<view class="map-item-menus" wx:if="{{menus.length>0}}">
<view bindtap="changeMenu" data-index="{{index}}" wx:for="{{menus}}" class="map-item-menu {{menuIndex==index?'active':''}}">{{item}}</view>
</view>
<view class="list">
<view wx:for="{{productList}}" bindtap="gotoDetail" data-item="{{item}}">
<view wx:if="{{menus[menuIndex]!='攻略'}}" class="item">
<image src="{{info.info.headimg}}" mode="aspectFill"></image>
<view class="right-info" style="display:flex;flex-direction:column;justify-content:space-between">
<view>
<view class="title textOver2">{{item.title}}</view>
<view class="product-tags textOver">
<view class="product-tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
</view>
<view class="product-address textOver">{{item.address}}</view>
</view>
<view class="product-bottom">
<text class="textOver">{{item.distance?('距您直线距离'+item.distance):'请开启定位'}}</text>
<view class="product-price">¥<text>{{item.price/100}}</text></view>
</view>
</view>
</view>
<view wx:else class="right-info strategy-item">
<view class="title textOver2">{{item.title}}</view>
<view class="product-address textOver">{{item.subtitle}}</view>
<view class="product-bottom">
<image src="{{item.avatar}}" mode="aspectFill"></image>
<view class="username">
{{item.nickname}}
</view>
<view class="iconfont icon-xin"></view>
<view>{{item.like_number}}</view>
<view class="iconfont icon-eye"></view>
<view>{{item.view_number}}</view>
</view>
</view>
</view>
</view>
</view>
<view class="mask" wx:if="{{showAllMask}}" bindtap="closeMask">
<image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/map/arrow.png" mode="widthFix" class="returnImg"></image>
</view>

184
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;
@ -149,3 +150,182 @@
.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;
}

9
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({

2
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=>{

4
pages/search/list/index.wxml

@ -113,11 +113,11 @@
<view class="product-info show-info">
<view class="product-title">{{item.title}}</view>
<view class="show-info">
<view>{{item.ext.subtitle || item.ext.sub_title}}</view>
<view wx:if="{{item.ext.subtitle || item.ext.sub_title}}">{{item.ext.subtitle || item.ext.sub_title}}</view>
<view class="scene-tags textOver">
<view class="show-tag textOver" wx:for="{{item.ext.display_tags}}">{{item}}</view>
<view style="flex:1"></view>
<view class="price"><text>¥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
<view class="price" style="line-height:50rpx"><text>¥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
</view>
</view>
</view>

2
pages/user/order/activityOrderInfo/index.wxml

@ -42,7 +42,7 @@
<text>-¥{{info.preference_money/100}}</text>
</view>
<view class="detail-item all-total-item" style="border-bottom:none">
<text>付款</text>
<text>付款</text>
<view class="price">{{info.paid_money/100}}</view>
</view>
<view class="btns" style="border-top:1rpx solid #ccc" wx:if="{{info.state!='CLOSED' && info.order_product_list && info.order_product_list.length>0}}">

2
pages/user/order/couponOrderInfo/index.wxml

@ -41,7 +41,7 @@
<text>-¥{{info.preference_money/100}}</text>
</view>
<view class="detail-item all-total-item" style="border-bottom:none">
<text>付款</text>
<text>付款</text>
<view class="price">{{info.paid_money/100}}</view>
</view>
<view class="btns" style="border-top:1rpx solid #ccc" wx:if="{{info.state!='CLOSED'}}">

2
pages/user/order/foodOrderInfo/index.wxml

@ -44,7 +44,7 @@
<text>-¥{{info.preference_money/100}}</text>
</view>
<view class="detail-item all-total-item" style="border-bottom:none">
<text>付款</text>
<text>付款</text>
<view class="price">{{info.paid_money/100}}</view>
</view>
<view class="btns" style="border-top:1rpx solid #ccc" wx:if="{{info.state!='CLOSED'}}">

2
pages/user/order/lineOrderInfo/index.wxml

@ -64,7 +64,7 @@
<view class="box-title">出行人</view>
<view wx:for="{{info.order_product_list}}">
<view style="font-weight:bold;font-size:26rpx;margin-bottom:10rpx">{{item.sku_name}} {{index+1}}</view>
<view class="line"></view>
<!-- <view class="line"></view> -->
<view wx:for="{{item.contacts_info}}">
<view class="line"></view>
<view class="detail-item">

8
pages/user/order/list.wxml

@ -31,7 +31,13 @@
<view class="sku-number">x{{item.product_num}}</view>
</view>
</view>
<view class="total"><text>共{{item.orderNum}}件商品</text><text style="margin-left:20rpx">合计</text> <text class="all-price">¥{{item.total_money/100}}</text></view>
<view style="text-align:right;font-size:28rpx;margin-right:30rpx;color:#333">
<text>共{{item.orderNum}}件商品</text>
</view>
<view style="text-align:right;font-size:28rpx;margin:20rpx 30rpx;margin-bottom:0rpx;color:#333">
<text class="all-price" style="color:#999">总价 ¥{{item.total_money/100}}</text><text class="all-price" style="margin-left:30rpx">需付款 ¥{{item.paid_money/100}}</text>
</view>
<!-- <view class="total"><text>共{{item.orderNum}}件商品</text><text style="margin-left:20rpx">合计</text> <text class="all-price">¥{{item.total_money/100}}</text></view> -->
<view class="btns">
<view class="btn" catchtap="order" data-item="{{item}}">再次购买</view>
<view catchtap="gotoComment" data-id="{{item.order_id}}" class="btn" wx:if="{{item.state=='WAIT_COMMENT'}}">立即评价</view>

2
pages/user/order/movieOrderInfo/index.wxml

@ -44,7 +44,7 @@
<text>-¥{{info.preference_money/100}}</text>
</view>
<view class="detail-item all-total-item" style="border-bottom:none">
<text>付款</text>
<text>付款</text>
<view class="price">{{info.paid_money/100}}</view>
</view>
<view class="btns" style="border-top:1rpx solid #ccc" wx:if="{{info.state!='CLOSED'}}">

40
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'
})
},

3
pages/user/order/museumOrderInfo/index.wxml

@ -41,10 +41,11 @@
<text>-¥{{info.preference_money/100}}</text>
</view>
<view class="detail-item all-total-item" style="border-bottom:none">
<text>付款</text>
<text>付款</text>
<view class="price">{{info.paid_money/100}}</view>
</view>
<view class="btns" style="border-top:1rpx solid #ccc" wx:if="{{info.state!='CLOSED'}}">
<view bindtap="leadRoad" data-url="{{info.order_product_list[0].btnUrl}}" class="btn" wx:if="{{info.state!='UNPAID' && !isRefund && info.order_product_list[0].btnUrl}}">行程规划</view>
<navigator url="../refundInfo/index?id={{info.order_id}}" class="btn" wx:if="{{isRefund}}">退款详情</navigator>
<navigator url="/pages/info/museumInfo/index?id={{info.order_product_list[0].scene_id}}" class="btn">再次购买</navigator>
<view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消订单</view>

2
pages/user/order/postOrderInfo/index.wxml

@ -41,7 +41,7 @@
<text>-¥{{info.preference_money/100}}</text>
</view>
<view class="detail-item all-total-item" style="border-bottom:none">
<text>付款</text>
<text>付款</text>
<view class="price">{{info.paid_money/100}}</view>
</view>
<view class="btns" style="border-top:1rpx solid #ccc" wx:if="{{info.state!='CLOSED'}}">

36
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'
})
},

1
pages/user/order/sceneOrderInfo/index.wxml

@ -33,6 +33,7 @@
<view class="scene-btns" wx:if="{{info.state!='CLOSED'}}">
<view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间:00:{{minute}}:{{second}}</view>
<navigator wx:if="{{info.state!='UNPAID'}}" url="/pages/info/sceneProductInfo/index?id={{info.order_product_list[0].scene_id}}" class="btn">再次购买</navigator>
<view bindtap="leadRoad" data-url="{{info.order_product_list[0].btnUrl}}" class="btn" wx:if="{{info.state!='UNPAID' && !isRefund && info.order_product_list[0].btnUrl}}">行程规划</view>
<navigator url="../refundInfo/index?id={{info.order_id}}" class="scene-btn" wx:if="{{isRefund}}">退款详情</navigator>
<view class="scene-btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消预订</view>
<view class="scene-btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消预订</view>

2
pages/user/service/info/index.wxml

@ -3,7 +3,7 @@
<view class="ques-ans-box" wx:if="{{info}}">
<view class="ques-title">{{info.question_name}}</view>
<view class="ques-content">{{info.answer}}</view>
<view class="ques-tip"><text>以上答案是否解决您的问题?</text> <text class="{{info.useful_info && info.useful_info.is_useful==1?'active':''}}" style="margin:0 10rpx;" bindtap="zan"><text class="iconfont icon-zan"></text>有用({{info.useful_num>99?'99+':info.useful_num}})</text> <text bindtap="unzan" class="{{info.useful_info && info.useful_info.is_useful===0?'active':''}}"><text class="iconfont icon-zan-copy"></text>没用({{info.unuseful_num>99?'99+':info.unuseful_num}})</text></view>
<view class="ques-tip"><text>以上答案是否解决您的问题?</text> <text class="{{info.useful_info && info.useful_info.is_useful==1?'active':''}}" style="margin:0 10rpx;" bindtap="zan"><text class="iconfont icon-zan"></text>有用({{info.useful_num}})</text> <text bindtap="unzan" class="{{info.useful_info && info.useful_info.is_useful===0?'active':''}}"><text class="iconfont icon-zan-copy"></text>没用({{info.unuseful_num}})</text></view>
</view>
<view class="ques-ans-box" wx:if="{{info}}">
<view class="ques-title other-title">可能您还想问</view>

4
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
}

Loading…
Cancel
Save