diff --git a/src/pages/Login/Index.vue b/src/pages/Login/Index.vue
index e4ff25b..534e3e2 100644
--- a/src/pages/Login/Index.vue
+++ b/src/pages/Login/Index.vue
@@ -171,7 +171,7 @@ const handleLogin = async () => {
         return router.push("/user");
     } else if (res.code === 201) {
         sessionStorage.setItem("reg", form.value.username);
-
+        sessionStorage.setItem("redirect", route.query.redirect);
         router.push({ name: "Register", query: { type: "mobile" } });
     } else {
         showToast({
diff --git a/src/pages/Login/LineLogin.vue b/src/pages/Login/LineLogin.vue
index e257205..cf0d79f 100644
--- a/src/pages/Login/LineLogin.vue
+++ b/src/pages/Login/LineLogin.vue
@@ -53,6 +53,11 @@ if(!code){
             }
         }else if(res.code == 201){
             sessionStorage.setItem('reg',JSON.stringify(response.data))
+            
+            if(route.query.state !== 'login'){
+                sessionStorage.setItem('redirect',route.query.state)
+            }
+
             router.push({name:'Register',query: {type:'line'}});
         }else{
 
diff --git a/src/pages/Register/Index.vue b/src/pages/Register/Index.vue
index 755a1df..36d5272 100644
--- a/src/pages/Register/Index.vue
+++ b/src/pages/Register/Index.vue
@@ -133,9 +133,15 @@ const onSubmit = async () => {
         return router.push("/login");
     } else if (regRes.code === 200) {
         showToast("註冊成功");
+        ;
+        sessionStorage.removeItem("reg");
         Cookies.set("token", regRes.data.token, { expires: 365, domain: shopStore.sso_domain });
         Cookies.set("uid", regRes.data.uid, { expires: 365, domain: shopStore.sso_domain });
-
+        if(sessionStorage.getItem("redirect")){
+            router.push(sessionStorage.getItem("redirect"));
+            sessionStorage.removeItem("redirect");
+            return;
+        }        
         return router.push("/user");
     } else {
         showToast("註冊失敗");