Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # src/views/shop/shopOrder/components/orderInfo.vue # src/views/shop/shopOrder/index.vue
2025-08-09 15:32:06 +08:00
parent 30c867c6b6 9ac52b5136
commit be3efaad57
15 changed files with 878 additions and 411 deletions
--- a/src/api/system/access-key/index.ts
+++ b/src/api/system/access-key/index.ts
@@ -26,7 +26,7 @@ export async function addAccessKey(data: AccessKey) {
    data
  );
  if (res.data.code === 0) {
-    return res.data.message;
+    return res.data.data;
  }
  return Promise.reject(new Error(res.data.message));
 }