From 1335dd9786525a1605ca591edcea4e6481414352 Mon Sep 17 00:00:00 2001
From: ronger <ronger-x@outlook.com>
Date: Fri, 18 Dec 2020 14:20:07 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E7=99=BB=E5=BD=95=E5=90=8E?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3=E4=B9=8B=E5=89=8D=E8=AE=BF=E9=97=AE?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2(=E6=9A=82=E5=8F=AA=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E8=AF=A6=E6=83=85=E9=A1=B5+=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=BB=E9=A1=B5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login.vue          | 260 ++++++++++++++++++++-------------------
 pages/user/_nickname.vue |   9 +-
 2 files changed, 139 insertions(+), 130 deletions(-)

diff --git a/pages/login.vue b/pages/login.vue
index d54c3ee..069aeaf 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -52,151 +52,157 @@
 </template>
 
 <script>
-  import {mapState} from 'vuex';
+import {mapState} from 'vuex';
 
-  const Cookie = process.client ? require('js-cookie') : undefined
-  export default {
-    name: "login",
-    middleware: 'notAuthenticated',
-    data() {
-      return {
-        user: {
-          account: '',
-          password: ''
-        },
-        forgetForm: {
-          email: ''
-        },
-        forget: false,
-        loading: false,
-        loginLoading: false
-      }
-    },
-    computed: {
-      ...mapState({
-        article: state => state.article.detail.data
-      })
-    },
-    methods: {
-      login() {
-        let _ts = this;
-        _ts.$refs.user.validate((valid) => {
-          if (valid) {
-            _ts.$set(_ts, 'loginLoading', true);
-            setTimeout(function () {
-              _ts.$set(_ts, 'loginLoading', false);
-            }, 10000);
+const Cookie = process.client ? require('js-cookie') : undefined
+export default {
+  name: "login",
+  middleware: 'notAuthenticated',
+  data() {
+    return {
+      user: {
+        account: '',
+        password: ''
+      },
+      forgetForm: {
+        email: ''
+      },
+      forget: false,
+      loading: false,
+      loginLoading: false,
+      historyUrl: ''
+    }
+  },
+  computed: {
+    ...mapState({
+      article: state => state.article.detail.data
+    })
+  },
+  methods: {
+    login() {
+      let _ts = this;
+      _ts.$refs.user.validate((valid) => {
+        if (valid) {
+          _ts.$set(_ts, 'loginLoading', true);
+          setTimeout(function () {
+            _ts.$set(_ts, 'loginLoading', false);
+          }, 10000);
 
-            let data = {
-              account: _ts.user.account,
-              password: _ts.user.password
-            }
+          let data = {
+            account: _ts.user.account,
+            password: _ts.user.password
+          }
 
-            _ts.$axios.$post('/api/console/login', data).then(function (res) {
-              _ts.$set(_ts, 'loginLoading', false);
-              if (res) {
-                if (res.message) {
-                  _ts.$message(res.message);
-                  return false;
-                }
-                let auth = {
-                  accessToken: res.user.token,
-                  idUser: res.user.idUser,
-                  role: res.user.weights
-                }
+          _ts.$axios.$post('/api/console/login', data).then(function (res) {
+            _ts.$set(_ts, 'loginLoading', false);
+            if (res) {
+              if (res.message) {
+                _ts.$message(res.message);
+                return false;
+              }
+              let auth = {
+                accessToken: res.user.token,
+                idUser: res.user.idUser,
+                role: res.user.weights
+              }
 
-                let user = {
-                  nickname: res.user.nickname,
-                  avatarURL: res.user.avatarUrl
-                }
-                _ts.$store.commit('setAuth', auth) // mutating to store for client rendering
-                localStorage.setItem('user', JSON.stringify(user))
-                _ts.$store.commit('setUser', user) // mutating to store for client rendering
-                Cookie.set('auth', auth)
+              let user = {
+                nickname: res.user.nickname,
+                avatarURL: res.user.avatarUrl
+              }
+              _ts.$store.commit('setAuth', auth) // mutating to store for client rendering
+              localStorage.setItem('user', JSON.stringify(user))
+              _ts.$store.commit('setUser', user) // mutating to store for client rendering
+              Cookie.set('auth', auth)
+              if (_ts.historyUrl) {
+                window.location.href = _ts.historyUrl
+              } else {
                 _ts.$router.push({
                   name: 'index'
                 })
               }
-            })
-          } else {
-            return false;
-          }
-        });
-      },
-      register() {
-        this.$router.push(
-          {
-            name: 'register'
-          }
-        )
-      },
-      forgetPassword() {
-        this.forget = true;
-      },
-      hideForgetPasswordDialog() {
-        this.forget = false;
-      },
-      sendEmailCode() {
-        let _ts = this;
-        _ts.loading = true;
-        let email = _ts.forgetForm.email;
-        if (!email) {
-          return false
+            }
+          })
+        } else {
+          return false;
         }
-        let data = {
-          email: email
-        };
-        _ts.$axios.$get('/api/console/get-forget-password-email', {
-          params: data
-        }).then(function (res) {
-          _ts.loading = false;
-          _ts.forget = false;
-          if (res) {
-            _ts.$message(res.message)
-          }
-        })
-      }
+      });
     },
-    mounted() {
-      this.$store.commit('setActiveMenu', 'login')
+    register() {
+      this.$router.push(
+        {
+          name: 'register'
+        }
+      )
+    },
+    forgetPassword() {
+      this.forget = true;
+    },
+    hideForgetPasswordDialog() {
+      this.forget = false;
+    },
+    sendEmailCode() {
+      let _ts = this;
+      _ts.loading = true;
+      let email = _ts.forgetForm.email;
+      if (!email) {
+        return false
+      }
+      let data = {
+        email: email
+      };
+      _ts.$axios.$get('/api/console/get-forget-password-email', {
+        params: data
+      }).then(function (res) {
+        _ts.loading = false;
+        _ts.forget = false;
+        if (res) {
+          _ts.$message(res.message)
+        }
+      })
     }
+  },
+  mounted() {
+    this.$store.commit('setActiveMenu', 'login');
+    this.$set(this, 'historyUrl', this.$route.query.historyUrl || '');
   }
+}
 </script>
 
 <style scoped>
-  .icon-rymcu {
-    margin: 0 auto;
-    display: block;
-    height: 4rem;
-  }
+.icon-rymcu {
+  margin: 0 auto;
+  display: block;
+  height: 4rem;
+}
 
-  .verify .verify-wrap {
-    /*width: 60%;*/
-  }
+.verify .verify-wrap {
+  /*width: 60%;*/
+}
 
-  .flex-inline {
-    display: flex;
-    align-items: center;
-  }
+.flex-inline {
+  display: flex;
+  align-items: center;
+}
 
-  .verify .intro {
-    padding: 50px;
-    background-color: #f1f7fe;
-    /*width: 40%;*/
-    color: #616161;
-  }
+.verify .intro {
+  padding: 50px;
+  background-color: #f1f7fe;
+  /*width: 40%;*/
+  color: #616161;
+}
 
-  .verify__sign {
-    background-color: transparent !important;
-  }
+.verify__sign {
+  background-color: transparent !important;
+}
 
-  .vditor-reset {
-    font-variant-ligatures: no-common-ligatures;
-    font-family: Helvetica Neue, Luxi Sans, DejaVu Sans, Tahoma, Hiragino Sans GB, Microsoft Yahei, sans-serif, Apple Color Emoji, Segoe UI Emoji, Noto Color Emoji, Segoe UI Symbol, Android Emoji, EmojiSymbols;
-    word-wrap: break-word;
-    overflow: auto;
-    line-height: 1.5;
-    font-size: 16px;
-    word-break: break-word;
-  }
+.vditor-reset {
+  font-variant-ligatures: no-common-ligatures;
+  font-family: Helvetica Neue, Luxi Sans, DejaVu Sans, Tahoma, Hiragino Sans GB, Microsoft Yahei, sans-serif, Apple Color Emoji, Segoe UI Emoji, Noto Color Emoji, Segoe UI Symbol, Android Emoji, EmojiSymbols;
+  word-wrap: break-word;
+  overflow: auto;
+  line-height: 1.5;
+  font-size: 16px;
+  word-break: break-word;
+}
 </style>
diff --git a/pages/user/_nickname.vue b/pages/user/_nickname.vue
index bd0439b..bc3a734 100644
--- a/pages/user/_nickname.vue
+++ b/pages/user/_nickname.vue
@@ -22,12 +22,12 @@
             <div v-if="oauth.idUser !== user.idUser">
               <el-button type="primary" v-if="isFollow" @click="cancelFollowUser(user.idUser)" plain>取消关注</el-button>
               <el-button type="primary" v-else @click="followUser(user.idUser)" plain>关注</el-button>
-              <el-button @click="gotoChats" plain>聊天</el-button>
+              <el-button v-show="false" @click="gotoChats" plain>聊天</el-button>
             </div>
           </div>
           <div v-else>
             <el-button type="primary" @click="login" plain>关注</el-button>
-            <el-button @click="login" plain>聊天</el-button>
+            <el-button v-show="false" @click="login" plain>聊天</el-button>
           </div>
         </div>
       </div>
@@ -151,7 +151,10 @@ export default {
     },
     login() {
       this.$router.push({
-        path: '/login'
+        path: '/login',
+        query: {
+          historyUrl: window.location.href
+        }
       })
     }
   },