Merge branch 'dev' into 'master'

fix: 问题修改

See merge request !6

src/components/head.vue

@@ -19,7 +19,7 @@
           </li>
         </ul>
       </nav>
-      <div class="user-info" v-if="userInfo">
+      <!-- <div class="user-info" v-if="userInfo">
         <div class="user-msg">
           <span class="user-name">{{ '小溪' }}</span>
           <span>欢迎您</span>
@@ -27,8 +27,8 @@
         <div class="logout" title="退出登录" @click="logout">
           <img src="../assets/images/logout.png"/>
         </div>
-      </div>
-      <div class="right_btn" v-else>
+      </div> -->
+      <div class="right_btn">
         <!-- <el-button type="primary" size="mini" @click="login">登录</el-button>
         <el-button size="mini" @click="register">注册</el-button> -->
         <div class="user-operate">

src/views/contact.vue

@@ -4,7 +4,7 @@
       <div class="header-image">
         <img src="../assets/logo.png" height="40px" />
       </div>
-      <div class="user-info">
+      <!-- <div class="user-info">
         <div class="user-msg">
           <span class="user-name">{{ '小溪' }}</span>
           <span>欢迎您</span>
@@ -12,9 +12,9 @@
         <div class="logout" title="退出登录" @click="logout">
           <img src="../assets/images/logout.png" />
         </div>
+      </div> -->
     </div>
-    </div>
-    <div class="login_content" v-if="!userInfo">
+    <div class="login_content">
       <div class="no-authority">
         <h1
           style="
@@ -42,7 +42,7 @@
         </el-button>
       </div>
     </div>
-    <div class="contain" v-else></div>
+    <!-- <div class="contain" v-else></div> -->
   </div>
 </template>