Merge remote-tracking branch 'origin/master'

components/common/comment/main.vue

@@ -136,10 +136,7 @@
       onRouter(name, data) {
         this.$router.push(
           {
-            name: name,
+            path: '/user/' + data
-            params: {
-              id: data
-            }
           }
         )
       },

package.json

@@ -11,18 +11,18 @@
   },
   "dependencies": {
     "@chenfengyuan/vue-qrcode": "^1.0.2",
-    "@nuxtjs/axios": "^5.12.1",
+    "@nuxtjs/axios": "^5.12.2",
     "babel-plugin-lodash": "^3.3.4",
     "cookieparser": "^0.1.0",
-    "echarts": "^4.8.0",
+    "echarts": "^4.9.0",
     "element-ui": "^2.13.2",
     "express": "^4.17.1",
     "js-cookie": "^2.2.1",
-    "nuxt": "^2.14.1",
+    "nuxt": "^2.14.5",
     "save-svg-as-png": "^1.4.17",
     "socket.io": "^2.3.0",
     "socket.io-client": "^2.3.0",
-    "vditor": "^3.4.6",
+    "vditor": "^3.5.3",
     "vuejs-avataaars": "^4.0.1"
   },
   "devDependencies": {

pages/notification.vue

@@ -13,6 +13,7 @@
 
   export default {
     name: "Notification",
+    middleware: 'authenticated',
     components: {
       NotificationList
     },

pages/user/_nickname.vue

@@ -7,13 +7,19 @@
         <div v-else class="card-header"
              :style="{backgroundImage:'url(https://static.rymcu.com/article/1574441651963.jpg)', backgroundSize:'cover', backgroundPosition:'50%'}"></div>
         <div class="card-body text-center">
-          <img v-if="user.avatarUrl" class="card-profile-img" :src="user.avatarUrl">
+          <img v-if="user.avatarUrl" class="card-profile-img-avatar" :src="user.avatarUrl">
           <img v-else class="card-profile-img" src="https://static.rymcu.com/article/1578475481946.png">
           <h3 class="mb-3">{{ user.nickname }}</h3>
           <p class="mb-4" v-html="user.signature"></p>
           <div v-if="oauth && oauth.idUser !== user.idUser">
+            <el-button type="primary" v-if="isFollow" @click="cancelFollowUser(user.idUser)">取消关注</el-button>
+            <el-button type="primary" v-else @click="followUser(user.idUser)">关注</el-button>
             <el-button @click="gotoChats">聊天</el-button>
           </div>
+          <div v-else>
+            <el-button type="primary" @click="login">关注</el-button>
+            <el-button @click="login">聊天</el-button>
+          </div>
         </div>
       </div>
     </el-col>
@@ -67,7 +73,8 @@
   },
   data() {
     return {
-        activeTab: '0'
+      activeTab: '0',
+      isFollow: false
     }
   },
   methods: {
@@ -85,6 +92,51 @@
       _ts.$router.push({
         path: `/chats/${_ts.user.nickname}`
       })
+    },
+    followUser(idUser) {
+      let _ts = this;
+      if (_ts.oauth) {
+        _ts.$axios.$post('/api/follow', {
+          followingId: idUser,
+          followingType: 0
+        }).then(function (res) {
+          _ts.$set(_ts, 'isFollow', res);
+        })
+      } else {
+        _ts.login()
+      }
+    },
+    cancelFollowUser(idUser) {
+      let _ts = this;
+      if (_ts.oauth) {
+        _ts.$axios.$post('/api/follow/cancel-follow', {
+          followingId: idUser,
+          followingType: 0
+        }).then(function (res) {
+          _ts.$set(_ts, 'isFollow', res);
+        })
+      } else {
+        _ts.login()
+      }
+    },
+    login() {
+      this.$router.push({
+        path: '/login'
+      })
+    }
+  },
+  mounted() {
+    let _ts = this;
+    this.$store.commit('setActiveMenu', 'user')
+    if (_ts.oauth) {
+      _ts.$axios.$get('/api/follow/is-follow', {
+        params: {
+          followingId: _ts.user.idUser,
+          followingType: 0
+        }
+      }).then(function (res) {
+        _ts.$set(_ts, 'isFollow', res);
+      })
     }
   }
 }
@@ -151,8 +203,19 @@
 }
 
 .card-profile-img {
-    max-width: 6rem;
+  max-width: 16rem;
-    margin-top: -5rem;
+  margin-top: -7rem;
+  margin-bottom: 1rem;
+  border: 3px solid #fff;
+  border-radius: 100%;
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+  background-color: #ffffff;
+}
+
+.card-profile-img-avatar {
+  max-width: 16rem;
+  height: auto;
+  margin-top: -10rem;
   margin-bottom: 1rem;
   border: 3px solid #fff;
   border-radius: 100%;

pages/user/settings/account.vue

@@ -119,7 +119,7 @@
         if (res && res.data && res.data.url) {
           let user = _ts.user;
           user.avatarUrl = res.data.url;
-          user.avatarType = '';
+          user.avatarType = '0';
           _ts.$set(_ts, 'user', user);
           _ts.$set(_ts, 'svgShow', false);
           _ts.$set(_ts, 'avatarUrl', res.data.url);
@@ -149,6 +149,7 @@
             } else {
               _ts.$set(_ts, 'user', res.user);
               _ts.$set(_ts, 'avatarUrl', res.user.avatarUrl);
+              _ts.$set(_ts, 'svgShow', false);
             }
           }
         })