Merge branch '机器人dev' into 天津中天

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

@@ -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

@@ -114,8 +114,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
     }
@@ -198,7 +200,8 @@ Page({
 
     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]
@@ -207,14 +210,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' || 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

@@ -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>

@@ -35,12 +35,11 @@ Page({
     this.setData({
       onresume:true
     })
-    this.checkUserInfo()
-
+    this.checkUserInfo("")
   },
 
   //判断该雇员是否有姓名和身份证号
-  checkUserInfo: function() {
+  checkUserInfo: function (skip_type) {
     var that = this;
     Authorization = getApp().globalData.Authorization;
     var real_auth_status = getApp().globalData.real_auth_status
@@ -55,47 +54,16 @@ Page({
           has_verify: true,
           onresume: false,
         })
-        that.taxconfirm();
+        that.taxconfirm(skip_type);
       } else {
         that.setData({
           has_verify: false
         })
       }
-      // wx.request({
-      //   url: baseUrl + 'socialwork/v1/employees/verify',
-      //   data: {},
-      //   header: {
-      //     'content-type': 'application/json',
-      //     "Authorization": Authorization
-      //   },
-      //   success: function(res) {
-      //     if (res.statusCode && res.statusCode >= 300) {
-      //       wx.showToast({
-      //         title: res.data.message,
-      //         icon: 'none',
-      //         duration: 1000
-      //       })
-      //     } else {
-      //       // that.setData({
-      //       //   has_verify: false
-      //       // })
-      //       if (!res.data.need_verify) { //不需要再实名认证
-      //         that.setData({
-      //           has_verify: true
-      //         })
-      //         that.taxconfirm();
-      //       } else {
-      //         that.setData({
-      //           has_verify: false
-      //         })
-      //       }
-      //     }
-      //   }
-      // })
     }
   },
 
-  taxconfirm: function() {
+  taxconfirm: function(skip_type) {
     var that = this;
     Authorization = getApp().globalData.Authorization;
 
@@ -113,6 +81,23 @@ Page({
           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',
+            })
+          } 
         }
       }
     })
@@ -135,7 +120,9 @@ Page({
           that.setData({
             isshow: false
           })
-          that.gotaxPerson()
+          wx.navigateTo({
+            url: '../taxperson/home',
+          })
         }
       }
     })
@@ -145,36 +132,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() {
@@ -226,6 +205,12 @@ Page({
     })
   },
 
+  close02:function(){
+    this.setData({
+      has_verify: true
+    })
+  },
+
   /**
    * 生命周期函数--监听页面卸载
    */

-
-
 <!--pages/main/guide/guide.wxml-->
 
 <view class=''>
@@ -73,11 +71,12 @@
     </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>
+        <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>
 
-</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

@@ -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'
     },
@@ -752,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 = '中国'
@@ -1420,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,