chore: update husky and lint-staged config

.husky/commit-msg

@@ -1 +0,0 @@
-pnpm commitlint --edit $1

.husky/pre-commit

@@ -1,4 +1,6 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
+echo "Running pre-commit hook..."
+git status
 pnpm lint-staged

package.json

@@ -38,7 +38,7 @@
       "stylelint --fix",
       "prettier --write"
     ],
-    "*.{txt,md}": [
+    "*.{txt,md,json}": [
       "prettier --write"
     ]
   },
@@ -129,4 +129,4 @@
     "gifsicle": "5.2.0"
   },
   "packageManager": "pnpm@10.7.1+sha512.2d92c86b7928dc8284f53494fb4201f983da65f0fb4f0d40baafa5cf628fa31dae3e5968f12466f17df7e97310e30f343a648baea1b9b350685dafafffdf5808"
-}
+}

src/views/card-jd-ck/order/index.vue

@@ -229,8 +229,7 @@ const fetchData = async (
       pagination.current,
       pagination.pageSize as ApiCookieInfoJdOrderListGetPageSizeEnum,
       null,
-      formModel.value.giftCardPwd,
-      formModel.value.merchantId
+      formModel.value.giftCardPwd
     );
     renderData.value = res.data.list;
     pagination.current = params.current;