Skip to content

J
jz_Travel
Commit 0a8f06ae authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'B2C' of http://gitlab.oytour.com/zk123/jz_travel into B2C

parents 70355c88 571bf4af
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 28 deletions
pages/bus/index.vue
View file @ 0a8f06ae
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
<view>包含成人和儿童</view> <view>包含成人和儿童</view>
</view> </view>
<view class="peopleCenterR row items-center"> <view class="peopleCenterR row items-center">
<input type="number" v-model="busInfor.peopleNum" @change="getPeople"/> <u-number-box :min="1" v-model="busInfor.peopleNum" @change="(e)=>{busInfor.peopleNum=e.value,getPeople()}"/>
<text>人</text> <text>人</text>
</view> </view>
</view> </view>
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
<view></view> <view></view>
</view> </view>
<view class="peopleCenterR row items-center"> <view class="peopleCenterR row items-center">
<input type="number" v-model="busInfor.days" @change="getPeople"/> <u-number-box :min="1" v-model="busInfor.days" @change="(e)=>{busInfor.days=e.value}"/>
<text>天</text> <text>天</text>
</view> </view>
</view> </view>
...@@ -372,7 +372,7 @@ ...@@ -372,7 +372,7 @@
}, },
getPeople(){ getPeople(){
if(this.busInfor.CarType<3&&(this.busInfor.peopleNum<1||!this.busInfor.peopleNum)) this.busInfor.peopleNum = 1 if(this.busInfor.CarType<3&&(this.busInfor.peopleNum<1||!this.busInfor.peopleNum)) this.busInfor.peopleNum = 1
if(this.busInfor.CarType==3&&(this.busInfor.days<1||!this.busInfor.days)) this.busInfor.peopleNum = 1 // if(this.busInfor.CarType==3&&(this.busInfor.days<1||!this.busInfor.days)) this.busInfor.peopleNum = 1
}, },
setType(type){ setType(type){
if(type) { if(type) {
......
pages/bus/order.vue
View file @ 0a8f06ae
...@@ -162,57 +162,57 @@ ...@@ -162,57 +162,57 @@
<input type="text" v-model="orderMsg.GetoffAddress" placeholder="请输入下车地址" /> <input type="text" v-model="orderMsg.GetoffAddress" placeholder="请输入下车地址" />
</view> </view>
</view> </view>
<view class="form-items row"> <view class="form-items row items-center">
<view class="label"> <view class="label active">
成人数 成人
</view>
<view class="LastNameBox column val" style="width: 1px;flex: 1;">
<view class="row items-center">
<input type="number" v-model="orderMsg.ManNum"
placeholder="请输入成人数" @change="getPeoples"/>
</view> </view>
<view class="LastNameBox" style="width: 1px;flex: 1;">
<u-number-box :min="1" v-model="orderMsg.ManNum" placeholder="成人数"
@change="(e)=>{orderMsg.ManNum=e.value,getPeoples()}" />
</view> </view>
</view> </view>
<view class="row-sbas-n"> <view class="row-sbas-n">
<view class="form-items row col" > <view class="form-items row col" >
<view class="label"> <view class="label active">
儿童数 儿童
</view> </view>
<view class="LastNameBox column val" style="width: 1px;flex: 1;"> <view class="LastNameBox" style="width: 1px;flex: 1;">
<view class="row items-center"> <view class="row items-center">
<input type="number" v-model="orderMsg.ChildNum" placeholder="儿童数" @change="getPeoples"/> <u-number-box :min="0" v-model="orderMsg.ChildNum" placeholder="儿童数"
@change="(e)=>{orderMsg.ChildNum=e.value,getPeoples()}"/>
</view> </view>
</view> </view>
</view> </view>
<view class="form-items row col" > <view class="form-items row col" >
<view class="label"> <view class="label active">
婴儿数 婴儿
</view> </view>
<view class="LastNameBox column val" style="width: 1px;flex: 1;"> <view class="LastNameBox" style="width: 1px;flex: 1;">
<view class="row items-center"> <view class="row items-center">
<input type="number" v-model="orderMsg.BabyNum" placeholder="婴儿数" @change="getPeoples"/> <u-number-box :min="0" v-model="orderMsg.BabyNum" placeholder="婴儿数"
@change="(e)=>{orderMsg.BabyNum=e.value,getPeoples()}"/>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="row-sbas-n"> <view class="row-sbas-n">
<view class="form-items row col" > <view class="form-items row col" >
<view class="label"> <view class="label active">
手提行李 手提
</view> </view>
<view class="LastNameBox column val" style="width: 1px;flex: 1;"> <view class="LastNameBox" style="width: 1px;flex: 1;">
<view class="row items-center"> <view class="row items-center">
<input type="number" v-model="orderMsg.HandLuggageNum" placeholder="手提数" /> <u-number-box :min="0" v-model="orderMsg.HandLuggageNum" placeholder="手提数" />
</view> </view>
</view> </view>
</view> </view>
<view class="form-items row col" > <view class="form-items row col" >
<view class="label"> <view class="label active">
托运行李 托运
</view> </view>
<view class="LastNameBox column val" style="width: 1px;flex: 1;"> <view class="LastNameBox" style="width: 1px;flex: 1;">
<view class="row items-center"> <view class="row items-center">
<input type="number" v-model="orderMsg.RegisteredLuggageNum" placeholder="托运数" /> <u-number-box :min="0" v-model="orderMsg.RegisteredLuggageNum" placeholder="托运数" />
</view> </view>
</view> </view>
</view> </view>
...@@ -1056,6 +1056,10 @@ ...@@ -1056,6 +1056,10 @@
margin-right: 57rpx; margin-right: 57rpx;
flex-shrink: 0; flex-shrink: 0;
} }
.hotel-order .form .form-items .label.active {
width: 80rpx;
margin-right: 10rpx;
}
.hotel-order .form .form-items .val { .hotel-order .form .form-items .val {
flex: 1; flex: 1;
...@@ -1367,7 +1371,7 @@ ...@@ -1367,7 +1371,7 @@
} }
.LastNameBox view { .LastNameBox view {
margin-bottom: 20rpx; /*margin-bottom: 20rpx;*/
} }
.LastNameBox view:last-child { .LastNameBox view:last-child {
...@@ -1382,6 +1386,7 @@ ...@@ -1382,6 +1386,7 @@
border-radius: 4px; border-radius: 4px;
margin: 0 10rpx; margin: 0 10rpx;
padding: 20rpx; padding: 20rpx;
width: 100%;
} }
.bus-radio:last-child{ .bus-radio:last-child{
margin-left: 137rpx; margin-left: 137rpx;
......
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