忘记密码图标

注册界面补全输入框（6个）
增加退出登陆

pages/forget/forget.wxml

@@ -14,7 +14,7 @@
         <input placeholder='请输入电话' maxlength='11' bindinput='inputPhone' type='number' placeholder-class='placeholder'></input>
       </view>  
        <view class='input_view'>
-        <image class='email_img' src='/images/email.png'></image>
+        <image class='email_img' src='/images/email.jpg'></image>
         <input placeholder='请输入邮箱' maxlength='48' bindinput='inputEmail' type='text' placeholder-class='placeholder'></input>
       </view>
     </view>

pages/register/register.js

@@ -235,19 +235,19 @@ Page({
         errorMsg: ''
       });
     }
-    // if (!this.checkMail()) {
-    //   this.setData({
-    //     errorMsg: '邮箱输入有误，请重新输入'
-    //   });
-    //   this.setData({
-    //     checkPass: false
-    //   });
-    //   return;
-    // } else {
-    //   this.setData({
-    //     errorMsg: ''
-    //   });
-    // }
+    if (!this.checkMail()) {
+      this.setData({
+        errorMsg: '邮箱输入有误，请重新输入'
+      });
+      this.setData({
+        checkPass: false
+      });
+      return;
+    } else {
+      this.setData({
+        errorMsg: ''
+      });
+    }
     if (!this.checkCarNum()) {
       this.setData({
         errorMsg: '车牌号输入有误，请重新输入'
@@ -270,19 +270,19 @@ Page({
       });
       return;
     }
-    // if (!this.checkPassword()) {
-    //   this.setData({
-    //     errorMsg: '两次密码输入不一致，请重新输入'
-    //   });
-    //   this.setData({
-    //     checkPass: false
-    //   });
-    //   return;
-    // } else {
-    //   this.setData({
-    //     errorMsg: ''
-    //   });
-    // }
+    if (!this.checkPassword()) {
+      this.setData({
+        errorMsg: '两次密码输入不一致，请重新输入'
+      });
+      this.setData({
+        checkPass: false
+      });
+      return;
+    } else {
+      this.setData({
+        errorMsg: ''
+      });
+    }
     this.setData({
       checkPass: true
     });

pages/register/register.wxml

@@ -6,36 +6,36 @@
     <view class="logo_view"><image class="login_logo2" src="/images/login_logo2.png"></image></view>
     <view class='context_input'>
       <view class='input_view'>
-        <image class='account_img' src='/images/account.png'></image>
+        <image class='password_img' src='/images/account.png'></image>
         <input placeholder='请设置账号' bindinput='inputAccount' maxlength='20' focus='true' placeholder-class='placeholder'></input>
       </view>
 
       <view class='input_view'>
-        <image class='phone_img' src='/images/phone.png'></image>
+        <image class='password_img' src='/images/phone.png'></image>
         <input placeholder='请输入电话' maxlength='11' bindinput='inputPhone' type='number' placeholder-class='placeholder'></input>
       </view>  
-      <!-- <view class='input_view'>
-        <image class='email_img' src='/images/email.png'></image>
+      <view class='input_view'>
+        <image class='password_img' src='/images/email.png'></image>
         <input placeholder='请输入邮箱' maxlength='48' bindinput='inputEmail' type='text' placeholder-class='placeholder'></input>
-      </view> -->
+      </view> 
       <!-- 
         <view class='input_view'>
           <image class='man_img' src='/images/man.png'></image>
           <input placeholder='请选择性别' maxlength='16' bindinput='checkPassword' type='password' placeholder-class='placeholder'></input>
         </view> 
       -->  
-      <!-- <view class='input_view'>
-        <image class='carNum_img' src='/images/car.png'></image>
+    <view class='input_view'>
+        <image class='password_img' src='/images/car.png'></image>
         <input placeholder='请输入车牌号' maxlength='8' bindinput='inputCarNum' type='text' placeholder-class='placeholder'></input>
-      </view> -->
+      </view>
       <view class='input_view'>
         <image class='password_img' src='/images/password.png'></image>
         <input placeholder='请设置密码' maxlength='16' bindinput='inputPassword' type='password' placeholder-class='placeholder'></input>
       </view>
-      <!-- <view class='input_view'>
+      <view class='input_view'>
         <image class='password_img' src='/images/password.png'></image>
         <input placeholder='请确认密码' maxlength='16' bindinput='inputRepassword' type='password' placeholder-class='placeholder'></input>
-      </view> -->
+      </view>
     </view>
     <view class="errorMsg"><text>{{errorMsg}}</text></view>
     <button class='{{checkPass?"login_button":"login_button_disable"}}' bindtap="{{checkPass?'getUserProfile':''}}">

pages/register/register.wxss

@@ -16,7 +16,7 @@
 .login_logo1 {
   height: 213rpx;
   width: 214rpx;
-  margin-top: 90rpx;
+  margin-top: 20rpx;
 }
 .login_logo2 {
   height: 120rpx;
@@ -36,7 +36,7 @@
   margin-top: 20rpx;
   margin-right: 32rpx;
   margin-left: 32rpx;
-  margin-bottom: 30rpx;
+  margin-bottom: 20rpx;
 }
 
 .account_img {
@@ -62,7 +62,7 @@
   padding-right:29rpx;
   border-right: 2rpx #999999 solid;
 }
-/* .email_img {
+.email_img {
   width: 26rpx;
   height: 20rpx;
   margin: 34rpx 32rpx 34rpx 0;
@@ -70,13 +70,13 @@
 .carNum_img {
   width: 36rpx;
   height: 26rpx;
-  margin: 31rpx 22rpx 31rpx 0;
+  margin: 31rpx 30rpx 31rpx 0;
 }
 .man_img {
   width: 28rpx;
   height: 24rpx;
   margin: 32rpx 30rpx 32rpx 0;
-} */
+}
 
 .context_input input {
   width: calc(100% - 122rpx);
@@ -109,7 +109,7 @@
 .input_view{
   box-shadow: 0rpx 0rpx 10rpx  #dedede;
   border-radius: 10rpx;
-  margin: 40rpx 0rpx;
+  margin: 15rpx 0rpx;
   height: 88rpx;
 }
 .errorMsg{

pages/ucenter/index/index.wxml

@@ -137,8 +137,9 @@
       </view>
 
     </view>
+
   </view>
-  <!-- <view class="logout" hover-class="active" wx:if="{{isLogin}}" bindtap="logout">退出账号</view> -->
+  <view class="logout" hover-class="active" wx:if="{{isLogin}}" bindtap="logout">退出账号</view>
 </view>
 <!-- <view class='footer' bindtap='phoneCall'>
   <text class="h1">客服电话：4009608068</text>