Skip to content

F
FlashMan
Commit 5fc70d92 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

完善机票下单

parent e1bde05d
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 24 deletions
Common.wxss
View file @ 5fc70d92
...@@ -241,4 +241,8 @@ image{ ...@@ -241,4 +241,8 @@ image{
text-align: center; text-align: center;
border: none; border: none;
margin: 0 2rpx; margin: 0 2rpx;
}
.flex-ter{
display: flex;
align-items: center;
} }
\ No newline at end of file
app.js
View file @ 5fc70d92
...@@ -51,8 +51,8 @@ App({ ...@@ -51,8 +51,8 @@ App({
let timestamp = (new Date()).valueOf() let timestamp = (new Date()).valueOf()
let sign = md5('cmd=' + url + '&' + 'msg=' + encodeURIComponent(data).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + getApp().state.admin.token + '&' + 'key=' + '') let sign = md5('cmd=' + url + '&' + 'msg=' + encodeURIComponent(data).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + getApp().state.admin.token + '&' + 'key=' + '')
wx.request({ wx.request({
// url: 'http://192.168.2.214:8082/api/Common/Post', url: 'http://192.168.2.214:8082/api/Common/Post',
url: 'http://192.168.2.65:8025/api/Common/Post', //春姐 // url: 'http://192.168.2.65:8025/api/Common/Post', //春姐
// url: 'https://reborn.oytour.com/api/common/post', //线上 // url: 'https://reborn.oytour.com/api/common/post', //线上
// url: ' http://test.viitto.com/api/common/post', // url: ' http://test.viitto.com/api/common/post',
......
app.json
View file @ 5fc70d92
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
"pages/Voucher/write/write", "pages/Voucher/write/write",
"pages/Ticket/Ticket", "pages/Ticket/Ticket",
"pages/Ticket/TicketList/TicketList", "pages/Ticket/TicketList/TicketList",
"pages/Ticket/TicketDate/TicketDate", "pages/Ticket/TicketOrder/TicketOrder",
"pages/Ticket/TicketSetpp/TicketSetpp",
"pages/login/smsLogin/smsLogin", "pages/login/smsLogin/smsLogin",
"pages/login/revisePwd/revisePwd", "pages/login/revisePwd/revisePwd",
"pages/product/SametradeZW/prizelist/prizelist", "pages/product/SametradeZW/prizelist/prizelist",
......
pages/Ticket/Ticket.js
View file @ 5fc70d92
...@@ -54,9 +54,18 @@ Page({ ...@@ -54,9 +54,18 @@ Page({
// 搜索进入机票列表 // 搜索进入机票列表
seachTiket: function () { seachTiket: function () {
let _this = this; let _this = this;
wx.navigateTo({ if (_this.data.msg.departure_city != 0 || _this.data.msg.arrival_city != 0) {
url: '/pages/Ticket/TicketList/TicketList?date=' + _this.data.msg.qFlightDateStart + "&sName=" + _this.data.msg.departureName + "&sId=" + _this.data.msg.departure_city + "&eName=" + _this.data.msg.arrivalName + "&eId=" + _this.data.msg.arrival_city + "&type=" + _this.data.msg.ticketType wx.navigateTo({
}) url: '/pages/Ticket/TicketList/TicketList?date=' + _this.data.msg.qFlightDateStart + "&sName=" + _this.data.msg.departureName + "&sId=" + _this.data.msg.departure_city + "&eName=" + _this.data.msg.arrivalName + "&eId=" + _this.data.msg.arrival_city + "&type=" + _this.data.msg.ticketType
})
} else {
wx.showToast({
title: "请选择出发地或目的地",
icon: 'none',
duration: 1000
})
return
}
}, },
bindPickerChange: function (e) { bindPickerChange: function (e) {
console.log('picker发送选择改变，携带值为', e.detail.value) console.log('picker发送选择改变，携带值为', e.detail.value)
......
pages/Ticket/TicketList/TicketList.js
View file @ 5fc70d92
...@@ -89,6 +89,13 @@ Page({ ...@@ -89,6 +89,13 @@ Page({
detailMsg: msg detailMsg: msg
}) })
}, },
// 跳转下订单页面
setOreder: function (e){
let id = e.currentTarget.dataset.id
wx.navigateTo({
url: '/pages/Ticket/TicketOrder/TicketOrder?id=' + id,
})
},
// 加载更多 // 加载更多
scrollGetMore: function () { scrollGetMore: function () {
this.setData({ this.setData({
...@@ -336,7 +343,12 @@ Page({ ...@@ -336,7 +343,12 @@ Page({
let tit = "机票列表" let tit = "机票列表"
if (options.sName && options.eName){ if (options.sName && options.eName){
tit = options.sName + '——' + options.eName tit = options.sName + '——' + options.eName
} else if (options.sName){
tit = options.sName + '——出发'
} else if (options.eName) {
tit = '目的地——' + options.eName
} }
console.log(options)
wx.setNavigationBarTitle({ wx.setNavigationBarTitle({
title: tit title: tit
}) })
...@@ -345,11 +357,17 @@ Page({ ...@@ -345,11 +357,17 @@ Page({
'getMonthMsg.qFlightDateStart': new Date().Format("yyyy-MM-dd")+ " 00:00:00", 'getMonthMsg.qFlightDateStart': new Date().Format("yyyy-MM-dd")+ " 00:00:00",
"msg.qFlightDateStart": util.AddDays(new Date().Format("yyyy-MM-dd"), 6), "msg.qFlightDateStart": util.AddDays(new Date().Format("yyyy-MM-dd"), 6),
qitianhou: util.AddDays(new Date().Format("yyyy-MM-dd"), 6), qitianhou: util.AddDays(new Date().Format("yyyy-MM-dd"), 6),
// "getMonthMsg.departure_city": options.sId, "getMonthMsg.departure_city": options.sId,
// "getMonthMsg.departure_cityname": options.sName, "getMonthMsg.departure_cityname": options.sName,
// "getMonthMsg.arrival_city": options.eId, "getMonthMsg.arrival_cityname": options.eName,
// "getMonthMsg.ticketType": options.type, "getMonthMsg.arrival_city": options.eId,
// "msg.ticketType": options.type, "getMonthMsg.ticketType": options.type,
"msg.departure_city": options.sId,
"msg.departure_cityname": options.sName,
"msg.arrival_cityname": options.eName,
"msg.arrival_city": options.eId,
"msg.ticketType": options.type,
"msg.ticketType": options.type,
}) })
this.getMinPrice() this.getMinPrice()
this.getForMonthMinPrice() this.getForMonthMinPrice()
...@@ -360,10 +378,11 @@ Page({ ...@@ -360,10 +378,11 @@ Page({
this.data.getMonthMsg.flithtMonthDate = i.detail.date_str this.data.getMonthMsg.flithtMonthDate = i.detail.date_str
this.data.getMonthMsg.qFlightDateStart = i.detail.date_str + " 00:00:00" this.data.getMonthMsg.qFlightDateStart = i.detail.date_str + " 00:00:00"
this.getMinPrice(i.detail.date_str) this.getMinPrice(i.detail.date_str)
this.openDate() this.openDate()
this.setData({ this.setData({
"msg.qFlightDateStart": i.detail.date_str "msg.qFlightDateStart": i.detail.date_str
}) })
this.getList()
}, },
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成
......
pages/Ticket/TicketList/TicketList.wxml
View file @ 5fc70d92
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</view> --> </view> -->
</view> </view>
</view> </view>
<view class='list-item-right'> <view class='list-item-right' bindtap='setOreder' data-id='{{item.id}}'>
<view class='f22 cee'> <view class='f22 cee'>
￥ <text class='f40 blod'>{{isLogin!=1 ? item.scatterB2CPrice : item.scatterB2BPrice}}</text> ￥ <text class='f40 blod'>{{isLogin!=1 ? item.scatterB2CPrice : item.scatterB2BPrice}}</text>
</view> </view>
......
pages/visa/visaOrder/visaOrder.wxml
View file @ 5fc70d92
...@@ -74,19 +74,15 @@ ...@@ -74,19 +74,15 @@
<view class='tit'> <view class='tit'>
<text class='f30'>配送方式</text> <text class='f30'>配送方式</text>
<text class='f24 cee'>顺丰快递</text> <text class='f24 cee'>顺丰快递</text>
</view> </view>
<!-- <view class='tips bb1e9'>
<image class='tips-img' src='../../../images/visa/info.png'></image>
<text class='f22'>出签后将按照您填写的地址投递出签护照，请务必保证地址准确性。</text>
</view> -->
<view class='bb1e9 info-item bb1e9'> <view class='bb1e9 info-item bb1e9'>
<text class='f30 name c11'>收件人</text> <text class='f30 name c11'>收件人</text>
<input class='f24 c88' placeholder='请输入联系人名称' value='{{saveMsg.VisaOrderRelation.Receiver}}' data-type="Receiver" bindinput='lianxirenChange'></input> <input class='f24 ' placeholder='请输入联系人名称' value='{{saveMsg.VisaOrderRelation.Receiver}}' data-type="Receiver" bindinput='lianxirenChange'></input>
</view> </view>
<view class='bb1e9 info-item bb1e9'> <view class='bb1e9 info-item bb1e9'>
<text class='f30 name c11'>联系电话</text> <text class='f30 name c11'>联系电话</text>
<text class='f24 c11 mg10'>+86</text> <text class='f24 c11 mg10'>+86</text>
<input class='f24 c88' placeholder='请输入联系人电话' value='{{saveMsg.VisaOrderRelation.ReceiverPhone}}' data-type="ReceiverPhone" type='number' bindinput='lianxirenChange'></input> <input class='f24 ' placeholder='请输入联系人电话' value='{{saveMsg.VisaOrderRelation.ReceiverPhone}}' data-type="ReceiverPhone" type='number' bindinput='lianxirenChange'></input>
</view> </view>
<view class='info-item'> <view class='info-item'>
<text class='f30 name c11'>邮寄地址</text> <text class='f30 name c11'>邮寄地址</text>
...@@ -110,12 +106,12 @@ ...@@ -110,12 +106,12 @@
</view> </view>
<view class='bb1e9 info-item bb1e9'> <view class='bb1e9 info-item bb1e9'>
<text class='f30 name c11'>联系人</text> <text class='f30 name c11'>联系人</text>
<input class='f24 c88' placeholder='请输入联系人名称' data-type="RelationName" bindinput='lianxirenChange'></input> <input class='f24 ' placeholder='请输入联系人名称' data-type="RelationName" bindinput='lianxirenChange'></input>
</view> </view>
<view class='bb1e9 info-item bb1e9'> <view class='bb1e9 info-item bb1e9'>
<text class='f30 name c11'>手机号码</text> <text class='f30 name c11'>手机号码</text>
<text class='f24 c11 mg10'>+86</text> <text class='f24 c11 mg10'>+86</text>
<input class='f24 c88' type='number' data-type="RelationPhone" bindinput='lianxirenChange' placeholder='请输入联系人电话'></input> <input class='f24 ' type='number' data-type="RelationPhone" bindinput='lianxirenChange' placeholder='请输入联系人电话'></input>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
...@@ -123,7 +119,7 @@ ...@@ -123,7 +119,7 @@
<view style="width:310rpx;"> <view style="width:310rpx;">
<text class="f20">￥</text> <text class="f20">￥</text>
<text class="f46 cee">{{isLogin!=1 ? ppList.length * dataList.visaB2CPrice : ppList.length * dataList.visaB2CPrice}}</text> <text class="f46 cee">{{isLogin!=1 ? ppList.length * dataList.visaB2CPrice : ppList.length * dataList.visaB2CPrice}}</text>
<text class="f20 c88">/人起</text> <text class="f20 ">/人起</text>
</view> </view>
<view style="width:100rpx;border-left:1px solid #E9E9E9;padding-top:29rpx;"> <view style="width:100rpx;border-left:1px solid #E9E9E9;padding-top:29rpx;">
<image style="width:45rpx;height:45rpx" src="/images/group/pay.png"></image> <image style="width:45rpx;height:45rpx" src="/images/group/pay.png"></image>
......
pages/visa/visaOrder/visaOrder.wxss
View file @ 5fc70d92
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
.addpeople-btn view.btn view image{ .addpeople-btn view.btn view image{
width: 28rpx; width: 28rpx;
height: 28rpx; height: 28rpx;
margin-right: 10rpx;
} }
.peisong,.fapiao-info-item{ .peisong,.fapiao-info-item{
background-color: white; background-color: white;
......
project.config.json
View file @ 5fc70d92
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
"current": 1, "current": 18,
"list": [ "list": [
{ {
"id": 2, "id": 2,
...@@ -152,6 +152,27 @@ ...@@ -152,6 +152,27 @@
"pathName": "pages/GroupTour/FillOrder/FillOrder", "pathName": "pages/GroupTour/FillOrder/FillOrder",
"query": "", "query": "",
"scene": null "scene": null
},
{
"id": -1,
"name": "机票列表",
"pathName": "pages/Ticket/TicketList/TicketList",
"query": "",
"scene": null
},
{
"id": 17,
"name": "机票详情",
"pathName": "pages/Ticket/TicketOrder/TicketOrder",
"query": "id=940",
"scene": null
},
{
"id": -1,
"name": "机票加人",
"pathName": "pages/Ticket/TicketSetpp/TicketSetpp",
"query": "id=940",
"scene": null
} }
] ]
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment