Merge branch 'bug-rework-2025-0603' of gitea.intra.yunpaper.com:kuaileadmin/acupuncture_register_system_uniapp into bug-rework-2025-0603

components/tabbar.vue

@@ -95,11 +95,24 @@
 						var url = `/${res.path}`;
 						uni.navigateTo({ url });
 					},
-					fail: (err) => {
+					// fail: (err) => {
-						uni.showToast({
+					// 	uni.showToast({
-							title: '扫码失败'+JSON.stringify(err),
+					// 		title: '扫码失败'+JSON.stringify(err),
-							icon: 'none'
+					// 		icon: 'none'
-						})
+					// 	})
+					// }
+					complete(res) {
+						// console.log('其他错误:', res);
+						if (res.errMsg === 'scanCode:ok') {
+							console.log('扫码成功:', res.result);
+						} else if (res.errMsg === 'scanCode:fail cancel') {
+							console.log('用户取消扫码');
+						} else {
+							uni.showToast({
+								title: '扫码失败'+JSON.stringify(res.errMsg),
+								icon: 'none'
+							})
+						}
 					}
 				})
 				// #endif

pages/visitors/visitors.vue

@@ -515,7 +515,7 @@
 		width: 100%;
 		top: 82.41%;
 		.submitbtn{
-			width: 646rpx;
+			// width: 646rpx;
 			margin: 0 auto;
 		}
 		.tip{