Browse Source

团体预约修改

master
yvette 4 years ago
parent
commit
7866aac663
  1. 2
      app.json
  2. 2
      pages/component/myCalendar/index.wxml
  3. 2
      pages/index/index.wxml
  4. 61
      pages/info/groupOrderInfo/index.js
  5. 30
      pages/info/groupOrderInfo/index.wxml
  6. 65
      pages/info/groupOrderInfo/index.wxss
  7. 7
      pages/info/postProductInfo/index.js
  8. 8
      pages/info/postProductInfo/index.wxml
  9. 6
      pages/info/postProductInfo/index.wxss
  10. 2
      pages/order/card/index.wxml
  11. 23
      pages/order/components/contact/index.wxml
  12. 31
      pages/order/components/contact/index.wxss
  13. 9
      pages/order/components/date/index.js
  14. 2
      pages/order/components/date/index.wxml
  15. 109
      pages/order/joinOrder/history/index.js
  16. 5
      pages/order/joinOrder/history/index.json
  17. 21
      pages/order/joinOrder/history/index.wxml
  18. 67
      pages/order/joinOrder/history/index.wxss
  19. 43
      pages/order/joinOrder/index.js
  20. 12
      pages/order/joinOrder/index.wxml
  21. 4
      pages/order/joinOrder/index.wxss
  22. 70
      pages/order/joinOrder/success/index.js
  23. 5
      pages/order/joinOrder/success/index.json
  24. 8
      pages/order/joinOrder/success/index.wxml
  25. 33
      pages/order/joinOrder/success/index.wxss
  26. 2
      pages/order/movie/index.wxml
  27. 2
      pages/order/postOrder/index.wxml
  28. 2
      pages/order/roadOrder/index.wxml
  29. 2
      pages/order/scene/index.js
  30. 45
      pages/order/scene/index.wxml
  31. 29
      pages/order/scene/index.wxss
  32. 2
      pages/order/showOrder/index.wxml
  33. 4
      pages/pbService/bike/index.js
  34. 7
      pages/pbService/index.wxml
  35. 12
      pages/pbService/index.wxss
  36. 3
      pages/user/order/list.js
  37. 3
      pages/user/order/team/list.js
  38. 2
      pages/user/user.wxml
  39. 4
      project.private.config.json

2
app.json

@ -19,6 +19,8 @@
"pages/order/hotel/index",
"pages/order/card/index",
"pages/order/joinOrder/index",
"pages/order/joinOrder/success/index",
"pages/order/joinOrder/history/index",
"pages/order/postOrder/index",
"pages/order/showOrder/index",
"pages/info/newsInfo/index",

2
pages/component/myCalendar/index.wxml

@ -16,7 +16,7 @@
</view>
<view class="date-tip" wx:if="{{dates[item.date] && dates[item.date].price!==null && dates[item.date].stock!=0 && dates[item.date].stock!==null}}">¥{{dates[item.date].price==0 || isKj?'免费':(dates[item.date].price/100)}}</view>
<!-- <view class="date-tip disable" wx:if="{{dates[item.date] && (dates[item.date].stock==null || dates[item.date].price==null)}}">不可定</view> -->
<view class="date-tip disable" wx:if="{{dates[item.date] && dates[item.date].stock==0}}">售罄</view>
<view class="date-tip disable" wx:if="{{dates[item.date] && dates[item.date].stock==0}}">{{dates[item.date].tipText?dates[item.date].tipText:'售罄'}}</view>
<!-- <view class='date-weight'>{{item.weight}}</view> -->
</view>
</view>

2
pages/index/index.wxml

@ -149,7 +149,7 @@
</view>
<view style="overflow-x:auto">
<view class="pbservice" style="width:100%">
<view bindtap="gotoPath" data-title="景区舒适度" data-path="/pages/pbService/security/index" class="pbservice-item">
<view bindtap="gotoPath" data-title="景区舒适度" data-path="/pages/pbService/sceneComfort/index" class="pbservice-item">
<image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
<view>景区舒适度</view>
</view>

61
pages/info/groupOrderInfo/index.js

@ -1,5 +1,6 @@
// pages/info/groupOrderInfo/index.js
import commonApi from "../../../utils/https/common"
let timer = null
Page({
/**
@ -9,7 +10,11 @@ Page({
info:null,
keywords:"",
id:null,
img:null
img:null,
restTime:null,
countdown:0,
codeImg:null,
showShareMask:false
},
/**
@ -19,7 +24,28 @@ Page({
this.setData({
id:options.id
})
// 获取二维码
commonApi.user_post("team_order/get_qrcode",{
url:'https://m.cloud.sz-trip.com/TeamForm?team_id='+this.data.id
}).then(res=>{
this.setData({
codeImg:res.data
})
})
if(options.from=='order'){
wx.showModal({
title:"提示",
content:"团体预约发起后请前往个人中心团体预约订单中查看订单详情和组团详情。",
success:function(){
}
})
}
},
showShare(){
this.setData({
showShareMask:!this.data.showShareMask
})
},
edit:function(e){
let item = e.currentTarget.dataset.item
@ -97,9 +123,13 @@ Page({
order_id:this.data.id
}).then(res=>{
if(res.code==1){
res.data.list.order_info = res.data.list.order_info?JSON.parse(res.data.list.order_info):null;
res.data.list.members.reverse()
this.setData({
info:res.data
info:res.data,
countdown:Number(res.data.list.countdown)
})
this.setTime()
commonApi._post("scene/detail_for_venue",{
id:res.data.list.scene_id
}).then(res=>{
@ -112,12 +142,37 @@ Page({
}
})
},
setTime(){
if(this.data.countdown && this.data.countdown>0){
let countdown = this.data.countdown;
this.setTimeText(countdown)
timer = setInterval(()=>{
countdown--;
this.setTimeText(countdown)
},1000)
}
},
setTimeText(countdown){
let h = Math.floor(countdown / (60 * 60));
countdown = countdown - h * 3600
h = h<10?'0'+h:h
let m = Math.floor(countdown / 60);
countdown = countdown - m * 60
m = m<10?'0'+m:m
let s = countdown<10?'0'+countdown:countdown
this.setData({
restTime:h+':'+m+':'+s
})
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
if(timer){
clearInterval(timer)
timer = null
}
},
/**

30
pages/info/groupOrderInfo/index.wxml

@ -1,15 +1,21 @@
<!--pages/info/groupOrderInfo/index.wxml-->
<title title="团信息"></title>
<title title="团信息"></title>
<view class="box" wx:if="{{info && info.list && info.list.state==0}}">
<view class="code">{{info.list.state_text}}</view>
<view class="code">{{info.list.team_name}}</view>
<view class="top-tips top-new-tips">
<view class="top-tip">场馆名称:{{info.list.scene.title}}</view>
<view class="line" style="height:25rpx"></view>
<view class="top-tip">预约时间:{{info.list.order_info.product_list[0].start_time}} ~ {{info.list.order_info.product_list[0].end_time}}</view>
</view>
<view class="top-tips">
<view class="top-tip">预约人数:{{info.list.member_num}}</view>
<view class="line"></view>
<view class="top-tip">填写信息人数:{{info.list.members_count}}</view>
</view>
<button open-type="share" style="width:100%" class="top-btn">立即邀请</button>
<button bindtap="showShare" style="width:100%" class="top-btn">立即邀请</button>
<view class="top-btn full" bindtap="order">提交订单</view>
<view class="count-down" wx:if="{{restTime}}">组团中({{restTime}})</view>
</view>
<view wx:else class="box">
<view class="code">{{info.list.state_text}}</view>
@ -17,6 +23,7 @@
<view class="code" style="margin-top:50rpx">{{info.list.members_count}}</view>
</view>
<view class="box" wx:if="{{info && info.list}}">
<view wx:if="{{info.list.state==0}}" class="new-tip">倒计时结束后订单将自动提交至后台,订单提交后团员信息将无法修改</view>
<view class="box-title" wx:if="{{info.list.state==0}}">已填写信息团员</view>
<view class="box-title" wx:else>预约成功团员</view>
<view class="search-box">
@ -24,14 +31,31 @@
<input bindinput="changeKeywords" placeholder="请输入关键字查找" />
<view class="btn" bindtap="search">搜索</view>
</view>
<view class="item" wx:for="{{info.list.members}}">
<view class="item{{info.list.user_id==item.user_id?' active':''}}" wx:for="{{info.list.members}}">
<view class="item-top">
<text>{{item.name}} {{item.mobile}}</text>
<text>{{item.id_number}}</text>
</view>
<view class="item-btns" wx:if="{{info && info.type==1 && info.list.state==0}}">
<view class="faqiren" wx:if="{{info.list.user_id==item.user_id}}">发起人</view>
<view style="flex:1"></view>
<view bindtap="edit" data-item="{{item}}" class="item-btn">修改</view>
<view class="item-btn" bindtap="delItem" data-index="{{index}}" data-item="{{item}}">删除</view>
</view>
</view>
</view>
<view class="mask" wx:if="{{showShareMask}}">
<view class="mask-bg" bindtap="showShare"></view>
<view class="mask-content">
<view bindtap="showShare" class="iconfont icon-close"></view>
<image src="{{codeImg}}" mode="widthFix"></image>
<view class="mask-info">
<view>{{info.list.scene.title}}</view>
<view>{{info.list.team_name}}</view>
</view>
<view>
<view>请将此二维码</view>
<view>截屏分享给团员</view>
</view>
</view>
</view>

65
pages/info/groupOrderInfo/index.wxss

@ -10,6 +10,7 @@ page {
border-radius: 20rpx;
background: white;
text-align: center;
position: relative;
}
.code {
color: #0B898E;
@ -89,6 +90,10 @@ page {
padding: 30rpx 0;
border-bottom: 1rpx solid #D8D8D8;
}
.item.active .item-top {
color: #0B898E;
font-weight: bold;
}
.item-top {
display: flex;
align-items: center;
@ -105,3 +110,63 @@ page {
.item-btn {
margin-left: 50rpx;
}
.faqiren {
width: 120rpx;
line-height: 40rpx;
background: rgba(11, 137, 142, .1);
border-radius: 10rpx;
color: #0B898E;
font-size: 26rpx;
text-align: center;
}
.new-tip {
color: #999;
font-size: 26rpx;
text-align: left;
margin-bottom: 20rpx;
}
.count-down {
position: absolute;
left: 50%;
line-height: 40rpx;
background: #0B898E;
border-radius: 0px 0px 20rpx 20rpx;
text-align: center;
color: #fff;
font-size: 26rpx;
width: 300rpx;
margin-left: -150rpx;
top: 0;
}
.top-new-tips {
font-size: 24rpx;
color: #0B898E;
margin: 0;
}
.mask-content image {
display: block;
width: 220rpx;
margin: 0 auto;
height: 220rpx;
margin-bottom: 60rpx;
}
.mask-content {
font-size: 30rpx;
text-align: center;
padding-top: 60rpx;
padding-bottom: 30rpx;
width: 460rpx;
}
.mask-info {
background: rgba(11, 137, 142, .1);
color: #0B898E;
font-size: 32rpx;
margin-bottom: 40rpx;
line-height: 50rpx;
padding: 10rpx 0;
}
.icon-close {
position: absolute;
right: 20rpx;
top: 20rpx;
}

7
pages/info/postProductInfo/index.js

@ -10,6 +10,7 @@ Page({
* 页面的初始数据
*/
data: {
autoPlay:true,
fixed:false,
type:1,
top:0,
@ -559,6 +560,12 @@ Page({
},200)
}
},
playVideo(){
// 播放视频需要把autoplay暂停
this.setData({
autoPlay:false
})
},
/**
* 生命周期函数--监听页面隐藏

8
pages/info/postProductInfo/index.wxml

@ -4,7 +4,13 @@
<view class="iconfont icon-fenxiang" bindtap="share"></view>
<image wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{item.headimg}}" mode="aspectFill"></image>
<swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}"
autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
autoplay="{{autoPlay}}" interval="{{2000}}" duration="{{300}}">
<block wx:if="{{info.videourl}}" wx:key="*this">
<swiper-item>
<video bindplay="playVideo" src="{{info.videourl}}" controls ></video>
<!-- <image src="{{info.headimg}}" mode="aspectFill"></image> -->
</swiper-item>
</block>
<block wx:for="{{info.listimg}}" wx:key="*this">
<swiper-item>
<image src="{{item}}" mode="aspectFill"></image>

6
pages/info/postProductInfo/index.wxss

@ -4,10 +4,10 @@ page {
}
.swiper {
width: 100%;
height: 400rpx;
height: 420rpx;
}
.swiper image {
height: 400rpx;
.swiper image,.swiper video {
height: 420rpx;
display: block;
width: 100%;
}

2
pages/order/card/index.wxml

@ -1,5 +1,5 @@
<!--pages/order/scene/index.wxml-->
<title title="提交订单"></title>
<title title="订单填写"></title>
<view class="product-info" wx:if="{{product}}">
<view class="product-title">{{product.product.title}}</view>
<!-- <view class="product-price">{{product.sku.price/100}}</view> -->

23
pages/order/components/contact/index.wxml

@ -1,8 +1,14 @@
<view class="box">
<view class="box{{isGroup==1?' group-box':''}}" style="border:none">
<view class="box-title">
<view style="flex:1">{{isGroup==1?'发起人信息':'出行人信息'}}</view>
<view class="contact-add" bindtap="showLinkman" wx:if="{{selectLinkman.length>0}}"><text class="iconfont icon-add-select"></text>添加</view>
<view style="flex:1">
<view>{{isGroup==1?'发起人信息':'出行人信息'}}</view>
<view wx:if="{{isGroup==1}}" class="group-tip-text">(*预约发起后前往个人中心-团体预约订单中查看详情)</view>
</view>
<view class="contact-add" bindtap="showLinkman" wx:if="{{selectLinkman.length>0 && isGroup!=1}}"><text class="iconfont icon-add-select"></text>添加</view>
<view class="group-edit" bindtap="showLinkman" wx:if="{{isGroup==1 && selectLinkman.length>0}}">编辑</view>
</view>
<view wx:if="{{isGroup!=1}}">
<view class="contacts-list" wx:if="{{selectLinkman.length>0}}">
<view class="contact-item" wx:for="{{selectLinkman}}">
<view class="iconfont icon-jian" bindtap="delLinkman" data-index="{{index}}"></view>
@ -19,6 +25,17 @@
<view bindtap="showLinkman" class="add-btn1"><text class="iconfont icon-add-select"></text>添加</view>
<view style="height:25rpx"></view>
</view>
</view>
<view wx:else>
<view class="group-add" wx:if="{{selectLinkman.length==0}}" bindtap="showLinkman">添加</view>
<view class="group-item" wx:for="{{selectLinkman}}">
<view>
<text style="margin-right:30rpx">{{item.name}}</text>
<text>{{item.tel}}</text>
</view>
<text>{{item.id_number}}</text>
</view>
</view>
</view>
<view class="mask" style="align-items:flex-end" wx:if="{{showMask}}">
<view class="mask-bg" bindtap="cancel"></view>

31
pages/order/components/contact/index.wxss

@ -136,3 +136,34 @@
color: #000;
margin: 25rpx auto;
}
.group-tip-text {
color: #999;
font-size: 24rpx;
}
.group-box .box-title {
margin: 0;
padding: 20rpx 0;
height: 80rpx;
}
.group-edit {
color: #0B898E;
font-size: 30rpx;
}
.group-add {
color: #0B898E;
font-size: 30rpx;
text-align: center;
width: 690rpx;
line-height: 70rpx;
border: 2rpx solid #0B898E;
border-radius: 20rpx;
}
.group-item {
display: flex;
height: 50rpx;
line-height: 50rpx;
align-items: center;
color: #333333;
font-size: 30rpx;
justify-content: space-between;
}

9
pages/order/components/date/index.js

@ -50,6 +50,7 @@ Component({
isSzMuseum: true
})
}
let todayTimes = new Date(today.replace(/-/g,'/')).getTime()
commonApi.user_post("token/check").then(res => {
if (res.code == 1) {
// 获取价格日历
@ -58,6 +59,14 @@ Component({
end_date: end_date,
sku_id: product.sku.id
}).then(res => {
for (let i = 0; i < res.data.length; i++) {
if(new Date(res.data[i].date.replace(/-/g,'/')).getTime()==todayTimes && (this.properties.isTeam || this.properties.product && this.properties.product.isTeam==1)){
// 如果是团队预约的场馆 并且是今天的话 不能预定
res.data[i].stock=0;
// res.data.price=100;
res.data[i].tipText = '不可定'
}
}
// 如果之前已经在详情页面选择了日期的话 默认日期不能是第一个有库存的日期了
if (app.globalData.product.infoDate) {
let dateIndex = res.data.slice(0, 3).findIndex(item => item.date == app.globalData.product.infoDate.date)

2
pages/order/components/date/index.wxml

@ -6,7 +6,7 @@
<view>{{item.date}}</view>
<view class="price" wx:if="{{ !isTeam && item.stock!=0 && item.stock!=null && item.price!=null}}">{{item.price==0 || kjIdCom?'免费':('¥'+item.price/100)}}</view>
<!-- <view class="price" wx:if="{{item.stock==null || item.price==null}}">不可定</view> -->
<view class="price" wx:if="{{item.stock==0}}">售罄</view>
<view class="price" wx:if="{{item.stock==0}}">{{item.tipText?item.tipText:'售罄'}}</view>
</view>
<view wx:if="{{moreFlag}}" class="date-item more-item" bindtap="showMoreDate">
更多

109
pages/order/joinOrder/history/index.js

@ -0,0 +1,109 @@
// pages/order/joinOrder/history/index.js
import commonApi from "../../../../utils/https/common"
Page({
/**
* 页面的初始数据
*/
data: {
oid:null,
id:null,
info:null,
user_id:null
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
commonApi.user_post("team_order/get_team_detail",{
order_id:options.oid
}).then(res=>{
res.data.list.members.reverse()
res.data.list.members.map(item=>{
item.idNew = item.id_number.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1********\$2");
})
this.setData({
info:res.data,
id:options.id,
oid:options.oid,
user_id:wx.getStorageSync('jstrip_userid')
})
})
},
delItem(e){
let item = e.currentTarget.dataset.item,index = e.currentTarget.dataset.index,info = this.data.info,that = this
wx.showModal({
title:"提示",
content:"确定删除该团员吗?",
success:function(res){
if(res.confirm){
commonApi.user_post("team_order/del",{
team_id:item.team_id,
member_id:item.id
}).then(res=>{
if(res.code==1){
wx.showToast({
title: '删除成功',
icon:'success'
})
info.list.members.splice(index,1)
that.setData({
info:info
})
}
})
}
}
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})

5
pages/order/joinOrder/history/index.json

@ -0,0 +1,5 @@
{
"usingComponents": {
"title":"/pages/component/TitleHeader"
}
}

21
pages/order/joinOrder/history/index.wxml

@ -0,0 +1,21 @@
<!--pages/order/joinOrder/history/index.wxml-->
<title title="预约记录"></title>
<view class="box" wx:if="{{info}}">
<view class="item" wx:for="{{info.list.members}}">
<view class="item-top{{item.user_id==info.list.user_id?' active':''}}">
<view class="name">{{item.name}}</view>
<view class="tel">{{item.mobile}}</view>
<view class="name" wx:if="{{item.user_id==user_id}}">{{item.id_number}}</view>
<view class="name" wx:else>{{item.idNew}}</view>
</view>
<view class="tags">
<view class="tag" wx:if="{{item.user_id==info.list.user_id}}">发起人</view>
<view class="tag" wx:elif="{{item.user_id==user_id}}">自己</view>
<view style="flex:1"></view>
<navigator url="../index?id={{id}}&oid={{oid}}&mid={{item.id}}" wx:if="{{item.user_id==user_id || user_id==info.list.user_id}}">修改</navigator>
<view bindtap="delItem" data-item="{{item}}" data-index="{{index}}" wx:if="{{item.user_id==user_id || user_id==info.list.user_id}}">删除</view>
</view>
</view>
</view>
<view style="height:120rpx"></view>
<navigator url="../index?id={{id}}&oid={{oid}}" class="btn">添加</navigator>

67
pages/order/joinOrder/history/index.wxss

@ -0,0 +1,67 @@
/* pages/order/joinOrder/history/index.wxss */
.box {
width: 690rpx;
background: #FFFFFF;
border-radius: 20rpx;
margin: 0 auto;
}
page {
background: #F2F2F2;
}
.item {
margin: 0 30rpx;
height: 105rpx;
border-bottom: 1rpx solid #d8d8d8;
font-size: 30rpx;
color: #333333;
padding: 20rpx 0;
}
.box .item:last-child {
border-bottom: none;
}
.box .item .name {
flex-shrink: 0;
}
.item-top,.tags {
display: flex;
align-items: center;
justify-content: space-between;
}
.item-top {
margin-bottom: 20rpx;
}
.item-top .tel {
flex: 1;
margin: 0 30rpx;
}
.tags {
font-size: 26rpx;
color: #0B898E;
}
.item-top.active {
color: #0B898E;
font-weight: bold;
}
.tag {
width: 120rpx;
line-height: 40rpx;
color: #0B898E;
background: rgba(11, 137, 142, .1);
border-radius: 10rpx;
text-align: center;
}
.tags view:last-child {
margin-left: 30rpx;
}
.btn {
width: 632rpx;
line-height: 70rpx;
background: #0B898E;
border-radius: 20rpx;
text-align: center;
position: fixed;
font-size: 30rpx;
color: #FFFFFF;
bottom: 30rpx;
left: 59rpx;
}

43
pages/order/joinOrder/index.js

@ -9,7 +9,9 @@ Page({
data: {
team_id:null,
info:{},
mobile:""
mobile:"",
detail:{},
oid:null
},
/**
@ -31,20 +33,24 @@ Page({
this.setData({
mobile:res.data.mobile
})
if(options.uid && res.data.id && options.uid==res.data.id && !options.mid){
// 是发起人的话 直接取团购订单详情页
wx.redirectTo({
url: '/pages/info/groupOrderInfo/index?id='+options.oid,
})
}
// if(options.uid && res.data.id && options.uid==res.data.id && !options.mid){
// // 是发起人的话 直接取团购订单详情页
// wx.redirectTo({
// url: '/pages/info/groupOrderInfo/index?id='+options.oid,
// })
// }
}
})
if(options.mid && options.oid){
if(options.oid){
this.setData({
oid:options.oid
})
// 如果是编辑来的
commonApi.user_post("team_order/get_team_detail",{
order_id:options.oid
}).then(res=>{
if(res.code==1){
if(options.mid){
let item = res.data.list.members.find(i=>i.id==options.mid);
let info = {
team_id:options.id,
@ -57,6 +63,11 @@ Page({
info:info
})
}
res.data.list.order_info = res.data.list.order_info?JSON.parse(res.data.list.order_info):null
this.setData({
detail:res.data
})
}
})
}
},
@ -75,8 +86,11 @@ Page({
})
},
submit:function(e){
let info = this.data.info
let info = this.data.info;
// wx.redirectTo({
// url: '/pages/order/joinOrder/success/index?id='+this.data.team_id+'&oid='+this.data.oid
// })
// return;
if(!info.name){
wx.showToast({
title: '请输入姓名',
@ -107,7 +121,16 @@ Page({
icon:'success'
})
setTimeout(()=>{
if(info.member_id){
// 如果是编辑来的 直接返回
util.back()
}
else {
// 如果是添加的话 去添加成功页
wx.redirectTo({
url: 'success/index&id='+this.data.team_id+'&oid='+this.data.oid
})
}
},500)
}
})

12
pages/order/joinOrder/index.wxml

@ -8,4 +8,16 @@
<view class="input-left">身份证:</view>
<input type="text" bindinput="changeId" value="{{info.id_number}}" placeholder="请填写预约人身份证号码" />
</view>
<view class="input-item">
<view class="input-left">团体名称:</view>
<input type="text" disabled value="{{detail.list.team_name}}"/>
</view>
<view class="input-item">
<view class="input-left">场馆名称:</view>
<input type="text" disabled value="{{detail.list.scene.title}}"/>
</view>
<view class="input-item">
<view class="input-left">预约时间:</view>
<input type="text" disabled value="{{detail.list.use_date + (detail.list.order_info && detail.list.order_info && detail.list.order_info.product_list[0] && detail.list.order_info.product_list[0].start_time?' '+detail.list.order_info.product_list[0].start_time +' ~ '+detail.list.order_info.product_list[0].end_time:'')}}"/>
</view>
<view bindtap="submit" class="btn">提交</view>

4
pages/order/joinOrder/index.wxss

@ -11,6 +11,7 @@
.input-item input {
display: block;
width: 560rpx;
text-align: right;
}
.btn {
width: 632rpx;
@ -23,3 +24,6 @@
color: #ffffff;
font-size: 30rpx;
}
.input-left {
flex-shrink: 0;
}

70
pages/order/joinOrder/success/index.js

@ -0,0 +1,70 @@
// pages/order/joinOrder/success/index.js
Page({
/**
* 页面的初始数据
*/
data: {
id:null,
oid:null
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.setData({
id:options.id,
oid:options.oid
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})

5
pages/order/joinOrder/success/index.json

@ -0,0 +1,5 @@
{
"usingComponents": {
"title":"/pages/component/TitleHeader"
}
}

8
pages/order/joinOrder/success/index.wxml

@ -0,0 +1,8 @@
<!--pages/order/joinOrder/success/index.wxml-->
<title title="添加成功"></title>
<image class="successimg" src="https://static.ticket.sz-trip.com/uploads/20211108/b11f361c5785a20fddf138a523d8ad71.png" mode="widthFix"></image>
<view class="submit-success">提交成功</view>
<view>团长确认后请前往公众号</view>
<view>君到苏州-个人中心 凭码入园</view>
<navigator url="../index?id={{id}}&oid={{oid}}" class="btn full">继续提交</navigator>
<navigator url="../history/index?id={{id}}&oid={{oid}}" class="btn">查看提交记录</navigator>

33
pages/order/joinOrder/success/index.wxss

@ -0,0 +1,33 @@
/* pages/order/joinOrder/success/index.wxss */
.successimg {
display: block;
margin: 0 auto;
width: 180rpx;
margin-top: 176rpx;
margin-bottom: 40rpx;
}
.submit-success {
color: #0B898E;
font-size: 36rpx;
margin-bottom: 30rpx;
}
page {
text-align: center;
font-size: 26rpx;
color: #999;
}
.btn {
margin: 30rpx auto;
color: #0B898E;
border: 2rpx solid;
border-radius: 20rpx;
line-height: 70rpx;
background: white;
font-size: 30rpx;
width: 632rpx;
}
.btn.full {
background: #0B898E;
color: #fff;
margin-top: 110rpx;
}

2
pages/order/movie/index.wxml

@ -1,5 +1,5 @@
<!--pages/order/movie/index.wxml-->
<title title="确认订单"></title>
<title title="订单填写"></title>
<view class="info-box" wx:if="{{product}}">
<view class="info-top">
<image src="{{product.product.headimg}}" mode="aspectFill"></image>

2
pages/order/postOrder/index.wxml

@ -1,5 +1,5 @@
<!--pages/order/post/index.wxml-->
<title title="确认订单"></title>
<title title="订单填写"></title>
<address bind:setAddress="setAddress"></address>
<view class="box topbox" wx:for="{{product}}">
<view class="header-title textOver" wx:if="{{from=='cart'}}">

2
pages/order/roadOrder/index.wxml

@ -1,5 +1,5 @@
<!--pages/order/roadOrder/index.wxml-->
<title title="确认订单"></title>
<title title="订单填写"></title>
<view class="top-box" wx:if="{{product}}">
<view class="product-title">{{product.title}}</view>
<view class="product-date">{{selectDate.date}}</view>

2
pages/order/scene/index.js

@ -224,7 +224,7 @@ Page({
if(res.code==1 && app.globalData.product.isGroup==1){
// 团购跳转到团购详情
wx.navigateTo({
url: '/pages/info/groupOrderInfo/index?id='+res.data.order_id
url: '/pages/info/groupOrderInfo/index?id='+res.data.order_id+'&from=order'
})
}
})

45
pages/order/scene/index.wxml

@ -1,39 +1,42 @@
<!--pages/order/scene/index.wxml-->
<title title="提交订单"></title>
<view class="product-info" wx:if="{{product}}">
<view class="product-title">{{product.product.title + product.sku.sku_name}}</view>
<view class="{{product && product.isGroup==1?'group-order':''}}">
<title title="订单填写"></title>
<view class="product-info" wx:if="{{product}}">
<view class="product-title">{{product.product.title + product.isGroup==1?'(团体预约)':product.sku.sku_name}}</view>
<view class="product-price" wx:if="{{type=='museum' || type=='activity'}}">免费</view>
</view>
<date wx:if="{{isLogin && type!='activity'}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}"></date>
<view class="box">
</view>
<date wx:if="{{isLogin && type!='activity'}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}"></date>
<view class="box" wx:if="{{product && product.isGroup==1}}">
<view class="box-title">
<view style="flex:1">购票数量</view>
<view style="flex-shrink:0">团体主体名称:</view>
<input type="text" placeholder="请输入名称" bindinput="changeGroupName"></input>
</view>
</view>
<view class="box">
<view class="box-title">
<view style="flex:1">{{product && product.isGroup!=1?'购票数量':'预约人数'}}</view>
<view class="iconfont icon-sami-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="minus"></view>
<view class="number-box">{{productNum}}</view>
<view class="iconfont icon-add-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add"></view>
</view>
</view>
<contact wx:if="{{isLogin}}" type="{{type}}" bind:setLinkman="setLinkman"></contact>
<coupon wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1}}" id="coupon" money="{{singlePrice * productNum}}" sku="{{product.sku.id}}"></coupon>
<view class="box" wx:if="{{type!='activity' && product && product.isGroup!=1}}">
</view>
<contact wx:if="{{isLogin}}" type="{{type}}" bind:setLinkman="setLinkman"></contact>
<coupon wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1}}" id="coupon" money="{{singlePrice * productNum}}" sku="{{product.sku.id}}"></coupon>
<view class="box" wx:if="{{type!='activity' && product && product.isGroup!=1}}">
<view class="box-title">
<view style="flex-shrink:0">订单备注</view>
<input type="text" bindinput="changeRemark" placeholder="选填"></input>
</view>
</view>
<view class="box" wx:if="{{product && product.isGroup==1}}">
<view class="box-title">
<view style="flex-shrink:0">团队主体名称:</view>
<input type="text" bindinput="changeGroupName"></input>
</view>
</view>
<view style="{{type=='museum' || type=='activity'?'height:138rpx':'height:113rpx'}}"></view>
<view class="fixed-bottom" wx:if="{{type!='museum' && type!='activity'}}">
<view style="{{type=='museum' || type=='activity'?'height:138rpx':'height:113rpx'}}"></view>
<view class="fixed-bottom" wx:if="{{type!='museum' && type!='activity'}}">
<view class="fixed-price-box" wx:if="{{kjId}}"><text>合计:</text><text class="price">¥0</text></view>
<view class="fixed-price-box" wx:else><text>合计:</text><text class="price">¥{{((singlePrice * productNum - (coupon?coupon.activity.money:0))>0?(singlePrice * productNum - (coupon?coupon.activity.money:0)):0)/ 100}}</text></view>
<view class="fixed-btn" bindtap="order">提交订单</view>
</view>
<view class="fixed-bottom yuyue-box" wx:else>
</view>
<view class="fixed-bottom yuyue-box" wx:else>
<view class="fixed-btn yuyue-btn" bindtap="order" wx:if="{{type=='museum'}}">立即预约</view>
<view class="fixed-btn yuyue-btn" bindtap="activityOrder" wx:else>立即预约</view>
</view>
</view>

29
pages/order/scene/index.wxss

@ -2,6 +2,9 @@
page {
background: #f6f6f6;
}
.group-order {
background: #fff;
}
.product-info {
padding: 20rpx 47rpx;
border-bottom: 1rpx solid #ccc;
@ -15,6 +18,22 @@ page {
color: #D62828;
font-size: 27rpx;
}
.group-order .box-title {
margin: 0;
}
.group-order .box,.group-order .date-box {
border-bottom: 1rpx solid #D8D8D8;
border-radius: 0;
margin: 0 25rpx;
}
.group-order .dates-boxes {
border-top: none;
padding-top: 0;
}
.group-order .date-time.disable {
background: #CCCCCC;
color: #fff;
}
.box {
margin: 30rpx 25rpx;
background: white;
@ -173,9 +192,19 @@ page {
color: #666;
margin-left: 15rpx;
font-weight: 400;
text-align: right;
}
.yuyue-btn {
width: 657rpx;
line-height: 78rpx;
border-radius: 39rpx;
}
.group-order .yuyue-box {
height: 100rpx;
}
.group-order .yuyue-btn {
width: 100%;
/* height: 100%; */
line-height: 100rpx;
border-radius: 0;
}

2
pages/order/showOrder/index.wxml

@ -1,5 +1,5 @@
<!--pages/order/showOrder/index.wxml-->
<title title="选择场次"></title>
<title title="订单填写"></title>
<view class="order-top" wx:if="{{product}}">
<view class="order-name">{{product.title}}</view>
<view class="order-subtitle">{{product.subtitle}}</view>

4
pages/pbService/bike/index.js

@ -65,7 +65,7 @@ Page({
lat:this.data.latitude,
lon:this.data.longitude
}).then(res=>{
let list = [];
let list = this.data.list;
if(this.data.type==2){
res.data = res.data.parklist;
}
@ -86,7 +86,7 @@ Page({
mapItem.latitude = Number(item.gaodelat);
mapItem.longitude = Number(item.gaodelon);
}
mapItem.id = index;
mapItem.id = list.length+index;
mapItem.info = item;
mapItem.iconPath = "https://static.ticket.sz-trip.com/xcxImages/other/bike"+this.data.type+".png";
mapItem.width = 40;

7
pages/pbService/index.wxml

@ -1,7 +1,8 @@
<!--pages/pbService/index.wxml-->
<title title="公共服务"></title>
<image class="title-img" style="margin-top:16rpx" src="https://static.ticket.sz-trip.com/uploads/20211105/9925a5e6d5e535c3c25c6923ec5a2897.png" mode="widthFix"></image>
<view class="pb-box">
<view class="pb-title">游玩助手</view>
<!-- <view class="pb-title">游玩助手</view> -->
<view class="pb-list">
<!-- <view class="pb-item" bindtap="gotoSku">
<image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb1.png" mode="widthFix"></image>
@ -29,8 +30,10 @@
</view>
</view>
</view>
<image class="title-img" src="https://static.ticket.sz-trip.com/uploads/20211105/25d428dfba0641294c8457acd8966076.png" mode="widthFix"></image>
<view class="pb-box">
<view class="pb-title">交通出行</view>
<!-- <view class="pb-title">交通出行</view> -->
<view class="pb-list">
<!-- <view class="pb-item" bindtap="gotoPath" data-path="/pages/pbService/bus/index">
<image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb6.png" mode="widthFix"></image>

12
pages/pbService/index.wxss

@ -1,20 +1,26 @@
/* pages/pbService/index.wxss */
page {
background: #f6f6f6;
background: url(https://static.ticket.sz-trip.com/uploads/20211105/835875f38dd733eb6374eba108db373a.png);
background-size: 100%;
background-color: none;
}
.pb-box {
margin: 35rpx 25rpx;
background: white;
/* background: white; */
border-radius: 13rpx;
padding: 0 25rpx;
}
.pb-title {
padding: 40rpx 0;
line-height: 32rpx;
font-size: 34rpx;
color: #333;
font-weight: 500;
}
.title-img {
width: 587rpx;
display: block;
}
.pb-list {
display: flex;
align-items: center;

3
pages/user/order/list.js

@ -31,6 +31,9 @@ Page({
lat:r.latitude
})
this.getList();
},
fail:()=>{
this.getList();
}
})

3
pages/user/order/team/list.js

@ -28,6 +28,9 @@ Page({
lat:r.latitude
})
this.getList();
},
fail:()=>{
this.getList();
}
})

2
pages/user/user.wxml

@ -61,7 +61,7 @@
实名认证
</navigator>
<navigator url="order/team/list" class="user-box-line">
订单
订单
</navigator>
</view>
<view class="user-box" style="margin-bottom:0">

4
project.private.config.json

@ -13,8 +13,8 @@
"miniprogram": {
"list": [
{
"name": "pages/pbService/gym/info/index",
"pathName": "pages/pbService/gym/info/index",
"name": "pages/order/joinOrder/success/index",
"pathName": "pages/order/joinOrder/index",
"query": "id=1001",
"scene": null
},

Loading…
Cancel
Save