Merge branch 'master' of http://git.cc-lotus.info/count/webnew-count

src/layout/common/topInfo.vue

@@ -6,7 +6,7 @@
           <span class="date">{{ data }}</span>
         </el-col>
         <el-col :span="12" class="login">
-          <span v-if="user.type == null">
+          <span v-if="user && user.type == null">
             <el-button size="mini" @click="$router.push({ path: '/login' })">登录</el-button>
             <el-button size="mini" @click="$router.push({ path: '/register' })">注册</el-button>
           </span>