fix

maoxiaoquan · Oct 29, 2019 · 8186500 · 8186500
1 parent 91c31ca
commit 8186500
Show file tree

Hide file tree

Showing 65 changed files with 180 additions and 165 deletions.
diff --git a/admin/src/containers/DynamicComment/view/DynamicComment.js b/admin/src/containers/DynamicComment/view/DynamicComment.js
@@ -163,7 +163,6 @@ class DynamicComment extends React.Component {
   }
 
   commentRender = val => {
-    console.log('val', val)
     let newComment = val
     faceqq.map(faceItem => {
       newComment = newComment.replace(

diff --git a/client/src/assets/css/other.scss b/client/src/assets/css/other.scss
@@ -175,7 +175,7 @@
   position: absolute;
   left: 0;
   top: 0;
-  z-index: 100;
+  z-index: 220;
   background-color: rgba(255, 255, 255, 0.95);
   overflow: hidden;
 }
@@ -184,7 +184,7 @@
   width: 30px;
   height: 30px;
   border-radius: 50%;
-  border: 4px solid purple;
+  border: 4px solid #f1f1f1;
   border-left-color: transparent;
   animation: custom-loading-rotate 1s linear infinite;
   position: absolute;

diff --git a/client/src/components/Face/index.vue b/client/src/components/Face/index.vue
@@ -13,7 +13,7 @@
             v-for="(item,key) in faceqq"
             @click="changeFace(item)"
             :key="key">
-          <img :src="item.face_url"
+          <img v-lazy="item.face_url"
                :alt="item.face_text">
         </li>
       </ul>

diff --git a/client/src/components/MarkDown/components/mdHeader.vue b/client/src/components/MarkDown/components/mdHeader.vue
@@ -182,7 +182,7 @@
             <!-- 缩略图展示 -->
             <img class="image-show"
                  :class="{'transition': transition}"
-                 :src="item[1].miniurl"
+                 v-lazy="item[1].miniurl"
                  alt="none">
           </div>
         </div>

diff --git a/client/src/directive.js b/client/src/directive.js
@@ -21,7 +21,6 @@ export const loading = {
       }
     } */
     const curStyle = window.getComputedStyle(el)
-    console.log('curStyle', curStyle)
     const position = curStyle.position
     if (position === 'absolute' || position === 'relative') {
       el.style.position = position

diff --git a/client/src/entryClient.js b/client/src/entryClient.js
@@ -2,6 +2,8 @@ import Vue from 'vue'
 import { createApp } from './app'
 import NProgress from 'nprogress'
 import { loading } from './directive'
+
+import VueLazyload from 'vue-lazyload'
 const { app, router, store } = createApp()
 NProgress.configure({
   easing: 'ease', // 动画方式
@@ -11,6 +13,14 @@ NProgress.configure({
   minimum: 0.3 // 初始化时的最小百分比
 })
 
+// or with options
+Vue.use(VueLazyload, {
+  preLoad: 1.3,
+  error: '/default/img/loadingfail.png',
+  loading: '/default/img/loadingimg.png',
+  attempt: 1
+})
+
 Vue.mixin({
   beforeRouteUpdate (to, from, next) {
     const { asyncData } = this.$options

diff --git a/client/src/router/routes.js b/client/src/router/routes.js
@@ -91,12 +91,12 @@ export default [
         //动态 2019.8.1 12:11开发
         path: 'dynamics/:dynamicTopicId',
         name: 'dynamics',
-        component: require('@views/Dynamic/index').default // 动态首页
+        component: () => import('@views/Dynamic/index') // 动态首页
       },
       {
         path: 'dynamic/:dynamicId',
         name: 'dynamicView',
-        component: require('@views/Dynamic/dynamicView').default // 动态内容页
+        component: () => import('@views/Dynamic/dynamicView') // 动态内容页
       },
       {
         path: 'topics',
@@ -106,7 +106,7 @@ export default [
       {
         path: 'topic/:dynamicTopicId',
         name: 'dynamicTopicView',
-        component: require('@views/Dynamic/dynamicTopicView').default // 动态专题内容页
+        component: () => import('@views/Dynamic/dynamicTopicView') // 动态专题内容页
       },
       // {
       //   path: 'blogs/:columnEnName', 屏蔽，此功能不开放
@@ -121,7 +121,7 @@ export default [
       {
         path: 'books-write/:type',
         name: 'booksWrite',
-        component: require('@views/Books/WriteBooks').default // 小书创建修改
+        component: () => import('@views/Books/WriteBooks') // 小书创建修改
       },
       {
         path: 'books/:columnEnName',
@@ -143,7 +143,7 @@ export default [
   {
     path: '/book/:books_id/write/:book_id',
     name: 'WriteBookView',
-    component: require('@views/BookView/WriteBookView').default // 编辑小书内容
+    component: () => import('@views/BookView/WriteBookView') // 编辑小书内容
   },
   {
     path: '/sign/in',

diff --git a/client/src/store/module/articleComment.js b/client/src/store/module/articleComment.js
@@ -1,28 +1,6 @@
 import { fetch } from '@request'
 
-const state = () => ({
-  article_comment: {
-    comment_list: [],
-    count: 0,
-    page: 1,
-    pageSize: 10
-  }
-})
-
-const mutations = {
-  SET_ARTICLE_COMMENT_UNSHIFT (state, data) {
-    // 追加评论
-    state.article_comment.comment_list.unshift(data)
-  },
-  SET_ARTICLE_COMMENT_LIST (state, data) {
-    // 设置评论列表
-    state.article_comment = data
-  },
-  SET_ARTICLE_COMMENT_COUNT_ADD (state, data) {
-    // 追加评论
-    state.article_comment.count = state.article_comment.count + 1
-  }
-}
+const state = () => ({})
 
 const actions = {
   ARTICLE_COMMENT_LIST ({ commit, dispatch, state }, parameter) {
@@ -59,7 +37,6 @@ const getters = {}
 export default {
   namespaced: true,
   state,
-  mutations,
   actions,
   getters
 }
diff --git a/client/src/store/module/dynamic.js b/client/src/store/module/dynamic.js
@@ -40,6 +40,14 @@ const mutations = {
   SET_RECOMMEND_DYNAMIC_LIST (state, data) {
     // 设置推荐动态列表
     state.recommendDynamicList = data
+  },
+  SET_RSS_DYNAMIC_TOPIC ({ commit, dispatch, state }, parameter) {
+    // 订阅动态话题
+    return fetch({
+      url: '/subscribe/dynamic_topic',
+      method: 'post',
+      parameter: parameter
+    })
   }
 }
 

diff --git a/client/src/store/module/index.js b/client/src/store/module/index.js
@@ -12,7 +12,6 @@ import setting from './setting'
 import search from './search'
 import website from './website'
 import dynamic from './dynamic'
-import rss from './rss'
 import books from './books'
 import book from './book'
 
@@ -31,7 +30,6 @@ export default {
   search,
   website,
   dynamic,
-  rss,
   books,
   book
 }
diff --git a/client/src/store/module/rss.js b/client/src/store/module/rss.js
diff --git a/client/src/views/Article/Article.vue b/client/src/views/Article/Article.vue
@@ -11,7 +11,7 @@
               <div class="author">
                 <router-link :to="{name:'user',params:{uid:article.user.uid,routeType:'article'}}"
                              class="avatar">
-                  <img :src="article.user.avatar"
+                  <img v-lazy="article.user.avatar"
                        alt />
                 </router-link>
                 <div class="info">
@@ -171,7 +171,6 @@ export default {
       this.$store.dispatch("article/GET_ARTICLE", { aid: this.$route.params.aid })
     },
     isCollect (item) { // 是否收藏
-      console.log('item', item)
       let likeUserIds = []
       if (item.likeUserIds && item.likeUserIds.length > 0) {
         item.likeUserIds.map(item => {

diff --git a/client/src/views/Article/component/ArticleItem.vue b/client/src/views/Article/component/ArticleItem.vue
@@ -48,7 +48,7 @@
            v-if="articleItem.article_blog">
         <router-link :to="{name:'user',params:{uid:articleItem.user.uid,routeType:'article'}}"
                      class="avatar">
-          <img :src="articleItem.user.avatar"
+          <img v-lazy="articleItem.user.avatar"
                alt="">
         </router-link>
         <router-link :to="{name:'user',params:{uid:articleItem.user.uid,routeType:'article'}}"
@@ -67,7 +67,7 @@
     <div class="thumb"
          v-if="articleItem.cover_img">
       <img class="box-image"
-           :src="articleItem.cover_img"
+           v-lazy="articleItem.cover_img"
            alt="">
     </div>
   </article>

diff --git a/client/src/views/ArticleBlog/BlogView.vue b/client/src/views/ArticleBlog/BlogView.vue
@@ -12,7 +12,7 @@
               <div class="user-article-blog-top">
                 <div class="article-blog-icon">
                   <img class="box-image"
-                       :src="articleBlog.blogInfo.icon"
+                       v-lazy="articleBlog.blogInfo.icon"
                        alt="">
                 </div>
 
@@ -67,7 +67,7 @@
                 <ul>
                   <li class="item item-icon read-count">
                     <img class="user-avatar"
-                         :src="articleBlog.blogInfo.user.avatar"
+                         v-lazy="articleBlog.blogInfo.user.avatar"
                          alt="">
                     <router-link :to='{name:"user",params:{uid:articleBlog.blogInfo.user.uid}}'
                                  class="nickname">{{articleBlog.blogInfo.user.nickname}}</router-link>

diff --git a/client/src/views/ArticleBlog/component/blogArticleItem.vue b/client/src/views/ArticleBlog/component/blogArticleItem.vue
@@ -43,7 +43,7 @@
     </div>
     <div class="thumb"
          v-if="articleItem.cover_img">
-      <img :src="articleItem.cover_img"
+      <img v-lazy="articleItem.cover_img"
            class="box-image"
            alt="">
     </div>

diff --git a/client/src/views/ArticleTag/ArticleTag.vue b/client/src/views/ArticleTag/ArticleTag.vue
@@ -9,7 +9,7 @@
                v-if="articleTag">
             <div class="main-top">
               <div class="thumb">
-                <img :src="articleTag.icon"
+                <img v-lazy="articleTag.icon"
                      class="box-image"
                      alt="">
               </div>

diff --git a/client/src/views/ArticleTag/component/ArticleTagItem.vue b/client/src/views/ArticleTag/component/ArticleTagItem.vue
@@ -4,7 +4,7 @@
 
       <router-link :to='{name:"article_tag",params:{en_name:articleTagItem.en_name}}'>
         <div class="thumb">
-          <img :src="articleTagItem.icon"
+          <img v-lazy="articleTagItem.icon"
                class="box-image"
                alt="">
         </div>

diff --git a/client/src/views/Book/Book.vue b/client/src/views/Book/Book.vue
@@ -6,7 +6,7 @@
           <div class="client-card">
             <div class="book-info">
               <div class="poster">
-                <img :src="books.booksInfo.cover_img||''">
+                <img v-lazy="books.booksInfo.cover_img||''">
               </div>
               <div class="info">
                 <div class="title-line">
@@ -26,7 +26,7 @@
                       <router-link :to="{name:'user',params:{uid:books.booksInfo.user.uid,routeType:'article'}}"
                                    class="user">
                         <img class="lazy avatar hero loaded"
-                             :src="books.booksInfo.user.avatar"
+                             v-lazy="books.booksInfo.user.avatar"
                              alt="">
                         <span class="username username">
                           {{books.booksInfo.user.nickname}}

diff --git a/client/src/views/BookView/BookView.vue b/client/src/views/BookView/BookView.vue
@@ -66,7 +66,7 @@
                     <div class="el-dropdown-link"
                          slot="button">
                       <div class="avatar-img">
-                        <img :src="personalInfo.user.avatar"
+                        <img v-lazy="personalInfo.user.avatar"
                              class="box-image"
                              alt="">
                       </div>

diff --git a/client/src/views/BookView/WriteBookView.vue b/client/src/views/BookView/WriteBookView.vue
@@ -66,7 +66,7 @@
                     <div class="el-dropdown-link"
                          slot="button">
                       <div class="avatar-img">
-                        <img :src="personalInfo.user.avatar"
+                        <img v-lazy="personalInfo.user.avatar"
                              class="box-image"
                              alt="">
                       </div>

diff --git a/client/src/views/Books/Books.vue b/client/src/views/Books/Books.vue
@@ -68,7 +68,7 @@
               <div class="library-item clearfix client-card">
                 <div class="library-item__thumb">
                   <router-link :to="{name:'book',params:{books_id:booksItem.books_id}}">
-                    <img :src="booksItem.cover_img"
+                    <img v-lazy="booksItem.cover_img"
                          class="img-full"
                          lazy="loaded">
                   </router-link>
@@ -236,7 +236,6 @@ export default {
     },
     switchColumn (val) {
       this.articleColumn.homeColumn.map(item => {
-        console.log(item.en_name, val)
         if (item.en_name === val) {
           this.childNavItem = item || {}
         }

diff --git a/client/src/views/Books/WriteBooks.vue b/client/src/views/Books/WriteBooks.vue
@@ -7,7 +7,7 @@
         <div class="row mrg-bm20 books-write-content">
           <div class="col-xs-12 col-sm-4 col-md-3 box-form-group">
             <div class="cover-img">
-              <img :src="write.cover_img"
+              <img v-lazy="write.cover_img"
                    v-if="write.cover_img"
                    class="cover-img-view"
                    alt="">

diff --git a/client/src/views/Comment/ArticleComment/CommentChildItem.vue b/client/src/views/Comment/ArticleComment/CommentChildItem.vue
@@ -2,7 +2,7 @@
   <div class="comment-item"
        :id="'comment'+childCommentItem.id">
     <div class="avatar">
-      <img :src="childCommentItem.user.avatar"
+      <img v-lazy="childCommentItem.user.avatar"
            class="box-image"
            alt="">
     </div>

diff --git a/client/src/views/Comment/ArticleComment/CommentForm.vue b/client/src/views/Comment/ArticleComment/CommentForm.vue
@@ -3,7 +3,7 @@
        id="comment_form">
     <div class="comment-avatar">
       <img v-if="personalInfo.islogin"
-           :src="personalInfo.user.avatar"
+           v-lazy="personalInfo.user.avatar"
            class="box-image"
            alt="">
       <img v-else

diff --git a/client/src/views/Comment/ArticleComment/CommentItem.vue b/client/src/views/Comment/ArticleComment/CommentItem.vue
@@ -3,7 +3,7 @@
        :id="'comment'+commentItem.id"
        ref="comment_list">
     <div class="avatar">
-      <img :src="commentItem.user.avatar"
+      <img v-lazy="commentItem.user.avatar"
            class="box-image"
            alt="">
     </div>