From 380bb582e4200646ef3c2f7f578d24c976b4f19e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?21=E4=B8=96=E7=BA=AA=E5=B0=8F=E5=85=AB=E8=B7=AF?= <2529156631@qq.com> Date: Sat, 9 Nov 2024 00:02:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?uniapp=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=EF=BC=9A=20=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=8B=E5=8D=95=E6=96=B9=E5=BC=8F=E5=92=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=B5=84=E6=96=99=E9=80=89=E6=8B=A9=E7=94=9F=E6=97=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/order/storeList/storeList.vue | 4 +- .../CoreShop/pages/order/submit/submit.scss | 2 +- .../CoreShop/pages/order/submit/submit.vue | 42 ++++++++++++------- .../member/set/userInfo/userInfo.vue | 6 +-- 4 files changed, 32 insertions(+), 22 deletions(-) diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/order/storeList/storeList.vue b/CoreCms.Net.Uni-App/CoreShop/pages/order/storeList/storeList.vue index f2159d05..c767ef77 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/order/storeList/storeList.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/order/storeList/storeList.vue @@ -11,7 +11,7 @@ - + @@ -32,7 +32,7 @@ 距离： {{ item.distanceStr }} - diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.scss b/CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.scss index fb3c15fe..b713131a 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.scss +++ b/CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.scss @@ -99,8 +99,8 @@ min-width: 40rpx; } .no-store { - margin: auto; font-size: 28rpx; + color: #aaaaaa; } .store-address-box { .store-address { diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.vue b/CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.vue index 5be769be..ab530e0e 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.vue @@ -33,7 +33,7 @@ 请添加收货地址 - + @@ -41,7 +41,7 @@ - + {{ state.store?.storeName }} @@ -50,11 +50,12 @@ {{ state.store?.address }} - + 请选择门店 + @@ -260,13 +261,13 @@ success : Function, file : Function, } - + interface TabList { name : string, type : OrderDistributionEnum; show : boolean; } - + /** 获取项目配置 */ const shopConfigStore : ShopConfigStoreType = useShopConfigStore(); const state = reactive<{ @@ -292,9 +293,9 @@ }>({ orderType: PaymentTypeEnum.common, tabList: [ - { name: '快递物流', type: OrderDistributionEnum.mailing, show: true, }, - { name: '同城配送', type: OrderDistributionEnum.homeDelivery, show: true, }, - { name: '门店自提', type: OrderDistributionEnum.selfDelivery, show: true, } + { name: '快递物流', type: OrderDistributionEnum.mailing, show: false, }, + { name: '同城配送', type: OrderDistributionEnum.homeDelivery, show: false, }, + { name: '门店自提', type: OrderDistributionEnum.selfDelivery, show: false , } ], tabSelectType: OrderDistributionEnum.mailing, userDefaultShip: {}, @@ -319,7 +320,7 @@ const loadingPage = ref(true); const handleSubmit = useLoadingFn(onSubmit, loading); const handleGetOrderDetail = useLoadingFn(getOrderDetail, loadingPage); - + /** 是否显示积分兑换价合计 */ const isShowPointRedemptionPrice = computed(() => { return shopConfigStore.config.pointSwitch == OpenPointEnum.yes && @@ -465,14 +466,25 @@ const orderDistribution : Response = await queryOrderDistributionModel({ id: state.orderType, }); + + if (!orderDistribution?.data || Object.keys(orderDistribution?.data).length === 0) { + handleShowToast('暂无下单配送方式'); + return; + } + const { isOpenMailing, isOpenHomeDelivery, isOpenSelfDelivery } = orderDistribution?.data; + if (!isOpenMailing && !isOpenHomeDelivery && !isOpenSelfDelivery) { + handleShowToast('暂无下单配送方式'); + return; + } + /** 物流快递 */ - state.tabList[0].show = orderDistribution?.data?.isOpenMailing; + state.tabList[0].show = isOpenMailing; /** 同城配送 */ - state.tabList[1].show = orderDistribution?.data?.isOpenHomeDelivery; + state.tabList[1].show = isOpenHomeDelivery; /** 门店自提 */ - state.tabList[2].show = orderDistribution?.data?.isOpenSelfDelivery; - - state.tabSelectType = (state.tabList.find((item:TabList)=> item.show)).type || OrderDistributionEnum.mailing ; + state.tabList[2].show = isOpenSelfDelivery; + + state.tabSelectType = (state.tabList.find((item : TabList) => item.show))?.type || OrderDistributionEnum.mailing; } /** 获取用户默认地址 */ @@ -543,8 +555,6 @@ const defaultStore : Response = await queryDefaultStore(); if (defaultStore.status && defaultStore.data) { state.store = defaultStore.data; - } else { - handleShowToast('商家未配置默认自提店铺!'); } } diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/userInfo/userInfo.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/userInfo/userInfo.vue index 7352c2f7..b58b1102 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/userInfo/userInfo.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/userInfo/userInfo.vue @@ -75,7 +75,7 @@ nickname : string; radiolist : Array<{ [key : string] : any }>; sex : string; - birthdayTemporary : string; + birthdayTemporary : number; birthday : string; avatar : string; userInfo : UserInfoType, @@ -86,7 +86,7 @@ avatar: "", nickname: "", sex: "", - birthdayTemporary: "", + birthdayTemporary: null, birthday: "", submitStatus: true, radiolist: [{ @@ -152,7 +152,7 @@ state.userInfo = userInfo?.data; if (userInfo?.data?.birthday) { state.percentage += 25; - state.birthdayTemporary = String(new Date(userInfo?.data?.birthday).getTime()); + state.birthdayTemporary =new Date(userInfo.data.birthday).getTime(); state.birthday = timeFormat(userInfo?.data?.birthday, 'yyyy-mm-dd'); } if (userInfo?.data?.nickName) { From f8504329585ef6e5f250ae7aef934f9e947620d0 Mon Sep 17 00:00:00 2001 From: 15093570141 <141405260+17521612761@users.noreply.github.com> Date: Sun, 10 Nov 2024 17:03:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?uniapp=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=EF=BC=9A=20=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=94=9F=E6=97=A5=E6=9C=80=E5=B0=8F=E4=B8=BA1949-10-0?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoreShop/pages/subpackage/member/set/userInfo/userInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/userInfo/userInfo.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/userInfo/userInfo.vue index b58b1102..ab5e6b10 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/userInfo/userInfo.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/userInfo/userInfo.vue @@ -54,7 +54,7 @@ 保存 -