From 0837f319ca4ce3affef737bab357f60ee071765c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=B1=E5=AE=87=E9=98=B3?= Date: Tue, 11 Feb 2025 03:26:01 +0000 Subject: [PATCH 1/5] =?UTF-8?q?update=20src/views/mall/trade/order/detail/?= =?UTF-8?q?index.vue.=20fix(trade)=EF=BC=9AReferenceError:=20form=20is=20n?= =?UTF-8?q?ot=20defined?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - form undefined - Vue: Argument of type number | undefined is not assignable to parameter of type number Type undefined is not assignable to type number Signed-off-by: 爱宇阳 --- src/views/mall/trade/order/detail/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/mall/trade/order/detail/index.vue b/src/views/mall/trade/order/detail/index.vue index d521c2a3..592d2c8c 100644 --- a/src/views/mall/trade/order/detail/index.vue +++ b/src/views/mall/trade/order/detail/index.vue @@ -334,13 +334,13 @@ onMounted(async () => { // 如果配送方式为快递，则查询物流公司 if (formData.value.deliveryType === DeliveryTypeEnum.EXPRESS.type) { deliveryExpressList.value = await DeliveryExpressApi.getSimpleDeliveryExpressList() - if (form.value.logisticsId) { + if (formData.value.logisticsId) { expressTrackList.value = await TradeOrderApi.getExpressTrackList(formData.value.id!) } } else if (formData.value.deliveryType === DeliveryTypeEnum.PICK_UP.type) { - pickUpStore.value = await DeliveryPickUpStoreApi.getDeliveryPickUpStore( - formData.value.pickUpStoreId - ) + if (formData.value.pickUpStoreId) { + pickUpStore.value = await DeliveryPickUpStoreApi.getDeliveryPickUpStore(formData.value.pickUpStoreId) + } } }) From e85c1b0a55ee9769d621aadc4a31f85f6845c54e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com> Date: Fri, 21 Feb 2025 17:03:49 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=911.=20=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=AD=89=E5=BE=85=E6=97=B6=E9=97=B4=E8=B0=83=E6=95=B4=E6=88=90?= =?UTF-8?q?15=E7=A7=92=EF=BC=9B2.=20=E5=95=86=E5=9F=8E=E5=AE=A2=E6=9C=8D?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8C=B9=E9=85=8D=E6=9A=97=E9=BB=91=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Editor/src/Editor.vue | 2 +- .../mall/promotion/kefu/components/KeFuConversationList.vue | 2 +- .../mall/promotion/kefu/components/KeFuMessageList.vue | 6 +++--- .../mall/promotion/kefu/components/member/MemberInfo.vue | 4 ++-- .../mall/promotion/kefu/components/message/OrderItem.vue | 2 +- .../mall/promotion/kefu/components/message/ProductItem.vue | 3 ++- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/components/Editor/src/Editor.vue b/src/components/Editor/src/Editor.vue index 38c34e25..3b0513b8 100644 --- a/src/components/Editor/src/Editor.vue +++ b/src/components/Editor/src/Editor.vue @@ -105,7 +105,7 @@ const editorConfig = computed((): IEditorConfig => { }, // 超时时间，默认为 10 秒 - timeout: 5 * 1000, // 5 秒 + timeout: 15 * 1000, // 15 秒 // form-data fieldName，后端接口参数名称，默认值wangeditor-uploaded-image fieldName: 'file', diff --git a/src/views/mall/promotion/kefu/components/KeFuConversationList.vue b/src/views/mall/promotion/kefu/components/KeFuConversationList.vue index 075edc33..318e27d1 100644 --- a/src/views/mall/promotion/kefu/components/KeFuConversationList.vue +++ b/src/views/mall/promotion/kefu/components/KeFuConversationList.vue @@ -200,7 +200,7 @@ onBeforeUnmount(() => {