Merge branch '机器人dev' into 苏州英格玛

# Conflicts:
#	app.js
#	app.json
#	pages/main/advancepayment/adPayHome.js
#	pages/main/guide/guide.js
#	pages/main/guide/guide.wxml

@@ -71,6 +71,7 @@ App({
         that.globalData.wx_open_id = user.wx_open_id;
         that.globalData.Authorization = "Bearer " + res.data.access_token;
         that.globalData.refresh_token = res.data.refresh_token;
+        that.globalData.real_auth_status = res.data.user.real_auth_status;
         if (user && user.type == "0") { //匿名用户
           wx.redirectTo({
             // url: '../../getPhone/getPhone'
@@ -156,6 +157,7 @@ App({
     refresh_token: "",
     tenant_id: "",
     wx_open_id: "",
+    real_auth_status:'',
     newComerOrder: null
   }
 })
\ No newline at end of file

@@ -12,9 +12,7 @@
     "pages/main/addtionalreduce/godetail/godetail",
     "pages/main/addtionalreduce/lookandupdate/lookandupdate",
     "pages/main/addtionalreduce/addextrainfo/addextrainfo",
-   
     "pages/main/addtionalreduce/adddupporters/adddupporters",
-    
     "pages/main/addtionalreduce/additiondetail/additiondetail",
     "pages/main/advancepayment/adPayHome",
     "pages/main/finalpayment/home",
@@ -22,12 +20,16 @@
     "pages/main/finalpayment/historylist/historylist",
     "pages/main/finalpayment/historydetail/historydetail",
     "pages/login/login",
-    "pages/main/advancepayment/adPayDetails/adPayDetails"
+    "pages/main/advancepayment/adPayDetails/adPayDetails",
+    "pages/main/verify/verify_info",
+    "pages/main/verify/verify_result/verify_result",
+    "pages/main/verify/verify_idcard/verify_idcard"
   ],
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#4478e3",
     "navigationBarTitleText": "WeChat",
     "navigationBarTextStyle": "white"
-  }
+  },
+  "sitemapLocation": "sitemap.json"
 }
\ No newline at end of file

@@ -64,7 +64,7 @@ Page({
           app.globalData.tenant_id = tenant.id;
           app.globalData.userInfo = user;
           app.globalData.wx_open_id = user.wx_open_id;
-          
+          app.globalData.real_auth_status = res.data.user.real_auth_status;
           app.configOssUrl()
           wx.reLaunch({
             url: '../main/guide/guide'

@@ -125,6 +125,7 @@ Page({
           var tenant = res.data.tenant;
           app.globalData.tenant_id = tenant.id;
           app.globalData.userInfo = user;
+          app.globalData.real_auth_status = res.data.user.real_auth_status;
           app.globalData.wx_open_id = user.wx_open_id;
           app.configOssUrl()
           wx.reLaunch({

@@ -111,6 +111,6 @@
    
   </view>
    <view wx:if="{{hascompleted&&additionlist.length<1}}" style='background:#fff;'>
-    <image style='width:55%;height:254rpx;margin:400rpx 166rpx 0 166rpx;' src='/images/nodeclare_img.png'></image>
+    <image style='width:55%;height:254rpx;margin:400rpx 166rpx 0 166rpx;' src='/images/noreduce_img.png'></image>
     </view>
 </view>
\ No newline at end of file

@@ -399,9 +399,10 @@
     <image wx:if="{{cur_status=='house_fund'&&house_type=='house_fund_rent'}}" class='modal_img02' src="/images/house_declare_rent.png"></image>
     <image wx:if="{{cur_status=='house_fund'&&house_type=='house_fund_loan'}}" class='modal_img' src="/images/house_declare_loan.png"></image>
     <!-- <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModalImg'>x</text> -->
-    <view style='width:80rpx;height:80rpx;position:absolute;float:right;top:0;right:0;display:flex;align-items:center;justify-content:center;' bindtap='closeModalImg'>
+        <view style='width:80rpx;height:80rpx;position:absolute;float:right;top:0;right:0;display:flex;align-items:center;justify-content:center;' bindtap='closeModalImg'>
       <image style='width:30rpx;height:30rpx;' src='/images/close.png'></image>
     </view>
+
   </view>
 
   <!-- 扣除类型 -->

@@ -35,7 +35,7 @@ Page({
       success: function (result) {
         console.log('成功', result)
         self.setData({
-          taxDatas: that.handleTaxData(result.data)
+          taxDatas: self.handleTaxData(result.data)
         })
       },
       fail: function (res) {

@@ -112,8 +112,10 @@ Page({
   handleSalaryData: function (items) {
     for (var i = 0; i < items.length; ++i) {
       var item = items[i]
+      console.log("item---", item)
       item.payroll_date = format.formatTime_date(item.payroll_date)
       item.count_date = format.formatDate_min(item.start_time) + '-' + format.formatDate_min(item.end_time)
+      item.zeroShow = item.zero_display=='yes'?true:false//是否展示非0字段
       item.detals = this.handleDetailsData(item)
       item.isshow = false
     }
@@ -193,10 +195,10 @@ Page({
   },
 
   handleDetailsData: function (data) {
-
-    let titles = JSON.parse(data['slip_titles'])
+    let titles = JSON.parse(data['slip_titles'])  
     let detail = JSON.parse(data['detail'])
-    let mapping_keys = data["mapping_keys"] ? data["mapping_keys"] : []
+    let mapping_keys = data["mapping_keys"] ? data["mapping_keys"]:[]
+     console.log(titles,detail,mapping_keys)
     var details = []
     for (var i = 0; i < titles.length; ++i) {
       var titleData = titles[i]
@@ -205,14 +207,15 @@ Page({
       if (!title) {
         title = titleData['original_column']
       }
-      if (!value) {
+      if (value != 0 && !value) {
         value = data[titleData['key']]
         if (value != undefined) {
           value += 'tax_rate' == titleData['key'] ? '%' : ''
         }
       }
-      if (!title || !value) continue;
-      if (mapping_keys.indexOf(titleData['key']) == -1 && value == '0') continue;
+      if (!title) continue;
+      if (!title || (value != 0 && !value)) continue;
+      // if (mapping_keys.indexOf(titleData['key']) == -1 && (value == '0' || value == 0)) continue;
       details.push({
         title: title,
         value: value

@@ -16,7 +16,7 @@
   <view class="swiper-box page" style="height:100%;margin-top:20rpx" bindchange="bindChange">
     <view wx:if="{{currentTab==0}}">
       <view wx:if="{{hascompleted_tax&&taxDatas.length<1}}" style='background:#fff;width:100%; align-items: center;'>
-        <image style='width:418rpx;height:254rpx;margin: 0 auto;padding-top:300rpx; display: block;' mode="aspectFit" src='/images/noDataIcon.jpg'></image>
+        <image style='width:418rpx;height:254rpx;margin: 0 auto;padding-top:300rpx; display: block;' mode="aspectFit" src='/images/nodata.png'></image>
         <view style='width:100%; font-family: PingFang-SC-Medium;font-size: 14px;color: #999999;letter-spacing: 0;text-align: center;'>还没有企业为您申报个税哦～</view>
       </view>
       <view wx:for="{{taxDatas}}" style='margin-bottom:20rpx'>
@@ -35,7 +35,7 @@
     </view>
     <view wx:else>     <!-- 工资明细 -->
       <view wx:if="{{hascompleted_sal&&salaryDatas.length<1}}" style='background:#fff;'>
-        <image style='width:418rpx;height:254rpx;margin: 0 auto;padding-top:300rpx; display: block;' mode="aspectFit" src='/images/noDataIcon.jpg'></image>
+        <image style='width:418rpx;height:254rpx;margin: 0 auto;padding-top:300rpx; display: block;' mode="aspectFit" src='/images/nodata.png'></image>
         <view style='width:100%; font-family: PingFang-SC-Medium;font-size: 14px;color: #999999;letter-spacing: 0;text-align: center;'>您还没有工资条哦～</view>
       </view>
       <view wx:for="{{salaryDatas}}" style='margin-bottom:20rpx'>
@@ -57,7 +57,7 @@
             <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view>
           </view>
           <view wx:if="{{item.isshow}}" wx:for="{{item.detals}}" wx:for-item='detal'>
-            <view>
+            <view hidden="{{!item.zeroShow&&(detal.value=='0'||detal.value==0)}}" >
               <text class='text_999_28'>{{detal.title}}</text>
               <text class='text_999_28' style='color:#333;text-align:right;float: right'>{{detal.value}}</text>
             </view>

 // pages/main/guide/guide.js
 var baseUrl = getApp().globalData.baseUrl;
+let Authorization = '';
 Page({
 
   /**
@@ -7,14 +8,15 @@ Page({
    */
   data: {
     isshow: false,
-    mobile:""
+    onresume: false,
+    has_verify: true
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-
+      
   },
 
   /**
@@ -28,38 +30,77 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
-    var user = getApp().globalData.userInfo 
-    if (user && user.mobile.length==11){
-      this.setData({
-        mobile: user.mobile
-      })
-      this.taxconfirm();
-    }
+    console.log("onshow")
+    this.setData({
+      onresume:true
+    })
+    this.checkUserInfo("")
   },
 
-  taxconfirm: function() {
+  //判断该雇员是否有姓名和身份证号
+  checkUserInfo: function (skip_type) {
     var that = this;
-    var Authorization = getApp().globalData.Authorization;
+    Authorization = getApp().globalData.Authorization;
+    var real_auth_status = getApp().globalData.real_auth_status
+    console.log("real_auth_status", real_auth_status)
     console.log("Authorization", Authorization)
     if (Authorization && Authorization.length > 10) {
-      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
+      // that.setData({
+      //   has_verify: false
+      // })
+      if (real_auth_status == 'active') { //不需要再实名认证
+        that.setData({
+          has_verify: true,
+          onresume: false,
+        })
+        that.taxconfirm(skip_type);
+      } else {
+        that.setData({
+          has_verify: false
+        })
+      }
+    }
+  },
+
+  taxconfirm: function(skip_type) {
+    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
+          })
+          if(skip_type=="1"){
+            wx.navigateTo({
+              url: '../taxperson/home',
+            })
+          } else if (skip_type == "2") {
+            wx.navigateTo({
+              url: '../addtionalreduce/home',
+            })
+          } else if (skip_type == "3") {
+            wx.navigateTo({
+              url: '../advancepayment/adPayHome',
             })
-          }
+          } else if (skip_type == "4") {
+            wx.navigateTo({
+              url: '../finalpayment/home',
+            })
+          } 
         }
-      })
-    }
+      }
+    })
+
   },
 
   showModal: function(data) {
@@ -78,7 +119,9 @@ Page({
           that.setData({
             isshow: false
           })
-          that.gotaxPerson()
+          wx.navigateTo({
+            url: '../taxperson/home',
+          })
         }
       }
     })
@@ -88,36 +131,28 @@ Page({
    * 自然人信息采集
    */
   gotaxPerson: function() {
-    wx.navigateTo({
-      url: '../taxperson/home',
-    })
+    this.checkUserInfo("1")
   },
 
   /**
    * 专项附加扣除
    */
   goAdditionalDiduction: function() {
-    wx.navigateTo({
-      url: '../addtionalreduce/home',
-    })
+    this.checkUserInfo("2")
   },
 
   /**
    * 预扣预缴
    */
   goAdvancePayment: function() {
-    wx.navigateTo({
-      url: '../advancepayment/adPayHome',
-    })
+    this.checkUserInfo("3")
   },
 
   /**
    * 汇算清缴
    */
   goFinalPayment: function() {
-    wx.navigateTo({
-      url: '../finalpayment/home',
-    })
+    this.checkUserInfo("4")
   },
 
   gochat: function() {
@@ -126,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)
@@ -146,18 +181,40 @@ Page({
     })
   },
 
+
+  go_verify_idcard: function() { //身份证认证
+    wx.navigateTo({
+      url: '../verify/verify_info?foreigner=false',
+    })
+  },
+
+  go_verify: function() { //外籍人员信息认证
+    wx.navigateTo({
+      url: '../verify/verify_info?foreigner=true',
+    })
+  },
+
   /**
    * 生命周期函数--监听页面隐藏
    */
   onHide: function() {
+    console.log("onhide")
+    this.setData({
+      onresume: false
+    })
+  },
 
+  close02:function(){
+    this.setData({
+      has_verify: true
+    })
   },
 
   /**
    * 生命周期函数--监听页面卸载
    */
   onUnload: function() {
-
+     
   },
 
   /**

 <!--pages/main/guide/guide.wxml-->
 
-<view class='' wx:if="{{mobile.length==11}}">
+<view class=''>
   <scroll-view>
     <view class="bg_wrap">
 
@@ -56,7 +56,7 @@
         <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
       </view> -->
 
-       <!-- <text style="font-size:34rpx;color:#999;text-align:center;padding:20rpx;margin:80rpx 0" bindtap='loginout'>退出登录</text> -->
+      <!-- <text style="font-size:34rpx;color:#999;text-align:center;padding:20rpx;margin:80rpx 0" bindtap='loginout'>退出登录</text> -->
     </view>
   </scroll-view>
 
@@ -66,4 +66,17 @@
 
    <image class='logout-img' bindtap='gochat' src='/images/icon_chat.png'></image>
 
-</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;' 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'>
+      <view class='btn_blue_radius' bindtap="go_verify_idcard">
+        <text style='font-size: 32rpx;color:#fff;text-align: center;line-height: 42px;' >立即认证</text>
+      </view>
+      <text style='font-size:26rpx;color: #357aeb;margin-top:22rpx' bindtap='go_verify'>外籍人员信息认证</text>
+    </view>
+  </view>
+<image wx:if="{{!has_verify&&onresume}}" style='width:44rpx;height:44rpx;right:0;left:0;margin:auto;margin-top:60rpx;position:absolute;z-index:10;' src="/images/close02.png"  bindtap='close02'></image>
+</view>
\ No newline at end of file

@@ -74,3 +74,24 @@ text_wrap_sub_999 {
   right: 40rpx;
   bottom: 40rpx;
 }
+
+/* 遮罩层 */
+
+.mask {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #000;
+  opacity: 0.7;
+  z-index: 10;
+}
+
+.btn_blue_radius {
+  margin-left: 120rpx ;
+  margin-right: 120rpx;
+  background: #357aeb;
+  border-radius: 5px;
+  height: 84rpx;
+}

@@ -54,6 +54,7 @@ Page({
       bindtype: 'forigner',
       placeholder: '是否境外人员',
       disabled: true,
+      selected:"否",
       values: ["否", "是"],
       onChange: 'onPickerSelect'
     },

@@ -104,6 +104,7 @@ Page({
       label: '纳税人类型',
       bindtype: 'taxpayerType',
       placeholder: '请选择纳税人类型',
+      selected:"居民",
       values: ["居民", "非居民"],
       onChange: 'onPickerSelect'
     },
@@ -113,6 +114,7 @@ Page({
       bindtype: 'forigner',
       placeholder: '请选择',
       disabled: true,
+      selected:"否",
       values: ["否", "是"],
       onChange: 'onPickerSelect'
     },
@@ -405,8 +407,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 +424,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 = '非居民'
@@ -748,7 +754,7 @@ Page({
     this.data.hasOtherCard = true
     this.data.overseas = '是'
     this.data.taxpayerTypeData.disabled = false
-    this.data.taxpayerTypeData.selected = ''
+    this.data.taxpayerTypeData.selected = '非居民'
     if ('居民身份证' == new_type || '中国护照' == new_type) {
       this.data.overseas = '否'
       this.data.countryData.selected = '中国'
@@ -1416,7 +1422,7 @@ Page({
         "other_name": that.data.hasOtherCard ? that.data.other_name : '',
         "family_ties": '本人',//that.data.relativeData.selected,
         "native": that.data.countryData.selected,
-        "taxpayer_type": that.data.taxpayerTypeData.selected == '居民' ? 'resident' :'non-resident',
+        "taxpayer_type": that.data.taxpayerTypeData.selected == '非居民' ? 'non-resident' :'resident',
         "is_overseas_personnel": that.data.overseas,
         'birth_native': that.data.hasOtherCard ? that.data.birthCountryData.selected : '',
         "id_card_type": that.data.cardtypeData.selected, //selected_code,

+// pages/main/verify/verify_idcard/verify_idcard.js
+var OSSInit;
+var baseUrl = getApp().globalData.baseUrl;
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+    input_name: "",
+    input_card_number: "",
+
+    facepath: '',
+    already_getdata: false,
+    front_card_info: {},
+    backpath: '',
+    back_card_info: {},
+    idInfo: {},
+  },
+
+  onLoad: function (options) {
+    console.log("options",options)
+    this.setData({
+      input_name:options.input_name,
+      input_card_number: options.input_card_number,
+    })
+    this.initOSS()
+  },
+
+  initOSS: function () {
+    var that = this
+    var Authorization = getApp().globalData.Authorization;
+    //OSS 上传前init
+    wx.showLoading()
+    wx.request({
+      url: baseUrl + "filemeta/v1/inits",
+      header: {
+        'Authorization': Authorization
+      },
+      method: 'POST',
+      data: {
+        "access_type": "web_upload",
+        "action ": "put_object",
+        "instance_id": "",
+        "object_type": "wx_image"
+      },
+      success: function (result) {
+
+        OSSInit = result.data
+        console.log(' OSS init 成功', OSSInit)
+      },
+      fail: function (res) {
+        console.log('OSS init  失败', res)
+      },
+      complete: function () {
+        wx.hideLoading()
+      }
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    console.log('onShow')
+  },
+
+  chooseImage: function (e) {
+    console.log(e)
+    var that = this
+    wx.chooseImage({
+      sourceType: ['camera', 'album'],
+      // sizeType: ['original'],
+      count: 1,
+      success: function (res) {
+        console.log('success', res)
+        if ("id_face" == e.currentTarget.id) {
+          that.setData({
+            facepath: res.tempFilePaths[0]
+          })
+          that.uploadImage(that.data.facepath, 'id_face')
+        } else if ("id_back" == e.currentTarget.id) {
+          that.setData({
+            backpath: res.tempFilePaths[0]
+          })
+          that.uploadImage(that.data.backpath, 'id_back')
+        }
+      }
+    })
+  },
+
+  uploadImage: function (path, str) {
+    var that = this
+    wx.showLoading({
+      title: '上传图片中...',
+    })
+    console.log('key', 'imagepath_' + path.substring(path.length - 10, path.length))
+    wx.uploadFile({
+      url: getApp().globalData.OSSUrl,
+      filePath: path,
+      name: 'file',
+      formData: {
+        'key': 'imagepath_' + path.substring(path.length - 15, path.length),
+        'OSSAccessKeyId': OSSInit.access_key_id,
+        'policy': OSSInit.policy,
+        'signature': OSSInit.signature,
+        'callback': OSSInit.callback_body,
+        'x:access_token': OSSInit.callback_token,
+        // 'x-oss-security-token': OSSInit.security_token,
+        'success_action_status': '200',
+      },
+      success: function (res) {
+        console.log('uploadFile', res.data)
+        if (res.statusCode == 200) {
+          var data = JSON.parse(res.data)
+          console.log('上传成功', res)
+          that.oss_bucket = data.bucket
+          if ("id_face" == str) {
+            that.setData({
+              front_card_info: data
+            })
+          } else if ("id_back" == str) {
+            that.setData({
+              back_card_info: data
+            })
+          }
+          that.checkAndupload()
+        } else {
+          var title = '图片上传失败，请重新上传'
+          if (res.statusCode == 413) {
+            title = '图片体积过大，请选择较小图片上传'
+          }
+          wx.showModal({
+            title: '上传失败',
+            content: title,
+            showCancel: false,
+            confirmColor: '#4E8FE7'
+          })
+        }
+        wx.hideLoading()
+      },
+      fail: function (err) {
+        console.log('fail', err)
+        wx.showModal({
+          title: '上传失败',
+          content: '图片上传失败，请重新上传',
+          showCancel: false,
+          confirmColor: '#4E8FE7'
+        })
+        wx.hideLoading()
+      },
+      complete(res) {
+        console.log('complete', res)
+        wx.hideLoading()
+      }
+    })
+  },
+
+  checkAndupload: function () {
+    var that = this
+    var frontdata = that.data.front_card_info
+    var backdata = that.data.back_card_info
+    console.log('frontdata', frontdata)
+    console.log('backdata', backdata)
+    if (!frontdata || !frontdata.object_id) {
+      return;
+    }
+    if (!backdata || !backdata.object_id) {
+      return;
+    }
+    wx.showLoading({
+      title: '解析图片中...',
+    })
+    var Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + 'common/v1/ocr/id-card-verify',
+      method: "POST",
+      header: {
+        'content-type': 'application/json', // 默认值
+        "Authorization": Authorization
+      },
+      data: {
+        front_card_copy: that.data.front_card_info,
+        back_card_copy: backdata
+      },
+      success: function (res) {
+        console.log('suc', res)
+        if (res.statusCode == 200) {
+          that.setData({
+            already_getdata: true,
+            idInfo: res.data.item
+          })
+          console.log('suc', that.data.idInfo)
+        } else {
+          wx.showModal({
+            showCancel: false,
+            title: '',
+            content: res.data.message ? res.data.message : "数据错误",
+          })
+        }
+      },
+      fail(res) {
+        console.log('fail', res.data)
+      },
+      complete(res) {
+        console.log('complete', res.data)
+        wx.hideLoading()
+      }
+    })
+  },
+
+  gonext: function () {
+    var frontdata = this.data.front_card_info
+    var backdata = this.data.back_card_info
+    var that = this
+    if (this.data.already_getdata) {
+      var id_Info = this.data.idInfo;
+      if(this.data.input_name!=id_Info.name){
+          this.showtoast("您输入的姓名与身份证照片不一致，请重试");
+          return;
+      }
+      if (this.data.input_card_number != id_Info.id_card_number) {
+        this.showtoast("您输入的证照号码与身份证照片不一致，请重试");
+        return;
+      }
+      //提交数据 
+      var Authorization = getApp().globalData.Authorization;
+      wx.request({
+        url: baseUrl + 'uaa/v1/users/auth',
+        method: 'POST',
+        data: {
+          id_card_front: frontdata,
+          id_card_back: backdata
+        },
+        header: {
+          'content-type': 'application/json',
+          "Authorization": Authorization
+        },
+        success: function (res) {
+          console.log("verify_idcard",res);
+          if (res.statusCode && res.statusCode >= 300) {
+            that.showtoast(res.data.message);
+            wx.redirectTo({
+              url: '../verify_result/verify_result?result=fail',
+            })
+          } else {
+            that.showtoast('提交成功');
+            wx.redirectTo({
+              url: '../verify_result/verify_result?result=succ',
+            })
+          }
+        },
+        fail(res){
+          that.showtoast(res.data.message);
+        }
+      })
+    } else {
+      // wx.redirectTo({
+      //   url: '../verify_result/verify_result?result=fail',
+      // })
+      if (!frontdata || !frontdata.object_id) {
+        this.showtoast('请上传证件照');
+        return;
+      }
+      if (!backdata || !backdata.object_id) {
+        this.showtoast('请上传证件照');
+        return;
+      }
+    }
+  },
+
+  showtoast: function (title) {
+    wx.showToast({
+      title: title,
+      duration: 2000,
+      icon: 'none'
+      // image: '/images/error.png'
+    })
+  },
+
+
+  /**
+   * Lifecycle function--Called when page hide
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page unload
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * Page event handler function--Called when user drop down
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * Called when page reach bottom
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * Called when user click on the top right corner to share
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file

+{
+  "navigationBarTitleText": "实名认证"
+}
\ No newline at end of file

+<view class='page'>
+  <scroll-view scroll-y style="padding-bottom:180rpx;">
+    <view style='display:flex;flex-direction:row;background:#fff'>
+      <!--左边 身份信息 -->
+      <view style='margin:40rpx 0 30rpx 130rpx'>
+        <view style='display:flex;flex-direction:row;height:48rpx;width:100%;'>
+          <image style='margin-left:30rpx; width: 24px;height: 24px' src='/images/step_first_blue.png'></image>
+          <view style='background:#357aeb;width:90px;height:4rpx;align-self:center;'></view>
+        </view>
+        <view style='font-size: 17px;color: #000;margin-top:16rpx'>身份信息</view>
+      </view>
+      <!--右边 上传证件照 -->
+      <view style='margin:40rpx 100rpx 30rpx 0'>
+        <view style='display:flex;flex-direction:row;height:48rpx;width:100%;'>
+          <view style='background:#357aeb;width:90px;height:4rpx;align-self:center;'></view>
+          <image style='margin-right:30rpx; width: 24px;height: 24px' src='/images/step_second_blue.png'></image>
+        </view>
+        <view style='font-size: 17px;color: #000;margin-top:16rpx;text-align:right'>上传证件照</view>
+      </view>
+    </view>
+
+    <view class='id_background' bindtap="chooseImage" id='id_face'>
+      <image class='id_image_wrap' src="{{facepath?facepath:'/images/id_face.png'}}"></image>
+    </view>
+    <view class='id_background' bindtap="chooseImage" id='id_back'>
+      <image class='id_image_wrap' src="{{backpath?backpath:'/images/id_back.png'}}"></image>
+    </view>
+
+    <view style='background-color:#fff;padding:0 32rpx ;'>
+      <view class='item_body'>
+        <text class='text_666_28 float_left'>签发机关</text>
+        <text class='text_333_28 float_right'>{{idInfo.issued_by}}</text>
+      </view>
+      <view class="divide_line"></view>
+      <view class='item_body'>
+        <text class='text_666_28 float_left'>有效期</text>
+        <text class='text_333_28 float_right'>{{idInfo.valid_date}}</text>
+      </view>
+    </view>
+  </scroll-view>
+
+  <view class='bottom_btn_wrap'>
+    <view class='btn_blue_radius' bindtap="gonext">
+      <view class='text_white_34'>提交</view>
+    </view>
+  </view>
+</view>
\ No newline at end of file

+.page {
+  background: #f8f8f8;
+}
+
+.id_background{
+  width: 100%;
+  height: 380rpx;
+  display: flex;
+  align-items: center;
+  background-color: #fff;
+}
+
+.id_image_wrap{
+  width: 540rpx;
+  height: 312rpx;
+  margin-left: 110rpx;
+  margin-right: 110rpx;
+}
+
+
+.item_body {
+  width: 100%;
+  height: 80rpx;
+}
+
+.text_666_28 {
+  font-family: PingFangSC-Regular;
+  font-size: 28rpx;
+  color: #666;
+  line-height: 80rpx;
+}
+
+.text_333_28 {
+  font-family: PingFangSC-Regular;
+  font-size: 28rpx;
+  color: #333;
+  text-align: right;
+  line-height: 80rpx;
+}
+
+.bottom_btn_wrap{
+  background: #FFFFFF;
+  box-shadow: 0 -2px 8px 0 rgba(208,208,208,0.30);
+  height: 136rpx;
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+}
+.btn_blue_radius{
+  margin: 26rpx 30rpx;
+  background: #357AEB;
+  border-radius: 5px;
+  height: 84rpx;
+}
+
+.text_white_34 {
+  font-family: PingFangSC-Regular;
+  font-size: 17px;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 42px;
+}
\ No newline at end of file

+// pages/main/verify/verify_info.js
+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]){1,20}$/;
+var baseUrl = getApp().globalData.baseUrl;
+let Authorization = '';
+Page({
+  /**
+   * Page initial data
+   */
+  data: {
+    is_foreigner: false,
+    btn_text: "下一步",
+    info_steps: [{
+      label: '身份信息',
+      status: 'success'
+    }, {
+      label: '上传证件照',
+      status: 'circle'
+    }],
+    cardTypeArray: ['中国护照', '港澳居民来往内地通行证', '港澳居民居住证', '台湾居民来往大陆通行证', '台湾居民居住证', '外国护照', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'],
+    cardtype: "",
+    card_number: "",
+    name: "",
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function(options) {
+    console.log("options", options);
+    this.setData({
+      is_foreigner: options.foreigner,
+      btn_text: "true" == options.foreigner ? "提交" : "下一步"
+    })
+  },
+
+  /**
+   * Lifecycle function--Called when page is initially rendered
+   */
+  onReady: function() {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page show
+   */
+  onShow: function() {
+
+  },
+
+  bindCardtypeChange: function(e) {
+    console.log("bindCardtypeChange", e)
+    var cardTypeArray = this.data.cardTypeArray
+    var new_type = cardTypeArray[e.detail.value] //['name']
+    this.setData({
+      cardtype: new_type
+    })
+  },
+
+  bindinputcardnum: function(e) {
+    var idCardNo = e.detail.value
+    this.setData({
+      card_number: idCardNo
+    })
+  },
+
+  nameInput: function(e) {
+    this.setData({
+      name: e.detail.value
+    })
+  },
+
+  dealCardType: 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]$/; //英文
+    console.log('cardtype', type)
+    // this.showtoast(this.data.cardTypeArray.indexOf(type) + "");
+
+    if (this.data.is_foreigner == 'true') { //非身份证
+      if (type.length < 1) {
+        this.showtoast('请选择证照类型');
+        return
+      }
+      if (name.length < 1) {
+        this.showtoast('请输入姓名');
+        return
+      }
+      name = name.replace(/(^\s*)|(\s*$)/g, "");
+      if (!regname_c.test(name) && !regname_e.test(name)) {
+        this.showtoast('请输入正确的姓名');
+        return
+      }
+      if (idCardNo.length < 1) {
+        this.showtoast('请填写证照号码');
+        return
+      }
+      if (type.indexOf('居住证') > -1 && !reg_18_Number.test(idCardNo)) {
+        this.showtoast('证照号码有误');
+        return
+      }else if (type.indexOf('中国护照') > -1 && !reg_9_n_a.test(idCardNo)) {
+        this.showtoast('证照号码有误');
+        return
+      }else if (type.indexOf('永久居留') > -1 && !reg_15_n_a.test(idCardNo)) {
+        this.showtoast('证照号码有误');
+        return
+      }
+      if (type.indexOf('居住证') < 0 && type.indexOf('中国护照') < 0 && type.indexOf('永久居留') < 0 &&!reg_20_n_a.test(idCardNo)) {
+        this.showtoast('证照号码有误');
+        return
+      }
+      //TODO  请求数据，上传用户身份信息
+      Authorization = getApp().globalData.Authorization;
+      wx.request({
+        url: baseUrl + 'uaa/v1/users/auth-extend',
+        method: 'POST',
+        data: {
+          name: name,
+          id_card_type: that.data.cardTypeArray.indexOf(type)+2+"",
+          id_card_no: idCardNo
+        },
+        header: {
+          'content-type': 'application/json',
+          "Authorization": Authorization
+        },
+        success: function(res) {
+          console.log("SUCC", res)
+          if (res.statusCode && res.statusCode >= 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',
+            })
+          }
+        }
+      })
+    } else { //身份证
+      if (name.length < 1) {
+        this.showtoast('请输入姓名');
+        return
+      }
+      if (!regname_c.test(name)) {
+        this.showtoast('请输入正确的姓名');
+        return
+      }
+      if (idCardNo.length < 1) {
+        this.showtoast('请填写证照号码');
+        return
+      }
+      if (!format.isIDCardNum(idCardNo)) {
+        this.showtoast('证照号码有误');
+        return;
+      }
+      wx.navigateTo({
+        url: 'verify_idcard/verify_idcard?input_name=' + name + '&input_card_number=' + idCardNo,
+      })
+    }
+  },
+
+  showtoast: function(title) {
+    wx.showToast({
+      title: title,
+      duration: 2000,
+      icon: 'none'
+      // image: '/images/error.png'
+    })
+  },
+
+  /**
+   * Lifecycle function--Called when page hide
+   */
+  onHide: function() {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page unload
+   */
+  onUnload: function() {
+
+  },
+
+  /**
+   * Page event handler function--Called when user drop down
+   */
+  onPullDownRefresh: function() {
+
+  },
+
+  /**
+   * Called when page reach bottom
+   */
+  onReachBottom: function() {
+
+  },
+
+  /**
+   * Called when user click on the top right corner to share
+   */
+  onShareAppMessage: function() {
+
+  }
+})
\ No newline at end of file

+{
+ "navigationBarTitleText": "实名认证"
+}
\ No newline at end of file

+<view class='page'>
+  <view style='background:#FDFBEA;height:96rpx;width:100%;text-align:center'>
+    <text style='font-size:30rpx;color:#E47C4A;font-family:PingFang-SC-Medium;line-height:96rpx'>为了您的账户安全，请先完成实名认证</text>
+  </view>
+
+  <view hidden="{{is_foreigner=='true'}}">
+    <view style='display:flex;flex-direction:row;background:#fff'>
+      <!--左边 身份信息 -->
+      <view style='margin:40rpx 0 30rpx 130rpx'>
+        <view style='display:flex;flex-direction:row;height:48rpx;width:100%;'>
+          <image style='margin-left:30rpx; width: 24px;height: 24px' src='/images/step_first_blue.png'></image>
+          <view style='background:#357aeb;width:90px;height:4rpx;align-self:center;'></view>
+        </view>
+        <view style='font-size: 17px;color: #000;margin-top:16rpx'>身份信息</view>
+      </view>
+      <!--右边 上传证件照 -->
+      <view style='margin:40rpx 100rpx 30rpx 0'>
+        <view style='display:flex;flex-direction:row;height:48rpx;width:100%;'>
+          <view style='background:#bcc3c7;width:90px;height:4rpx;align-self:center;'></view>
+          <image style='margin-right:30rpx; width: 24px;height: 24px' src='/images/step_second_gray.png'></image>
+        </view>
+        <view style='font-size: 17px;color: #999;margin-top:16rpx;text-align:right'>上传证件照</view>
+      </view>
+    </view>
+  </view>
+
+  <view style='flex-direction: column;display: flex;background:#fff'>
+    <view hidden="{{is_foreigner=='false'}}">
+      <picker bindchange="bindCardtypeChange" value="{{index}}" range="{{cardTypeArray}}">
+        <view style='height:90rpx;padding:0 30rpx '>
+          <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>证照类型</text>
+          <image class='arrow_wrap' src='/images/arrow_right.png' style='margin-top:26rpx'></image>
+          <text wx:if="{{cardtype.length<1}}" class='text_999_30 float_right' style="line-height: 90rpx;">请选择</text>
+          <text wx:else style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>{{cardtype}}</text>
+        </view>
+      </picker>
+      <view class="divide_line_30"></view>
+    </view>
+
+    <view style='padding-left: 30rpx;padding-right: 30rpx;'>
+      <text class='text_777_30 float_left' style='line-height: 90rpx'>姓名</text>
+      <input class='input_wrap' placeholder='请输入您的真实姓名' value='{{name}}' placeholder-class='text_999_30' maxlength='15' bindinput='nameInput'></input>
+    </view>
+    <view class="divide_line_30"></view>
+
+    <view style='padding-left: 30rpx;padding-right: 30rpx;'>
+      <view wx:if="{{is_foreigner=='false'}}">
+        <text class='text_777_30 float_left' style='line-height: 90rpx'>身份证号码</text>
+        <input class='input_wrap' placeholder='请输入您的身份证号码' placeholder-class='text_999_30' name='id_card_no' maxlength='18' value='{{card_number}}' bindinput="bindinputcardnum" type='idcard'></input>
+      </view>
+      <view wx:else>
+        <text class='text_777_30 float_left' style='line-height: 90rpx'>证照号码</text>
+        <input class='input_wrap' placeholder='请输入您的证件号码' placeholder-class='text_999_30' name='id_card_no' maxlength='20' value='{{card_number}}' bindinput="bindinputcardnum"></input>
+      </view>
+    </view>
+  </view>
+
+  <view class='bottom_btn_wrap'>
+    <view class='btn_blue_radius' bindtap="gonext">
+      <view class='text_white_34'>{{btn_text}}</view>
+    </view>
+  </view>
+</view>
\ No newline at end of file

+.page{
+  background: #f8f8f8;
+  width: 100%;
+  height: 3000rpx;
+}
+
+.input_wrap {
+  /* max-width: 460rpx; */
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+  flex: 1;
+  height: 90rpx;
+  font-size: 28rpx;
+  color: #000;
+  text-align: right;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.bottom_btn_wrap{
+  background: #FFFFFF;
+  box-shadow: 0 -2px 8px 0 rgba(208,208,208,0.30);
+  height: 136rpx;
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+}
+.btn_blue_radius{
+  margin: 26rpx 30rpx;
+  background: #357AEB;
+  border-radius: 5px;
+  height: 84rpx;
+}
+
+.text_white_34 {
+  font-family: PingFangSC-Regular;
+  font-size: 17px;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 42px;
+}
+
+.text_black_34 {
+  font-family: PingFangSC-Regular;
+  font-size: 34rpx;
+  color: #000;
+}
\ No newline at end of file

+// 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: "完成"
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function(options) {
+    console.log("options", options)
+    if ('succ' == options.result) {
+      this.setData({
+        verify_img: "/images/verify_succ.png",
+        verify_status: "succ",
+        verify_tip: "恭喜您！认证成功",
+        btn_text: "完成"
+      })
+    } else if ('fail' == options.result) {
+      this.setData({
+        verify_img: "/images/verify_fail.png",
+        verify_status: "fail",
+        verify_tip: "对不起！认证失败",
+        btn_text: "重新认证"
+      })
+    }
+  },
+
+  /**
+   * Lifecycle function--Called when page is initially rendered
+   */
+  onReady: function() {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page show
+   */
+  onShow: function() {
+
+  },
+
+  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
+      })
+    }
+  },
+
+  /**
+   * Lifecycle function--Called when page hide
+   */
+  onHide: function() {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page unload
+   */
+  onUnload: function() {
+
+  },
+
+  /**
+   * Page event handler function--Called when user drop down
+   */
+  onPullDownRefresh: function() {
+
+  },
+
+  /**
+   * Called when page reach bottom
+   */
+  onReachBottom: function() {
+
+  },
+
+  /**
+   * Called when user click on the top right corner to share
+   */
+  onShareAppMessage: function() {
+
+  }
+})
\ No newline at end of file

+{
+  "navigationBarTitleText": "实名认证"
+}
\ No newline at end of file

+<view class='page'>
+<image style='width:60%;height:330rpx;margin:250rpx 160rpx 0 160rpx;' src='{{verify_img}}'></image>
+<view style='text-align:center'>
+<text style='font-size:14px;color:#999;margin-top:20rpx'>{{verify_tip}}</text>
+</view>
+<view class='bottom_btn_wrap' >
+    <view class='btn_blue_radius' bindtap="done">
+      <view class='text_white_34'>{{btn_text}}</view>
+    </view>
+  </view>
+</view>

+/* pages/main/verify/verify_result/verify_result.wxss */
+
+
+.bottom_btn_wrap{
+  background: #FFFFFF;
+  box-shadow: 0 -2px 8px 0 rgba(208,208,208,0.30);
+  height: 136rpx;
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+}
+.btn_blue_radius{
+  margin: 26rpx 30rpx;
+  background: #357AEB;
+  border-radius: 5px;
+  height: 84rpx;
+}
+
+.text_white_34 {
+  font-family: PingFangSC-Regular;
+  font-size: 17px;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 42px;
+}
\ No newline at end of file

@@ -8,7 +8,8 @@
 		"es6": true,
 		"postcss": true,
 		"minified": true,
-		"newFeature": true
+		"newFeature": true,
+		"checkInvalidKey": true
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.4.2",
@@ -18,6 +19,8 @@
 		"hidedInDevtools": []
 	},
 	"isGameTourist": false,
+	"simulatorType": "wechat",
+	"simulatorPluginLibVersion": {},
 	"condition": {
 		"search": {
 			"current": -1,

+{
+  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}
\ No newline at end of file