Merge branch 'Dev' of http://www.origtek.com:2999/nelson.kai/ShowEasyFrontEnd into Dev

FrontEnd/pages/user/index.vue

@@ -242,12 +242,12 @@
                   const authtoken = data.authtoken;
                   that.$auth.$storage.removeUniversal('authtoken');
                   that.$auth.$storage.setUniversal('authtoken', authtoken);
-                  let path = that.$auth.$storage.getUniversal('userBeforePath');
-                  if(path == "/user"){
-                    path = "/";
-                  }
-                  that.$router.push({path: path});
                 }
+                let path = that.$auth.$storage.getUniversal('userBeforePath');
+                if(path == "/user"){
+                  path = "/";
+                }
+                that.$router.push({path: path});
               }else if(response.data.STATUSCODE==500){
                 that.$auth.redirect('login');
               }else if(response.data.STATUSCODE==401){
@@ -272,8 +272,8 @@
         }
       },
       //重新寄出認證信
-      resendVerifyEmail() {
-      this.$axios
+      async resendVerifyEmail() {
+      await this.$axios
       .post(
             `/trending/api/Signup/ReSendVerifyMail?Email=${this.userData.Account}`
           )
@@ -292,9 +292,9 @@
       },
       
       //認證會員
-      userVerifyCode(value){
+      async userVerifyCode(value){
         this.error = false;
-        this.$axios
+        await this.$axios
             .get(
               `/trending/api/Signup/VerifyAccount?OrgID=${this.userInfo.OrgID}&MemberID=${this.userInfo.MemberID}&Code=${value}`
             )
@@ -313,8 +313,8 @@
           });
       },
       //重啟帳號
-      ReactivateAccount(){
-      this.$axios
+      async ReactivateAccount(){
+        await this.$axios
       .post(
             `/trending/api/Members/ReactivateAccountByAcc?Account=${this.userData.Account}`
           )
@@ -339,8 +339,8 @@
           this.valid = false;
         }
       },
-      checkExpireTime(){
-        this.$axios
+      async checkExpireTime(){
+        await  this.$axios
       .get(`/trending/api/System/RememberMe?Account=${this.$auth.$storage.getUniversal('userAccount')}`)
       .then((response) => {
         //console.log(response);

FrontEnd/pages/user/signUp.vue

@@ -213,10 +213,10 @@ export default {
     },
   methods: {
     //會員註冊
-    userRegister() {
+    async userRegister() {
       const postUserData = { ...this.user };
         this.isPageLoading = true;
-        this.$axios
+        await this.$axios
           .post(
             `/trending/api/Signup/SignupWithEmail`, postUserData
           )
@@ -242,9 +242,9 @@ export default {
         });
     },
     //重新寄出認證碼
-    resendVerifyEmail() {
+    async resendVerifyEmail() {
       this.countdown = 60;
-      this.$axios
+      await this.$axios
           .post(
             `/trending/api/Signup/ReSendVerifyMail?Email=${this.user.Email}`
           )
@@ -255,9 +255,9 @@ export default {
           });     
     },
     //認證會員
-    userVerifyCode(value){
+    async userVerifyCode(value){
       this.error = false;
-      this.$axios
+      await this.$axios
           .get(
             `/trending/api/Signup/VerifyAccount?OrgID=${this.userInfo.OrgID}&MemberID=${this.userInfo.MemberID}&Code=${value}`
           )