From e8b5f1d2e7ed86e728f6526f52b8537e8e78ba8e Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 31 Oct 2024 11:08:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E5=AE=A2=E5=BA=A7=E8=B4=B9?=
=?UTF-8?q?=E9=99=90=E5=88=B6=E5=8F=AA=E8=83=BD=E5=85=A8=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pagesOrder/detail/components/tuicai.vue | 27 ++++++++++++----
pagesOrder/detail/detail.vue | 12 ++++---
pagesOrder/tuikuan/tuikuan.vue | 42 +++++++++++++++++++------
3 files changed, 60 insertions(+), 21 deletions(-)
diff --git a/pagesOrder/detail/components/tuicai.vue b/pagesOrder/detail/components/tuicai.vue
index 930ccc6..2e2e687 100644
--- a/pagesOrder/detail/components/tuicai.vue
+++ b/pagesOrder/detail/components/tuicai.vue
@@ -5,21 +5,24 @@
{{data.productName}}
-
-
+
+
-
-
+
+
@@ -66,7 +69,11 @@
const props = defineProps({
data: {
type: Object,
- default: () => {}
+ default: () => {
+ return {
+ productId:'-999'
+ }
+ }
},
show: {
type: Boolean,
@@ -143,6 +150,9 @@
function open() {
model.value.open()
+ if(props.data.productId=='-999'){
+ number.value=props.data.num
+ }
}
function close() {
@@ -191,7 +201,12 @@
::v-deep .uni-input-input {
text-align: center;
}
-
+ .gray{
+ .minus::after{
+ border-color: #ccc;
+ }
+
+ }
.minus {
&::after {
content: '';
diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue
index 463d73e..0bebcf2 100644
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@@ -284,11 +284,13 @@
}
console.log(res.seatInfo);
orderDetail.seatFee = res.seatInfo|| {
- name: '客座费',
- number: res.seatCount,
- totalNumber: res.seatCount,
- priceAmount: res.seatAmount,
- status:''
+ // name: '客座费',
+ // number: res.seatCount,
+ // num: res.seatCount,
+ // totalNumber: res.seatCount,
+ // priceAmount: res.seatAmount,
+ // status:'',
+ totalNumber:0,
}
orderDetail.goodsList = Object.entries(goodsMap).map(([key, value]) => ({
info: value,
diff --git a/pagesOrder/tuikuan/tuikuan.vue b/pagesOrder/tuikuan/tuikuan.vue
index dc2feee..04df108 100644
--- a/pagesOrder/tuikuan/tuikuan.vue
+++ b/pagesOrder/tuikuan/tuikuan.vue
@@ -3,9 +3,13 @@
全退
-
+
+
+ *
+ 客座费只能全退
+
@@ -14,15 +18,25 @@
{{item.productSkuName||""}}
最多可退×{{item.num}}
-
- ￥{{item.priceAmount}}
-
-
- {{item.number}}
-
+
+
+ ￥{{item.priceAmount}}
+
+ x{{item.number}}
+
-
+
+
+
+ ￥{{item.priceAmount}}
+
+
+ {{item.number}}
+
+
+
+
@@ -139,6 +153,9 @@
}
function changeItem(item, step) {
+ if(item.productId=='-999'){
+ return
+ }
console.log(item);
let newval = item.number * 1 + step * 1;
if (newval <= 0) {
@@ -179,9 +196,14 @@
uni.navigateBack({delta:1})
},500)
}
- const option=reactive({})
+ const option=reactive({
+ productId:'-999'
+ })
onLoad((opt) => {
Object.assign(option,opt)
+ if(opt.productId=='-999'){
+ allTui.value=true
+ }
if (Array.isArray(opt)) {
orderDetail.goodsList = opt
} else {