Merge branch 'zhengjie' of pplokijuhyg/falvpingtai into master

src/login.vue

@@ -19,10 +19,10 @@
       <p>注册即同意《隐私保护指引》</p>
     </div>
     <button class="submit" @click="sub">登录</button>
-    <div class="other">
+    <!-- <div class="other">
       <p  @click="loginpwd">密码登录</p>
       <p @click="open">需要帮助？</p>
-    </div>
+    </div> -->
     <div class="ways">
       <div class="top">
         <div class="line"></div>
@@ -31,8 +31,8 @@
       </div>
       <div class="icons">
         <img src="./assets/wechat.png" alt class="icon" />
-        <img src="./assets/weibo.png" alt class="icon" />
-        <img src="./assets/qq.png" alt class="icon" />
+        <!-- <img src="./assets/weibo.png" alt class="icon" />
+        <img src="./assets/qq.png" alt class="icon" /> -->
       </div>
     </div>
     <div class="tanchuangbox" v-if="ifshow">