Merge branch 'develop' of http://g.28ms.com:8000/yangjianbin/page into develop

@@ -18,7 +18,7 @@
                 <input name="password" type="password" placeholder="密码">
                 <input name="password" type="password" placeholder="密码">
             </form>
             </form>
 <!--                <input value="登录" type="submit">-->
 <!--                <input value="登录" type="submit">-->
-            <input value="登录" typ="submit" onclick="save()">
+            <input value="登录" type="button" class="btn btn-primary" onclick="save()">
 
 
         </div>
         </div>
         <div class="copyright">
         <div class="copyright">