diff --git a/pagesOrder/detail/components/extra.vue b/pagesOrder/detail/components/extra.vue
index ad38e62..0032d6b 100644
--- a/pagesOrder/detail/components/extra.vue
+++ b/pagesOrder/detail/components/extra.vue
@@ -10,14 +10,14 @@
-
+
{{data.name||'餐位费'}}
x{{data.number}}
¥{{data.totalAmount}}
-
+
{{data.name||'餐位费'}}
已退
diff --git a/pagesOrder/detail/components/tuicai.vue b/pagesOrder/detail/components/tuicai.vue
index a00929f..930ccc6 100644
--- a/pagesOrder/detail/components/tuicai.vue
+++ b/pagesOrder/detail/components/tuicai.vue
@@ -44,7 +44,7 @@
-
+
确认退菜
×{{item.num}}
- ¥{{item.price}}
+ ¥{{item.price}}
@@ -98,8 +98,9 @@
if (!item) {
return ''
}
+ const minW=`${item.price}`.length * priceSize + 15
return {
- 'min-width': `${item.price}`.length * priceSize + 'px'
+ 'min-width':(minW<36?36:minW) + 'px'
}
}
// const computedPriceStyle = computed(() => {
diff --git a/pagesOrder/index/index.vue b/pagesOrder/index/index.vue
index 72888c9..379d18c 100644
--- a/pagesOrder/index/index.vue
+++ b/pagesOrder/index/index.vue
@@ -88,7 +88,7 @@
}
async function init() {
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()
order.setVal('list',content)
console.log(order.data.list);