fix(api): 修复登录参数和请求URL配置问题

修正志愿者登录接口参数从username改为uuid
更新兑换相关接口的URL路径和参数配置
添加请求参数合并逻辑确保默认参数被正确应用

 /*
 /*
  * @Date: 2023-08-24 09:42:27
  * @Date: 2023-08-24 09:42:27
  * @LastEditors: hookehuyr hookehuyr@gmail.com
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2026-01-14 20:50:41
+ * @LastEditTime: 2026-01-20 11:08:06
  * @FilePath: /xyxBooking-weapp/src/api/index.js
  * @FilePath: /xyxBooking-weapp/src/api/index.js
  * @Description: 文件描述
  * @Description: 文件描述
  */
  */
@@ -28,9 +28,9 @@ const Api = {
   QUERY_QR_CODE: '/srv/?a=api&t=id_number_query_qr_code',
   QUERY_QR_CODE: '/srv/?a=api&t=id_number_query_qr_code',
   ICBC_ORDER_QRY: '/srv/?a=icbc_orderqry',
   ICBC_ORDER_QRY: '/srv/?a=icbc_orderqry',
   WX_PAY: '/srv/?a=icbc_pay_wxamp',
   WX_PAY: '/srv/?a=icbc_pay_wxamp',
-  REDEEM_LOGIN: '/srv/?a=redeem&t=login',
-  REDEEM_CHECK_AUTH: '/srv/?a=redeem&t=check_auth',
-  REDEEM_REDEEM: '/srv/?a=redeem&t=redeem',
+  REDEEM_LOGIN: '/srv/?f=reserve_admin&a=login',
+  REDEEM_CHECK_AUTH: '/srv/?f=reserve_admin&a=user&t=check_auth',
+  REDEEM_REDEEM: '/srv/?f=reserve_admin&a=bill&t=redeem',
 };
 };
 
 
 /**
 /**

 <!--
 <!--
  * @Date: 2026-01-08 13:01:56
  * @Date: 2026-01-08 13:01:56
  * @LastEditors: hookehuyr hookehuyr@gmail.com
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2026-01-14 20:49:12
+ * @LastEditTime: 2026-01-20 10:54:19
  * @FilePath: /xyxBooking-weapp/src/pages/volunteerLogin/index.vue
  * @FilePath: /xyxBooking-weapp/src/pages/volunteerLogin/index.vue
  * @Description: 义工登录页面
  * @Description: 义工登录页面
 -->
 -->
@@ -68,7 +68,7 @@ const handleLogin = async () => {
   }
   }
 
 
   Taro.showLoading({ title: '登录中...' })
   Taro.showLoading({ title: '登录中...' })
-  const login_res = await volunteerLoginAPI({ username: username.value, password: password.value })
+  const login_res = await volunteerLoginAPI({ uuid: username.value, password: password.value })
   Taro.hideLoading()
   Taro.hideLoading()
 
 
   if (login_res?.code !== 1) {
   if (login_res?.code !== 1) {

@@ -51,6 +51,46 @@ service.defaults.params = {
 let has_shown_timeout_modal = false
 let has_shown_timeout_modal = false
 
 
 /**
 /**
+ * 合并请求参数，将默认参数与请求参数合并
+ * @param {Object} config - axios请求配置对象
+ * @returns {Object} 合并后的请求配置对象
+ */
+
+const merge_request_params = (config) => {
+  const url = config?.url || ''
+  if (!url || url.indexOf('?') === -1) {
+    const params = config?.params || {}
+    return {
+      ...config,
+      params: {
+        ...REQUEST_DEFAULT_PARAMS,
+        ...params,
+      },
+    }
+  }
+
+  const parts = url.split('?')
+  const base_url = parts[0]
+  const search = parts.slice(1).join('?')
+  const url_params = {}
+  const search_params = new URLSearchParams(search)
+  for (const [key, value] of search_params.entries()) {
+    url_params[key] = value
+  }
+  const merged_params = {
+    ...REQUEST_DEFAULT_PARAMS,
+    ...url_params,
+    ...(config?.params || {}),
+  }
+
+  return {
+    ...config,
+    url: base_url,
+    params: merged_params,
+  }
+}
+
+/**
  * 判断是否为超时错误
  * 判断是否为超时错误
  * @param {Error} error - 请求错误对象
  * @param {Error} error - 请求错误对象
  * @returns {boolean} 是否为超时错误
  * @returns {boolean} 是否为超时错误
@@ -147,6 +187,8 @@ service.interceptors.request.use(
       config.headers.cookie = sessionid;
       config.headers.cookie = sessionid;
     }
     }
 
 
+    config = merge_request_params(config)
+
     // 增加时间戳
     // 增加时间戳
     if (config.method === 'get') {
     if (config.method === 'get') {
         config.params = { ...config.params, timestamp: (new Date()).valueOf() }
         config.params = { ...config.params, timestamp: (new Date()).valueOf() }

@@ -125,7 +125,7 @@ const buildApiUrl = (action, params = {}) => {
         a: action,
         a: action,
         f: REQUEST_DEFAULT_PARAMS.f,
         f: REQUEST_DEFAULT_PARAMS.f,
         client_name: REQUEST_DEFAULT_PARAMS.client_name,
         client_name: REQUEST_DEFAULT_PARAMS.client_name,
-        ...params
+        ...params,
     })
     })
     return `${BASE_URL}/srv/?${queryParams.toString()}`
     return `${BASE_URL}/srv/?${queryParams.toString()}`
 }
 }