diff --git a/.husky/commit-msg b/.husky/commit-msg deleted file mode 100644 index 66ae5b5..0000000 --- a/.husky/commit-msg +++ /dev/null @@ -1 +0,0 @@ -pnpm commitlint --edit $1 \ No newline at end of file diff --git a/.husky/pre-commit b/.husky/pre-commit index a5a29d9..3d2acd3 100755 --- a/.husky/pre-commit +++ b/.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 diff --git a/package.json b/package.json index 99719fa..c724cab 100644 --- a/package.json +++ b/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" -} \ No newline at end of file +} diff --git a/src/views/card-jd-ck/order/index.vue b/src/views/card-jd-ck/order/index.vue index 7e15437..fd289e6 100644 --- a/src/views/card-jd-ck/order/index.vue +++ b/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;