From 24821ba01d6c209a8b9eb016464aec8b5d0c5de9 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Thu, 14 Jul 2016 09:44:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=B8=8E=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=BE=93=E5=85=A5=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/login.html    | 4 ++--
 public/assets/wechat/reg.html      | 8 ++++----
 public/stylesheets/weui/weixin.css | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/assets/wechat/login.html b/public/assets/wechat/login.html
index 1283ad281..61c9b9de3 100644
--- a/public/assets/wechat/login.html
+++ b/public/assets/wechat/login.html
@@ -4,13 +4,13 @@
     <form name="loginFrm" novalidate>
     <div class="blue-title">绑定<span class="f13 blue-title-sub" ng-click="goReg()">注册</span></div>
     <div class="input-box-wrap login-wrap mt30">
-        <input name="login" ng-model="user.login" required class="input-box f12" placeholder="请输入电子邮箱地址或登录名" />
+        <input name="login" ng-model="user.login" required class="input-box" placeholder="请输入电子邮箱地址或登录名" />
         <div ng-show="loginFrm.$submitted || loginFrm.login.$touched">
             <span ng-show="loginFrm.login.$error.required" class="c-red fl f12">电子邮箱地址或登录名不能为空</span>
         </div>
     </div>
     <div class="input-box-wrap login-wrap mt10 mb20">
-        <input class="input-box f12" placeholder="请输入密码" name="password" type="password" ng-model="user.password" required />
+        <input class="input-box" placeholder="请输入密码" name="password" type="password" ng-model="user.password" required />
         <div ng-show="loginFrm.$submitted || loginFrm.password.$touched">
             <span ng-show="loginFrm.password.$error.required" class="c-red fl f12">密码不能为空</span>
         </div>
diff --git a/public/assets/wechat/reg.html b/public/assets/wechat/reg.html
index 9e2978e3b..26a17931f 100644
--- a/public/assets/wechat/reg.html
+++ b/public/assets/wechat/reg.html
@@ -6,14 +6,14 @@
         <div class="blue-title">注册<span class="f13 blue-title-sub" ng-click="goLogin()">登录</span></div>
         <img src="/images/wechat/male.jpg" width="60" class="img-circle mt15 block-center"/>
         <div class="input-box-wrap login-wrap mt10 mb20">
-            <input class="input-box f12" type="email" ng-model="user.email" name="email" required placeholder="请输入电子邮箱地址"/>
+            <input class="input-box" type="email" ng-model="user.email" name="email" required placeholder="请输入电子邮箱地址"/>
             <div ng-show="regFrm.$submitted || regFrm.email.$touched">
                 <span class="f12 c-red fl" ng-show="regFrm.email.$error.required">电子邮箱地址不能为空</span>
                 <span class="f12 c-red fl" ng-show="regFrm.email.$error.email">电子邮箱地址不合法</span>
             </div>
         </div>
         <div class="input-box-wrap login-wrap mb20">
-            <input class="input-box f12" type="password" ng-model="user.password" name="password" ng-maxlength="20" ng-minlength="8" required placeholder="请输入密码"/>
+            <input class="input-box" type="password" ng-model="user.password" name="password" ng-maxlength="20" ng-minlength="8" required placeholder="请输入密码"/>
             <div ng-show="regFrm.$submitted || regFrm.password.$touched">
                 <span class="f12 c-red fl" ng-show="regFrm.password.$error.required">密码不能为空</span>
                 <span class="f12 c-red fl" ng-show="regFrm.password.$error.minlength">密码长度为8-20位</span>
@@ -21,13 +21,13 @@
             </div>
         </div>
         <div class="input-box-wrap login-wrap mb20">
-            <input class="input-box f12" type="password" ng-model="user.password_confirm" name="password_confirm"  required placeholder="请再次输入密码" pwdconfirm/>
+            <input class="input-box" type="password" ng-model="user.password_confirm" name="password_confirm"  required placeholder="请再次输入密码" pwdconfirm/>
             <div ng-show="regFrm.$submitted || regFrm.password_confirm.$touched">
                 <span class="f12 c-red fl" ng-show="regFrm.password_confirm.$error.pwdconfirm">两次密码不一致</span>
             </div>
         </div>
         <div class="input-box-wrap login-wrap mb20">
-            <input class="input-box f12" required ng-model="user.username" name="username" placeholder="输入用户登录名"/>
+            <input class="input-box" required ng-model="user.username" name="username" placeholder="输入用户登录名"/>
             <div ng-show="regFrm.$submitted || regFrm.username.$touched">
                 <span class="f12 c-red fl" ng-show="regFrm.username.$error.required">用户名不能为空</span>
             </div>
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index dd60e6f2e..17c039a29 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -211,7 +211,7 @@ a.underline {text-decoration:underline;}
 /*20160616登录注册*/
 .login-wrap {padding:0 10px;}
 .input-box-wrap {padding-right:17px;}
-.input-box { -webkit-appearance: none; font-size: 16px;width:100%; height:16px; padding: 10px 0px 10px 5px; line-height:16px; border:1px solid #ccc; border-radius:5px;}
+.input-box { -webkit-appearance: none; font-size: 15px;width:100%; height:18px; padding: 10px 0px 10px 5px; line-height:18px; border:1px solid #ccc; border-radius:5px;}
 .login-op-wrap {height:30px; line-height:30px; vertical-align:middle;}
 .login-box{display:inline-block; width:14px; height:14px; line-height:14px; text-align:center; vertical-align:middle; border:1px solid #ccc; background:#fff; border-radius:3px; color:#fff; cursor:pointer;}
 .login-box.checked{background:#63c360; border:1px solid #63c360;}