Merge branch 'dev' of git.oa00.com:xiaowen/swsWecat into dev

* 'dev' of git.oa00.com:xiaowen/swsWecat:
  cxw-010203

pages/mine/pages/register/register.js

@@ -67,14 +67,14 @@ Page({
             action: 'getVERCode',
             sPhone: this.data.sPhone,
         }
-        // 定时60s
-        timer(this)
         app.globalData.request(obj).then((res) => {
             if (res.Code == 1) {
                 wx.showModal({
                     title: '提示',
                     content: data.Msg,
                 })
+                // 定时60s
+                timer(this)
             }
         }).catch(err => {
             wx.showModal({
@@ -202,12 +202,11 @@ Page({
         }
         return a;
     },
-    handlerBack(){
+    handlerBack() {
-      wx.navigateBack({
+        wx.navigateBack({
-        delta: 1
+            delta: 1
-    });
+        });
     },
-
     onLoad(options) {
 
     },

pages/mine/pages/register/register.wxml

@@ -4,7 +4,7 @@
   <view style="font-size:28rpx;font-weight:bolder;margin-left: 32rpx">用户名</view>
   <input value="{{sUserName}}" placeholder="请输入用户名" placeholder-class="placeholder-style" bindinput="usernameInput"></input>
   <view style="font-size:28rpx;font-weight:bolder;margin-top: 32rpx;margin-left: 32rpx">密码</view>
-  <input value="{{sPwd}}" placeholder="请输入密码" placeholder-class="placeholder-style" bindinput="passwordInput"></input>
+  <input type="password" value="{{sPwd}}" placeholder="请输入密码" placeholder-class="placeholder-style" bindinput="passwordInput"></input>
   <view style="font-size:28rpx;font-weight:bolder;margin-top: 32rpx;margin-left: 32rpx">手机号</view>
   <input value="{{sPhone}}" placeholder="请输入手机号" placeholder-class="placeholder-style" bindinput="sPhoneInput"></input>
   <view style="font-size:28rpx;font-weight:bolder;margin-top: 32rpx;margin-left: 32rpx">邮箱</view>