优化

@@ -144,8 +144,8 @@ App({
     // baseUrl: "http://192.144.144.220:20000/",
     // baseUrl: "http://154.8.229.55:20000/",
     // baseUrl: "http://47.110.250.177:20000/",
-    baseUrl: "http://47.110.158.110:20000/",
-    // baseUrl: "https://api.workai.com.cn/",
+    // baseUrl: "http://47.110.158.110:20000/",
+    baseUrl: "https://api.workai.com.cn/",
     OSSUrl: "", //"https://oss.workai.com.cn/",
     userInfo: null,
     hostInfo: null,

@@ -8,6 +8,7 @@ Page({
    */
   data: {
     isshow: false,
+    onresume: false,
     has_verify: true
   },
 
@@ -15,7 +16,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-
+      
   },
 
   /**
@@ -29,6 +30,10 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
+    console.log("onshow")
+    this.setData({
+      onresume:true
+    })
     this.checkUserInfo()
   },
 
@@ -37,18 +42,19 @@ Page({
     var that = this;
     Authorization = getApp().globalData.Authorization;
     var real_auth_status = getApp().globalData.real_auth_status
-    console.log("Authorization", Authorization)
+    console.log("real_auth_status", real_auth_status)
     console.log("Authorization", Authorization)
     if (Authorization && Authorization.length > 10) {
       // that.setData({
       //   has_verify: false
       // })
-      if (real_auth_status == 'active') {
+      if (real_auth_status == 'active') { //不需要再实名认证
         that.setData({
-          has_verify: true
+          has_verify: true,
+          onresume: false,
         })
         that.taxconfirm();
-      } else { //不需要再实名认证
+      } else {
         that.setData({
           has_verify: false
         })
@@ -213,14 +219,17 @@ Page({
    * 生命周期函数--监听页面隐藏
    */
   onHide: function() {
-
+    console.log("onhide")
+    this.setData({
+      onresume: false
+    })
   },
 
   /**
    * 生命周期函数--监听页面卸载
    */
   onUnload: function() {
-
+     
   },
 
   /**

@@ -64,12 +64,12 @@
 
   <image class='logout-img' bindtap='loginout' src='/images/icon_logout.png'></image>
 
-  <view class="mask" hidden="{{has_verify}}" bindtap='closeModalImg'></view>
+  <view class="mask" wx:if="{{!has_verify&&onresume}}"></view>
 
-  <view style='top:180rpx;position:absolute;z-index:10;right:0;left:0;margin:auto;text-align:center;' hidden="{{has_verify}}">
+  <view style='top:180rpx;position:absolute;z-index:10;right:0;left:0;margin:auto;text-align:center;' wx:if="{{!has_verify&&onresume}}">
     <image style='height:860rpx' src='/images/verify_dialog.png'>
     </image>
-    <view style='position:absolute;top:660rpx;right:0;left:0;display:flex;flex-direction:column' bindtap='closeModalImg'>
+    <view style='position:absolute;top:660rpx;right:0;left:0;display:flex;flex-direction:column'>
       <view class='btn_blue_radius' bindtap="go_verify_idcard">
         <text style='font-size: 32rpx;color:#fff;text-align: center;line-height: 42px;' >立即认证</text>
       </view>

@@ -405,8 +405,10 @@ Page({
     this.data.name = tax_info.name
     this.data.other_name = tax_info.other_name
     if (tax_info.certification_status == 'active' && tax_info.id_card_no.length) {//已通过拍摄身份证认证过，不能修改
-      this.data.genderData.disabled = true
-      this.data.birthDate.disabled = true
+      if (tax_info.id_card_type=='居民身份证'){
+        this.data.genderData.disabled = true
+        this.data.birthDate.disabled = true
+      }
       this.data.cardtypeData.disabled = true
     }
 
@@ -420,7 +422,9 @@ Page({
 
     this.data.other_card_number = tax_info.other_id_card_no
     this.data.overseas = tax_info.is_overseas_personnel
-    this.data.countryData.selected = tax_info.native
+    if (tax_info.native){
+      this.data.countryData.selected = tax_info.native
+    }
     this.data.birthCountryData.selected = tax_info.birth_native
     if (tax_info.taxpayer_type == 'non-resident') {
       this.data.taxpayerTypeData.selected = '非居民'

@@ -3,7 +3,7 @@ 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}$/;
-const reg_20_n_a = /^([a-zA-z]|[0-9]){20}$/;
+const reg_20_n_a = /^([a-zA-z]|[0-9]){1,20}$/;
 var baseUrl = getApp().globalData.baseUrl;
 let Authorization = '';
 Page({
@@ -86,6 +86,8 @@ Page({
     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)
+    // this.showtoast(this.data.cardTypeArray.indexOf(type) + "");
+
     if (this.data.is_foreigner == 'true') { //非身份证
       if (type.length < 1) {
         this.showtoast('请选择证照类型');
@@ -114,7 +116,6 @@ Page({
         this.showtoast('证照号码有误');
         return
       }
-      
       if (type.indexOf('居住证') < 0 && type.indexOf('中国护照') < 0 && type.indexOf('永久居留') < 0 &&!reg_20_n_a.test(idCardNo)) {
         this.showtoast('证照号码有误');
         return
@@ -126,7 +127,7 @@ Page({
         method: 'POST',
         data: {
           name: name,
-          id_card_type: type,
+          id_card_type: that.data.cardTypeArray.indexOf(type)+2+"",
           id_card_no: idCardNo
         },
         header: {
@@ -134,8 +135,8 @@ Page({
           "Authorization": Authorization
         },
         success: function(res) {
-          console.log("SUCC", res.data)
-          if (res.data.code && res.data.code >= 300) {
+          console.log("SUCC", res)
+          if (res.statusCode && res.statusCode >= 300) {
             wx.navigateTo({
               url: 'verify_result/verify_result?result=fail',
             })

 // pages/main/verify/verify_result/verify_result.js
+var app = getApp();
 Page({
 
   /**
    * Page initial data
    */
   data: {
-    verify_img:"/images/verify_succ.png",
-    verify_status:"succ",
-    verify_tip:"恭喜您！认证成功",
-    btn_text:"完成"
+    verify_img: "/images/verify_succ.png",
+    verify_status: "succ",
+    verify_tip: "恭喜您！认证成功",
+    btn_text: "完成"
   },
 
   /**
    * Lifecycle function--Called when page load
    */
-  onLoad: function (options) {
+  onLoad: function(options) {
     console.log("options", options)
-    if('succ'==options.result){
+    if ('succ' == options.result) {
       this.setData({
         verify_img: "/images/verify_succ.png",
         verify_status: "succ",
         verify_tip: "恭喜您！认证成功",
         btn_text: "完成"
       })
-    }else if('fail'==options.result){
+    } else if ('fail' == options.result) {
       this.setData({
         verify_img: "/images/verify_fail.png",
         verify_status: "fail",
@@ -36,23 +37,30 @@ Page({
   /**
    * Lifecycle function--Called when page is initially rendered
    */
-  onReady: function () {
+  onReady: function() {
 
   },
 
   /**
    * Lifecycle function--Called when page show
    */
-  onShow: function () {
+  onShow: function() {
 
   },
 
-  done:function(){
-    if('succ'==this.data.verify_status){
-        wx.reLaunch({
-          url: '../../guide/guide',
-        })
-    }else{
+  done: function() {
+    if ('succ' == this.data.verify_status) {
+      // var requestdata = {
+      //   "grant_type": "refresh_token",
+      //   "refresh_token": app.globalData.refresh_token,
+      //   "scope": "global_access:end_user"
+      // };
+      // app.getTokenByCode(requestdata, false, "")
+      app.globalData.real_auth_status = "active";
+      wx.reLaunch({
+        url: '../../guide/guide',
+      })
+    } else {
       wx.navigateBack({
         delta: 1
       })
@@ -62,35 +70,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() {
 
   }
 })
\ No newline at end of file