diff --git a/app.json b/app.json index f7d8a52..60bd63e 100644 --- a/app.json +++ b/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", diff --git a/pages/component/myCalendar/index.wxml b/pages/component/myCalendar/index.wxml index 5819e00..4f32041 100644 --- a/pages/component/myCalendar/index.wxml +++ b/pages/component/myCalendar/index.wxml @@ -16,7 +16,7 @@ ￥{{dates[item.date].price==0 || isKj?'免费':(dates[item.date].price/100)}} - 售罄 + {{dates[item.date].tipText?dates[item.date].tipText:'售罄'}} diff --git a/pages/index/index.wxml b/pages/index/index.wxml index ea3a3db..724dcfa 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -149,7 +149,7 @@ - + 景区舒适度 diff --git a/pages/info/groupOrderInfo/index.js b/pages/info/groupOrderInfo/index.js index 7a46f26..f85a2fe 100644 --- a/pages/info/groupOrderInfo/index.js +++ b/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 + } }, /** diff --git a/pages/info/groupOrderInfo/index.wxml b/pages/info/groupOrderInfo/index.wxml index db15486..abab27b 100644 --- a/pages/info/groupOrderInfo/index.wxml +++ b/pages/info/groupOrderInfo/index.wxml @@ -1,15 +1,21 @@ - + {{info.list.state_text}} {{info.list.team_name}} + + 场馆名称：{{info.list.scene.title}} + + 预约时间：{{info.list.order_info.product_list[0].start_time}} ~ {{info.list.order_info.product_list[0].end_time}} + 预约人数：{{info.list.member_num}} 填写信息人数：{{info.list.members_count}} - + 提交订单 + 组团中({{restTime}}) {{info.list.state_text}} @@ -17,6 +23,7 @@ {{info.list.members_count}} + 倒计时结束后订单将自动提交至后台，订单提交后团员信息将无法修改 已填写信息团员 预约成功团员 @@ -24,14 +31,31 @@ 搜索 - + {{item.name}} {{item.mobile}} {{item.id_number}} + 发起人 + 修改 删除 + + + + + + + {{info.list.scene.title}} + {{info.list.team_name}} + + + 请将此二维码 + 截屏分享给团员 + + + \ No newline at end of file diff --git a/pages/info/groupOrderInfo/index.wxss b/pages/info/groupOrderInfo/index.wxss index 69c0f98..e8cb5af 100644 --- a/pages/info/groupOrderInfo/index.wxss +++ b/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; @@ -104,4 +109,64 @@ 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; } \ No newline at end of file diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js index f3394c1..61be271 100644 --- a/pages/info/postProductInfo/index.js +++ b/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 + }) + }, /** * 生命周期函数--监听页面隐藏 diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml index abb92b3..b7a234f 100644 --- a/pages/info/postProductInfo/index.wxml +++ b/pages/info/postProductInfo/index.wxml @@ -4,7 +4,13 @@ + autoplay="{{autoPlay}}" interval="{{2000}}" duration="{{300}}"> + + + + + + diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss index 80824f3..a61b3fc 100644 --- a/pages/info/postProductInfo/index.wxss +++ b/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%; } diff --git a/pages/order/card/index.wxml b/pages/order/card/index.wxml index e5f4b16..dc5a550 100644 --- a/pages/order/card/index.wxml +++ b/pages/order/card/index.wxml @@ -1,5 +1,5 @@ - + {{product.product.title}} diff --git a/pages/order/components/contact/index.wxml b/pages/order/components/contact/index.wxml index d1ec671..27928d2 100644 --- a/pages/order/components/contact/index.wxml +++ b/pages/order/components/contact/index.wxml @@ -1,23 +1,40 @@ - + - {{isGroup==1?'发起人信息':'出行人信息'}} - 添加 + + {{isGroup==1?'发起人信息':'出行人信息'}} + （*预约发起后前往个人中心-团体预约订单中查看详情） + + 添加 + 编辑 - - - - - {{item.name}} - 手机号{{item.tel}} - {{item.title}}{{item.id_number}} + + + + + + + {{item.name}} + 手机号{{item.tel}} + {{item.title}}{{item.id_number}} + + - + + + + 添加 + - - - 添加 - + + 添加 + + + {{item.name}} + {{item.tel}} + + {{item.id_number}} + diff --git a/pages/order/components/contact/index.wxss b/pages/order/components/contact/index.wxss index 7b4e420..e3d2575 100644 --- a/pages/order/components/contact/index.wxss +++ b/pages/order/components/contact/index.wxss @@ -135,4 +135,35 @@ font-size: 29rpx; 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; } \ No newline at end of file diff --git a/pages/order/components/date/index.js b/pages/order/components/date/index.js index 902fe26..adc9886 100644 --- a/pages/order/components/date/index.js +++ b/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) diff --git a/pages/order/components/date/index.wxml b/pages/order/components/date/index.wxml index a3c9f45..f107cdd 100644 --- a/pages/order/components/date/index.wxml +++ b/pages/order/components/date/index.wxml @@ -6,7 +6,7 @@ {{item.date}} {{item.price==0 || kjIdCom?'免费':('￥'+item.price/100)}} - 售罄 + {{item.tipText?item.tipText:'售罄'}} 更多 diff --git a/pages/order/joinOrder/history/index.js b/pages/order/joinOrder/history/index.js new file mode 100644 index 0000000..4666765 --- /dev/null +++ b/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 () { + + } +}) \ No newline at end of file diff --git a/pages/order/joinOrder/history/index.json b/pages/order/joinOrder/history/index.json new file mode 100644 index 0000000..35cf02f --- /dev/null +++ b/pages/order/joinOrder/history/index.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "title":"/pages/component/TitleHeader" + } +} \ No newline at end of file diff --git a/pages/order/joinOrder/history/index.wxml b/pages/order/joinOrder/history/index.wxml new file mode 100644 index 0000000..b95ef43 --- /dev/null +++ b/pages/order/joinOrder/history/index.wxml @@ -0,0 +1,21 @@ + + + + + + {{item.name}} + {{item.mobile}} + {{item.id_number}} + {{item.idNew}} + + + 发起人 + 自己 + + 修改 + 删除 + + + + +添加 \ No newline at end of file diff --git a/pages/order/joinOrder/history/index.wxss b/pages/order/joinOrder/history/index.wxss new file mode 100644 index 0000000..6811542 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/pages/order/joinOrder/index.js b/pages/order/joinOrder/index.js index 9fa0edb..4b1b971 100644 --- a/pages/order/joinOrder/index.js +++ b/pages/order/joinOrder/index.js @@ -9,7 +9,9 @@ Page({ data: { team_id:null, info:{}, - mobile:"" + mobile:"", + detail:{}, + oid:null }, /** @@ -31,30 +33,39 @@ 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){ - let item = res.data.list.members.find(i=>i.id==options.mid); - let info = { - team_id:options.id, - member_id:options.mid, - name:item.name, - id_number:item.id_number, - mobile:item.mobile + if(options.mid){ + let item = res.data.list.members.find(i=>i.id==options.mid); + let info = { + team_id:options.id, + member_id:options.mid, + name:item.name, + id_number:item.id_number, + mobile:item.mobile + } + this.setData({ + info:info + }) } + res.data.list.order_info = res.data.list.order_info?JSON.parse(res.data.list.order_info):null this.setData({ - info:info + 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(()=>{ - util.back() + if(info.member_id){ + // 如果是编辑来的 直接返回 + util.back() + } + else { + // 如果是添加的话 去添加成功页 + wx.redirectTo({ + url: 'success/index&id='+this.data.team_id+'&oid='+this.data.oid + }) + } },500) } }) diff --git a/pages/order/joinOrder/index.wxml b/pages/order/joinOrder/index.wxml index 14f705b..21543e8 100644 --- a/pages/order/joinOrder/index.wxml +++ b/pages/order/joinOrder/index.wxml @@ -8,4 +8,16 @@ 身份证： + + 团体名称： + + + + 场馆名称： + + + + 预约时间： + + 提交 \ No newline at end of file diff --git a/pages/order/joinOrder/index.wxss b/pages/order/joinOrder/index.wxss index 0f39fc0..391f910 100644 --- a/pages/order/joinOrder/index.wxss +++ b/pages/order/joinOrder/index.wxss @@ -11,6 +11,7 @@ .input-item input { display: block; width: 560rpx; + text-align: right; } .btn { width: 632rpx; @@ -22,4 +23,7 @@ margin-top: 400rpx; color: #ffffff; font-size: 30rpx; +} +.input-left { + flex-shrink: 0; } \ No newline at end of file diff --git a/pages/order/joinOrder/success/index.js b/pages/order/joinOrder/success/index.js new file mode 100644 index 0000000..26d8616 --- /dev/null +++ b/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 () { + + } +}) \ No newline at end of file diff --git a/pages/order/joinOrder/success/index.json b/pages/order/joinOrder/success/index.json new file mode 100644 index 0000000..35cf02f --- /dev/null +++ b/pages/order/joinOrder/success/index.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "title":"/pages/component/TitleHeader" + } +} \ No newline at end of file diff --git a/pages/order/joinOrder/success/index.wxml b/pages/order/joinOrder/success/index.wxml new file mode 100644 index 0000000..ebb3316 --- /dev/null +++ b/pages/order/joinOrder/success/index.wxml @@ -0,0 +1,8 @@ + + + +提交成功 +团长确认后请前往公众号 +君到苏州-个人中心 凭码入园 +继续提交 +查看提交记录 \ No newline at end of file diff --git a/pages/order/joinOrder/success/index.wxss b/pages/order/joinOrder/success/index.wxss new file mode 100644 index 0000000..5786bc3 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/pages/order/movie/index.wxml b/pages/order/movie/index.wxml index 745162f..5c51fc5 100644 --- a/pages/order/movie/index.wxml +++ b/pages/order/movie/index.wxml @@ -1,5 +1,5 @@ - + diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml index 0d76011..ce6793b 100644 --- a/pages/order/postOrder/index.wxml +++ b/pages/order/postOrder/index.wxml @@ -1,5 +1,5 @@ - +
diff --git a/pages/order/roadOrder/index.wxml b/pages/order/roadOrder/index.wxml index 9a1f845..fc75220 100644 --- a/pages/order/roadOrder/index.wxml +++ b/pages/order/roadOrder/index.wxml @@ -1,5 +1,5 @@ - + {{product.title}} {{selectDate.date}} diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js index daea7cd..325ae52 100644 --- a/pages/order/scene/index.js +++ b/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' }) } }) diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml index 98a76d9..7aac402 100644 --- a/pages/order/scene/index.wxml +++ b/pages/order/scene/index.wxml @@ -1,39 +1,42 @@ - - - {{product.product.title + product.sku.sku_name}} - 免费 - - - - - 购票数量 - - {{productNum}} - + + + + {{product.product.title + product.isGroup==1?'（团体预约）':product.sku.sku_name}} + 免费 - - - - - - 订单备注 - + + + + 团体主体名称： + + - - - - 团队主体名称： - + + + {{product && product.isGroup!=1?'购票数量':'预约人数'}} + + {{productNum}} + + + + + + + + 订单备注 + + + + + + + 合计：¥0 + 合计：¥{{((singlePrice * productNum - (coupon?coupon.activity.money:0))>0?(singlePrice * productNum - (coupon?coupon.activity.money:0)):0)/ 100}} + 提交订单 + + + 立即预约 + 立即预约 - - - - 合计：¥0 - 合计：¥{{((singlePrice * productNum - (coupon?coupon.activity.money:0))>0?(singlePrice * productNum - (coupon?coupon.activity.money:0)):0)/ 100}} - 提交订单 - - - 立即预约 - 立即预约 \ No newline at end of file diff --git a/pages/order/scene/index.wxss b/pages/order/scene/index.wxss index 0a7faaa..4994410 100644 --- a/pages/order/scene/index.wxss +++ b/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; } \ No newline at end of file diff --git a/pages/order/showOrder/index.wxml b/pages/order/showOrder/index.wxml index bf257c8..acaee06 100644 --- a/pages/order/showOrder/index.wxml +++ b/pages/order/showOrder/index.wxml @@ -1,5 +1,5 @@ - + {{product.title}} {{product.subtitle}} diff --git a/pages/pbService/bike/index.js b/pages/pbService/bike/index.js index 6fb5ad3..684c960 100644 --- a/pages/pbService/bike/index.js +++ b/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; diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml index 5544471..27b5788 100644 --- a/pages/pbService/index.wxml +++ b/pages/pbService/index.wxml @@ -1,7 +1,8 @@ + - 游玩助手 +