6
0
Fork 0
develop
Jing Li 2023-11-05 17:55:46 +08:00
parent 52a8296c7b
commit 8cf1713fa6
3 changed files with 14 additions and 12 deletions

View File

@ -1,5 +1,5 @@
<template> <template>
<view> <view class="text-xl">
<view class="w-full bg-white p-base mb-20rpx"> <view class="w-full bg-white p-base mb-20rpx">
<view class="flex justify-between flex-auto"> <view class="flex justify-between flex-auto">
<view>门店</view> <view>门店</view>
@ -9,9 +9,9 @@
</view> </view>
</view> </view>
<view class="bg-white my-20rpx"> <view class="bg-white my-20rpx">
<view class="flex justify-between p-20rpx border-b"> <view class="flex justify-between items-center p-20rpx border-b">
<view>订单明细</view> <view>订单明细</view>
<view class="text-hex-2979ff" @tap="addOrderItem"><u-icon name="plus"></u-icon></view> <view class="text-lg text-hex-2979ff" @tap="addOrderItem"><u-icon name="plus"></u-icon></view>
</view> </view>
<view class="flex flex-col px-20rpx pb-20rpx"> <view class="flex flex-col px-20rpx pb-20rpx">
<view class="flex flex-col border-b mt-20rpx" v-for="(orderItem, index) in orderItems" :key="index"> <view class="flex flex-col border-b mt-20rpx" v-for="(orderItem, index) in orderItems" :key="index">
@ -33,7 +33,7 @@
<view>{{ orderItem.paymentAmount }}</view> <view>{{ orderItem.paymentAmount }}</view>
</view> </view>
</view> </view>
<view class="flex justify-end py-20rpx text-sm"> <view class="flex justify-end py-20rpx text-lg">
<view class="text-hex-2979ff" @tap="editOrderItem(index)"><u-icon name="edit-pen"></u-icon></view> <view class="text-hex-2979ff" @tap="editOrderItem(index)"><u-icon name="edit-pen"></u-icon></view>
<view class="ml-30rpx text-hex-dd524d" @tap="deleteOrderItem(index)"><u-icon name="trash"></u-icon></view> <view class="ml-30rpx text-hex-dd524d" @tap="deleteOrderItem(index)"><u-icon name="trash"></u-icon></view>
</view> </view>
@ -44,7 +44,7 @@
<view class="h-130rpx"></view> <view class="h-130rpx"></view>
<view class="flex items-center justify-between bg-white shadow-up fixed right-0 left-0 bottom-0 p-20rpx"> <view class="flex items-center justify-between bg-white shadow-up fixed right-0 left-0 bottom-0 p-20rpx">
<view class="text-lg">合计:<text class="text-xl text-txSvip">{{ paymentAmount }}</text></view> <view class="text-lg">合计:<text class="wxl text-txSvip">{{ paymentAmount }}</text></view>
<view @tap="createOrderPreview" class="btn btn-primary rounded-full text-lg px-40rpx py-10rpx">生成订单</view> <view @tap="createOrderPreview" class="btn btn-primary rounded-full text-lg px-40rpx py-10rpx">生成订单</view>
</view> </view>
@ -117,6 +117,7 @@
</template> </template>
<script> <script>
import Vue from 'vue'
export default { export default {
data() { data() {
return { return {
@ -263,7 +264,7 @@
if (this.orderItemIndex === -1) { if (this.orderItemIndex === -1) {
this.orderItems.push(orderItem) this.orderItems.push(orderItem)
} else { } else {
this.orderItems[this.orderItemIndex] = orderItem Vue.set(this.orderItems, this.orderItemIndex, orderItem)
} }
this.orderItemModalVisible = false this.orderItemModalVisible = false

View File

@ -1,5 +1,5 @@
<template> <template>
<view> <view class="text-lg">
<view class="bg-white mt-20rpx"> <view class="bg-white mt-20rpx">
<view class="flex flex-col"> <view class="flex flex-col">
<view class="flex flex-col border-b p-20rpx" v-for="(item, index) in order.items" :key="index"> <view class="flex flex-col border-b p-20rpx" v-for="(item, index) in order.items" :key="index">
@ -25,7 +25,7 @@
</view> </view>
</view> </view>
<view class="bg-white mt-base p-20rpx text-md"> <view class="bg-white mt-base p-20rpx text-lg">
<view class="flex items-center justify-between pb-20rpx text-txBase"> <view class="flex items-center justify-between pb-20rpx text-txBase">
<view>订单总额</view> <view>订单总额</view>
<view>{{ order.products_total_amount }}</view> <view>{{ order.products_total_amount }}</view>
@ -34,7 +34,7 @@
<view>折扣金额</view> <view>折扣金额</view>
<view :class="{'text-bgSubtitle': order.discount_reduction_amount > 0}">{{ order.discount_reduction_amount > 0 ? ('-¥'+order.discount_reduction_amount) : '无' }}</view> <view :class="{'text-bgSubtitle': order.discount_reduction_amount > 0}">{{ order.discount_reduction_amount > 0 ? ('-¥'+order.discount_reduction_amount) : '无' }}</view>
</view> </view>
<view v-if="order.payment_amount > 0" class="flex items-center justify-between pb-20rpx text-lg"> <view v-if="order.payment_amount > 0" class="flex items-center justify-between pb-20rpx text-xl">
<view>会员积分抵扣<block v-if="hasRemainingPoints">{{ order.remaining_points }}</block></view> <view>会员积分抵扣<block v-if="hasRemainingPoints">{{ order.remaining_points }}</block></view>
<view v-if="hasRemainingPoints" class="flex items-center" @tap="openPointDiscountDrawer"> <view v-if="hasRemainingPoints" class="flex items-center" @tap="openPointDiscountDrawer">
<view v-if="pointDiscount.amount > 0" class="text-bgSubtitle">-{{ pointDiscount.amount }}</view> <view v-if="pointDiscount.amount > 0" class="text-bgSubtitle">-{{ pointDiscount.amount }}</view>
@ -48,7 +48,7 @@
</view> </view>
<!-- --> <!-- -->
<view class="border-t" style="margin: 0 -20rpx;"> <view class="border-t" style="margin: 0 -20rpx;">
<view class="flex items-center justify-end px-20rpx pt-20rpx text-md"> <view class="flex items-center justify-end px-20rpx pt-20rpx">
<view class="text-txBase">实付金额</view> <view class="text-txBase">实付金额</view>
<view class="text-bgSubtitle">{{ paymentAmount }}</view> <view class="text-bgSubtitle">{{ paymentAmount }}</view>
</view> </view>

View File

@ -19,6 +19,7 @@
}, },
onLoad(e) { onLoad(e) {
const scene = strToParams(decodeURIComponent(e.scene)) const scene = strToParams(decodeURIComponent(e.scene))
console.log(scene)
this.scene = scene this.scene = scene
// //
uni.removeStorageSync('desk'); uni.removeStorageSync('desk');
@ -39,9 +40,9 @@
}) })
} }
// 线 // 线
else if (scene.offline_order) { else if (scene.oo) {
uni.reLaunch({ uni.reLaunch({
url: '/pageB/offline_order/user/order_preview?id=' + scene.offline_order url: '/pageB/offline_order/user/order_preview?id=' + scene.oo
}) })
} }
// //