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();
}

73
pages/order/components/orderInfoAfter.vue
View File

@@ -41,10 +41,10 @@
</view>
</view> -->
</view>
<view class="tabBox" v-else-if="listinfo.tableName">
<view class="table" >
<view class="table">
<view class="table_left">
<image class="icon"
src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png"
@@ -53,9 +53,9 @@
</view>
<view class="value" v-if="listinfo.tableName"> {{ listinfo.tableName || '' }} </view>
</view>
</view>
<view class="card">
<!-- 订单头部 -->
<view class="card_item" v-for="(value, key) in listinfo.detailMap" :key="key">
@@ -104,27 +104,8 @@
</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>{{listinfo.packFeess}}</view>
</view>
</view>
<!-- isTableFee == 0是不免除 -->
<view class="cell-item"
v-if="ordershopUserInfo.isTableFee == 0 && is_type == 0 && listinfo.Seatcharge != 0">
<view class="label">餐位费</view>
<view class="val">
<view>X{{listinfo.Seatcharge}}</view>
<view style="font-size: 28rpx;">￥</view>
<view>{{listinfo.Seatcharge}}</view>
</view>
</view>
<!-- <view class="cell-item" v-else>
<view class="label">免餐位费</view>
<view class="val">
@@ -185,6 +166,26 @@
</view>
</view>
</block> -->
<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>{{listinfo.packFeess}}</view>
</view>
</view>
<!-- isTableFee == 0是不免除 -->
<view class="cell-item"
v-if="ordershopUserInfo.isTableFee == 0 && is_type == 0 && listinfo.Seatcharge != 0">
<view class="label">餐位费</view>
<view class="val">
<view>X{{listinfo.Seatcharge}}</view>
<view style="font-size: 28rpx;">￥</view>
<view>{{listinfo.Seatcharge}}</view>
</view>
</view>
<view class="total-wrap" v-if="listinfo.status == 'unpaid'">
<text>总计</text>
@@ -197,6 +198,8 @@
<text class="price"> {{listinfo.payAmount}} </text>
</view>
</view>
</view>
@@ -222,7 +225,7 @@
<text class="t">新客立减</text>
<text class="price">-{{listinfo.newCustomerDiscountAmount}}</text>
</view>
<view class="row" v-if="listinfo.vipDiscountAmount">
<text class="t">会员折扣</text>
<text class="price">-{{listinfo.vipDiscountAmount}}</text>
@@ -407,7 +410,7 @@
const showDiscount = computed(() => {
const keys = ['productCouponDiscountAmount', 'otherCouponDiscountAmount',
'pointsDiscountAmount', 'discountActAmount', 'newCustomerDiscountAmount','vipDiscountAmount'
'pointsDiscountAmount', 'discountActAmount', 'newCustomerDiscountAmount', 'vipDiscountAmount'
]
if (isObjHasPropertyAndNotNull(props.listinfo, keys)) {
return true
@@ -567,7 +570,7 @@
height: 100%;
border-radius: 18rpx;
padding-bottom: 32rpx;
.tabBox {
width: 100%;
margin-top: 52rpx;
@@ -1133,31 +1136,37 @@
}
}
.disocunt{
.disocunt {
background: #FFFFFF;
border-radius: 18rpx 18rpx 18rpx 18rpx;overflow: hidden;
border-radius: 18rpx 18rpx 18rpx 18rpx;
overflow: hidden;
margin-top: 32rpx;
.row{
.row {
padding: 16rpx 24rpx;
display: flex;
justify-content: space-between;
.t {
font-weight: bold;
font-size: 28rpx;
color: #333333;
flex-shrink: 0;
}
.info {
font-weight: 400;
font-size: 28rpx;
color: #666666;
}
}
.price {
color: #FF1C1C;
}
}
.orderInfo {
background: #FFFFFF;
border-radius: 18rpx 18rpx 18rpx 18rpx;
@@ -1236,6 +1245,4 @@
}
}
}
</style>

2
pages/order/index.vue
View File

@@ -88,7 +88,7 @@
<view class="btn s" @click.stop="$u.debounce(orderinfo(item),1000)"
v-if="item.status == 'unpaid' || item.status == 'paying'"> 去付款 </view>
<view class="btn s" @click.stop="agignOrder(item)" v-if="item.status == 'done'"> 再来一单 </view>
<view class="btn s" @click.stop="agignOrder(item)" v-if="item.status != 'unpaid'"> 再来一单 </view>
</view>
</view>
</view>