Add payment and remark pages with order submission functionality
The changes include: - Added pay.vue with order submission and payment handling - Added remark.vue for order remarks input - Implemente
This commit is contained in:
parent
7b7e00bd20
commit
929072ee92
@ -12,7 +12,7 @@
|
||||
<list-cell class="location">
|
||||
<view class="flex-fill d-flex justify-content-between align-items-center">
|
||||
<view class="store-name flex-fill">{{ orderType == 'takeout' ? '外卖配送' : '点餐自取' }}</view>
|
||||
<uv-switch activeColor="#09b4f1" v-model="active" @change="takout">
|
||||
<uv-switch activeColor="#52ac41" v-model="active" @change="takout">
|
||||
</uv-switch>
|
||||
</view>
|
||||
</list-cell>
|
||||
@ -123,21 +123,33 @@
|
||||
/>
|
||||
</view>
|
||||
</list-cell>
|
||||
|
||||
<!-- <list-cell>
|
||||
<view v-if="orderType == 'takeout'"class="flex-fill d-flex justify-content-between align-items-center">
|
||||
<view class="text-color-base">餐盒费:({{ store.canheDesc}})</view>
|
||||
<view>¥{{ store.canhePrice }}</view>
|
||||
</view>
|
||||
</list-cell> -->
|
||||
|
||||
<list-cell arrow @click="goToPackages">
|
||||
<view class="flex-fill d-flex justify-content-between align-items-center">
|
||||
<view class="text-color-base">优惠券</view>
|
||||
<!-- <view v-if="orderType == 'takeout'">餐盒费¥({{ store.canheDesc}}){{ store.canhePrice }}</view> -->
|
||||
|
||||
<view v-if="coupons == 0" class="text-color-base">暂无可用</view>
|
||||
<view v-else-if="coupon.title" class="text-color-danger">
|
||||
{{ coupon.title }}(满{{ coupon.least }}减{{ coupon.value }})
|
||||
</view>
|
||||
<view v-else class="text-color-primary">可用优惠券{{ coupons }}张</view>
|
||||
</view>
|
||||
|
||||
</list-cell>
|
||||
<list-cell last>
|
||||
<view class="flex-fill d-flex justify-content-end align-items-center">
|
||||
<view>
|
||||
总计¥{{ total }}
|
||||
<text v-if="orderType == 'takeout'">,配送费¥{{ store.deliveryPrice }}</text>
|
||||
|
||||
<text v-if="coupon.value">,¥-{{ coupon.value }}</text>
|
||||
,实付
|
||||
</view>
|
||||
@ -200,7 +212,7 @@
|
||||
<view class="font-size-sm" style="margin-left: 20rpx;">合计:</view>
|
||||
<view class="font-size-lg flex-fill">¥{{ amount }}</view>
|
||||
<view class="bg-primary h-100 d-flex align-items-center just-content-center text-color-white font-size-base"
|
||||
style="padding: 0 60rpx;" @tap="debounce(submit, 500)">付款</view>
|
||||
style="padding: 0 60rpx; background-color: #52ac41;" @tap="debounce(submit, 500)">付款</view>
|
||||
</view>
|
||||
<!-- 付款栏 end -->
|
||||
<modal :show="ensureAddressModalVisible" custom :mask-closable="false" :radius="'0rpx'" width="90%">
|
||||
@ -719,13 +731,14 @@ const aliPay = async(order) => {
|
||||
|
||||
.location {
|
||||
.store-name {
|
||||
font-size: $font-size-lg;
|
||||
font-size: $font-size-lg;
|
||||
}
|
||||
|
||||
.iconfont {
|
||||
font-size: 50rpx;
|
||||
line-height: 100%;
|
||||
color: $color-primary;
|
||||
// color: #52ac41;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -98,8 +98,10 @@ const submit = () => {
|
||||
|
||||
.quick-input {
|
||||
background-color: #FFFFFF;
|
||||
border: 2rpx solid $color-primary;
|
||||
color: $color-primary;
|
||||
// border: 2rpx solid $color-primary;
|
||||
border: 2rpx solid #52ac41;
|
||||
// color: $color-primary;
|
||||
color: #52ac41;
|
||||
font-size: $font-size-base;
|
||||
padding: 16rpx 26rpx;
|
||||
margin-right: 20rpx;
|
||||
@ -112,6 +114,7 @@ const submit = () => {
|
||||
height: 80rpx;
|
||||
border-radius: 40rpx;
|
||||
line-height: 80rpx;
|
||||
background-color: #52ac41;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
Loading…
x
Reference in New Issue
Block a user