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

修复订单退菜弹窗关闭未重置，餐位费退款时限制问题

This commit is contained in:
YeMingfei666 2024-10-18 17:48:18 +08:00
parent df3cf998c3
commit 8eb51062cc
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pagesOrder/detail/components/extra.vue
View File

@ -10,14 +10,14 @@
</template> </template>
</view> </view>
<template v-if="data.status!='return'"> <template v-if="data.status!='return'">
<view class="u-flex u-row-between u-m-t-20"> <view class="u-flex u-row-between u-m-t-24">
<view>{{data.name||'餐位费'}}</view> <view>{{data.name||'餐位费'}}</view>
<view>x{{data.number}}</view> <view>x{{data.number}}</view>
<view>￥{{data.totalAmount}}</view> <view>￥{{data.totalAmount}}</view>
</view> </view>
</template> </template>
<template v-else> <template v-else>
<view class="u-flex u-row-between u-m-t-20 color-999"> <view class="u-flex u-row-between u-m-t-24 color-999">
<view class="u-flex"> <view class="u-flex">
<view class="line-th ">{{data.name||'餐位费'}}</view> <view class="line-th ">{{data.name||'餐位费'}}</view>
<view class="tag yitui u-m-l-10">已退</view> <view class="tag yitui u-m-l-10">已退</view>

3
pagesOrder/detail/components/tuicai.vue
View File

@ -44,7 +44,7 @@
</view> </view>
</template> </template>
<template #btn> <template #btn>
<view class="u-p-t-18 u-p-l-30 u-p-r-30 u-p-b-30"> <view class="u-p-t-18 u-p-l-30 u-p-r-30 u-p-b-10">
<my-button box-shadow shape="circle" @tap="confirm">确认退菜</my-button> <my-button box-shadow shape="circle" @tap="confirm">确认退菜</my-button>
<view class="u-m-t-10"> <view class="u-m-t-10">
<my-button @tap="toggleModelShow" shape="circle" bgColor="#fff" type="cancel" <my-button @tap="toggleModelShow" shape="circle" bgColor="#fff" type="cancel"
@ -133,6 +133,7 @@
} }
function onModelClose() { function onModelClose() {
number.value=1
modelShow.value = false modelShow.value = false
} }

2
pagesOrder/detail/detail.vue
View File

@ -75,6 +75,8 @@
}) })
function onSeatFeeTuicai(seatFee) { function onSeatFeeTuicai(seatFee) {
seatFee={...seatFee,num:seatFee.number,productName:seatFee.name}
console.log(seatFee);
tuicai.show = true tuicai.show = true
tuicai.isSeatFee = seatFee tuicai.isSeatFee = seatFee
tuicai.selGoods = seatFee tuicai.selGoods = seatFee

5
pagesOrder/index/compoents/order-item.vue
View File

@ -40,7 +40,7 @@
</view> </view>
<view class="u-flex u-flex-1 u-row-right"> <view class="u-flex u-flex-1 u-row-right">
<view>×{{item.num}}</view> <view>×{{item.num}}</view>
<view class="u-m-l-24 u-text-right" :style="computedPriceStyle()">￥{{item.price}}</view> <view class="u-text-right" :style="computedPriceStyle()">￥{{item.price}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -98,8 +98,9 @@
if (!item) { if (!item) {
return '' return ''
} }
const minW=`${item.price}`.length * priceSize + 15
return { return {
'min-width': `${item.price}`.length * priceSize + 'px' 'min-width':(minW<36?36:minW) + 'px'
} }
} }
// const computedPriceStyle = computed(() => { // const computedPriceStyle = computed(() => {

2
pagesOrder/index/index.vue
View File

@ -88,7 +88,7 @@
} }
async function init() { async function init() {
console.log(order.data.query); console.log(order.data.query);
const {content,totalElements}=await Api.tbOrderInfoData({...order.data.query,page:order.data.query.page,searchText:search.val}) const {content,totalElements}=await Api.tbOrderInfoData({...order.data.query,page:order.data.query.page,keyword:search.val})
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
order.setVal('list',content) order.setVal('list',content)
console.log(order.data.list); console.log(order.data.list);