增加了练习的高级功能需要vip的功能

src/components/m-exercise/components/bottomBar.vue

@@ -1,91 +1,110 @@
 <script lang="tsx">
-	import { defineComponent } from "vue";
-	export default defineComponent({
-		props: {
-			currentSubjectIndex: {
-				type: Number,
-				default: 0,
-			},
-			subjectTotal: {
-				type: Number,
-				default: 0,
-			},
-			trueNum: {
-				type: Number,
-				default: 0,
-			},
-			falseNum: {
-				type: Number,
-				default: 0,
-			},
-			officialShow: Boolean,
-			showSubjectChangePopup: Boolean,
+import { defineComponent } from "vue";
+import store from "@/store";
+import { Dialog } from "vant";
+import { useRouter } from "vue-router";
+export default defineComponent({
+	props: {
+		currentSubjectIndex: {
+			type: Number,
+			default: 0,
 		},
-		emits: {
-			"update:officialShow": (value: boolean) => {
-				return value;
-			},
-			"update:showSubjectChangePopup": (value: boolean) => {
-				return value;
-			},
-			nextSubject: () => {},
-			lastSubject: () => {},
+		subjectTotal: {
+			type: Number,
+			default: 0,
 		},
-		setup(props, { emit }) {
-			return () => {
-				return (
-					<van-tabbar placeholder route>
-						<van-tabbar-item
-							onClick={() => {
-								emit("lastSubject");
-							}}
-							v-slots={{
-								icon: () => <m-icon type="shangyiti" />,
-							}}>
-							上一题
-						</van-tabbar-item>
-						<van-tabbar-item
-							v-slots={{
-								icon: () => <m-icon type="dui" />,
-							}}>
-							{props.trueNum}
-						</van-tabbar-item>
-						<van-tabbar-item
-							v-slots={{
-								icon: () => <m-icon type="cuo" />,
-							}}>
-							{props.falseNum}
-						</van-tabbar-item>
-						<van-tabbar-item
-							onClick={() => {
-								emit("update:showSubjectChangePopup", true);
-							}}
-							v-slots={{
-								icon: () => <m-icon type="zongtishu" />,
-							}}>
-							{props.currentSubjectIndex + 1}/{props.subjectTotal}
-						</van-tabbar-item>
-						<van-tabbar-item
-							onClick={() => {
-								emit("update:officialShow", true);
-							}}
-							v-slots={{
-								icon: () => <m-icon type="gfjs" />,
-							}}>
-							官方解释
-						</van-tabbar-item>
-						<van-tabbar-item
-							onClick={() => {
-								emit("nextSubject");
-							}}
-							v-slots={{
-								icon: () => <m-icon type="xiayiti" />,
-							}}>
-							下一题
-						</van-tabbar-item>
-					</van-tabbar>
-				);
-			};
+		trueNum: {
+			type: Number,
+			default: 0,
 		},
-	});
+		falseNum: {
+			type: Number,
+			default: 0,
+		},
+		officialShow: Boolean,
+		showSubjectChangePopup: Boolean,
+	},
+	emits: {
+		"update:officialShow": (value: boolean) => {
+			return value;
+		},
+		"update:showSubjectChangePopup": (value: boolean) => {
+			return value;
+		},
+		nextSubject: () => {},
+		lastSubject: () => {},
+	},
+	setup(props, { emit }) {
+		const router = useRouter();
+		const isVip = store.getters.getIsVip;
+		const vipClick = () => {
+			if (store.getters.getIsVip) {
+				emit("update:officialShow", true);
+			} else {
+				Dialog.confirm({
+					title: "温馨提示",
+					message: "需要购买vip才能使用",
+					confirmButtonText: "购买",
+				}).then(() => {
+					router.push("/buyVip");
+				});
+			}
+		};
+
+		return () => {
+			return (
+				<van-tabbar placeholder route>
+					<van-tabbar-item
+						onClick={() => {
+							emit("lastSubject");
+						}}
+						v-slots={{
+							icon: () => <m-icon type="shangyiti" />,
+						}}>
+						上一题
+					</van-tabbar-item>
+					<van-tabbar-item
+						v-slots={{
+							icon: () => <m-icon type="dui" />,
+						}}>
+						{props.trueNum}
+					</van-tabbar-item>
+					<van-tabbar-item
+						v-slots={{
+							icon: () => <m-icon type="cuo" />,
+						}}>
+						{props.falseNum}
+					</van-tabbar-item>
+					<van-tabbar-item
+						onClick={() => {
+							emit("update:showSubjectChangePopup", true);
+						}}
+						v-slots={{
+							icon: () => <m-icon type="zongtishu" />,
+						}}>
+						{props.currentSubjectIndex + 1}/{props.subjectTotal}
+					</van-tabbar-item>
+					<van-tabbar-item
+						onClick={() => {
+							vipClick()
+						}}
+						v-slots={{
+							icon: () => <m-icon type="gfjs" />,
+						}}>
+						官方解释
+					</van-tabbar-item>
+					<van-tabbar-item
+						onClick={() => {
+							emit("nextSubject");
+						}}
+						v-slots={{
+							icon: () => <m-icon type="xiayiti" />,
+						}}>
+						下一题
+					</van-tabbar-item>
+				</van-tabbar>
+			);
+		};
+	},
+});
 </script>

src/components/m-exercise/components/functionList.vue

@@ -2,6 +2,7 @@
 	import { defineComponent } from "vue";
 	import store from "@/store"
 	import { Dialog } from 'vant';
+	import { useRouter } from "vue-router";
 	export default defineComponent({
 		props: {
 			currentSubject: Object as any,
@@ -20,7 +21,8 @@
 		},
 		setup(props, { emit }) {
 			//该功能就是vip专门使用
-			const vipClick =(index :number)=>{
+	const router = useRouter()
+	const vipClick =(index :number)=>{
 				let vipButtonList :[any] = [{
 					name:"读题+答案"					
 				},
@@ -36,8 +38,10 @@
 					
 				}]
 				if(store.getters.getIsVip){
+					
 					switch(index){
 						case 0:
+							console.log("触发vip")
 							emit("subjectAudioPlay", vipButtonList[index].name);
 						break;
 						case 1:
@@ -53,26 +57,22 @@
 				}
 				else{
 					Dialog.confirm({
-						 title: '提示',
-  							message: '需要vip才能使用'
+						 title: '温馨提示',
+  						  message: '需要购买vip才能使用',
+							confirmButtonText:"购买"
    
 					}).then(()=>{
-
-
+						router.push("/buyVip")
 					})
-
 				}
-
-
-
 			}
-
 			return () => {
 				return (
 					<div class="function-list">
 						<div
 							class="function-item"
 							onClick={() => {
+								
 								emit("addCurrentQuestion");
 							}}>
 							<m-icon type={props.currentSubject?.isCollection ? "shoucanghuang" : "shoucanghui"} size="25px" />
@@ -80,8 +80,9 @@
 						</div>
 						<div
 							class="function-item"
-							onClick={() => {
-								emit("subjectAudioPlay", "读题+答案");
+							onClick={()=>{
+								// emit("subjectAudioPlay", "读题+答案");
+								vipClick(0);
 							}}>
 							<m-icon type="a-dtda" size="25px" />
 							<span>读题+答案</span>
@@ -89,7 +90,8 @@
 						<div
 							class="function-item"
 							onClick={() => {
-								emit("subjectAudioPlay", "读题");
+								//emit("subjectAudioPlay", "读题");
+								vipClick(1);
 							}}>
 							<m-icon type="duti" size="25px" />
 							<span>读题</span>
@@ -97,8 +99,7 @@
 						<div
 							class="function-item"
 							onClick={() => {
-								emit("subjectAudioPlay", "读技巧解释");
-								emit("update:skillsShow", true);
+								vipClick(2);
 							}}>
 							<m-icon type="jqjj" size="25px" />
 							<span>技巧讲解</span>

src/components/m-exercise/components/modeSelection.vue

@@ -1,7 +1,6 @@
 <script lang="tsx">
 	import { Image, Loading } from "vant";
 	import { defineComponent } from "vue";
-
 	export default defineComponent({
 		props: {
 			currentSubject: Object as any,
@@ -13,7 +12,7 @@
 						<span v-for="(answerType, index) in answerTypeList" key={index} class={{ selected: currentType == index }} onClick={(currentType = index)}>
 							{answerType.name}
 						</span>
-						<span class={{ selected: aotuPlayFlag }} onClick={aotuPlaySet}>
+						<span  class={{ selected: aotuPlayFlag }} onClick={aotuPlaySet}>
 							自动读题
 						</span>
 					</div>

src/components/m-exercise/index.vue

@@ -9,7 +9,9 @@
 	<!-- 答题模式选择 -->
 	<div class="answerType">
 		<span v-for="(answerType, index) in answerTypeList" :key="index" :class="{ selected: currentType == index }" @click="currentType = index">{{ answerType.name }}</span>
-		<span :class="{ selected: aotuPlayFlag }" @click="aotuPlaySet">自动读题</span>
+		<span v-if="isVip" :class="{ selected: aotuPlayFlag }" @click="aotuPlaySet">自动读题</span>
+		<!-- 不是vip隐藏自动读题 -->
+		<span v-else class="visibility-hidden" :class="{ selected: aotuPlayFlag }">自动读题</span>
 	</div>
 	<!-- 答题模式选择end -->
 	<!-- 分割线 -->
@@ -104,122 +106,129 @@
 </template>
 
 <script lang="ts" setup>
-	import { ref, defineProps } from "vue";
-	import subjectChangePopup from "./components/subjectChangePopup.vue";
-	import { useTopicMode, useAudioSet, useSubjectShowLogic } from "@/hooks/exercise";
-	import { RouterBus } from "@/hooks";
-	import subjectContext from "./components/subjectContext.vue";
-	import functionList from "./components/functionList.vue";
-	import explainJq from "./components/explainJq.vue";
-	import explainJs from "./components/explainJs.vue";
-	import reciteMode from "./components/reciteMode.vue";
-	import bottomBar from "./components/bottomBar.vue";
-	const {
-		router: { back },
-		route: { query },
-	} = new RouterBus();
+import { ref, defineProps } from "vue";
+import subjectChangePopup from "./components/subjectChangePopup.vue";
+import { useTopicMode, useAudioSet, useSubjectShowLogic } from "@/hooks/exercise";
+import { RouterBus } from "@/hooks";
+import subjectContext from "./components/subjectContext.vue";
+import functionList from "./components/functionList.vue";
+import explainJq from "./components/explainJq.vue";
+import explainJs from "./components/explainJs.vue";
+import reciteMode from "./components/reciteMode.vue";
+import bottomBar from "./components/bottomBar.vue";
+import store from "@/store";
+const {
+	router: { back },
+	route: { query },
+} = new RouterBus();
 
-	const props = defineProps<{
-		listType: ExerciseType.ListType;
-	}>();
+const props = defineProps<{
+	listType: ExerciseType.ListType;
+}>();
 
-	//答题模式选择逻辑
-	const { answerTypeList, currentType, typeParams } = useTopicMode();
+const isVip = store.getters.getIsVip;
 
-	//设置操作栏
-	/**显示设置栏 */
-	const setShow = ref(false);
-	/**答题音效 */
-	const isSoundEffect = ref(true);
-	// 显示题目选择栏
-	const showSubjectChangePopup = ref(false);
+//答题模式选择逻辑
+const { answerTypeList, currentType, typeParams } = useTopicMode();
 
-	//题目展示逻辑
-	const { subjectList, currentSubject, currentSubjectIndex, subjectTotal, nextSubject, lastSubject, trueNum, falseNum, isJumpNext, userAnswerChange, addCurrentQuestion, skillsShow, officialShow } = useSubjectShowLogic(props.listType);
+//设置操作栏
+/**显示设置栏 */
+const setShow = ref(false);
+/**答题音效 */
+const isSoundEffect = ref(true);
+// 显示题目选择栏
+const showSubjectChangePopup = ref(false);
 
-	//音频模块
-	const { aotuPlayFlag, subjectAudioPlay, aotuPlaySet } = useAudioSet(currentSubject);
+//题目展示逻辑
+const { subjectList, currentSubject, currentSubjectIndex, subjectTotal, nextSubject, lastSubject, trueNum, falseNum, isJumpNext, userAnswerChange, addCurrentQuestion, skillsShow, officialShow } = useSubjectShowLogic(props.listType);
+
+//音频模块
+const { aotuPlayFlag, subjectAudioPlay, aotuPlaySet } = useAudioSet(currentSubject);
 </script>
 
 <style lang="scss" scoped>
-	.parsing-img {
-		width: 100%;
-		margin-top: 10px;
+.visibility-hidden{
+	visibility: hidden;
+
+}
+.parsing-img {
+	width: 100%;
+	margin-top: 10px;
+}
+.answerType {
+	width: 100%;
+	font-size: 13px;
+	display: flex;
+	justify-content: space-around;
+	padding: 15px;
+	box-sizing: border-box;
+	span {
+		border-radius: 20px;
+		padding: 3px 10px;
+		background-color: #b8c0cc;
+		color: #ffffff;
 	}
-	.answerType {
-		width: 100%;
-		font-size: 13px;
-		display: flex;
-		justify-content: space-around;
-		padding: 15px;
-		box-sizing: border-box;
-		span {
-			border-radius: 20px;
-			padding: 3px 10px;
-			background-color: #b8c0cc;
-			color: #ffffff;
-		}
-		.selected {
-			background-color: #498ef5;
-		}
+	.selected {
+		background-color: #498ef5;
 	}
-	.divider {
-		width: 100%;
-		height: 10px;
-		background-color: #f2f3f5;
+}
+.divider {
+	width: 100%;
+	height: 10px;
+	background-color: #f2f3f5;
+}
+.problem-box {
+	font-size: 17px;
+	padding: 15px;
+	.answer {
+		margin-top: 25px;
 	}
-	.problem-box {
-		font-size: 17px;
-		padding: 15px;
-		.answer {
-			margin-top: 25px;
-		}
-		.answer-box {
-			display: flex;
-			margin-top: 25px;
-			align-items: center;
-			.iconTrue {
-				background-color: #01c18d;
-			}
-			.answer-text {
-				margin-left: 10px;
-			}
-			.true {
-				color: #01c18d;
-			}
-			.false {
-				color: #ff4d53;
-			}
-		}
-
-		.choose-icon {
-			width: 30px;
-			height: 30px;
-			border-radius: 50%;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			font-size: 17px;
-			box-shadow: 0px 2px 6px rgba(0, 0, 0, 0.16);
-			box-sizing: border-box;
-			margin-left: 5px;
-			margin-top: 1px;
+	.answer-box {
+		display: flex;
+		margin-top: 25px;
+		align-items: center;
+		.iconTrue {
+			background-color: #01c18d;
 		}
-		.selected {
-			background-color: #498ef5;
+		.answer-text {
+			margin-left: 10px;
 		}
-		.checkbox-btn {
-			width: 266px;
-			height: 40px;
-			margin: auto;
-			margin-top: 25px;
-			left: 50%;
-			transform: translateX(-50%);
+		.true {
+			color: #01c18d;
 		}
-		.checkbox-answer {
-			padding: 8px 10px;
-			background-color: #f2f3f5;
-			margin-top: 25px;
+		.false {
+			color: #ff4d53;
 		}
 	}
+
+	.choose-icon {
+		width: 30px;
+		height: 30px;
+		border-radius: 50%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 17px;
+		box-shadow: 0px 2px 6px rgba(0, 0, 0, 0.16);
+		box-sizing: border-box;
+		margin-left: 5px;
+		margin-top: 1px;
+	}
+	.selected {
+		background-color: #498ef5;
+	}
+	.checkbox-btn {
+		width: 266px;
+		height: 40px;
+		margin: auto;
+		margin-top: 25px;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+	.checkbox-answer {
+		padding: 8px 10px;
+		background-color: #f2f3f5;
+		margin-top: 25px;
+	}
+}
 </style>

src/hooks/exercise/wrong.ts

@@ -3,6 +3,7 @@ import { CollectionModel } from "@/model/collection";
 import { RouterBus } from "@/hooks";
 import { Notify } from "vant";
 import { isArrSubset } from "@/utils/utils";
+import store from "@/store";
 
 /**错题与收藏 */
 export const useSubjectCheck = (currentSubject: ComputedRef<any>, nextSubject: () => Promise<void>) => {
@@ -97,7 +98,14 @@ export const useSubjectCheck = (currentSubject: ComputedRef<any>, nextSubject: (
 				},
 			]);
 			currentSubject.value.isTrue = false;
-			skillsShow.value = true;
+			//vip才显示错误解析
+			if (store.getters.getIsVip) {
+
+				skillsShow.value = true;
+
+
+			}
+
 			falseNum.value++;
 		}
 	};

src/route/guard.ts

@@ -77,16 +77,19 @@ const guard = (router: Router) => {
 		// }
 
 		try {
-			const userTime :number = dayjs(store.getters.getUserData.expireTime).valueOf();
-			const currentTime :number = dayjs().valueOf();
+			const userTime: number = dayjs(store.getters.getUserData.expireTime).valueOf();
+			const currentTime: number = dayjs().valueOf();
 			const vipPathSet = new Set(["/exercise", "/mockTest"]);
 			if (vipPathSet.has(to.path)) {
 				if (to.query.title === '顺序练习') {
 					next();
 				}
-				else if (userTime - currentTime > 0 && to.query.title === '顺序练习') {
+				else if (to.query.title === '分类练习') {
 					next();
-				} else {
+				} else if (userTime - currentTime > 0) {
+
+				}
+				else {
 					Toast.fail("会员到期");
 					next("/buyVip");
 				}

wq

@@ -0,0 +1,756 @@
+commit 02ab22ffccf52c5085f22191c8e010dc7ed5f659 (HEAD -> master, origin/master, origin/HEAD)
+Author: zhangyujun <347613781@qq.com>
+Date:   Mon Feb 28 13:23:59 2022 +0800
+
+    绑定vip点击事件前
+
+commit c8ba7e15b19c7318098f9eda33004485980d029b
+Author: zhangyujun <347613781@qq.com>
+Date:   Fri Feb 25 18:39:53 2022 +0800
+
+    打包的配置修改
+
+commit 2ab6070037bd0fed03bdac4556fcbbb685358a8e
+Author: zhangyujun <347613781@qq.com>
+Date:   Fri Feb 25 17:55:37 2022 +0800
+
+    1
+
+commit 6c9e6758a0b852af5e7bdede09f581fa5de7ccda
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Feb 25 10:48:30 2022 +0800
+
+    新增baseHook
+
+commit 13f44d5a5aa1c9549acb8f84665a28ff8b132e78
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Mon Feb 21 21:35:07 2022 +0800
+
+    拆分练习组件,改用jsx
+
+commit cdd9f60bc3fc7bcce186ccb45dca824a7f0ff8a2
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Mon Feb 21 15:38:44 2022 +0800
+
+    题库hook整理
+
+commit c8128ca23214a13005c953147d1191c663fae6c0
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Mon Feb 21 14:47:45 2022 +0800
+
+    修改模拟考试使用接口
+
+commit 282e29d357e0815243c928e00ef458f6c8472f06
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Feb 18 09:31:18 2022 +0800
+
+    题号
+
+commit 3cae526eb27622cd7bbf401bb4c906b8ffc56726
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Feb 18 08:42:03 2022 +0800
+
+    我的推广积分新增推广人数
+
+commit 7d21a2c8cf3b296819de4453055313a6143590aa
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Feb 18 06:35:12 2022 +0800
+
+    修正题目选项缺失问题
+
+commit ba2237d7f26ff46d08eb048b8410913fc09d2537
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Feb 18 06:03:48 2022 +0800
+
+    修改题目判断逻辑
+
+commit 1656686f6b2eb933d7146dcfa4c391ebb1eee6b5
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Tue Feb 15 17:43:17 2022 +0800
+
+    新增题目列表预览
+
+commit 15df3b946cebf3d245891620430a0d9f3c05aa72
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Feb 11 20:54:22 2022 +0800
+
+    修复单选答案多选问题
+
+commit ffc9efea58c17f2732298b8f017c6a346a75cfe9
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Feb 11 18:33:45 2022 +0800
+
+    修改登陆逻辑,新增工具函数
+
+commit 24cfd1d0cca9b7336078da2f18ea2ab64662945a
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Feb 11 13:58:04 2022 +0800
+
+    save
+
+commit 4c96e28bad7a4945503f89bae10ce21b7ae045cb
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Feb 11 12:22:15 2022 +0800
+
+    修改文件路径,删除废弃文件
+
+commit b95d8713b95efcde087ce183a307770e36dd09d9
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Feb 11 12:18:00 2022 +0800
+
+    save
+
+commit c202b26f69fe2c4759d89b52696f289722ee8eb9
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Feb 11 12:10:43 2022 +0800
+
+    save
+
+commit 0e8163431bf33601446f643e7c201d1a19b6af87
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Feb 11 12:09:35 2022 +0800
+
+    更新细节
+
+commit 94dc2924aea3c06d31927acd52ef66da089f9c3c
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Feb 11 12:05:47 2022 +0800
+
+    save
+
+commit e67b03cf7625abaed8caf82be5795a69b056256e
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Feb 11 11:59:16 2022 +0800
+
+    新增我要提现功能
+
+commit 4f80f7b8c8af6d796b6d3bcfbae81883408c44d8
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Tue Feb 8 20:40:43 2022 +0800
+
+    新增会员到期跳转至购买页面
+
+commit 760752144a71c3ba177e93b4a80a163737522e42
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Mon Feb 7 20:41:57 2022 +0800
+
+    隐藏我的下级
+
+commit 3a2550adfc35d31d5122de84e4aed07e570f939e
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Sun Jan 30 11:17:48 2022 +0800
+
+    修改文案
+
+commit a7b3e44569b2b0418c75914e0f5aa68b6cd864c5
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Sun Jan 30 11:09:40 2022 +0800
+
+    props注入unmount
+
+commit b1bdcf3ecef4daadc9094c93f782957c51ab5226
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Sun Jan 30 11:01:32 2022 +0800
+
+    unmount循环引用
+
+commit da03a0bef5c7ec5c7b04167cd0587f849cbbcf89
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Sun Jan 30 10:43:42 2022 +0800
+
+    新增我的推广积分模块
+
+commit 0d01a683dba8733eed9eb2735b28df7714e96119
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 28 07:44:25 2022 +0800
+
+    我要提现页面修改
+
+commit 7fbfcedf9138147c06ac5a973f3c6f995f70e67d
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 21 18:38:50 2022 +0800
+
+    字体
+
+commit 0085605a56a7b8545e23b0a3741ac97912af61cb
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 21 18:36:04 2022 +0800
+
+    首页中间两个圆中的字换行
+
+commit 3f6f9e92a8c53c7cc16d9c89c6f109d164e6d375
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 21 18:34:26 2022 +0800
+
+    错题收藏字样
+
+commit 5b57a62d0a7f2f66fe6226619b8b1e240040033f
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 21 18:33:24 2022 +0800
+
+    首页UI字体放大
+
+commit 98317f989a63654fdea156389672802a6c419169
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 21 18:21:27 2022 +0800
+
+    关闭生产环境调试器
+
+commit 67b0f1602633197e868267dce8e2c53cbf6d648b
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 21 18:19:45 2022 +0800
+
+    题库点击 “技巧讲解” 不会自动播放语音
+
+commit 4de8668c045c241c2c6d559787c5222f64b7b52a
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 21 18:15:38 2022 +0800
+
+    题目中，没有图片的，不要显示图片框。
+
+commit f9c2525c7f4412bf023a80b10fa5df9846914f57
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 21 13:42:46 2022 +0800
+
+    修改登陆逻辑
+
+commit 5ad6f4a7932ae2f3ed891beaac36736f866ab5f9
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 21 13:35:44 2022 +0800
+
+    修改登陆逻辑
+
+commit a02e4d0cbe716248bb6991c99d2433ccf3a29725
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 21 13:27:08 2022 +0800
+
+    修改登陆逻辑
+
+commit 88da2bafbc6a217c8c2e5df32d02bc7a62563760
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 21 13:23:55 2022 +0800
+
+    修改登陆逻辑
+
+commit 62a8058804fc84d0d34d78d9b14a7112a7d8dbca
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 21 13:18:11 2022 +0800
+
+    修改登陆逻辑
+
+commit 0bc0ffabe453f6c2d9b0694183f7303a70aa2b88
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 21 13:13:09 2022 +0800
+
+    修改登陆逻辑
+
+commit 2dd769fbbf6017122f15c6931a2eb89709e100c5
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 21 13:09:05 2022 +0800
+
+    修改登陆逻辑
+
+commit d01022c8435f8106942af73d745a24a64887fad1
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 21 12:50:05 2022 +0800
+
+    登陆失败刷新页面
+
+commit ab47a68cffc05555d7c96b466225d884b8873c4f
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 21 12:24:06 2022 +0800
+
+    save
+
+commit abc8d9d749b1c619bd2161325cdc2f4b202edb49
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 21 10:58:33 2022 +0800
+
+    登陆测试
+
+commit 562a0b6ebff9eab6841f722c596a2d9ec191e4e1
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 21 10:40:22 2022 +0800
+
+    启动调试工具
+
+commit a172c5664e813431a0aeb67f8104ed38101d9543
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Thu Jan 20 18:13:37 2022 +0800
+
+    修复登陆参数重复问题
+
+commit b030864632a71342559fbd1df060333a2041b189
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Thu Jan 20 18:02:05 2022 +0800
+
+    save
+
+commit 68854b0c39e33a25549b980df964808dc30ab770
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Thu Jan 20 17:59:38 2022 +0800
+
+    登陆失败跳转至home
+
+commit 66b605f15b847c3dc20f67115a3907089c764455
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Thu Jan 20 17:25:38 2022 +0800
+
+    修改登陆逻辑
+
+commit 047247a3a5a6a25893f65b0c2ff7100f5fc1d522
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Thu Jan 20 00:19:40 2022 +0800
+
+    修改登陆逻辑
+
+commit b7cf6df407e05ad3379a9c3a96ae3140787afe36
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Wed Jan 19 23:42:51 2022 +0800
+
+    修改样式,新增答题错误自动打开技巧讲解
+
+commit 9f3ce62675ed83929c244cb83100e17f0a2acbc2
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Wed Jan 19 09:15:58 2022 +0800
+
+    增加隔离条,包管理工具改用pnpm
+
+commit f7a3c8a18ca69fb906b5f1e17a11b4e12cbb2303
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Mon Jan 17 17:06:33 2022 +0800
+
+    save
+
+commit f2c39b10d2ab51a7fed7ddc20c2613ecd4a32bfc
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Mon Jan 17 16:01:59 2022 +0800
+
+    save
+
+commit 144aa51ea204afc2da5b1fe8bfdb365d5e7aac46
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 14 18:26:23 2022 +0800
+
+    marked页面不登陆
+
+commit c06617af759f2c09920f84d9156b7e468babd232
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Fri Jan 14 10:51:10 2022 +0800
+
+    save
+
+commit b82a9da46ff4bb01bd6b129e0d3263d9fa67a314
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Thu Dec 30 16:20:05 2021 +0800
+
+    save
+
+commit c7fbc1ff43d1245bfde4ceff70d24a58d723592d
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Thu Dec 30 16:19:35 2021 +0800
+
+    save
+
+commit c908d5016ab1a566dd04c60ac49b8084713f2162
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Thu Dec 30 16:17:37 2021 +0800
+
+    save
+
+commit cd0c078ce2a933f5f78141f027b02f0871ab5b41
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Thu Dec 30 15:11:50 2021 +0800
+
+    修改git忽视
+
+commit e2d86caeafa0405a93dcb29dbb8bd84eb9bc01e0
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Mon Dec 27 12:43:24 2021 +0800
+
+    修改题库查询逻辑
+
+commit e5e08dd01fa96552ffe254e3158206fe96978dd2
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Thu Dec 23 15:43:33 2021 +0800
+
+    捐款选项展示
+
+commit 8409ffc08ff66c291eafc1e10abddebaaea36359
+Author: wyling <811062785@qq.com>
+Date:   Wed Dec 22 18:02:30 2021 +0800
+
+    save
+
+commit f299f3c355105dca66ec616a0bb1f521d747e312
+Author: wyling <811062785@qq.com>
+Date:   Wed Dec 22 16:37:36 2021 +0800
+
+    错题重阅
+
+commit f0220130c49986869fde2d577493fa8aea569f69
+Author: wyling <811062785@qq.com>
+Date:   Wed Dec 22 16:17:56 2021 +0800
+
+    错题重阅
+
+commit 4476086cb52529b5fe3f87c3472d6b34bb9e6181
+Author: wyling <811062785@qq.com>
+Date:   Tue Dec 21 09:36:44 2021 +0800
+
+    由内网ip改为公网ip
+
+commit 68e4c071b25b95b8bf950cc98d87a314fe40d329
+Author: wyling007 <50375423+wyling007@users.noreply.github.com>
+Date:   Tue Dec 21 02:56:22 2021 +0800
+
+    save
+
+commit 958b9ffdde7f90b18be0f59a92b47d9a7717329e
+Author: wyling <811062785@qq.com>
+Date:   Mon Dec 20 16:21:46 2021 +0800
+
+    save
+
+commit 2366c25d43b8787b10d8268e5df1f130bb186f93
+Author: wyling <811062785@qq.com>
+Date:   Mon Dec 20 16:16:46 2021 +0800
+
+    save
+
+commit e9ac1fd89fd556257162d63535461ef6c972c4f3
+Author: wyling <811062785@qq.com>
+Date:   Mon Dec 20 16:11:44 2021 +0800
+
+    save
+
+commit 78e9e9e8e676fd791a1ed2c33c88625658888d64
+Merge: 31c362d 29da675
+Author: wyling <811062785@qq.com>
+Date:   Mon Dec 20 16:07:02 2021 +0800
+
+    Merge branch 'master' of http://192.168.8.213:3000/miaxis/jkt-h5
+
+commit 31c362dff9e31e42cebd19af7cfe4df397bcce64
+Author: wyling <811062785@qq.com>
+Date:   Mon Dec 20 16:06:58 2021 +0800
+
+    修改页面BUG
+
+commit 7cc3abf2820e5ca3667ae848301cb6a20921cae0
+Author: wyling <811062785@qq.com>
+Date:   Mon Dec 20 16:05:58 2021 +0800
+
+    修改登陆页面跳转
+
+commit 29da675a14340d9171fca380d2a786f045ffcd60
+Author: wyling <811062785@qq.com>
+Date:   Mon Dec 20 15:58:55 2021 +0800
+
+    修改登陆页面跳转
+
+commit 3fcb80cb7357d788c23ff97a18e5f402b28f7093
+Author: wyling <811062785@qq.com>
+Date:   Mon Dec 20 15:52:21 2021 +0800
+
+    修复页面报错
+
+commit 09f63fcb36d976e67a0f973eaf13e785b317fe2f
+Author: wyling <811062785@qq.com>
+Date:   Mon Dec 20 15:38:24 2021 +0800
+
+    修复路由守卫
+
+commit 02e86a4080a7f7e016c5a48438d0d9b1acee9146
+Author: wyling <811062785@qq.com>
+Date:   Mon Dec 20 13:57:22 2021 +0800
+
+    修改登陆逻辑
+
+commit 1f749b2c5b80c156c93fd58ae1e3a3647de8d296
+Author: wyling <811062785@qq.com>
+Date:   Mon Dec 20 13:57:02 2021 +0800
+
+    底部空间适配
+
+commit a5ccae2cb313e1468603249c82597a9d95c709af
+Author: wyling <811062785@qq.com>
+Date:   Mon Dec 20 13:56:41 2021 +0800
+
+    配置dev和prod接口代理
+
+commit b40069a3a5bf2bc9c9c5d38592d890d618abcfdc
+Author: wyling <811062785@qq.com>
+Date:   Fri Dec 17 16:43:34 2021 +0800
+
+    save
+
+commit b6f80251baa6600ef99de90e3cec671b78880b9a
+Author: wyling <811062785@qq.com>
+Date:   Fri Dec 17 16:43:23 2021 +0800
+
+    修改登陆逻辑
+
+commit ac4c185fa607218a2a704c5825c442d6dcff8c87
+Author: wyling <811062785@qq.com>
+Date:   Fri Dec 17 16:42:28 2021 +0800
+
+    预设广告sdk入口
+
+commit fb1aa8d4fa352f0e557a7205a4d76be45d871b10
+Author: wyling <811062785@qq.com>
+Date:   Fri Dec 17 16:42:09 2021 +0800
+
+    新增https,修改host
+
+commit d15a6e592dca4093d568c9d43ed180c05ce63844
+Author: wyling <811062785@qq.com>
+Date:   Fri Dec 3 10:41:05 2021 +0800
+
+    支付完成跳转home/test
+
+commit 0f85e8d0845469015168ab4d1005bd650f74c007
+Author: wyling <811062785@qq.com>
+Date:   Thu Dec 2 14:40:27 2021 +0800
+
+    新增错题移入收藏夹功能
+
+commit f43e7bdb07f4780bb37be399b86f548689e710fe
+Author: wyling <811062785@qq.com>
+Date:   Wed Dec 1 17:24:49 2021 +0800
+
+    新增收藏也错题记录功能
+
+commit 34fa7833b7c24d6cb8c66edde679e390c2cf4a29
+Author: wyling <811062785@qq.com>
+Date:   Wed Dec 1 13:25:26 2021 +0800
+
+    删除css user-select:none,原因:会导致input无法输入
+
+commit 876cf8cb929459726827354186bc29c710a31a48
+Author: wyling <811062785@qq.com>
+Date:   Wed Dec 1 11:36:35 2021 +0800
+
+    我要提现样式修改
+
+commit 25b4248b8c30f58c384fde49fe43a8c4d1e52170
+Author: wyling <811062785@qq.com>
+Date:   Wed Dec 1 11:35:32 2021 +0800
+
+    新增收藏错题数据模型
+
+commit a992415bb5df1d2bfa6f7e8b77268dd4c0179028
+Author: wyling <811062785@qq.com>
+Date:   Wed Dec 1 11:35:06 2021 +0800
+
+    新增我要提现
+
+commit f1f649921010d5bb690bbdf4629334dbcddd77f5
+Author: wyling <811062785@qq.com>
+Date:   Wed Dec 1 11:34:57 2021 +0800
+
+    新增顺序分类
+
+commit 7d4a98d48cdad1353388d6dfccc12769646ad51b
+Author: wyling <811062785@qq.com>
+Date:   Wed Dec 1 11:34:25 2021 +0800
+
+    新增我要提现页面
+
+commit 578202e0fffd9ce757ff2de21ae04504c7b8bdcc
+Author: wyling <811062785@qq.com>
+Date:   Tue Nov 30 17:01:16 2021 +0800
+
+    修复报错
+
+commit 02bcd94353fad3f6ad1252bfdfcf9c9db02a27b0
+Author: wyling <811062785@qq.com>
+Date:   Tue Nov 30 16:23:31 2021 +0800
+
+    修改类名
+
+commit 3c2788bad2d4d77017f7bbe3eb95cfa48ef02f3f
+Author: wyling <811062785@qq.com>
+Date:   Tue Nov 30 15:25:06 2021 +0800
+
+    暂无数据展示
+
+commit b38ecc541a7151be2c6869c26511b12a649c11d8
+Author: wyling <811062785@qq.com>
+Date:   Tue Nov 30 15:18:02 2021 +0800
+
+    判断是不是张滨的号.然后显示无限循环付款0.01入口
+
+commit 5f99eb9ce5137c00c200b51187febfb70a6e005c
+Author: wyling <811062785@qq.com>
+Date:   Tue Nov 30 15:10:14 2021 +0800
+
+    我的下级页面完成,新增数据分层dataModel
+
+commit 8e47dcb99adc14b394f082968f22dabbfa036c74
+Author: wyling <811062785@qq.com>
+Date:   Fri Nov 26 18:07:39 2021 +0800
+
+    收藏错题接口接入
+
+commit 3461488b7ce50405f7b93938f2f93866c722c378
+Author: wyling <811062785@qq.com>
+Date:   Thu Nov 25 10:21:48 2021 +0800
+
+    新增我的下级页面
+
+commit 21ce9b8da8201ac73c92b15b844ea019f80a554c
+Author: wyling <811062785@qq.com>
+Date:   Wed Nov 24 16:35:49 2021 +0800
+
+    关闭生成模式VConsole
+
+commit f30915fd2147bf5c05e9a2c83d9b6de79fb3a06c
+Author: wyling <811062785@qq.com>
+Date:   Wed Nov 24 16:32:10 2021 +0800
+
+    隐藏Vconsole,改为点击我的用户头像cell 10次后展示
+
+commit 77013af521e5a410b6ab5fe283a0f3d4df8b34a2
+Author: wyling <811062785@qq.com>
+Date:   Wed Nov 24 16:18:15 2021 +0800
+
+    调整免费试用接口,新增代理提现页面
+
+commit c3cb2971e3d7d54df8001ec40d7890ba32d8ee38
+Author: wyling <811062785@qq.com>
+Date:   Tue Nov 23 17:16:59 2021 +0800
+
+    新增免费试用,修改路由逻辑
+
+commit 40ae4fe2184d20d7827ad941d2b9b918c93c31c8
+Author: wyling <811062785@qq.com>
+Date:   Tue Nov 23 09:56:24 2021 +0800
+
+    线上测试
+
+commit ac58234b5bf51ce571754546742a51280dca5714
+Author: wyling <811062785@qq.com>
+Date:   Tue Nov 23 09:52:59 2021 +0800
+
+    线上测试
+
+commit bdae9b9273ffdf0fa8d4ef878dfb1f189779dbee
+Author: wyling <811062785@qq.com>
+Date:   Tue Nov 23 09:46:47 2021 +0800
+
+    测试userTestData数据
+
+commit 8633a1e3c4014e013c50a972311deb6be9bcf341
+Author: wyling <811062785@qq.com>
+Date:   Mon Nov 22 17:59:43 2021 +0800
+
+    考试成绩计算
+
+commit a21d72e8e6f0a4b873a0d1d974fa94e6bef3cffe
+Author: wyling <811062785@qq.com>
+Date:   Mon Nov 22 14:10:04 2021 +0800
+
+    新增考试成绩提交
+
+commit 1321b85352819e9399ab5cd7e6c839631d737d46
+Author: wyling <811062785@qq.com>
+Date:   Thu Nov 18 17:29:14 2021 +0800
+
+    修改模拟考试初始化页面
+
+commit 5a45c29b78c2db8745bbe1fe2e5cfb491eef9d9a
+Author: wyling <811062785@qq.com>
+Date:   Thu Nov 18 16:49:34 2021 +0800
+
+    临时启动vconsole
+
+commit 30ded92e652e7f9ef159851fe08ebe30b47ea603
+Author: wyling <811062785@qq.com>
+Date:   Thu Nov 18 16:43:17 2021 +0800
+
+    引入环境变量,新增开通会员页面,跳转普通用户权限
+
+commit 63e61760f8050c320654985022bfefff60a9e2e6
+Author: wyling <811062785@qq.com>
+Date:   Fri Nov 12 16:54:36 2021 +0800
+
+    更新答题逻辑
+
+commit 8f977d0765b6794fd5d09beaa35923f0d29bfc48
+Author: wyling <811062785@qq.com>
+Date:   Thu Nov 11 17:17:48 2021 +0800
+
+    save
+
+commit 2b012d4212604e9728fdc0cc1665a55204aacdde
+Author: wyling <811062785@qq.com>
+Date:   Thu Nov 11 17:17:30 2021 +0800
+
+    顺序练习逻辑调整
+
+commit 0852836dbbf90887379f47fed099d7c29c34b2a8
+Author: wyling <811062785@qq.com>
+Date:   Wed Nov 10 16:11:06 2021 +0800
+
+    关闭路由hash模式,改用history
+
+commit 604b13f6685745c8a0c8b2b7b2c26332012d1311
+Author: wyling <811062785@qq.com>
+Date:   Wed Nov 10 16:00:01 2021 +0800
+
+    修改login路由
+
+commit ee9fc20435771442f98445eb4e938fdd4ac905c2
+Author: wyling <811062785@qq.com>
+Date:   Wed Nov 10 15:36:56 2021 +0800
+
+    save
+
+commit fb7007ea459834d5f60d6d16b3af96c748f3cbed
+Author: wyling <811062785@qq.com>
+Date:   Wed Nov 10 15:36:27 2021 +0800
+
+    save
+
+commit 80bee201b19316a9d4bc27c45430232cda260ebe
+Author: wyling <811062785@qq.com>
+Date:   Wed Nov 10 15:29:37 2021 +0800
+
+    修改接口代理配置
+
+commit 369de6e9c7dc14c5b7d4ea861b0bd9d8ddc8dd5a
+Author: wyling <811062785@qq.com>
+Date:   Wed Nov 10 15:10:54 2021 +0800
+
+    接口引入
+
+commit a1ece5a636e21c9e52973261e8f8e1669f37163e
+Author: wyling <811062785@qq.com>
+Date:   Tue Oct 19 15:16:06 2021 +0800
+
+    微信公众号网页授权域名校验文件
+
+commit 6f498208fe81aedf230fdc7f25fb88790ced8eb5
+Author: wyling <811062785@qq.com>
+Date:   Mon Oct 11 17:14:00 2021 +0800
+
+    新增帮助反馈跳转兔小巢
+
+commit 49c1f04c00f2f4c754b75f4d6cbc743cd9088d9e
+Author: wyling <811062785@qq.com>
+Date:   Mon Oct 11 10:54:39 2021 +0800
+
+    关闭vconsole
+
+commit cc2602bac02fb1c44f526373e2835b6bef88086c
+Author: wyling <811062785@qq.com>
+Date:   Mon Oct 11 10:52:11 2021 +0800
+
+    新增学车必看,考前须知修改页面标题
+
+commit 4f8d26f20ecba73bae11628fbdc6497605dc6b2e
+Author: wyling <811062785@qq.com>
+Date:   Mon Sep 27 15:47:40 2021 +0800
+
+    初次上传