diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue index e83abaa4..9456ba2f 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue @@ -96,8 +96,8 @@ + :safeAreaInsetBottom="false" :buyNowNowloading="buyNowLoading" :addCartloading="addCartLoading" + @handleChangePopup="handleChangePopup" @handleAddCart="handleAddCart" @handleBuyNow="handleBuyNow"> @@ -131,6 +131,7 @@ import { getDomInfo, handleStaticResources, handleRouteNavigateTo, handleShowToast, handleRouteSwitchTab } from '@/core/utils'; import { AddCartEnum, PaymentTypeEnum, RouteSwitchTabEnum } from '@/core/enum'; import GoodsDetailSkuPopup from '@/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue'; + import { useLoadingFn } from '@/core/hooks'; const instance = getCurrentInstance(); @@ -185,6 +186,13 @@ goodsDetailData: {}, }); + const buyNowLoading = ref(false); + const addCartLoading = ref(false); + + const handleBuyNow = useLoadingFn(onBuyNow, buyNowLoading); + const handleAddCart = useLoadingFn(onAddCart, addCartLoading) + + watch(() => props.data, (newVal : Array) => { if (newVal) { state.classifyData = newVal.map((item : CategoriesType) => { @@ -277,7 +285,7 @@ } /** 添加购物车 */ - const handleAddCart = async ({ productId, nums } : any) => { + async function onAddCart({ productId, nums } : any) { const addCart : Response = await queryAddCart({ productId, nums, @@ -295,7 +303,7 @@ } /** 立即购买 */ - const handleBuyNow = async ({ productId, nums } : any) => { + async function onBuyNow({ productId, nums } : any) { const addCart : Response = await queryAddCart({ productId, nums, diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue index 8f6a3884..f4b92642 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue @@ -127,6 +127,7 @@ const addCartLoading = ref(false); const handleBuyNow = useLoadingFn(onBuyNow, buyNowLoading); + const handleAddCart = useLoadingFn(onAddCart, addCartLoading) watch(() => props.data, (newVal : Array) => { if (newVal) { @@ -208,7 +209,7 @@ } /** 添加购物车 */ - const handleAddCart = async ({ productId, nums } : any) => { + async function onAddCart({ productId, nums } : any) { const addCart : Response = await queryAddCart({ productId, nums, diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue index 2412758f..264bdde1 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue @@ -54,14 +54,14 @@ + :isShowAddCartBtn="false" :buyNowNowloading="loading" btnBuyTitlt="立即团购" + @handleChangePopup="handleChangePopup" @handleBuyNow="handleBuyNow">