修改登陆逻辑,新增工具函数

package.json

@@ -1,41 +1,41 @@
 {
-  "name": "vue3-ts",
-  "version": "0.0.0",
-  "scripts": {
-    "dev": "vite",
-    "prod": "vite --mode production",
-    "build": "vite build",
-    "serve": "vite preview"
-  },
-  "dependencies": {
-    "axios": "^0.21.4",
-    "axios-logger": "^2.6.0",
-    "dayjs": "^1.10.7",
-    "howler": "^2.2.3",
-    "marked": "^3.0.4",
-    "mockjs": "^1.1.0",
-    "soundjs": "^1.0.1",
-    "tyshemo": "^11.20.3",
-    "vant": "^3.1.5",
-    "vconsole": "^3.9.1",
-    "vue": "^3.0.5",
-    "vue-router": "^4.0.10",
-    "vuex": "^4.0.2",
-    "vuex-persistedstate": "^4.1.0",
-    "weixin-js-sdk-ts": "^1.6.1"
-  },
-  "devDependencies": {
-    "@types/howler": "^2.2.4",
-    "@types/marked": "^3.0.1",
-    "@types/mockjs": "^1.0.4",
-    "@types/node": "^16.11.6",
-    "@types/soundjs": "^0.6.28",
-    "@vitejs/plugin-vue": "^1.3.0",
-    "@vue/compiler-sfc": "^3.0.5",
-    "postcss-pxtorem": "^6.0.0",
-    "sass": "^1.37.5",
-    "typescript": "^4.3.2",
-    "vite": "^2.4.4",
-    "vue-tsc": "^0.2.2"
-  }
+	"name": "vue3-ts",
+	"version": "0.0.0",
+	"scripts": {
+		"dev": "vite",
+		"prod": "vite --mode production",
+		"build": "vite build",
+		"serve": "vite preview --port 443"
+	},
+	"dependencies": {
+		"axios": "^0.21.4",
+		"axios-logger": "^2.6.0",
+		"dayjs": "^1.10.7",
+		"howler": "^2.2.3",
+		"marked": "^3.0.4",
+		"mockjs": "^1.1.0",
+		"soundjs": "^1.0.1",
+		"tyshemo": "^11.20.3",
+		"vant": "^3.1.5",
+		"vconsole": "^3.9.1",
+		"vue": "^3.0.5",
+		"vue-router": "^4.0.10",
+		"vuex": "^4.0.2",
+		"vuex-persistedstate": "^4.1.0",
+		"weixin-js-sdk-ts": "^1.6.1"
+	},
+	"devDependencies": {
+		"@types/howler": "^2.2.4",
+		"@types/marked": "^3.0.1",
+		"@types/mockjs": "^1.0.4",
+		"@types/node": "^16.11.6",
+		"@types/soundjs": "^0.6.28",
+		"@vitejs/plugin-vue": "^1.3.0",
+		"@vue/compiler-sfc": "^3.0.5",
+		"postcss-pxtorem": "^6.0.0",
+		"sass": "^1.37.5",
+		"typescript": "^4.3.2",
+		"vite": "^2.4.4",
+		"vue-tsc": "^0.2.2"
+	}
 }

src/hooks/exercise/wrong.ts

@@ -49,6 +49,8 @@ export const useSubjectCheck = (currentSubject: ComputedRef<any>, nextSubject: (
 	 * 选择答案后进行校验
 	 */
 	const userAnswerChange = () => {
+		console.log(currentSubject.value);
+
 		currentSubject.value.optsBack = currentSubject.value.opts.map((val: String) => {
 			let status;
 			if (currentSubject.value.answer.includes(val)) {

src/hooks/index.ts

@@ -19,9 +19,6 @@ export const useLogin = async (query: LocationQuery) => {
 export const useUpdateUserInfo = async () => {
 	//获取用户信息
 	const userDataRes = await API.userInfo();
-	if (userDataRes.data.code !== 200) {
-		throw userDataRes.data.msg;
-	}
 	store.commit("setUserData", {
 		...store.getters.getUserData,
 		...userDataRes.data.data,

src/route/guard.ts

@@ -37,6 +37,10 @@ const guard = (router: Router) => {
 		//检测token状态,token失效直接跳转至登陆链接
 		try {
 			useUpdateUserInfo();
+			const authTest = await userInfo();
+			if (authTest.data.code !== 200) {
+				throw authTest.data.msg;
+			}
 		} catch (error) {
 			//监听到登陆事件
 			if (to.query.state === "LOGIN") {

src/utils/utils.ts

@@ -0,0 +1,7 @@
+/**判断第一个数组是否是第二个数组的子集 */
+export const isArrSubset = (subset: [], parentSet: []) => {
+	for (const item of subset) {
+		if (!parentSet.includes(item)) return false;
+	}
+	return true;
+};