issues/89

Author: shinygang

README.md

@@ -1,8 +1,10 @@
 #基于vue.js重写Cnodejs.org社区的webapp [线上访问地址](http://shinygang.coding.me/)
 
-## 注意：当前项目代码已经升级到2.0，采用vue-cli构建的2.0版本。1.x代码请看1.x分支。
-
-## 当前版本采用vue-cli搭建的版本。 非vue-cli的版本请看分支：not-vue-cli
+## 注意：当前项目代码已经升级到2.0，均采用vue-cli搭建的程序，非vue-cli的版本请看分支：not-vue-cli
+ * master分支采用vue-cli构建的2.0版本。
+ * ssr分支采用服务端渲染
+ * 1.x代码请看1.x分支。
+ * not-vue-cli则是没有采用vue-cli搭建的原始版本
 
 -------
 如果你觉得该项目对你有帮助，就打赏作者一杯咖啡吧。

package.json

@@ -55,13 +55,13 @@
     "json-loader": "^0.5.4",
     "lodash": "^4.16.6",
     "markdown": "^0.5.0",
-    "node-sass": "^3.11.2",
+    "node-sass": "^4.5.3",
     "opn": "^4.0.2",
     "optimize-css-assets-webpack-plugin": "^1.3.0",
     "ora": "^0.3.0",
     "path": "^0.12.7",
     "postcss-loader": "^1.1.1",
-    "sass-loader": "^4.0.2",
+    "sass-loader": "^6.0.6",
     "semver": "^5.3.0",
     "shelljs": "^0.7.4",
     "style-loader": "^0.14.1",

src/components/header.vue

@@ -1,64 +1,58 @@
 <template>
     <div>
-        <div class="page-cover"
-                v-if="show&&fixHead"
-                @click="showMenus">
+        <div class="page-cover" v-if="show&&fixHead" @click="showMenus">
         </div>
         <header :class="{'show':show&&fixHead,'fix-header':fixHead,'no-fix':!fixHead}" id="hd">
             <div class="nv-toolbar">
-                <div class="toolbar-nav"
-                        @click="openMenu"
-                        v-if="fixHead">
+                <div class="toolbar-nav" @click="openMenu" v-if="fixHead">
                 </div>
                 <span v-text="pageType"></span>
                 <i class="num" v-if="messageCount > 0"> {{messageCount}}</i>
                 <router-link to="/add">
-                    <i v-if="needAdd" v-show="!messageCount || messageCount <= 0"
-                        class="iconfont add-icon">&#xe60f;</i>
+                    <i v-if="needAdd" v-show="!messageCount || messageCount <= 0" class="iconfont add-icon">&#xe60f;</i>
                 </router-link>
             </div>
         </header>
-        <nv-menu :show-menu="show"
-            :page-type="pageType"
-            :nick-name="nickname"
-            :profile-url="profileimgurl"
-            v-if="fixHead" ></nv-menu>
+        <nv-menu :show-menu="show" :page-type="pageType" :nick-name="nickname" :profile-url="profileimgurl" v-if="fixHead"></nv-menu>
     </div>
 </template>
 
 <script>
-    import $ from 'webpack-zepto';
+import $ from 'webpack-zepto';
 
-    export default {
-        replace: true,
-        props: {
-            pageType: String,
-            fixHead: Boolean,
-            messageCount: Number,
-            needAdd: {
-                type: Boolean,
-                default: true
-            }
-        },
-        data() {
-            return {
-                nickname: '',
-                profileimgurl: '',
-                show: false
-            };
-        },
-        methods: {
-            openMenu() {
-                $('html, body, #page').addClass('scroll-hide');
-                this.show = !this.show;
-            },
-            showMenus() {
-                this.show = !this.show;
-                $('html, body, #page').removeClass('scroll-hide');
-            }
+export default {
+    replace: true,
+    props: {
+        pageType: String,
+        fixHead: Boolean,
+        messageCount: Number,
+        scrollTop: 0,
+        needAdd: {
+            type: Boolean,
+            default: true
+        }
+    },
+    data () {
+        return {
+            nickname: '',
+            profileimgurl: '',
+            show: false
+        };
+    },
+    methods: {
+        openMenu() {
+            // $('html, body, #page').addClass('scroll-hide');
+            $('body').css('overflow', 'hidden');
+            this.show = !this.show;
         },
-        components: {
-            'nvMenu': require('./menu.vue')
+        showMenus() {
+            this.show = !this.show;
+            $('body').css('overflow', 'auto');
+            // $('html, body, #page').removeClass('scroll-hide');
         }
-    };
-</script>
+    },
+    components: {
+        'nvMenu': require('./menu.vue')
+    }
+};
+</script>

src/main.js

@@ -29,7 +29,8 @@ if (window.sessionStorage.user) {
 // 登录中间验证，页面需要登录而没有登录的情况直接跳转登录
 router.beforeEach((to, from, next) => {
     // 处理左侧滚动不影响右边
-    $('html, body, #page').removeClass('scroll-hide');
+    // $('html, body, #page').removeClass('scroll-hide');
+    $('body').css('overflow', 'auto');
     if (to.matched.some(record => record.meta.requiresAuth)) {
         if (store.state.userInfo.userId) {
             next();
@@ -47,4 +48,4 @@ router.beforeEach((to, from, next) => {
 new Vue({
     router,
     store
-}).$mount('#app');
+}).$mount('#app');