From 52c856b9804415920efcc2147c9d812cdd8f50cf 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, 19 Oct 2024 23:05:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?uniapp=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=20=E6=96=B0=E5=A2=9E=E6=B7=BB=E5=8A=A0=E8=B4=AD?=
 =?UTF-8?q?=E7=89=A9=E8=BD=A6=EF=BC=8C=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E7=AB=8B=E5=8D=B3=E8=B4=AD=E4=B9=B0=EF=BC=8C=E4=BB=A3?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=88=86=E9=94=80=E5=BA=97=E9=93=BA=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0loading=20=E7=A6=81=E7=94=A8=E5=A4=9A=E6=AC=A1?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coreshop-button/coreshop-button.vue       | 29 ++++++-----
 .../CoreShop/pages/cart/cart.vue              | 11 +---
 .../classify-four/classify-four.vue           | 16 ++++--
 .../goods-detail-sku/goods-detail-sku.scss    | 11 ++++
 .../goods-detail-sku/goods-detail-sku.vue     | 52 ++++++++++++++++---
 .../pages/components/pay-method/index.vue     | 27 ++++++----
 .../CoreShop/pages/order/pay/pay.vue          | 15 +++---
 .../CoreShop/pages/order/submit/submit.vue    | 13 +++--
 .../subpackage/agency/store-set/index.vue     | 13 +++--
 .../distribution/store-set/index.vue          | 13 +++--
 10 files changed, 138 insertions(+), 62 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-button/coreshop-button.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-button/coreshop-button.vue
index dde49887..371e8807 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-button/coreshop-button.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-button/coreshop-button.vue
@@ -1,7 +1,7 @@
 <template>
-	<view class="btn" :style="{'border-radius':radiusComp,'background-color':props.backgroundColor,'color':props.color}" @click="onClick()">
-		{{props.title}}
-	</view>
+	<uv-button :text="props.title" :loading="props.loading"
+		:custom-style="{'border-radius':radiusComp,'height':'100%','width':'100%','background-color':props.backgroundColor,'color':props.color,...customStyleComp}"
+		@click="onClick()"></uv-button>
 </template>
 
 <script setup lang="ts">
@@ -14,26 +14,31 @@
 		radius ?: number;
 		backgroundColor ?: string;
 		color ?: string;
+		loading : boolean;
+		customStyle ?: { [key : string] : any }
 	}>(), {
 		title: '保存',
 		radius: 44,
 		backgroundColor: '#D33123',
-		color: '#FFFFFF'
+		color: '#FFFFFF',
+		loading: false,
 	})
 
 	const radiusComp = computed(() => `${props.radius}px`);
-
+	const customStyleComp = computed(() => {
+		return props.customStyle || { 'height': '88rpx' };
+	});
 	const onClick = () => {
 		emits('onClick');
 	}
 </script>
 
 <style lang="scss" scoped>
-	.btn {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		height: 88rpx;
-		font-size: 32rpx;
-	}
+	// .base-btn {
+	// 	display: flex;
+	// 	align-items: center;
+	// 	justify-content: center;
+	// 	height: 88rpx;
+	// 	font-size: 32rpx;
+	// }
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue b/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue
index dc720aa7..4a9e7d1f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue
@@ -101,9 +101,6 @@
 				</view>
 			</view>
 		</view>
-
-		<!-- 登录提示 -->
-		<!-- <coreshop-login-modal></coreshop-login-modal> -->
 	</view>
 </template>
 
@@ -313,12 +310,8 @@
 
 	/** 去购买 */
 	const handleGoToBuy = () => {
-		let ids : Array<number> = [];
-		state.cartList.forEach((item : CartListType) => {
-			if (item.select) {
-				ids.push(item.id)
-			}
-		})
+		const ids : Array<number>= state.cartList.filter(x=>x.select).map(x=>x.id);
+		
 		if (ids.length > 0) {
 			handleRouteNavigateTo(`/pages/order/submit/submit?cartIds=${ids.join(',')}`)
 		} else {
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 10c26825..8f6a3884 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
@@ -67,15 +67,15 @@
 
 		<!-- 商品sku弹框 -->
 		<GoodsDetailSkuPopup :showSku="state.showSku" :goodsDetailData="state.goodsDetailData"
-			:safeAreaInsetBottom="false" @handleChangePopup="handleChangePopup" @handleAddCart="handleAddCart"
-			@handleBuyNow="handleBuyNow">
+			:safeAreaInsetBottom="false" :buyNowNowloading="buyNowLoading" :addCartloading="addCartLoading"
+			@handleChangePopup="handleChangePopup" @handleAddCart="handleAddCart" @handleBuyNow="handleBuyNow">
 		</GoodsDetailSkuPopup>
 
 	</view>
 </template>
 
 <script setup lang="ts">
-	import { reactive, watch } from 'vue';
+	import { reactive, ref, watch } from 'vue';
 	import { onShow } from '@dcloudio/uni-app';
 	import { UserToken, advertPosition, onClassifyPageHide } from '@/core/consts';
 	import { queryGoodsPageList, queryCartNumAndMoney, queryGoodsDetailByToken, queryGoodsDetail, queryAddCart } from '@/core/api';
@@ -84,6 +84,7 @@
 	import { useLoginStore } from '@/core/store'
 	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';
 
 	/** 登录store */
 	const _useLoginStore = useLoginStore();
@@ -122,6 +123,11 @@
 		goodsDetailData: {},
 	});
 
+	const buyNowLoading = ref(false);
+	const addCartLoading = ref(false);
+
+	const handleBuyNow = useLoadingFn(onBuyNow, buyNowLoading);
+
 	watch(() => props.data, (newVal : Array<CategoriesType>) => {
 		if (newVal) {
 			state.classifyData = newVal.map((item : CategoriesType) => {
@@ -211,7 +217,7 @@
 		if (addCart.status) {
 			handleShowToast(addCart.msg, 'success');
 			/** 添加成功后，重新获取购物车数量和价格 */
-			getCartNumAndMoney();
+			await getCartNumAndMoney();
 			/** 关闭sku弹框 */
 			handleChangePopup(false);
 		} else {
@@ -220,7 +226,7 @@
 	}
 
 	/** 立即购买 */
-	const handleBuyNow = async ({ productId, nums } : any) => {
+	async function onBuyNow({ productId, nums } : any) {
 		const addCart : Response<number> = await queryAddCart({
 			productId,
 			nums,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.scss b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.scss
index edd3937e..ca5558a9 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.scss
@@ -108,4 +108,15 @@
 	.buy-now {
 		background-color: #d33123;
 	}
+	.core-button-confirm{
+		flex: 1;
+		font-size: 27rpx;
+		text-align: center;
+		color: #fff;
+		height: 90rpx;
+	}
+	coreshop-button{
+		display: block;
+		height: 90rpx;
+	}
 }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue
index 5c179d85..8d2a8764 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue
@@ -30,8 +30,16 @@
 					@change="handleChangeNumberVal"></uv-number-box>
 			</view>
 			<view class="btn-box">
-				<view v-if="props.isShowAddCartBtn" class="btn add-cart" @click="handleAddCart">加入购物车</view>
-				<view class="btn buy-now" @click="handleBuyNow">{{ props.btnBuyTitlt }}</view>
+				<!-- 	<view v-if="props.isShowAddCartBtn" class="btn add-cart" @click="handleAddCart">加入购物车</view> -->
+				<view v-if="props.isShowAddCartBtn" class="core-button-confirm add-cart">
+					<coreshop-button :loading="props.addCartloading" class="core-button-confirm_" :radius="0" title="加入购物车"
+						:customStyle="addCartCustomStyle" @onClick="handleAddCart()"></coreshop-button>
+				</view>
+				<!-- <view class="btn buy-now" @click="handleBuyNow">{{ props.btnBuyTitlt }}</view> -->
+				<view class="core-button-confirm">
+					<coreshop-button :loading="props.buyNowNowloading" class="core-button-confirm_" :radius="0"
+						:title="props.btnBuyTitlt" :customStyle="buyNowCustomStyle" @onClick="handleBuyNow()"></coreshop-button>
+				</view>
 			</view>
 		</view>
 	</uv-popup>
@@ -43,18 +51,50 @@
 	import { handleStaticResources, handleShowToast } from '@/core/utils';
 	import { deepClone } from '@/uni_modules/uv-ui-tools/libs/function/index.js';
 
+	const buyNowCustomStyle = {
+		'border': 'none',
+		'background-color': '#d33123',
+		'flex': 1,
+		'padding': '32rpx 0',
+		'font-size': '27rpx',
+		'text-align': 'center',
+		'color': '#fff',
+		'height': '90rpx'
+	}
+
+	const addCartCustomStyle = {
+		...buyNowCustomStyle,
+		'background-color': '#000',
+	}
+
+
 	const props = withDefaults(defineProps<{
 		showSku : boolean,
 		goodsDetailData : any,
 		isShowAddCartBtn : boolean,
 		btnBuyTitlt : string,
 		safeAreaInsetBottom : boolean;
+		buyNowCustomStyle : { [key : string] : any },
+		buyNowNowloading : boolean,
+		addCartloading : boolean
 	}>(), {
 		showSku: false,
 		goodsDetailData: {},
 		isShowAddCartBtn: true,
 		btnBuyTitlt: '立即购买',
 		safeAreaInsetBottom: true,
+		buyNowCustomStyle: {
+			'border': 'none',
+			'background-color': '#d33123',
+			'flex': 1,
+			'padding': '25rpx 0',
+			'font-size': '27rpx',
+			'text-align': 'center',
+			'color': '#fff',
+			'height': '90rpx'
+		},
+		buyNowNowloading: false,
+		addCartloading: false
 	});
 
 	const emits = defineEmits(['handleChangePopup', 'handleAddCart', 'handleBuyNow', 'handleChangeGoodSku']);
@@ -116,12 +156,12 @@
 	const handleChangeNumberVal = (e : any) => {
 		state.numberVal = e.value;
 	}
-	
+
 	/** sku弹框显示或者隐藏 */
 	const handleChangePopup = (e : any) => {
 		emits('handleChangePopup', e.show)
 	}
-	
+
 	/** sku选择 */
 	const handleChooseSku = (index : number, sku : GoodsSpecListType) => {
 		let chooseSku : GoodsSkuListType = {}; // 选中的sku
@@ -163,7 +203,7 @@
 		});
 
 	}
-	
+
 	/** 立即购买 */
 	const handleBuyNow = () => {
 		if (!handleHaveStock()) {
@@ -174,7 +214,7 @@
 			nums: state.numberVal,
 		});
 	}
-	
+
 	/** 判断库存 */
 	const handleHaveStock = () => {
 		if (state.chooseSku.stock === 0) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/pay-method/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/pay-method/index.vue
index 310d6fca..0928c057 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/pay-method/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/pay-method/index.vue
@@ -19,7 +19,7 @@
 	</view>
 </template>
 <script setup lang="ts">
-	import { reactive, watch } from 'vue';
+	import { Ref, reactive, watch } from 'vue';
 	import { PayMethodCodeEnum, PaymentTypeEnum } from '@/core/enum';
 	import { handleStaticResources, handleShowToast, handleRouteRedirectTo } from '@/core/utils';
 	import type { PayMethodListType, Response } from '@/core/models';
@@ -64,13 +64,13 @@
 			if (props.orderType === PaymentTypeEnum.recharge) {
 				payMethodList = payMethodList.filter(item => item.code !== 'balancepay' || !item.isOnline);
 			}
-			
+
 			/** 当支付方式只有一个的时候，默认选择 */
-			if(payMethodList.length == 1){
+			if (payMethodList.length == 1) {
 				state.payCode = payMethodList[0].code;
 				emits('handleSelectPay', payMethodList[0].code);
 			}
-			state.payMethodList = payMethodList; 
+			state.payMethodList = payMethodList;
 		}
 	})
 
@@ -118,7 +118,7 @@
 		)
 	}
 
-	const handlePayNow = async () => {
+	const handlePayNow = async (loading : Ref<boolean>) => {
 		uni.showLoading({
 			title: '加载中',
 		});
@@ -150,18 +150,20 @@
 		const pay : Response<any> = await queryPay(data);
 		if (pay.status) {
 			if (state.payCode === PayMethodCodeEnum.wechatpay) {
-				handleWxpay(pay);
+				handleWxpay(pay, loading);
 			} else if (state.payCode === PayMethodCodeEnum.alipay) {
-				handleAlipay(pay);
+				handleAlipay(pay, loading);
 			} else if (state.payCode === PayMethodCodeEnum.balancepay) {
 				uni.hideLoading();
 				handleShowToast('支付成功', 'success', () => {
 					setTimeout(() => {
+						loading.value = false;
 						handleRouteRedirectTo(`/pages/order/result/result?id=${pay.data.paymentId}`)
 					}, 1000)
 				})
 			} else if (state.payCode === PayMethodCodeEnum.offline) {
 				uni.hideLoading();
+				loading.value = false;
 				uni.showModal({
 					title: '线下支付说明',
 					content: '请联系客服进行线下支付',
@@ -170,6 +172,7 @@
 			}
 		} else {
 			handleShowToast(pay.msg, 'none', () => {
+				loading.value = false;
 				setTimeout(() => {
 					uni.hideLoading();
 				}, 1000);
@@ -179,7 +182,7 @@
 	}
 
 	/** 微信支付 */
-	const handleWxpay = (res : any) => {
+	const handleWxpay = (res : any, loading : Ref<boolean>) => {
 		uni.requestPayment({
 			provider: 'wxpay',
 			// #ifdef MP-WEIXIN
@@ -208,6 +211,7 @@
 				if (e.errMsg === 'requestPayment:ok') {
 					handleShowToast('支付成功', 'success', () => {
 						setTimeout(() => {
+							loading.value = false;
 							handleRouteRedirectTo(`/pages/order/result/result?id=${res.data.paymentId}`)
 						}, 1000)
 					})
@@ -217,12 +221,14 @@
 				// #ifdef APP-PLUS || APP-PLUS-NVUE
 				handleShowToast('支付成功', 'success', () => {
 					setTimeout(() => {
+						loading.value = false;
 						handleRouteRedirectTo(`/pages/order/result/result?id=${res.data.paymentId}`)
 					}, 1000)
 				})
 				// #endif 
 			},
 			fail: function (e : any) {
+				loading.value = false;
 				if (e.errMsg === 'requestPayment:fail cancel') {
 					handleShowToast('您已经取消此方式支付,可继续选择其他方式支付。');
 				}
@@ -234,7 +240,7 @@
 	}
 
 	/** 支付宝支付 */
-	const handleAlipay = (res : any) => {
+	const handleAlipay = (res : any, loading : Ref<boolean>) => {
 		uni.requestPayment({
 			provider: 'alipay',
 			orderInfo: res.data.tradeNo,
@@ -243,6 +249,7 @@
 				if (e.errMsg === 'requestPayment:ok') {
 					handleShowToast('支付成功', 'success', () => {
 						setTimeout(() => {
+							loading.value = false;
 							handleRouteRedirectTo(`/pages/order/result/result?id=${res.data.paymentId}`)
 						}, 1000)
 					})
@@ -252,12 +259,14 @@
 				// #ifdef APP-PLUS || APP-PLUS-NVUE
 				handleShowToast('支付成功', 'success', () => {
 					setTimeout(() => {
+						loading.value = false;
 						handleRouteRedirectTo(`/pages/order/result/result?id=${res.data.paymentId}`)
 					}, 1000)
 				})
 				// #endif 
 			},
 			fail: function (res) {
+				loading.value = false;
 				console.log(res);
 			}
 		});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/order/pay/pay.vue b/CoreCms.Net.Uni-App/CoreShop/pages/order/pay/pay.vue
index ce0b81ea..94146055 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/order/pay/pay.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/order/pay/pay.vue
@@ -72,11 +72,8 @@
 			<view class="tips-box">注：如果您在支付中选择的支付方式不适合或异常，请再次选择其他支付方式。</view>
 
 			<!-- 底部按钮 -->
-			<view class="fixed-box">
-				<view class="fixed-btn">
-					<view class="btn-box" @click="handlePayNow">立即支付</view>
-				</view>
-			</view>
+			<coreshop-fixed-bottom-button title="立即支付" @onClick="onPayNow()"
+				:loading="loading"></coreshop-fixed-bottom-button>
 		</view>
 	</coreshop-page>
 </template>
@@ -98,7 +95,7 @@
 	}
 
 	const payMethod = ref();
-
+	const loading = ref(false);
 	const state = reactive<{
 		payMethodList : Array<PayMethodListType>;
 		payCode : string;
@@ -241,9 +238,11 @@
 	}
 
 	/** 立即支付 */
-	const handlePayNow = () => {
+	async function onPayNow() {
 		if (state.payCode) {
-			payMethod.value.handlePayNow()
+			loading.value = true;
+			payMethod.value.handlePayNow(loading);
+			console.log('xxx');
 		} else {
 			handleShowToast('请选择支付方式');
 		}
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 b27a6261..2473c7f1 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.vue
@@ -226,7 +226,8 @@
 								<text>￥{{ state.cartData?.amount }}</text>
 							</view>
 						</view>
-						<view class="btn" @click="handleSubmit">确认下单</view>
+						<coreshop-button class="btn" title="确认下单" @onClick="handleSubmit" :loading="loading"
+							:customStyle="{'border':'none','height':'90rpx'}"></coreshop-button>
 					</view>
 				</view>
 			</view>
@@ -234,7 +235,7 @@
 	</coreshop-page>
 </template>
 <script setup lang="ts">
-	import { reactive, computed } from 'vue';
+	import { reactive, computed, ref } from 'vue';
 	import { onLoad, onShow } from '@dcloudio/uni-app';
 	import {
 		PaymentTypeEnum, OrderDistributionEnum, ShowStoresSwitchEnum,
@@ -247,6 +248,7 @@
 	import { mobile } from '@/uni_modules/uv-ui-tools/libs/function/test.js';
 	import { handleRouteNavigateTo, handleShowToast, handleRouteRedirectTo } from '@/core/utils';
 	import { addressUserShip, userInvoice, userStore } from '@/core/consts';
+	import { useLoadingFn } from '@/core/hooks';
 
 	interface QueryParams {
 		cartIds ?: string;
@@ -257,7 +259,6 @@
 
 	/** 获取项目配置 */
 	const shopConfigStore : ShopConfigStoreType = useShopConfigStore();
-
 	const state = reactive<{
 		orderType : PaymentTypeEnum;    // 订单类型
 		tabList : Array<{               // 送达方式
@@ -308,6 +309,8 @@
 		couponCodeList: [],
 	});
 
+	const loading = ref(false);
+	const handleSubmit = useLoadingFn(onSubmit, loading);
 
 	/** 是否显示积分兑换价合计 */
 	const isShowPointRedemptionPrice = computed(() => {
@@ -512,7 +515,7 @@
 		} else {
 			state.couponCodeList.push(item.couponCode);
 		}
-		
+
 		getCartList({
 			success() {
 				item.checked = !item.checked;
@@ -561,7 +564,7 @@
 	}
 
 	/** 立即购买 */
-	const handleSubmit = async () => {
+	async function onSubmit() {
 		let delivery : any = {};
 		/** 如果是快递物流 / 同城送货 */
 		if (state.tabSelectType === OrderDistributionEnum.mailing || state.tabSelectType == OrderDistributionEnum.homeDelivery) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/store-set/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/store-set/index.vue
index 33a6e323..475e4231 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/store-set/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/store-set/index.vue
@@ -30,17 +30,18 @@
 				</view>
 			</view>
 		</view>
-		<coreshop-fixed-bottom-button :radius="100" title="保存"
-			@onClick="onConfirmStoreSet()"></coreshop-fixed-bottom-button>
+		<coreshop-fixed-bottom-button :radius="100" title="保存" :loading="loading"
+			@onClick="hanldeConfirmStoreSet()"></coreshop-fixed-bottom-button>
 	</coreshop-page>
 </template>
 
 <script setup lang="ts">
-	import { reactive } from 'vue';
+	import { reactive, ref } from 'vue';
 	import { onLoad } from '@dcloudio/uni-app';
 	import { queryUploadImages, queryAgentInfo, queryAgentSetStore } from '@/core/api';
 	import type { Response } from '@/core/models';
 	import { handleShowToast } from '@/core/utils';
+	import { useLoadingFn } from '@/core/hooks/use-loading';
 
 	const state = reactive<{
 		logoFile : Array<{ [key : string] : any }>;
@@ -54,6 +55,10 @@
 		storeDesc: null,
 	})
 
+	const loading = ref<boolean>(false);
+
+	const hanldeConfirmStoreSet = useLoadingFn(onConfirmStoreSet, loading);
+
 	onLoad(() => {
 		getAgentInfo();
 	});
@@ -105,7 +110,7 @@
 	};
 
 	/** 保存 */
-	const onConfirmStoreSet = async () => {
+	async function onConfirmStoreSet() {
 		if (!state.storeName) {
 			handleShowToast('请输入店铺名称'); return;
 		}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/store-set/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/store-set/index.vue
index 7d605a94..1e7f6e92 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/store-set/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/store-set/index.vue
@@ -30,17 +30,18 @@
 				</view>
 			</view>
 		</view>
-		<coreshop-fixed-bottom-button :radius="100" title="保存"
-			@onClick="onConfirmStoreSet()"></coreshop-fixed-bottom-button>
+		<coreshop-fixed-bottom-button :radius="100" title="保存" :loading="loading"
+			@onClick="hanldeConfirmStoreSet()"></coreshop-fixed-bottom-button>
 	</coreshop-page>
 </template>
 
 <script setup lang="ts">
-	import { reactive } from 'vue';
+	import { reactive, ref } from 'vue';
 	import { onLoad } from '@dcloudio/uni-app';
 	import { queryUploadImages, queryDistributionInfo, querySetStore } from '@/core/api';
 	import type { Response } from '@/core/models';
 	import { handleShowToast } from '@/core/utils';
+	import { useLoadingFn } from '@/core/hooks/use-loading';
 
 	const state = reactive<{
 		logoFile : Array<{ [key : string] : any }>;
@@ -54,6 +55,10 @@
 		storeDesc: null,
 	})
 
+	const loading = ref<boolean>(false);
+
+	const hanldeConfirmStoreSet = useLoadingFn(onConfirmStoreSet, loading);
+
 	onLoad(() => {
 		getDistributionInfo();
 	});
@@ -105,7 +110,7 @@
 	};
 
 	/** 保存 */
-	const onConfirmStoreSet = async () => {
+	async function onConfirmStoreSet() {
 		if (!state.storeName) {
 			handleShowToast('请输入店铺名称'); return;
 		}

From 8edb0f156769ac02c85569f6ce5ba1b9444a2008 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: Sun, 20 Oct 2024 11:44:14 +0800
Subject: [PATCH 2/3] =?UTF-8?q?uniapp(=E6=96=B0=E5=A2=9E)=EF=BC=9A?=
 =?UTF-8?q?=E7=A7=92=E6=9D=80=E8=AF=A6=E6=83=85=E7=AB=8B=E5=8D=B3=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=EF=BC=8C=E5=9B=A2=E8=B4=AD=E8=AF=A6=E6=83=85=E7=AB=8B?=
 =?UTF-8?q?=E5=8D=B3=E8=B4=AD=E4=B9=B0=EF=BC=8C=E5=9B=A2=E8=B4=AD=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E8=B4=AD=E4=B9=B0=E6=93=8D=E4=BD=9C=EF=BC=8C=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E5=9C=B0=E5=9D=80=E6=8F=90=E4=BA=A4=EF=BC=8C=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=94=AE=E5=90=8E=E6=8F=90=E4=BA=A4=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20=E6=8C=89=E9=92=AEloading=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=A4=9A=E6=AC=A1=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classify-five/classify-five.vue           | 16 +++++++---
 .../classify-four/classify-four.vue           |  3 +-
 .../activity/groupBuying/detail/detail.vue    | 14 +++++----
 .../activity/pinTuan/detail/detail.vue        | 28 +++++++++--------
 .../activity/seckill/detail/detail.vue        | 30 +++++++++++--------
 .../subpackage/member/address/index/index.vue | 14 ++++++---
 .../member/afterSales/apply/apply.vue         | 14 ++++++---
 7 files changed, 75 insertions(+), 44 deletions(-)

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 @@
 
 		<!-- 商品sku弹框 -->
 		<GoodsDetailSkuPopup :showSku="state.showSku" :goodsDetailData="state.goodsDetailData"
-			:safeAreaInsetBottom="false" @handleChangePopup="handleChangePopup" @handleAddCart="handleAddCart"
-			@handleBuyNow="handleBuyNow">
+			:safeAreaInsetBottom="false" :buyNowNowloading="buyNowLoading" :addCartloading="addCartLoading"
+			@handleChangePopup="handleChangePopup" @handleAddCart="handleAddCart" @handleBuyNow="handleBuyNow">
 		</GoodsDetailSkuPopup>
 
 		<!-- 头部大分类的弹框 -->
@@ -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<CategoriesType>) => {
 		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<number> = await queryAddCart({
 			productId,
 			nums,
@@ -295,7 +303,7 @@
 	}
 
 	/** 立即购买 */
-	const handleBuyNow = async ({ productId, nums } : any) => {
+	async function onBuyNow({ productId, nums } : any) {
 		const addCart : Response<number> = 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<CategoriesType>) => {
 		if (newVal) {
@@ -208,7 +209,7 @@
 	}
 
 	/** 添加购物车 */
-	const handleAddCart = async ({ productId, nums } : any) => {
+	async function onAddCart({ productId, nums } : any) {
 		const addCart : Response<number> = 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 @@
 
 			<!-- 商品sku弹框 -->
 			<GoodsDetailSkuPopup :showSku="state.showSku" :goodsDetailData="state.goodsDetailData"
-				:isShowAddCartBtn="false" btnBuyTitlt="立即团购" @handleChangePopup="handleChangePopup"
-				@handleBuyNow="handleSeckillNow"></GoodsDetailSkuPopup>
+				:isShowAddCartBtn="false" :buyNowNowloading="loading" btnBuyTitlt="立即团购"
+				@handleChangePopup="handleChangePopup" @handleBuyNow="handleBuyNow"></GoodsDetailSkuPopup>
 
 		</view>
 	</coreshop-page>
 </template>
 <script setup lang="ts">
-	import { reactive } from 'vue';
+	import { reactive, ref } from 'vue';
 	import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
 	import { queryActivityDetial, queryCartNum, queryShare, queryAddCart } from '@/core/api';
 	import { PaymentTypeEnum, ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
@@ -69,12 +69,11 @@
 	import { UserToken, shareUrl } from '@/core/consts'
 	import { useCartStore, useLoginStore } from '@/core/store';
 	import { handleShowToast, handleRouteNavigateTo } from '@/core/utils';
-
 	import GoodsDetail from '@/pages/components/goods-detail/index.vue';
 	import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
 	import GoodsDetailSkuPopup from '@/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue';
 	import GoodsDetailBottomTabbar from '@/pages/components/goods-detail/components/goods-detail-bottom-tabbar/goods-detail-bottom-tabbar.vue';
-
+	import { useLoadingFn } from '@/core/hooks';
 	interface QueryParams {
 		id : number;
 	}
@@ -117,6 +116,9 @@
 		}
 	});
 
+	const loading = ref(false);
+	const handleBuyNow = useLoadingFn(onBuyNow, loading)
+
 	onLoad((query : QueryParams) => {
 		state.id = Number(query.id);
 		/** 获取商品详情 */
@@ -177,7 +179,7 @@
 	}
 
 	/** 立即秒杀 */
-	const handleSeckillNow = async ({ productId, nums } : any) => {
+	async function onBuyNow({ productId, nums } : any) {
 		const addCart : Response<number> = await queryAddCart({
 			ProductId: productId,
 			Nums: nums,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
index d1d0c2ac..3cbbb7de 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
@@ -3,7 +3,7 @@
 		<view class="goods-detail">
 			<!-- 商品详情 -->
 			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
-				:swiperBanner="state.swiperBanner" :shareType="ShareEnum.pinTuan" 
+				:swiperBanner="state.swiperBanner" :shareType="ShareEnum.pinTuan"
 				:goodsDetailContent="state.goodsDetailContent" :isActivityGoods="true">
 				<template #activityGoodsOtheService>
 					<view class="pinTuan-record" v-if="state.goodsDetailData?.pinTuanRecord?.length > 0">
@@ -62,14 +62,14 @@
 
 			<!-- 商品sku弹框 -->
 			<GoodsDetailSkuPopup :showSku="state.showSku" :goodsDetailData="state.goodsDetailData"
-				:isShowAddCartBtn="false" @handleChangePopup="handleChangePopup" @handleBuyNow="handleBuyNow"
+				:isShowAddCartBtn="false" :buyNowNowloading="loading" @handleChangePopup="handleChangePopup" @handleBuyNow="handleBuyNow"
 				:btnBuyTitlt="state.btnBuyTitlt">
-			</GoodsDetailSkuPopup> 
+			</GoodsDetailSkuPopup>
 		</view>
 	</coreshop-page>
 </template>
 <script setup lang="ts">
-	import { reactive } from 'vue';
+	import { reactive, ref } from 'vue';
 	import { onLoad } from '@dcloudio/uni-app';
 	import { queryPinTuanGoodsDetail, queryCartNum, queryAddCart, queryOrderPinTuanTeamInfo } from '@/core/api';
 	import type { Response } from '@/core/models';
@@ -83,6 +83,7 @@
 	import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
 	import GoodsDetailSkuPopup from '@/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue';
 	import GoodsDetailBottomTabbar from '@/pages/components/goods-detail/components/goods-detail-bottom-tabbar/goods-detail-bottom-tabbar.vue';
+	import { useLoadingFn } from '@/core/hooks';
 
 	interface QueryParams {
 		id : number;
@@ -107,7 +108,7 @@
 		teamId : number;
 		isSingleBuy : boolean;
 		btnBuyTitlt : string;
-		teamInfo : any; 
+		teamInfo : any;
 	}>({
 		id: 0,
 		goodsDetailData: {},
@@ -120,9 +121,12 @@
 		teamId: 0,
 		isSingleBuy: true,
 		btnBuyTitlt: "发起拼团",
-		teamInfo: {}, 
+		teamInfo: {},
 	});
 
+	const loading = ref(false);
+	const handleBuyNow = useLoadingFn(onBuyNow, loading)
+
 	onLoad((query : QueryParams) => {
 		if (query?.teamId) {
 			state.goodsDetailData = {
@@ -193,7 +197,7 @@
 			state.isSingleBuy = true;
 			state.btnBuyTitlt = '单独购买';
 			state.goodsDetailData.skuList.sku_list = state.defaultSkuList;
-		});   
+		});
 	}
 
 	/** 拼团购买 */
@@ -204,7 +208,7 @@
 			state.isSingleBuy = false;
 			state.btnBuyTitlt = '发起拼团';
 			state.goodsDetailData.skuList.sku_list = state.activitySkuList;
-		});     
+		});
 	}
 
 	/** 去拼单 */
@@ -219,11 +223,11 @@
 	}
 
 	/** 立即购买购买 */
-	const handleBuyNow = async ({ productId, nums } : any) => {
+	async function onBuyNow({ productId, nums } : any) {
 		if (state.isSingleBuy) {
-			handleSingleQuery(productId, nums)
+			await handleSingleQuery(productId, nums)
 		} else {
-			handleMultipleQuery(productId, nums)
+			await handleMultipleQuery(productId, nums)
 		}
 	}
 
@@ -261,7 +265,7 @@
 		} else {
 			handleShowToast(addCart.msg);
 		}
-	}  
+	}
 </script>
 <style lang="scss" scoped>
 	@import './detail.scss';
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
index c5039f0a..d1bc198f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
@@ -3,7 +3,7 @@
 		<view class="goods-detail">
 			<!-- 商品详情 -->
 			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
-				:swiperBanner="state.swiperBanner" :spesDesc="state.spesDesc" 
+				:swiperBanner="state.swiperBanner" :spesDesc="state.spesDesc"
 				:goodsDetailContent="state.goodsDetailContent" :isActivityGoods="true" :shareType="ShareEnum.seckill"
 				@hanldeShowGoodSku="hanldeShowGoodSku">
 				<template #tip>
@@ -54,32 +54,33 @@
 
 			<!-- 商品sku弹框 -->
 			<GoodsDetailSkuPopup :showSku="state.showSku" :goodsDetailData="state.goodsDetailData"
-				:isShowAddCartBtn="false" btnBuyTitlt="立即秒杀" @handleChangePopup="handleChangePopup"
-				@handleBuyNow="handleSeckillNow"></GoodsDetailSkuPopup>
+				:isShowAddCartBtn="false" btnBuyTitlt="立即秒杀" :buyNowNowloading="loading"
+				@handleChangePopup="handleChangePopup" @handleBuyNow="handleSeckillNow"></GoodsDetailSkuPopup>
 		</view>
 	</coreshop-page>
 </template>
 <script setup lang="ts">
-	import { reactive } from 'vue';
+	import { reactive, ref } from 'vue';
 	import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
 	import { queryActivityDetial, queryCartNum, queryShare, queryAddCart, queryUserInfo } from '@/core/api';
 	import { PaymentTypeEnum, ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
-	import type { Response, UserInfoType } from '@/core/models';
+	import type { Response } from '@/core/models';
 	import { UserToken, shareUrl } from '@/core/consts'
-	import { useCartStore, useUserInfoStore ,useLoginStore} from '@/core/store';
+	import { useCartStore, useLoginStore } from '@/core/store';
 	import { handleShowToast, handleRouteNavigateTo } from '@/core/utils';
 
 	import GoodsDetail from '@/pages/components/goods-detail/index.vue';
 	import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
 	import GoodsDetailSkuPopup from '@/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue';
 	import GoodsDetailBottomTabbar from '@/pages/components/goods-detail/components/goods-detail-bottom-tabbar/goods-detail-bottom-tabbar.vue';
+	import { useLoadingFn } from '@/core/hooks';
 
 	interface QueryParams {
 		id : number;
 	}
-	
+
 	/** 登录store */
-	const _useLoginStore = useLoginStore(); 
+	const _useLoginStore = useLoginStore();
 
 	const cartStore = useCartStore();
 
@@ -91,7 +92,7 @@
 		shareUrl : string;
 		id : number;
 		showTip : boolean;
-		spesDesc : string; 
+		spesDesc : string;
 		timeData : {
 			days : number,
 			hours : number,
@@ -106,7 +107,7 @@
 		shareUrl: "",
 		id: 0,
 		showTip: true,
-		spesDesc: "", 
+		spesDesc: "",
 		timeData: {
 			days: 0,
 			hours: 0,
@@ -115,6 +116,9 @@
 		}
 	});
 
+	const loading = ref(false);
+	const handleSeckillNow = useLoadingFn(onSeckillNow, loading)
+
 	onLoad((query : QueryParams) => {
 		state.id = Number(query.id);
 		/** 获取商品详情 */
@@ -171,11 +175,11 @@
 	const hanldeShowGoodSku = () => {
 		_useLoginStore.checkLogin(() => {
 			state.showSku = true;
-		});   
+		});
 	}
 
 	/** 立即秒杀 */
-	const handleSeckillNow = async ({ productId, nums } : any) => {
+	async function onSeckillNow({ productId, nums } : any) {
 		const addCart : Response<number> = await queryAddCart({
 			ProductId: productId,
 			Nums: nums,
@@ -190,7 +194,7 @@
 		} else {
 			handleShowToast(addCart.msg);
 		}
-	}  
+	}
 
 	/** 获取分享url */
 	const getShareUrl = async () => {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/address/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/address/index/index.vue
index 6bc4c253..770dedc4 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/address/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/address/index/index.vue
@@ -46,7 +46,7 @@
 				</view>
 			</view>
 
-			<coreshop-fixed-bottom-button :radius="100" title="保存"
+			<coreshop-fixed-bottom-button :radius="100" title="保存" :loading="loading"
 				@onClick="handleSaveShip"></coreshop-fixed-bottom-button>
 
 			<coreshop-select-city :show="state.showSelectCity" :pickerValue="state.pickerValue"
@@ -56,13 +56,14 @@
 	</coreshop-page>
 </template>
 <script setup lang="ts">
-	import { reactive } from 'vue';
+	import { reactive, ref } from 'vue';
 	import { onLoad, onShow, onUnload } from '@dcloudio/uni-app';
 	import { AddressPageTitltEnum, ShowAllowAddressToUseMap } from '@/core/enum';
 	import { queryAreaId, querySaveUserShip, queryShipDetail } from '@/core/api';
 	import type { Response, ShopConfigStoreType, AddressType } from '@/core/models';
 	import { useShopConfigStore } from '@/core/store';
 	import { handleShowToast } from '@/core/utils';
+	import { useLoadingFn } from '@/core/hooks';
 
 	interface QueryParams {
 		type : string;
@@ -103,7 +104,7 @@
 		city: "",
 		longitude: 0,
 		latitude: 0,
-		region: ['湖南省', '怀化市', '鹤城区'],
+		region: [],
 		shipId: 0,
 		submitStatus: true,
 		pickerValue: '',
@@ -118,6 +119,11 @@
 		}
 	});
 
+
+	const loading = ref(false);
+	const handleSaveShip = useLoadingFn(onSaveShip, loading)
+
+
 	onShow(() => {
 		// #ifdef MP-WEIXIN
 		const chooseLocation = requirePlugin('chooseLocation');
@@ -278,7 +284,7 @@
 	}
 
 	/** 提交地址 */
-	const handleSaveShip = async () => {
+	async function onSaveShip() {
 		if (!state.submitStatus) {
 			return;
 		}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/afterSales/apply/apply.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/afterSales/apply/apply.vue
index 1f5ecef6..bb8d4dd4 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/afterSales/apply/apply.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/afterSales/apply/apply.vue
@@ -91,20 +91,23 @@
 			</view>
 
 			<!-- 按钮 -->
-			<view class="btn-box">
+			<!-- 	<view class="btn-box">
 				<view class="btn" @click="handlesubmit">提交</view>
-			</view>
+			</view> -->
+			<coreshop-fixed-bottom-button :loading="loading" title="提交"
+				@onClick="handlesubmit()"></coreshop-fixed-bottom-button>
 		</view>
 	</coreshop-page>
 </template>
 <script setup lang="ts">
-	import { reactive } from 'vue';
+	import { reactive, ref } from 'vue';
 	import { onLoad } from '@dcloudio/uni-app';
 	import { handleShowToast, handleRouteNavigateTo } from '@/core/utils';
 	import { queryOrderDetails, queryUploadImages, queryAddAftersales } from '@/core/api';
 	import type { Response } from '@/core/models';
 	import { OrderAllStatusTypeEnum, OrderShipStatusEnum } from '@/core/enum';
 	import { amount } from '@/uni_modules/uv-ui-tools/libs/function/test.js';
+	import { useLoadingFn } from '@/core/hooks';
 
 	enum RefundType {
 		/** 仅退款 */
@@ -141,6 +144,9 @@
 		refundPrice: 0,
 	});
 
+	const loading = ref(false);
+	const handlesubmit = useLoadingFn(onSubmit, loading)
+
 	onLoad((query : QueryParams) => {
 		if (query?.orderId) {
 			state.orderId = query?.orderId;
@@ -288,7 +294,7 @@
 	}
 
 	/** 提交 */
-	const handlesubmit = async () => {
+	async function onSubmit() {
 		if (!amount(state.refundPrice)) {
 			handleShowToast('请输入正确金额'); return;
 		}

From 5517229452df9c71bfa537ec52c19f74799434b1 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: Sun, 20 Oct 2024 16:34:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?uniapp(=E4=BF=AE=E5=A4=8D)=EF=BC=9A=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E7=9C=81=E5=B8=82=E5=8C=BA=E5=BC=B9=E5=87=BA=E6=A1=86?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=B8=8D=E5=AF=B9=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coreshop-select-city/coreshop-select-city.vue          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-select-city/coreshop-select-city.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-select-city/coreshop-select-city.vue
index a3319822..a35e97f1 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-select-city/coreshop-select-city.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-select-city/coreshop-select-city.vue
@@ -1,5 +1,6 @@
 <template>
-	<uv-picker ref="cityPicker" :columns="addressList" keyName="label" @change="change" @confirm="confirm" @close="close"> </uv-picker>
+	<uv-picker ref="cityPicker" :columns="addressList" keyName="label" @change="change" @confirm="confirm"
+		@close="close"> </uv-picker>
 </template>
 <script setup lang="ts">
 	import { watch, watchEffect, reactive, ref, computed, onMounted } from 'vue';
@@ -52,8 +53,10 @@
 	watchEffect(() => {
 		if (props.pickerValue && state.cityList.length > 0) {
 
+			console.log('props.pickerValue', props.pickerValue);
 			const cityName = props.pickerValue.split(' ');
 
+			const province = state.cityList.find(x => x.label === cityName[0]);
 			let provincesIndex : number = state.cityList.findIndex(((item : CityAddressType) => item.label === cityName[0]));
 
 			let citysIndex : number = state.cityList[provincesIndex].children.findIndex((item : CityAddressType) => item.label === cityName[1])
@@ -61,6 +64,8 @@
 			let areasIndex : number = state.cityList[provincesIndex].children[citysIndex].children.findIndex((item : CityAddressType) => item.label === cityName[2])
 
 			state.cityVal = [provincesIndex, citysIndex, areasIndex];
+			state.citys = province.children;
+			state.areas = province.children[citysIndex].children;
 		}
 	});