diff --git a/src/components/Task.vue b/src/components/Task.vue
index 69c2e24..2a2aca0 100644
--- a/src/components/Task.vue
+++ b/src/components/Task.vue
@@ -120,7 +120,8 @@ async function prepare() {
 async function getContent() {
   const data = await Tutorial.get(step.value)
   taskId.value = data.task_ptr
-  content.value = await marked.parse(data.content, { async: true })
+  const merged = `# #${data.display} ${data.title}\n${data.content}`
+  content.value = await marked.parse(merged, { async: true })
 }
 
 // 用 js 来写的，可以换成 vue 的方式
diff --git a/src/store/task.ts b/src/store/task.ts
index ef9ccd8..1375222 100644
--- a/src/store/task.ts
+++ b/src/store/task.ts
@@ -1,5 +1,8 @@
 import { ref } from "vue"
 import { TASK_TYPE } from "../utils/const"
 
-export const taskTab = ref(TASK_TYPE.Tutorial)
+const urlParams = new URLSearchParams(window.location.search)
+const currentTask = urlParams.get("task") ?? TASK_TYPE.Tutorial
+
+export const taskTab = ref(currentTask)
 export const taskId = ref(0)
diff --git a/src/store/tutorial.ts b/src/store/tutorial.ts
index 1f05acb..5a1799a 100644
--- a/src/store/tutorial.ts
+++ b/src/store/tutorial.ts
@@ -1,6 +1,9 @@
 import { ref } from "vue"
 
-export const step = ref(1)
+const urlParams = new URLSearchParams(window.location.search)
+const currentStep = urlParams.get("step") ?? "1"
+
+export const step = ref(Number(currentStep))
 
 export const show = ref(true)
 export const tutorialSize = ref(2 / 5)