czg_team/cashier_wx
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

部分显示问题调整，问题修复，增加购物车初始化和商品更新未找到对应商品发送删除消息

Browse Source
This commit is contained in:
YeMingfei666
2025-12-24 09:21:14 +08:00
parent 9a09ac901f
commit addb9f0e75
12 changed files with 319 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
pages/order/components/orderInfo.vue
View File

@@ -41,11 +41,28 @@
:limitDiscount="cartStore.limitTimeDiscount"
></orderItemVue> -->
<orderItemVue :useVipPrice="useVipPrice" v-if="cartStore.allGoods.length" :nowCarts="cartStore.allGoods"
:shopInfo="cartStore.shopInfo"
:shopUserInfo="cartStore.shopUserInfo"
:shopInfo="cartStore.shopInfo" :shopUserInfo="cartStore.shopUserInfo"
:limitDiscount="cartStore.limitTimeDiscount"></orderItemVue>
<template v-if="listinfo.id&&listinfo.status=='done'">
<view class="cell-item" v-if="is_type != 0">
<view class="label">打包费</view>
<view class="val">
<view></view>
<view style="font-size: 28rpx">￥</view>
<view>{{ cartStore.orderCostSummary.packFee }}</view>
</view>
</view>
<view class="cell-item" v-if="cartStore.orderCostSummary.seatFee">
<view class="label">餐位费</view>
<view class="val">
<view>X{{ cartStore.seatFeeConfig.personCount }}</view>
<view style="font-size: 28rpx">￥</view>
<view>{{ cartStore.orderCostSummary.seatFee }}</view>
</view>
</view>
</template>
<view class="total-wrap u-m-t-30" v-if="listinfo.status == 'unpaid' || !listinfo.id">
<text>总计</text>
@@ -55,11 +72,11 @@
</text>
</view>
<view class="total-wrap u-m-t-30" v-else>
<text>总计</text>
<view class="total-wrap u-m-t-30" v-else-if="listinfo.status != 'unpaid'">
<text>实付</text>
<text class="u-font-32">￥</text>
<text class="price">
{{ cartStore.orderCostSummary.goodsRealAmount }}
{{ listinfo.payAmount }}
</text>
</view>
@@ -68,24 +85,27 @@
<view class="price"> {{listinfo.payAmount||''}} </view>
</view> -->
<view class="cell-item" v-if="is_type != 0">
<view class="label">打包费</view>
<view class="val">
<view></view>
<view style="font-size: 28rpx">￥</view>
<view>{{ cartStore.orderCostSummary.packFee }}</view>
<template v-if="!listinfo.id||listinfo.status=='unpaid'">
<view class="cell-item" v-if="is_type != 0">
<view class="label">打包费</view>
<view class="val">
<view></view>
<view style="font-size: 28rpx">￥</view>
<view>{{ cartStore.orderCostSummary.packFee }}</view>
</view>
</view>
</view>
<!-- isTableFee == 0是不免除 -->
<view class="cell-item" v-if="cartStore.orderCostSummary.seatFee">
<view class="label">餐位费</view>
<view class="val">
<view>X{{ cartStore.seatFeeConfig.personCount }}</view>
<view style="font-size: 28rpx">￥</view>
<view>{{ cartStore.orderCostSummary.seatFee }}</view>
<view class="cell-item" v-if="cartStore.orderCostSummary.seatFee">
<view class="label">餐位费</view>
<view class="val">
<view>X{{ cartStore.seatFeeConfig.personCount }}</view>
<view style="font-size: 28rpx">￥</view>
<view>{{ cartStore.orderCostSummary.seatFee }}</view>
</view>
</view>
</view>
</template>
<!-- <view class="cell-item" v-else>
<view class="label">免餐位费</view>
@@ -230,7 +250,7 @@
<text class="t">会员折扣</text>
<text class="price">-{{listinfo.vipDiscountAmount}}</text>
</view>
</view>
@@ -456,7 +476,7 @@
const showDiscount = computed(() => {
const keys = ['productCouponDiscountAmount', 'otherCouponDiscountAmount',
'pointsDiscountAmount', 'discountActAmount', 'newCustomerDiscountAmount','vipDiscountAmount'
'pointsDiscountAmount', 'discountActAmount', 'newCustomerDiscountAmount', 'vipDiscountAmount'
]
if (isObjHasPropertyAndNotNull(props.listinfo, keys)) {
return true
@@ -803,9 +823,9 @@
}
console.log("当前满减门槛", discountActivity.value);
}
let fullReductionActivities=[]
let fullReductionActivities = []
async function getDiscountActivity() {
const res = await discountActivityApi.config({
shopId: uni.cache.get("shopId"),
@@ -815,7 +835,7 @@
}
discountActivityRes.value = res;
cartStore.fullReductionActivities = [res];
fullReductionActivities=[res];
fullReductionActivities = [res];
calcDiscountActivity();
}