Merge branch 'dev_wy' into 机器人dev

@@ -157,10 +157,20 @@ Page({
     if (this.data.cardtype.length < 1) {
     if (this.data.cardtype.length < 1) {
       this.showToast("请选择证照类型")
       this.showToast("请选择证照类型")
       return;
       return;
-    } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
+    } 
+    if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
       this.showToast("请输入证件号码")
       this.showToast("请输入证件号码")
       return;
       return;
-    } else if (this.data.cardtype == '居民身份证' && !format.isIDCardNum(formdata.id_card_no)) {
+    } 
+    if (this.data.cardtype == '居民身份证' && !format.isIDCardNum(formdata.id_card_no)) {
+      this.showToast("证件号码有误")
+      return;
+    }
+    if (this.data.cardtype == '中国护照' && formdata.id_card_no.length!=9) {
+      this.showToast("证件号码有误")
+      return;
+    }
+    if ((this.data.cardtype.indexOf('港澳') != -1 || this.data.cardtype.indexOf('台湾') != -1) &&! /^\d{18}$/.test(formdata.id_card_no)) {
       this.showToast("证件号码有误")
       this.showToast("证件号码有误")
       return;
       return;
     }
     }

@@ -28,7 +28,7 @@
         <input class='input_wrap01 float_right' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='id_card_no' maxlength='18' type='idcard' value='{{id_card_no}}' bindinput="bindinput"></input>
         <input class='input_wrap01 float_right' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='id_card_no' maxlength='18' type='idcard' value='{{id_card_no}}' bindinput="bindinput"></input>
       </view>
       </view>
       <view wx:else>
       <view wx:else>
-        <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='id_card_no' maxlength='24' value='{{id_card_no}}' bindinput="bindinput"></input>
+        <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='id_card_no' maxlength='20' value='{{id_card_no}}' bindinput="bindinput"></input>
       </view>
       </view>
     </view>
     </view>
     <view style="margin:0 30rpx;background:#e5e5e5;height:2rpx;"></view>
     <view style="margin:0 30rpx;background:#e5e5e5;height:2rpx;"></view>

@@ -120,6 +120,26 @@ Page({
     })
     })
   },
   },
 
 
+  loginout:function(){
+    wx.showModal({
+      title: '退出登录',
+      content: '确认要退出登录吗？',
+      confirmText: '确定',
+      showCancel: true,
+      cancelText:"取消",
+      confirmColor: '#357aeb',
+      success(res) {
+        console.log("loginout", res)
+        if (res.confirm) {
+          wx.reLaunch({
+            // url: '../../login/login'
+            url: '../../getPhone/getPhone'
+          })
+        }
+      }
+    })
+  },
+
   /**
   /**
    * 生命周期函数--监听页面隐藏
    * 生命周期函数--监听页面隐藏
    */
    */

@@ -55,9 +55,11 @@
         </view>
         </view>
         <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
         <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
       </view> -->
       </view> -->
+
+       <text style="font-size:34rpx;color:#999;text-align:center;padding:20rpx;margin:80rpx 0" bindtap='loginout'>退出登录</text>
     </view>
     </view>
   </scroll-view>
   </scroll-view>
-  
+
   <image class='chat-img' bindtap='gochat' src='/images/icon_chat.png'></image>
   <image class='chat-img' bindtap='gochat' src='/images/icon_chat.png'></image>
 
 
 </view>
 </view>