Merge branch 'dev_wy' into dev2.0

@@ -61,10 +61,6 @@ Page({
         console.log('id_info', res.data)
         console.log('id_info', res.data)
         if (res.data && res.data.length > 0) {
         if (res.data && res.data.length > 0) {
           var id_info = JSON.parse(res.data)
           var id_info = JSON.parse(res.data)
-          if (that.data.name.length > 0 && id_info.name != that.data.name) {
-            that.showtoast("姓名冲突")
-            return
-          }
           var birth_day
           var birth_day
           if (id_info.birthday.month > 9 && id_info.birthday.day > 9) {
           if (id_info.birthday.month > 9 && id_info.birthday.day > 9) {
             birth_day = id_info.birthday.year + '-' + id_info.birthday.month + '-' + id_info.birthday.day;
             birth_day = id_info.birthday.year + '-' + id_info.birthday.month + '-' + id_info.birthday.day;
@@ -75,7 +71,7 @@ Page({
           } else if (id_info.birthday.month < 10 && id_info.birthday.day < 10) {
           } else if (id_info.birthday.month < 10 && id_info.birthday.day < 10) {
             birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
             birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
           }
           }
-          
+          console.log("birth_day", birth_day)
           that.setData({
           that.setData({
             name: id_info.name,
             name: id_info.name,
             id_card_no: id_info.id_card_number,
             id_card_no: id_info.id_card_number,
@@ -148,19 +144,13 @@ Page({
               delta: 1
               delta: 1
             })
             })
           }else{
           }else{
-            wx.showToast({
-              title: res.data.message,
-              icon:"none"
-            })
+            that.showToast(res.data.message)
           }
           }
         }
         }
       },
       },
       fail:function(res){
       fail:function(res){
         console.log("fail", res)
         console.log("fail", res)
-        wx.showToast({
-          title: res.data.message,
-          icon: 'none'
-        })
+        that.showToast(res.data.message)
       }
       }
     })
     })
   },
   },