多驿站修改
This commit is contained in:
parent
6f5185beb3
commit
e93e48f2e3
@ -16,6 +16,7 @@ Page({
|
|||||||
},
|
},
|
||||||
package:{
|
package:{
|
||||||
name:'',
|
name:'',
|
||||||
|
stationCount:0,
|
||||||
count:0
|
count:0
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -81,6 +82,7 @@ Page({
|
|||||||
this.setData({
|
this.setData({
|
||||||
package:{
|
package:{
|
||||||
name:name.join('|'),
|
name:name.join('|'),
|
||||||
|
stationCount:name.length,
|
||||||
count:count
|
count:count
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -89,6 +91,7 @@ Page({
|
|||||||
this.setData({
|
this.setData({
|
||||||
package:{
|
package:{
|
||||||
name:'',
|
name:'',
|
||||||
|
stationCount:0,
|
||||||
count:0
|
count:0
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@ -112,18 +112,21 @@ bind:enter="enterPageContainer" bind:leave="leavePageContainer" wx:if="{{isShowO
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="spliter"></view>
|
<view class="spliter"></view>
|
||||||
<view class="kv-item">
|
<!-- <view class="kv-item">
|
||||||
<view class="key">订单总金额</view>
|
<view class="key">订单总金额</view>
|
||||||
<view class="value money money-normal">
|
<view class="value money money-normal">
|
||||||
{{preOrder.price_info.original_amount}}
|
{{preOrder.price_info.original_amount}}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view> -->
|
||||||
<view class="kv-item">
|
<view class="kv-item">
|
||||||
<view class="key">基础配送费</view>
|
<view class="key">基础配送费</view>
|
||||||
<view class="value money money-normal">{{preOrder.price_info.base_delivery_amount}}</view>
|
<view class="value money money-normal">{{preOrder.price_info.base_delivery_amount}}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="kv-item" wx:if="{{preOrder.price_info.more_station_price}}">
|
<view class="kv-item" wx:if="{{preOrder.price_info.more_station_price}}">
|
||||||
<view class="key">多驿站费</view>
|
<view class="key">
|
||||||
|
<label>多驿站费</label>
|
||||||
|
<label class="station-count">({{package.stationCount}}个驿站)</label>
|
||||||
|
</view>
|
||||||
<view class="value money money-normal">{{preOrder.price_info.more_station_price}}</view>
|
<view class="value money money-normal">{{preOrder.price_info.more_station_price}}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="kv-item" wx:if="{{preOrder.price_info.coupon_discount_amount}}">
|
<view class="kv-item" wx:if="{{preOrder.price_info.coupon_discount_amount}}">
|
||||||
@ -143,7 +146,7 @@ bind:enter="enterPageContainer" bind:leave="leavePageContainer" wx:if="{{isShowO
|
|||||||
</view>
|
</view>
|
||||||
<view class="value money">{{preOrder.price_info.final_amount}}</view>
|
<view class="value money">{{preOrder.price_info.final_amount}}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="tips">{{preOrder.price_detail_text}}</view>
|
<text class="tips">{{preOrder.price_detail_text}}</text>
|
||||||
|
|
||||||
<button class="button" type="primary" bind:tap="getOrder" loading="{{ordering}}">确认下单</button>
|
<button class="button" type="primary" bind:tap="getOrder" loading="{{ordering}}">确认下单</button>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@ -203,10 +203,13 @@
|
|||||||
}
|
}
|
||||||
.pc-content .kv-item .key{
|
.pc-content .kv-item .key{
|
||||||
font-size: 30rpx;
|
font-size: 30rpx;
|
||||||
}
|
|
||||||
.pc-content .kv-item .key{
|
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
flex:1;
|
||||||
|
}
|
||||||
|
.pc-content .kv-item .station-count{
|
||||||
|
color: #ff0000;
|
||||||
|
font-size: 24rpx;
|
||||||
}
|
}
|
||||||
.pc-content .kv-item .tags{
|
.pc-content .kv-item .tags{
|
||||||
margin-left:20rpx;
|
margin-left:20rpx;
|
||||||
@ -220,9 +223,6 @@
|
|||||||
.pc-content .kv-item .red{
|
.pc-content .kv-item .red{
|
||||||
color: #ff0000;
|
color: #ff0000;
|
||||||
}
|
}
|
||||||
.pc-content .kv-item .key{
|
|
||||||
flex:1
|
|
||||||
}
|
|
||||||
.pc-content .head .kv-item{
|
.pc-content .head .kv-item{
|
||||||
margin:40rpx 0;
|
margin:40rpx 0;
|
||||||
}
|
}
|
||||||
@ -241,6 +241,7 @@
|
|||||||
font-size:26rpx;
|
font-size:26rpx;
|
||||||
color:#888888;
|
color:#888888;
|
||||||
line-height: 38rpx;
|
line-height: 38rpx;
|
||||||
|
display: block;
|
||||||
}
|
}
|
||||||
.pc-content .button{
|
.pc-content .button{
|
||||||
margin:57rpx 0 40rpx 0;
|
margin:57rpx 0 40rpx 0;
|
||||||
|
|||||||
@ -101,12 +101,12 @@
|
|||||||
<view class="key">取件数量</view>
|
<view class="key">取件数量</view>
|
||||||
<view class="value bold">{{orderDetail.package_count}}</view>
|
<view class="value bold">{{orderDetail.package_count}}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="kv">
|
<!-- <view class="kv">
|
||||||
<view class="key">订单总金额</view>
|
<view class="key">订单总金额</view>
|
||||||
<view class="value">
|
<view class="value">
|
||||||
<view class="money money-normal">{{orderDetail.original_amount}}</view>
|
<view class="money money-normal">{{orderDetail.original_amount}}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view> -->
|
||||||
<view class="kv">
|
<view class="kv">
|
||||||
<view class="key">基础配送费</view>
|
<view class="key">基础配送费</view>
|
||||||
<view class="value">
|
<view class="value">
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user