From 21c6bc90c7570fd9114c015b10e8906989efaf01 Mon Sep 17 00:00:00 2001 From: LinCyJang Date: Fri, 14 Nov 2025 23:45:46 +0800 Subject: [PATCH 1/9] =?UTF-8?q?Fix=EF=BC=9A4596=20=E3=80=90=E6=97=85?= =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?= =?UTF-8?q?=E5=B7=B2=E6=94=AF=E4=BB=98=E5=9B=A2=E8=B4=AD=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=EF=BC=8C=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E6=9C=AA?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=94=AF=E4=BB=98=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_product/views/sojoumOrderDetails.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg_product/views/sojoumOrderDetails.vue b/pkg_product/views/sojoumOrderDetails.vue index 18c4f48..30eaa7d 100644 --- a/pkg_product/views/sojoumOrderDetails.vue +++ b/pkg_product/views/sojoumOrderDetails.vue @@ -124,7 +124,7 @@ 支付状态 - {{orderInfo._status._type !== '0' && orderInfo._status._type !== '9' ? '已支付' : '未支付'}} + {{ orderInfo.paid ? '已支付' : '未支付'}} 支付方式 From 8ed2563e3395a56977eca6ae594b0fc04150bcae Mon Sep 17 00:00:00 2001 From: LinCyJang Date: Sat, 15 Nov 2025 00:22:36 +0800 Subject: [PATCH 2/9] =?UTF-8?q?Fix=EF=BC=9A=20=E3=80=90=E6=97=85=E5=B1=85?= =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=97=85?= =?UTF-8?q?=E5=B1=85=E5=95=86=E5=AE=B6PC=E7=AB=AF=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=9A=84=E4=B8=BB=E9=A1=B5=E8=A7=86=E9=A2=91=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E5=AE=89=E5=8D=93=E5=92=8C=E7=94=B5=E8=84=91=E7=AB=AF=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=9C=AA=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_product/views/sojoumStore.vue | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkg_product/views/sojoumStore.vue b/pkg_product/views/sojoumStore.vue index d47c44a..90ca899 100644 --- a/pkg_product/views/sojoumStore.vue +++ b/pkg_product/views/sojoumStore.vue @@ -19,8 +19,8 @@ > @@ -678,8 +678,17 @@ export default { getFarmerData() { getJiaLouDetail(this.id).then(res => { this.store = res.data || {} + this.store.banner = res.data.banner.map(img => { + return { + type: 'img', + url: img + } + }) if(res.data.video) { - this.store.banner.unshift(res.data.video) + this.store.banner.unshift({ + type: 'video', + url: res.data.video + }) } this.getNews() this.getJiaLouProductList() From 67d1e7e5eddeed033d603bbbe1734a34382f5928 Mon Sep 17 00:00:00 2001 From: LinCyJang Date: Sat, 15 Nov 2025 00:24:59 +0800 Subject: [PATCH 3/9] =?UTF-8?q?Fix=EF=BC=9A4584=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=A4=9A=E8=A7=84?= =?UTF-8?q?=E6=A0=BC=E5=95=86=E5=93=81=EF=BC=8C=E9=A6=96=E4=B8=AA=E8=A7=84?= =?UTF-8?q?=E6=A0=BC=E6=97=A0=E5=BA=93=E5=AD=98=E6=97=B6=EF=BC=8C=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=95=86=E5=93=81=E6=95=B0=E9=87=8F=E6=94=B6=E8=B5=B7?= =?UTF-8?q?=E9=94=AE=E7=9B=98=E5=90=8E=EF=BC=8C=E6=95=B0=E9=87=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=BA0=E4=B8=94=E6=95=B0=E9=87=8F=E8=83=BD?= =?UTF-8?q?=E5=87=8F=E5=B0=91=E4=B8=BA=E8=B4=9F=E6=95=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/ProductWindow.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/ProductWindow.vue b/components/ProductWindow.vue index d0adbbe..89120f2 100644 --- a/components/ProductWindow.vue +++ b/components/ProductWindow.vue @@ -183,7 +183,7 @@ export default { this.$emit("changeFun", { action: "changeattr", value: false }) }, CartNumDes() { - if(this.cartNumber === 1) return + if(this.cartNumber <= 1) return console.log(this.cartNumber, 'cartNumber'); this.cartNumber-- this.$emit("changeFun", { action: "ChangeCartNum", value: this.cartNumber }) From fc8257b1e3fa55d836b7c13555da39f8e4ca6715 Mon Sep 17 00:00:00 2001 From: LinCyJang Date: Sat, 15 Nov 2025 00:26:10 +0800 Subject: [PATCH 4/9] =?UTF-8?q?Fix=EF=BC=9A4595=20=E3=80=90=E6=97=85?= =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?= =?UTF-8?q?=E7=AE=A1=E5=AE=B6=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C=E7=AE=A1?= =?UTF-8?q?=E5=AE=B6=E7=AE=80=E4=BB=8B=E4=B8=8E=E8=AF=A6=E7=BB=86=E4=BB=8B?= =?UTF-8?q?=E7=BB=8D=E5=86=85=E5=AE=B9=E6=98=BE=E7=A4=BA=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_product/views/housekeeperDetail.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg_product/views/housekeeperDetail.vue b/pkg_product/views/housekeeperDetail.vue index dd1a7ed..4bf7e99 100644 --- a/pkg_product/views/housekeeperDetail.vue +++ b/pkg_product/views/housekeeperDetail.vue @@ -39,14 +39,14 @@ 家 - {{ record.desc }} + {{ record.intro }} {{ tag }} - {{ record.intro }} + {{ record.desc }} From ef2eb0cdeb4ed64f28b0e927326b09793c5d79f4 Mon Sep 17 00:00:00 2001 From: LinCyJang Date: Sat, 15 Nov 2025 00:28:13 +0800 Subject: [PATCH 5/9] =?UTF-8?q?Fix=EF=BC=9A4424=20=E3=80=90=E6=97=85?= =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?= =?UTF-8?q?=E9=80=81=E7=A4=BC=E2=80=94=E7=A4=BC=E5=93=81=E5=8D=A1=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98=E5=8F=96=E6=B6=88=E6=97=B6=E5=B0=86?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=8D=E6=94=B9=E4=B8=BA=E2=80=9C=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=8F=96=E6=B6=88=EF=BC=8C=E8=AF=B7=E5=9C=A8=E6=88=91?= =?UTF-8?q?=E7=9A=84=E7=A4=BC=E5=93=81=E5=8D=A1=E4=B8=AD=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_user/views/gift/gift.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue index a586aff..760de35 100644 --- a/pkg_user/views/gift/gift.vue +++ b/pkg_user/views/gift/gift.vue @@ -536,7 +536,7 @@ export default { this.isPayOk = true; }).catch(err => { - this.makeAgain() + // this.makeAgain() uni.showToast({ title: '支付取消,请在我的礼品卡中完成支付', icon: "none", From a98c1544bda0f80435a401ed27f9d8179c6c7a57 Mon Sep 17 00:00:00 2001 From: LinCyJang Date: Sat, 15 Nov 2025 00:33:55 +0800 Subject: [PATCH 6/9] =?UTF-8?q?Fix=EF=BC=9A4422=20=E3=80=90=E6=97=85?= =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?= =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E7=82=B9=E5=87=BB=E8=81=94=E7=B3=BB=E5=95=86?= =?UTF-8?q?=E5=AE=B6=E6=8C=89=E9=92=AE=EF=BC=8C=E5=BC=B9=E5=87=BA=E7=9A=84?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=86=85=E6=B2=A1=E6=9C=89=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=94=B5=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_product/views/submitOrder.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg_product/views/submitOrder.vue b/pkg_product/views/submitOrder.vue index 72b37b3..bc354ed 100644 --- a/pkg_product/views/submitOrder.vue +++ b/pkg_product/views/submitOrder.vue @@ -206,7 +206,7 @@ export default { contactMerchant() { uni.showModal({ title: '商家电话', - content: this.form.merPhone || '暂无电话', + content: this.orderInfo.merPhone || '暂无电话', confirmText: '立即拨打', cancelText: '取消', success: (res) => { From 8cc32b5a1936310d49c3819a7ef1cc9b5cd98d9f Mon Sep 17 00:00:00 2001 From: LinCyJang Date: Sat, 15 Nov 2025 00:44:21 +0800 Subject: [PATCH 7/9] =?UTF-8?q?Fix=EF=BC=9A4432=20=E3=80=90=E6=97=85?= =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E5=BE=85=E7=A1=AE=E8=AE=A4=E8=AE=A2=E5=8D=95=E6=9C=AA=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=A1=AE=E8=AE=A4=E5=80=92=E8=AE=A1=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/MyOrder/index.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue index c0efff7..3c17874 100644 --- a/pages/order/MyOrder/index.vue +++ b/pages/order/MyOrder/index.vue @@ -186,6 +186,13 @@ 入住时间: {{ order.travelGroupOrderInfo.orderStartDate }} + + + 等待商家确认时间，剩余 + + 订单将自动取消 + + Date: Sat, 15 Nov 2025 00:59:35 +0800 Subject: [PATCH 8/9] =?UTF-8?q?Fix=EF=BC=9A4368=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E7=82=B9=E5=87=BB=E6=B5=B7=E6=8A=A5?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E4=BC=98=E6=83=A0=E5=88=B8=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E4=BC=98=E6=83=A0=E5=88=B8=E5=90=8E=E4=BC=9A?= =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E5=BC=B9=E7=AA=97=EF=BC=8C=E5=8F=AF=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E9=A2=86=E5=8F=96=E4=BC=98=E6=83=A0=E5=88=B8=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=94=B9=E4=B8=BA=E9=A2=86=E5=8F=96=E5=90=8E?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/home/index.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pages/home/index.vue b/pages/home/index.vue index ba9eea6..997a61b 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -1481,6 +1481,12 @@ export default { success: () => { } }) + } else { + uni.showToast({ + title: res.msg + '', + icon: 'none', + duration: 3000 + }) } }).catch((err) => { uni.showToast({ From ee9d3c150780134b09a61c9f04ed7b6ab5c2aab0 Mon Sep 17 00:00:00 2001 From: LinCyJang Date: Sat, 15 Nov 2025 01:12:03 +0800 Subject: [PATCH 9/9] =?UTF-8?q?Fix=EF=BC=9A4585=20=E3=80=90=E6=97=85?= =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E5=BE=85=E5=85=A5=E4=BD=8F=E7=9A=84=E4=BA=A4=E4=BA=92=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=98=BE=E7=A4=BA=E7=9A=84=E6=98=AF=E5=BE=85=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E5=95=86=E5=93=81=E8=AE=A2=E5=8D=95=E7=9A=84=E4=BA=A4?= =?UTF-8?q?=E4=BA=92=E6=8C=89=E9=92=AE=EF=BC=8C=E5=BA=94=E6=94=B9=E5=9B=9E?= =?UTF-8?q?=E5=BE=85=E7=A1=AE=E8=AE=A4=E4=BA=A4=E4=BA=92=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/MyOrder/index.vue | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue index 3c17874..8a1827e 100644 --- a/pages/order/MyOrder/index.vue +++ b/pages/order/MyOrder/index.vue @@ -274,6 +274,7 @@ >{{ '申请退款' }} {{ order.isTravelGroup === 0 ? '查看详情' : '查看券码' }} @@ -283,7 +284,24 @@ @click="goOrderDetails(order)" >立即核销 -