diff --git a/src/App.vue b/src/App.vue
index 872c8c4..0e127c1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -46,7 +46,7 @@
 
                 <v-avatar
                   color="#635d56"
-                  v-if="getImg&&img"
+                  v-if="getImg"
                   :image="getImg"
                   size="30"
                 >
diff --git a/src/components/MainVote.vue b/src/components/MainVote.vue
index 9840efd..a6b54b4 100644
--- a/src/components/MainVote.vue
+++ b/src/components/MainVote.vue
@@ -12,6 +12,8 @@
   </div>
 </template>
 <script>
+import { mapGetters } from "vuex";
+// import { client } from "@/utils/trpc";
 import Header from "./HeaderHome.vue";
 import Section2Green from "./Section2Green.vue";
 import Section3Base from "./Section3Base.vue";
@@ -22,6 +24,8 @@ import Section7GreenTab from "./Section7GreenTab.vue";
 import Section8Base from "./Section8Base.vue";
 import FooterPage from "./FooterPage.vue";
 export default {
+  computed: {
+    ...mapGetters(["getUsername"]),},
   components: {
     Header,
     Section2Green,
@@ -34,6 +38,26 @@ export default {
     FooterPage
 
 
+  },
+  mounted() {
+    // if(this.getUsername){
+    //   client.user.getSelf
+    //     .mutate({})
+    //     .then((data) => {
+    //       console.log('data.image',data.image);
+    //       this.$store.commit("setUsername", data.firstName);
+    //       this.$store.commit("setImg", data.image);
+    //       localStorage.setItem("img",data.image);
+    //       localStorage.setItem("username", data.firstName);
+    //     })
+    //     .catch((error) => {
+    //       // alert("ไม่สามารถโหลดข้อมูลได้");
+    //       console.error("เกิดข้อผิดพลาดในการโหลดข้อมูล:", error);
+    //     });
+    //     this.$store.commit("setCheckLogin", true);
+    // }
+
+     
   },
 };
 </script>
diff --git a/src/components/form/FormSteper.vue b/src/components/form/FormSteper.vue
index b426953..9062f26 100644
--- a/src/components/form/FormSteper.vue
+++ b/src/components/form/FormSteper.vue
@@ -254,8 +254,12 @@
                   </v-col>
                 </v-row>
                 <div class="btn-next">
-                  <v-btn @click="e1--"  variant="tonal" class="float-left"
-                  size="large"   >ก่อนหน้า</v-btn
+                  <v-btn
+                    @click="e1--"
+                    variant="tonal"
+                    class="float-left"
+                    size="large"
+                    >ก่อนหน้า</v-btn
                   >
 
                   <v-btn
@@ -355,8 +359,11 @@
                     ></v-textarea> -->
 
                     <div class="btn-next">
-                      <v-btn @click="e1--"  class="float-left" size="large" variant="tonal"
-
+                      <v-btn
+                        @click="e1--"
+                        class="float-left"
+                        size="large"
+                        variant="tonal"
                         >ก่อนหน้า</v-btn
                       >
                       <!-- <v-spacer></v-spacer> -->
@@ -506,11 +513,14 @@
                   </div>
 
                   <div class="btn-next">
-                      <v-btn @click="e1--"  class="float-left" size="large" variant="tonal"
-
-                        >ก่อนหน้า</v-btn
-                      >
-                    </div>
+                    <v-btn
+                      @click="e1--"
+                      class="float-left"
+                      size="large"
+                      variant="tonal"
+                      >ก่อนหน้า</v-btn
+                    >
+                  </div>
                 </v-card>
               </div>
             </v-stepper-window-item>
@@ -766,10 +776,12 @@ export default {
         method: "POST",
         body: formData,
       }).then(() => {
-        client.user.confirmChangeImage.mutate();
-        alert(
-          "บันทึกข้อมูลสำเร็จ\n สามารถ login ด้วย username : เลขบัตรประชาชน / password : เบอร์โทรศัพท์"
-        );
+        client.user.confirmChangeImage.mutate().then(() => {
+          this.getUser();
+          // alert(
+          //   "บันทึกข้อมูลสำเร็จ\n สามารถ login ด้วย username : เลขบัตรประชาชน / password : เบอร์โทรศัพท์"
+          // );
+        });
       });
       console.log("done");
     },
@@ -824,11 +836,12 @@ export default {
           if (this.file) {
             this.uploadImage();
           } else {
-            alert(
-              "บันทึกข้อมูลสำเร็จ\n สามารถ login ด้วย username : เลขบัตรประชาชน / password : เบอร์โทรศัพท์"
-            );
+            this.getUser();
+            // alert(
+            //   "บันทึกข้อมูลสำเร็จ\n สามารถ login ด้วย username : เลขบัตรประชาชน / password : เบอร์โทรศัพท์"
+            // );
           }
-          this.getUser();
+         
         })
         .catch((error) => {
           alert("ไม่สามารถบันทึกข้อมูลได้: " + error.message);
@@ -839,10 +852,10 @@ export default {
       client.user.login
         .mutate(payload)
         .then((data) => {
-          // console.log("data", data);
-
+          this.$store.commit("setCheckLogin", false);
           localStorage.setItem("token", data.token);
           this.$router.push("/");
+         
         })
         .catch((error) => {
           alert("ไม่สามารถบันทึกข้อมูลได้: " + error.message);
@@ -858,6 +871,10 @@ export default {
           localStorage.setItem("img", data.image);
           this.$store.commit("setUsername", data.firstName);
           this.$store.commit("setImg", data.image);
+          alert(
+            "บันทึกข้อมูลสำเร็จ\n สามารถ login ด้วย username : เลขบัตรประชาชน / password : เบอร์โทรศัพท์"
+          );
+
           this.login({ cid: data.cid, phone: data.phone });
         })
         .catch((error) => {
diff --git a/src/components/search/CardUser.vue b/src/components/search/CardUser.vue
index d83b4db..13bd130 100644
--- a/src/components/search/CardUser.vue
+++ b/src/components/search/CardUser.vue
@@ -53,7 +53,7 @@
                     <span class="ml-3">
                       {{ item.lastName }}
                       <span v-if="item.age" class="text-sub2">
-                        ( {{ item.age }}ปี )</span
+                        ({{ item.age }}ปี)</span
                       ></span
                     >
                     <div
diff --git a/src/store/index.js b/src/store/index.js
index 15e7284..5055cd6 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -4,13 +4,17 @@ export default createStore({
   state: {
     username:"",
     img:"",
-    checkPage:""
+    checkPage:"",
+    checkLogin:"",
   },
   getters: {
    
     getUsername: (state) => {
       return state.username
     },
+    getCheckLogin: (state) => {
+      return state.checkLogin
+    },
     getImg: (state) => {
       return state.img
     },
@@ -19,6 +23,9 @@ export default createStore({
     },
   },
   mutations: {
+    setCheckLogin: (state, payload) => {
+     state.checkLogin = payload;
+    },
     setUsername: (state, payload) => {
       state.username = payload;
     },
diff --git a/src/views/LoginForm.vue b/src/views/LoginForm.vue
index badd2ba..ae12aa5 100644
--- a/src/views/LoginForm.vue
+++ b/src/views/LoginForm.vue
@@ -170,7 +170,7 @@ export default {
           // this.provinceItems = data;
         })
         .catch((error) => {
-          alert("ไม่สามารถบันทึกข้อมูลได้: " + error.message);
+          alert("ไม่สามารถเข้าสู่ระบบได้: " + error.message);
           console.error("เกิดข้อผิดพลาดในการโหลดข้อมูล:", error);
         });
     },
diff --git a/src/views/RegisterForm.vue b/src/views/RegisterForm.vue
index 400c74d..b3d149d 100644
--- a/src/views/RegisterForm.vue
+++ b/src/views/RegisterForm.vue
@@ -19,7 +19,7 @@ import FormMain from "../components/form/FormMain.vue";
 export default {
   components: { FormMain },
   computed: {
-    ...mapGetters(["getUsername", "getImg"]),
+    ...mapGetters(["getUsername", "getImg",'getCheckLogin']),
   },
 };
 </script>