From 5fef307e88b3ec0bf5ac2dd1fa74c71c4966210b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=A9=E4=BB=9488?= <>
Date: Fri, 9 Jan 2026 09:43:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 h5/pages/main/login/login.vue     | 157 +++++++++++++++---------------
 h5/pages/main/order/src/order.vue |   1 -
 2 files changed, 77 insertions(+), 81 deletions(-)

diff --git a/h5/pages/main/login/login.vue b/h5/pages/main/login/login.vue
index 5a1eedd..49acd76 100644
--- a/h5/pages/main/login/login.vue
+++ b/h5/pages/main/login/login.vue
@@ -1,88 +1,85 @@
 <script setup>
 import DraggableButton from "@/pages/components/goHome.vue";
-	/**
-	 * name：
-	 * user：sa0ChunLuyu
-	 * date：2024年8月12日 19:47:35
-	 */
-	import {
-		ref
-	} from 'vue'
-	import {
-		$response
-	} from '@/api'
-	import {
-		onShow
-	} from '@dcloudio/uni-app'
-	const $props = defineProps({
-		openid: {
-			type: String,
-			default: ''
-		},
-		path:{
-			type:String,
-			default:''
-		},
-		orderid:{
-			type:String,
-			default:''
-		}
-	});
-	const tip_str = ref('授权登录中，请稍候...')
-	const checkOpenid = () => {
-		let openid = ''
-		let path=''
-		let param=''
-		if (!!$props.openid) {
-			openid = decodeURIComponent($props.openid)
-		}
-		if (!!$props.path) {
-			path = decodeURIComponent($props.path)
-			
-			const index = path.indexOf('#');
-			if (index !== -1) {
-			        path= path.substring(0, index); // 包含 # 时，返回 # 前面的部分
-			}
-			
-			param=param+"?path="+path
-		}
-		if (!!$props.orderid) {
-			path = decodeURIComponent($props.orderid)
-			const index = path.indexOf('#');
-			if (index !== -1) {
-			        path= path.substring(0, index); // 包含 # 时，返回 # 前面的部分
-			}
-			param=param+"&orderid="+path
-		}
-		if (!!openid) {
-			const index = openid.indexOf('#');
-			if (index !== -1) {
-			        openid= openid.substring(0, index); // 包含 # 时，返回 # 前面的部分
-			}
-			uni.setStorageSync('OPENID', openid)
-			uni.redirectTo({
-				url: "/pages/main/index/index"+param
-			})
-		} else {
-			tip_str.value = '未获取到授权信息，请从小程序进入'
-		}
-	}
+/**
+ * name：
+ * user：sa0ChunLuyu
+ * date：2024年8月12日 19:47:35
+ */
+import { ref } from 'vue'
+import { $response } from '@/api'
+import { onShow } from '@dcloudio/uni-app'
 
-	onShow(() => {
-		checkOpenid()
-	})
+// 1. 解构 props，命名更清晰，符合 Vue 最佳实践
+const props = defineProps({
+  openid: {
+    type: String,
+    default: ''
+  },
+  path: {
+    type: String,
+    default: ''
+  },
+  orderid: {
+    type: String,
+    default: ''
+  }
+});
+
+const tip_str = ref('授权登录中，请稍候...')
+
+// 2. 封装通用函数：截取 # 之前的字符串，避免重复代码
+const getPureValue = (value) => {
+  if (!value) return '';
+  const decodedValue = decodeURIComponent(value);
+  const hashIndex = decodedValue.indexOf('#');
+  return hashIndex !== -1 ? decodedValue.substring(0, hashIndex) : decodedValue;
+};
+
+const checkOpenid = () => {
+  // 3. 处理各参数，使用通用函数统一处理 # 截取
+  const openid = getPureValue(props.openid);
+  const path = getPureValue(props.path);
+  const orderid = getPureValue(props.orderid);
+
+  // 4. 初始化参数拼接字符串，避免 undefined 开头
+  let redirectParams = '';
+  // 拼接 path 参数
+  if (path) {
+    redirectParams += `?path=${path}`;
+  }
+  // 拼接 orderid 参数（修复：不再覆盖 path 变量）
+  if (orderid) {
+    redirectParams += `${redirectParams ? '&' : '?'}orderid=${orderid}`;
+  }
+
+  if (openid) {
+    uni.setStorageSync('OPENID', openid);
+    // 跳转页面，拼接参数
+    uni.redirectTo({
+      url: `/pages/main/index/index${redirectParams}`
+    });
+  } else {
+    tip_str.value = '未获取到授权信息，请从小程序进入';
+  }
+};
+
+onShow(() => {
+  checkOpenid();
+});
 </script>
+
 <template>
-	<view class="tip_wrapper">
-		{{ tip_str }}
-	</view>
+  <view class="tip_wrapper">
+    {{ tip_str }}
+  </view>
 </template>
+
 <style scoped>
-	.tip_wrapper {
-		height: 100vh;
-		width: 100%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
+.tip_wrapper {
+  height: 100vh;
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 </style>
\ No newline at end of file
diff --git a/h5/pages/main/order/src/order.vue b/h5/pages/main/order/src/order.vue
index d77fceb..4dead3d 100644
--- a/h5/pages/main/order/src/order.vue
+++ b/h5/pages/main/order/src/order.vue
@@ -404,7 +404,6 @@
 	}
 	
 	onMounted(() => {
-		
 		deepInfo();
 	});
 </script>