From b9c916e226dc1c5221085c4e3fa16791e99d5727 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 4 Nov 2024 09:48:20 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=80=E8=8F=9C?=
=?UTF-8?q?=E6=9C=AA=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pagesOrder/detail/components/tuicai.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pagesOrder/detail/components/tuicai.vue b/pagesOrder/detail/components/tuicai.vue
index 80ded7f..dc833b1 100644
--- a/pagesOrder/detail/components/tuicai.vue
+++ b/pagesOrder/detail/components/tuicai.vue
@@ -50,7 +50,7 @@
确认退菜
- 取消
@@ -138,7 +138,8 @@
function toggleModelShow(show) {
modelShow.value = show ? true : false
}
-
+
+
function onModelClose() {
number.value=1
modelShow.value = false
From 12890fe257b4614b936790a05873a2655874311f Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 4 Nov 2024 09:55:57 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E9=9C=B8=E7=8E=8B=E9=A4=90=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/index.vue | 5 +++++
static/indexImg/icon-bwc.svg | 1 +
2 files changed, 6 insertions(+)
create mode 100644 static/indexImg/icon-bwc.svg
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 75bfd96..a5783fe 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -164,6 +164,11 @@
icon: '/static/indexImg/icon-line-up.svg',
pageUrl: 'PAGES_LINE_UP'
},
+ {
+ title: '霸王餐',
+ icon: '/static/indexImg/icon-bwc.svg',
+ pageUrl: 'PAGES_BWC'
+ },
// {
// title: '成员管理',
// icon: '/static/indexImg/icon-staff.svg',
diff --git a/static/indexImg/icon-bwc.svg b/static/indexImg/icon-bwc.svg
new file mode 100644
index 0000000..18375a5
--- /dev/null
+++ b/static/indexImg/icon-bwc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
From 20c4631ad4d1b8dedc47b790bc9e8d6f04f1ac22 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 4 Nov 2024 10:22:14 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E9=80=80=E6=AC=BE=E4=BB=B7=E6=A0=BC=E5=B1=95=E7=A4=BA=E6=A0=BC?=
=?UTF-8?q?=E5=BC=8F=E4=B8=BA=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D=E5=B0=8F?=
=?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pagesOrder/detail/components/list.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index 2c6e17f..fc3770b 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -109,7 +109,7 @@
退款金额
- {{orderInfo.refundAmount}}
+ {{(orderInfo.refundAmount).toFixed(2)}}
From e064484fe22f6ccedc26e92bbe435925cc0e8e96 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 4 Nov 2024 10:23:06 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81?=
=?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BB=B7=E6=A0=BC=E7=BC=96=E8=BE=91=E5=B0=8F?=
=?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=85=BC=E5=AE=B9=E6=97=A0=E5=8F=8D=E5=BA=94?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pageProduct/index/components/edit-price.vue | 12 ++++++++++--
pageProduct/index/components/edit-stock.vue | 8 +++++++-
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/pageProduct/index/components/edit-price.vue b/pageProduct/index/components/edit-price.vue
index 5d5dc74..79f676a 100644
--- a/pageProduct/index/components/edit-price.vue
+++ b/pageProduct/index/components/edit-price.vue
@@ -89,7 +89,8 @@
reactive,
ref,
watch,
- nextTick
+ nextTick,
+ onMounted
} from 'vue';
import {
returnSkuSnap,
@@ -138,7 +139,10 @@
}
}
})
- let data = ref(props.goods)
+ let data = ref({
+ lowPrice: 0,
+ skuList: []
+ })
const rules = {
'lowPrice': [{
type: 'Number',
@@ -221,6 +225,10 @@
// skuSnap: JSON.stringify(skuSnap)
// })
// }
+
+ onMounted(()=>{
+ refForm.value.setRules(rules)
+ })