优化实名认证逻辑

wangyu
pages/main/guide/guide.js
pages/main/verify/verify_idcard/verify_idcard.js
pages/main/verify/verify_info.js
--- a/pages/main/guide/guide.js
查看文件 @56177c5
+++ b/pages/main/guide/guide.js
查看文件 @56177c5
 // pages/main/guide/guide.js
 var baseUrl = getApp().globalData.baseUrl;
+let Authorization = '';
 Page({
   /**
@@ -7,7 +8,7 @@ Page({
    */
   data: {
     isshow: false,
-    has_verify:false
+    has_verify: true
   },
   /**
@@ -28,34 +29,73 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
-    this.taxconfirm();
+    this.checkUserInfo()
   },
-  taxconfirm: function() {
+  //判断该雇员是否有姓名和身份证号
+  checkUserInfo: function() {
     var that = this;
-    var Authorization = getApp().globalData.Authorization;
+    Authorization = getApp().globalData.Authorization;
     console.log("Authorization", Authorization)
     if (Authorization && Authorization.length > 10) {
       wx.request({
-        url: baseUrl + 'persontax/v1/personal-taxes-confirm',
+        url: baseUrl + 'socialwork/v1/employees/verify',
+        data: {},
         header: {
           'content-type': 'application/json',
           "Authorization": Authorization
         },
         success: function(res) {
-          console.log("taxconfirm", res)
-          if (res.statusCode == 200 && !that.data.isshow && res.data.status != '0' ) { //未完善
-            that.showModal(res.data)
+          if (res.statusCode && res.statusCode >= 300) {
+            wx.showToast({
+              title: res.data.message,
+              icon: 'none',
+              duration: 1000
+            })
           } else {
             that.setData({
-              isshow: false
+              has_verify: false
             })
+            // if (!res.data.need_verify) { //不需要再实名认证
+            //   that.setData({
+            //     has_verify: true
+            //   })
+            //   that.taxconfirm();
+            // } else {
+            //   that.setData({
+            //     has_verify: false
+            //   })
+            // }
           }
         }
       })
     }
   },
+  taxconfirm: function() {
+    var that = this;
+    Authorization = getApp().globalData.Authorization;
+
+    wx.request({
+      url: baseUrl + 'persontax/v1/personal-taxes-confirm',
+      header: {
+        'content-type': 'application/json',
+        "Authorization": Authorization
+      },
+      success: function(res) {
+        console.log("taxconfirm", res)
+        if (res.statusCode == 200 && !that.data.isshow && res.data.status != '0') { //未完善
+          that.showModal(res.data)
+        } else {
+          that.setData({
+            isshow: false
+          })
+        }
+      }
+    })
+
+  },
+
   showModal: function(data) {
     var that = this
     that.setData({
@@ -121,13 +161,13 @@ Page({
     })
   },
-  loginout:function(){
+  loginout: function() {
     wx.showModal({
       title: '退出登录',
       content: '确认要退出登录吗？',
       confirmText: '确定',
       showCancel: true,
-      cancelText:"取消",
+      cancelText: "取消",
       confirmColor: '#357aeb',
       success(res) {
         console.log("loginout", res)
@@ -142,13 +182,13 @@ Page({
   },
-  go_verify_idcard:function(){//身份证认证
+  go_verify_idcard: function() { //身份证认证
     wx.navigateTo({
       url: '../verify/verify_info?foreigner=false',
     })
   },
-  go_verify: function () { //外籍人员信息认证
+  go_verify: function() { //外籍人员信息认证
     wx.navigateTo({
       url: '../verify/verify_info?foreigner=true',
     })
--- a/pages/main/verify/verify_idcard/verify_idcard.js
查看文件 @56177c5
+++ b/pages/main/verify/verify_idcard/verify_idcard.js
查看文件 @56177c5
@@ -211,6 +211,26 @@ Page({
   gonext: function () {
     if (this.data.already_getdata) {
       //提交数据 
+      wx.request({
+        url: baseUrl + 'uaa/v1/users/auth',
+        method: 'POST',
+        data: {
+          id_card_front: front_card_copy,
+          id_card_back: back_card_copy
+        },
+        header: {
+          'content-type': 'application/json',
+          "Authorization": Authorization
+        },
+        success: function (res) {
+          if (res.statusCode && res.statusCode >= 300) {
+            this.showtoast(res.data.message);
+          } else {
+            this.showtoast('提交成功');
+            wx.navigateBack({})
+          }
+        }
+      })
       wx.navigateTo({
         url: '../verify_result/verify_result?result=succ',
       })
--- a/pages/main/verify/verify_info.js
查看文件 @56177c5
+++ b/pages/main/verify/verify_info.js
查看文件 @56177c5
@@ -3,6 +3,8 @@ var format = require('../../../utils/util.js');
 const reg_18_Number = /^[0-9]{18}$/;
 const reg_9_n_a = /^([a-zA-z]|[0-9]){9}$/;
 const reg_15_n_a = /^([a-zA-z]|[0-9]){15}$/;
+var baseUrl = getApp().globalData.baseUrl;
+let Authorization = '';
 Page({
   /**
    * Page initial data
@@ -10,25 +12,23 @@ Page({
   data: {
     is_foreigner: false,
     btn_text: "下一步",
-    info_steps: [
-      {
-        label: '身份信息',
-        status: 'success'
-      }, {
-        label: '上传证件照',
-        status: 'circle'
-      }
-    ],
+    info_steps: [{
+      label: '身份信息',
+      status: 'success'
+    }, {
+      label: '上传证件照',
+      status: 'circle'
+    }],
     cardTypeArray: ['中国护照', '港澳居民来往内地通行证', '港澳居民居住证', '台湾居民来往大陆通行证', '台湾居民居住证', '外国护照', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'],
     cardtype: "",
-    card_number:"",
-    name:"",
+    card_number: "",
+    name: "",
   },
   /**
    * Lifecycle function--Called when page load
    */
-  onLoad: function (options) {
+  onLoad: function(options) {
     console.log("options", options);
     this.setData({
       is_foreigner: options.foreigner,
@@ -39,18 +39,18 @@ Page({
   /**
    * Lifecycle function--Called when page is initially rendered
    */
-  onReady: function () {
+  onReady: function() {
   },
   /**
    * Lifecycle function--Called when page show
    */
-  onShow: function () {
+  onShow: function() {
   },
-  bindCardtypeChange: function (e) {
+  bindCardtypeChange: function(e) {
     console.log("bindCardtypeChange", e)
     var cardTypeArray = this.data.cardTypeArray
     var new_type = cardTypeArray[e.detail.value] //['name']
@@ -59,32 +59,33 @@ Page({
     })
   },
-  bindinputcardnum: function (e) {
+  bindinputcardnum: function(e) {
     var idCardNo = e.detail.value
     this.setData({
       card_number: idCardNo
     })
   },
-  nameInput: function (e) {
+  nameInput: function(e) {
     this.setData({
       name: e.detail.value
     })
   },
-  dealCardType: function () {//提交前验证输入的内容规则
-    
+  dealCardType: function() { //提交前验证输入的内容规则
+
   },
-  gonext: function () {
-     //校验证照类型,证照号码，姓名
+  gonext: function() {
+    var that = this
+    //校验证照类型,证照号码，姓名
     var type = this.data.cardtype;
     var idCardNo = this.data.card_number;
     var name = this.data.name.replace(/(^\s*)|(\s*$)/g, "");
-    var regname_c = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,30}$/;  //中文
-    var regname_e = /^[A-Za-z][A-Za-z\s]*[A-Za-z]$/;         //英文
+    var regname_c = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,30}$/; //中文
+    var regname_e = /^[A-Za-z][A-Za-z\s]*[A-Za-z]$/; //英文
     console.log('cardtype', type)
-    if (this.data.is_foreigner == 'true') {//非身份证
+    if (this.data.is_foreigner == 'true') { //非身份证
       if (type.length < 1) {
         this.showtoast('请选择证照类型');
         return
@@ -121,13 +122,34 @@ Page({
         return
       }
       //TODO  请求数据，上传用户身份信息
-      wx.showToast({
-        title: '提交成功',
-        icon: "none",
-        duration: 2000
+      Authorization = getApp().globalData.Authorization;
+      wx.request({
+        url: baseUrl + 'uaa/v1/users/auth-extend',
+        method: 'POST',
+        data: {
+          name: name,
+          id_card_type: type,
+          id_card_no: idCardNo
+        },
+        header: {
+          'content-type': 'application/json',
+          "Authorization": Authorization
+        },
+        success: function (res) {
+          console.log("SUCC",res.data)
+          if (res.data.code && res.data.code >= 300) {
+            wx.navigateTo({
+              url: 'verify_result/verify_result?result=fail',
+            })
+            that.showtoast(res.data.message);
+          } else {
+            wx.navigateTo({
+              url: 'verify_result/verify_result?result=succ',
+            })
+          }
+        }
       })
-      wx.navigateBack({})
-    } else {//身份证
+    } else { //身份证
       if (name.length < 1) {
         this.showtoast('请输入姓名');
         return
@@ -150,7 +172,7 @@ Page({
     }
   },
-  showtoast: function (title) {
+  showtoast: function(title) {
     wx.showToast({
       title: title,
       duration: 2000,
@@ -162,35 +184,35 @@ Page({
   /**
    * Lifecycle function--Called when page hide
    */
-  onHide: function () {
+  onHide: function() {
   },
   /**
    * Lifecycle function--Called when page unload
    */
-  onUnload: function () {
+  onUnload: function() {
   },
   /**
    * Page event handler function--Called when user drop down
    */
-  onPullDownRefresh: function () {
+  onPullDownRefresh: function() {
   },
   /**
    * Called when page reach bottom
    */
-  onReachBottom: function () {
+  onReachBottom: function() {
   },
   /**
    * Called when user click on the top right corner to share
    */
-  onShareAppMessage: function () {
+  onShareAppMessage: function() {
   }
 })