From d13c02adcf747118247c537e8ebb3e713bb02eb4 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Thu, 14 May 2026 10:01:11 +0800
Subject: [PATCH 1/7] 1

---
 pages/index/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0210112..2e0ce19 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -964,10 +964,13 @@
 					if (res.code == 200) {
 						that.resetSwipeOrder();
 						if (!uni.getStorageSync('worker') && res.result != null) {
+							that.tui.toast(res.message + '点击下方"配送"即可开始送单啦!');
 							uni.setStorageSync('worker', res.result)
+						}else{
+							that.tui.toast(res.message);
 						}
 						that.deliveryItem.splice(index, 1)
-						that.tui.toast(res.message);
+						
 						if (item.workerId != null && item.workerId != undefined && item.workerId != '') {
 							that.zhipaiCount -= 1
 						} else {

From c6f57109760b2e4a0ef882974e5910342b5fddda Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Thu, 14 May 2026 10:39:53 +0800
Subject: [PATCH 2/7] 1

---
 components/common-loading/common-loading.vue | 99 ++++++++++++++++++++
 components/kk-printer/index.vue              |  1 +
 2 files changed, 100 insertions(+)
 create mode 100644 components/common-loading/common-loading.vue

diff --git a/components/common-loading/common-loading.vue b/components/common-loading/common-loading.vue
new file mode 100644
index 0000000..cc5542d
--- /dev/null
+++ b/components/common-loading/common-loading.vue
@@ -0,0 +1,99 @@
+<template>
+	<view
+		v-if="visible"
+		class="common-loading"
+		:class="{'common-loading--mask': mask}"
+		@touchmove.stop.prevent="noop"
+		@tap.stop="noop"
+	>
+		<view class="common-loading__box">
+			<image class="common-loading__gif" src="/static/images/img/loading.gif" mode="aspectFit"></image>
+			<view v-if="title" class="common-loading__text">{{ title }}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { LOADING_HIDE_EVENT, LOADING_SHOW_EVENT, getLoadingState } from '@/utils/loading.js'
+
+	export default {
+		name: 'CommonLoading',
+		data() {
+			return {
+				visible: false,
+				title: '加载中...',
+				mask: true
+			}
+		},
+		created() {
+			const state = getLoadingState()
+			this.visible = state.visible
+			this.title = state.title
+			this.mask = state.mask
+			uni.$on(LOADING_SHOW_EVENT, this.show)
+			uni.$on(LOADING_HIDE_EVENT, this.hide)
+		},
+		beforeDestroy() {
+			uni.$off(LOADING_SHOW_EVENT, this.show)
+			uni.$off(LOADING_HIDE_EVENT, this.hide)
+		},
+		methods: {
+			show(options = {}) {
+				this.visible = true
+				this.title = options.title || '加载中...'
+				this.mask = options.mask !== false
+			},
+			hide() {
+				this.visible = false
+			},
+			noop() {}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.common-loading {
+		position: fixed;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		z-index: 99999;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		pointer-events: none;
+		background: rgba(0, 0, 0, 0.18);
+	}
+
+	.common-loading--mask {
+		pointer-events: auto;
+	}
+
+	.common-loading__box {
+		min-width: 180rpx;
+		min-height: 180rpx;
+		padding: 34rpx 36rpx 30rpx;
+		border-radius: 28rpx;
+		background: rgba(255, 255, 255, 0.96);
+		box-shadow: 0 18rpx 46rpx rgba(0, 0, 0, 0.16);
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.common-loading__gif {
+		width: 92rpx;
+		height: 92rpx;
+	}
+
+	.common-loading__text {
+		margin-top: 18rpx;
+		max-width: 320rpx;
+		font-size: 26rpx;
+		line-height: 36rpx;
+		color: #333;
+		text-align: center;
+	}
+</style>
diff --git a/components/kk-printer/index.vue b/components/kk-printer/index.vue
index 98e913a..2415463 100644
--- a/components/kk-printer/index.vue
+++ b/components/kk-printer/index.vue
@@ -39,6 +39,7 @@
 				</view>
 			</view>
 		</view>
+		<common-loading />
 	</view>
 </template>
 

From 5639882512659f7c4b809a1c1bb696cf5d88aca1 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Thu, 14 May 2026 10:40:19 +0800
Subject: [PATCH 3/7] 1

---
 package1/buyFood/buyFood.vue              | 1 +
 package1/group/groupBuySingle.vue         | 1 +
 package1/group/shopEvaluate.vue           | 1 +
 package1/myCenter/addGoods.vue            | 1 +
 package1/myCenter/partTimeJobRegister.vue | 1 +
 package1/order/orderDetail.vue            | 1 +
 package1/order/orderEvaluate.vue          | 1 +
 package1/order/returnOrder.vue            | 1 +
 package1/runErrand/runErrand.vue          | 1 +
 9 files changed, 9 insertions(+)

diff --git a/package1/buyFood/buyFood.vue b/package1/buyFood/buyFood.vue
index 675ed56..be5e80a 100644
--- a/package1/buyFood/buyFood.vue
+++ b/package1/buyFood/buyFood.vue
@@ -422,6 +422,7 @@
 		<delivery-time-op @timeCallback="timeCallback" :dodge="true" ref='model' :content="content" :barHidth='600'
 			title="选择送达时间">
 			> </delivery-time-op>
+		<common-loading />
 	</view>
 </template>
 
diff --git a/package1/group/groupBuySingle.vue b/package1/group/groupBuySingle.vue
index 4072df5..472748b 100644
--- a/package1/group/groupBuySingle.vue
+++ b/package1/group/groupBuySingle.vue
@@ -625,6 +625,7 @@
 				</view>
 			</view>
 		</uni-popup>
+		<common-loading />
 	</view>
 </template>
 
diff --git a/package1/group/shopEvaluate.vue b/package1/group/shopEvaluate.vue
index 820b076..9bd83b1 100644
--- a/package1/group/shopEvaluate.vue
+++ b/package1/group/shopEvaluate.vue
@@ -122,6 +122,7 @@
 				<img :src="bigImg" alt="" style="width: 100%;height: 100%;">
 			</view>
 		</uni-popup>
+		<common-loading />
 	</view>
 </template>
 
diff --git a/package1/myCenter/addGoods.vue b/package1/myCenter/addGoods.vue
index 0252bdb..2d871f7 100644
--- a/package1/myCenter/addGoods.vue
+++ b/package1/myCenter/addGoods.vue
@@ -150,6 +150,7 @@
 				</view>
 			</view>
 		</uni-popup>
+		<common-loading />
 	</view>
 </template>
 
diff --git a/package1/myCenter/partTimeJobRegister.vue b/package1/myCenter/partTimeJobRegister.vue
index 3eb6dd7..96eca0a 100644
--- a/package1/myCenter/partTimeJobRegister.vue
+++ b/package1/myCenter/partTimeJobRegister.vue
@@ -205,6 +205,7 @@
 				</view>
 			</view>
 		</uni-popup>
+		<common-loading />
 	</view>
 </template>
 
diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue
index 5750ed0..bd181ff 100644
--- a/package1/order/orderDetail.vue
+++ b/package1/order/orderDetail.vue
@@ -746,6 +746,7 @@
 				</view>
 			</view>
 		</uni-popup>
+		<common-loading />
 	</view>
 </template>
 
diff --git a/package1/order/orderEvaluate.vue b/package1/order/orderEvaluate.vue
index 013ea2f..ca8e7dc 100644
--- a/package1/order/orderEvaluate.vue
+++ b/package1/order/orderEvaluate.vue
@@ -131,6 +131,7 @@
 				</view>
 			</view>
 		</view>
+		<common-loading />
 	</view>
 </template>
 
diff --git a/package1/order/returnOrder.vue b/package1/order/returnOrder.vue
index e022075..9a7a545 100644
--- a/package1/order/returnOrder.vue
+++ b/package1/order/returnOrder.vue
@@ -279,6 +279,7 @@
 				</view>
 			</view>
 		</uni-popup>
+		<common-loading />
 	</view>
 </template>
 
diff --git a/package1/runErrand/runErrand.vue b/package1/runErrand/runErrand.vue
index f329ed6..91ba843 100644
--- a/package1/runErrand/runErrand.vue
+++ b/package1/runErrand/runErrand.vue
@@ -353,6 +353,7 @@
 				</view>
 			</view>
 		</uni-popup>
+		<common-loading />
 	</view>
 </template>
 

From 12e4b365fedf231038028cac077e34328ff3e561 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Thu, 14 May 2026 10:40:43 +0800
Subject: [PATCH 4/7] 1

---
 package2/shop/merchantRegister.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package2/shop/merchantRegister.vue b/package2/shop/merchantRegister.vue
index b0ad364..7840566 100644
--- a/package2/shop/merchantRegister.vue
+++ b/package2/shop/merchantRegister.vue
@@ -178,6 +178,7 @@
 		
 		<button @tap.stop="submit()">保存</button>
 		
+		<common-loading />
 	</view>
 </template>
 

From b151650b3179b467ad6142e6dc908d48feadd930 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Thu, 14 May 2026 10:41:04 +0800
Subject: [PATCH 5/7] 1

---
 pages/index/home.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pages/index/home.vue b/pages/index/home.vue
index 7318f39..cb6cd50 100644
--- a/pages/index/home.vue
+++ b/pages/index/home.vue
@@ -1,5 +1,7 @@
 <template>
-
+	<view>
+		<common-loading />
+	</view>
 </template>
 
 <script>

From 1d8df2331e2088634a38f1ad22c7ad2ec8921e16 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Thu, 14 May 2026 10:41:25 +0800
Subject: [PATCH 6/7] 1

---
 utils/loading.js | 78 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 utils/loading.js

diff --git a/utils/loading.js b/utils/loading.js
new file mode 100644
index 0000000..f782fb9
--- /dev/null
+++ b/utils/loading.js
@@ -0,0 +1,78 @@
+export const LOADING_SHOW_EVENT = 'common-loading:show'
+export const LOADING_HIDE_EVENT = 'common-loading:hide'
+
+const defaultOptions = {
+	title: '加载中...',
+	mask: true
+}
+
+const loadingState = {
+	visible: false,
+	title: defaultOptions.title,
+	mask: defaultOptions.mask
+}
+
+let installed = false
+let nativeShowLoading = null
+let nativeHideLoading = null
+
+function normalizeOptions(options = {}) {
+	if (typeof options === 'string') {
+		return {
+			...defaultOptions,
+			title: options
+		}
+	}
+
+	return {
+		...defaultOptions,
+		...options,
+		title: options.title || defaultOptions.title,
+		mask: options.mask !== false
+	}
+}
+
+export function getLoadingState() {
+	return {
+		...loadingState
+	}
+}
+
+export function showLoading(options) {
+	const loadingOptions = normalizeOptions(options)
+	loadingState.visible = true
+	loadingState.title = loadingOptions.title
+	loadingState.mask = loadingOptions.mask
+	uni.$emit(LOADING_SHOW_EVENT, loadingOptions)
+	loadingOptions.success && loadingOptions.success({ errMsg: 'showLoading:ok' })
+	loadingOptions.complete && loadingOptions.complete({ errMsg: 'showLoading:ok' })
+}
+
+export function hideLoading(options = {}) {
+	loadingState.visible = false
+	uni.$emit(LOADING_HIDE_EVENT)
+	nativeHideLoading && nativeHideLoading.call(uni)
+	options.success && options.success({ errMsg: 'hideLoading:ok' })
+	options.complete && options.complete({ errMsg: 'hideLoading:ok' })
+}
+
+export function installLoading() {
+	if (installed) {
+		return
+	}
+
+	installed = true
+	nativeShowLoading = uni.showLoading
+	nativeHideLoading = uni.hideLoading
+	uni.$nativeShowLoading = nativeShowLoading
+	uni.$nativeHideLoading = nativeHideLoading
+	uni.showLoading = showLoading
+	uni.hideLoading = hideLoading
+}
+
+export default {
+	installLoading,
+	showLoading,
+	hideLoading,
+	getLoadingState
+}

From c67a8660c03f77c047abbebe889996fa10ca2d14 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Thu, 14 May 2026 10:41:47 +0800
Subject: [PATCH 7/7] 1

---
 main.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/main.js b/main.js
index 4a6d6d6..0f21fb4 100644
--- a/main.js
+++ b/main.js
@@ -3,6 +3,7 @@ import store from '@/store'
 import App from './App'
 import config from '@/config.js'
 import uView from '@/uni_modules/uview-ui'
+import { installLoading } from '@/utils/loading.js'
 
 import tui from './common/httpRequest'
 
@@ -10,6 +11,7 @@ Vue.config.productionTip = false
 App.mpType = 'app'
 Vue.prototype.$ossDomain = config.OSS_DOMAIN
 Vue.use(uView)
+installLoading()
 
 
 // #ifndef MP