diff --git a/.lintstagedrc.json b/.lintstagedrc.json index 3ae556d..ed2a987 100644 --- a/.lintstagedrc.json +++ b/.lintstagedrc.json @@ -1,4 +1,9 @@ { - "src/**/*.{vue,js}": ["npm run prettier", "npm run eslint"], - "src/**/*.{vue,scss,css,less}": ["npm run stylelint:out"] -} + "*.{vue,js}": [ + "prettier --write", + "eslint --fix" + ], + "*.{vue,scss,css,less}": [ + "stylelint --fix" + ] +} \ No newline at end of file diff --git a/constant/transportType.js b/constant/transportType.js index 7effc3f..acfa808 100644 --- a/constant/transportType.js +++ b/constant/transportType.js @@ -1,7 +1,13 @@ export const transportType = { - TRANSPORT_BLUETOOTH: 0, - TRANSPORT_OFFLINE: 10, - TRANSPORT_GATEWAY: 20, - TRANSPORT_WIFI: 30, - TRANSPORT_TENCENT_YUN: 40 + TRANSPORT_BLUETOOTH: 10, + TRANSPORT_OFFLINE: 20, + TRANSPORT_GATEWAY: 30, + TRANSPORT_WIFI: 40, + TRANSPORT_TENCENT_YUN: 50, + TRANSPORT_WIFI_PRIORITY: 60, + TRANSPORT_BLUETOOTH_PRIORITY: 70 +} + +export const model = { + TENCENT_YUN_LOCK: 'XB007' } diff --git a/package.json b/package.json index 51c700d..5a12c60 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "vite-plugin-eslint": "^1.8.1" }, "scripts": { + "prepare": "husky install", "format": "prettier --write \"**/*.{js,jsx,ts,tsx,vue,json,css,scss}\"", "format:check": "prettier --check \"**/*.{js,jsx,ts,tsx,vue,json,css,scss}\"", "lint": "eslint --fix \"**/*.{js,jsx,ts,tsx,vue}\"", diff --git a/pages/addDevice/addLockGuid.vue b/pages/addDevice/addLockGuid.vue index b3accef..7c85489 100644 --- a/pages/addDevice/addLockGuid.vue +++ b/pages/addDevice/addLockGuid.vue @@ -12,22 +12,12 @@