部分显示问题调整,问题修复,增加购物车初始化和商品更新未找到对应商品发送删除消息
This commit is contained in:
@@ -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>
|
||||
Reference in New Issue
Block a user