Merge branch '海峡new' into 苏州英格玛

# Conflicts:
#	app.js
#	pages/getPhone/getPhone.json
#	pages/login/login.json
#	pages/main/guide/guide.json
#	project.config.json

@@ -37,9 +37,13 @@ Page({
       },
       data: { 'declare_month': timestamp },
       success: function (result) {
-        that.setData({
-          taxDatas: that.handleTaxData(result.data.items)
-        })
+        let taxDatas = that.handleTaxData(result.data.items)
+        if (taxDatas) {
+          that.setData({
+            taxDatas: taxDatas
+          })
+        }
+        
 
       },
       fail: function (res) {
@@ -83,6 +87,7 @@ Page({
 
   },
   handleTaxData: function (items) {
+    if (!items) return
     for (var i = 0; i < items.length; ++i) {
       var item = items[i]
       var method
@@ -189,8 +194,9 @@ Page({
 
    handleDetailsData: function (data) {
 
-    var titles = JSON.parse(data['slip_titles'])  
-    var detail = JSON.parse(data['detail'])
+    let titles = JSON.parse(data['slip_titles'])  
+    let detail = JSON.parse(data['detail'])
+    let mapping_keys = data["mapping_keys"] ? data["mapping_keys"]:[]
     var details = []
     for (var i = 0; i < titles.length; ++i) {
       var titleData = titles[i]
@@ -200,9 +206,13 @@ Page({
         title = titleData['original_column']
       }
       if (!value) {
-        value = data[titleData['key']] + ('tax_rate' == titleData['key'] ? '%' : '')
+        value = data[titleData['key']]
+        if (value != undefined) {
+          value += 'tax_rate' == titleData['key'] ? '%' : ''
+        }
       } 
-      if (!title || value == '0') continue;
+      if (!title || !value) continue;
+      if (mapping_keys.indexOf(title) == -1 && value == '0') continue;
       details.push({
         title: title,
         value: value

@@ -3,9 +3,10 @@ var app = getApp();
 var baseUrl = app.globalData.baseUrl;
 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 countryInfo = require('../../../../utils/country.js');
-// const cardTypeArray = ['居民身份证', '中国护照', '港澳居民来往内地通行证', '港澳居民居住证', '台湾居民来往大陆通行证', '台湾居民居住证', '外国护照', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
-const cardTypeArray8 = ['居民身份证', '中国护照', '港澳居民居住证', '台湾居民居住证', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
+const cardTypeArray = ['居民身份证', '中国护照', '港澳居民来往内地通行证', '港澳居民居住证', '台湾居民来往大陆通行证', '台湾居民居住证', '外国护照', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
+// const cardTypeArray8 = ['居民身份证', '中国护照', '港澳居民居住证', '台湾居民居住证', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
 // const cardTypeDicts = [{ 'code': '1', 'name': '居民身份证' }, { 'code': '2', 'name': '中国护照' }, { 'code': '3', 'name': '港澳居民来往内地通行证' }, { 'code': '4', 'name': '港澳居民居住证' }, { 'code': '5', 'name': '台湾居民来往大陆通行证' }, { 'code': '6', 'name': '台湾居民居住证' }, { 'code': '7', 'name': '外国护照' }, { 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）'}];
 // const cardTypes8 = [{ 'code': '1', 'name': '居民身份证' }, { 'code': '2', 'name': '中国护照' }, { 'code': '4', 'name': '港澳居民居住证' }, { 'code': '6', 'name': '台湾居民居住证' }, { 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）' }];
 
@@ -57,7 +58,7 @@ Page({
       bindtype: 'cardtype',
       placeholder: '请选择证照类型',
       selected: '',
-      values: cardTypeArray8,
+      values: cardTypeArray,
       // range_key:'name',
       // values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
       //   '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
@@ -65,7 +66,7 @@ Page({
       onChange: 'onPickerSelect'
     },
     otherCardtypeData: {
-      isrequre: true,
+      // isrequre: true,
       label: '其他证照类型',
       bindtype: 'other_cardtype',
       placeholder: '请选择证照类型',
@@ -90,6 +91,14 @@ Page({
       placeholder: '请选择出生国家（地区）',
       onChange: 'onPickerSelect',
     },
+    // taxReasonData: {
+    //   isrequre: true,
+    //   label: '涉税事由',
+    //   bindtype: 'tax_reason',
+    //   placeholder: '请选择涉税事由',
+    //   values: ["任职受雇","提供临时劳务","转让财产","从事投资和经营活动","其他"],
+    //   onChange: 'onPickerSelect',
+    // },
     taxpayerTypeData: {
       isrequre: true,
       label: '纳税人类型',
@@ -444,7 +453,7 @@ Page({
     this.data.predictLeaveDate.selected = (predictLeaveDate.indexOf("01-01-01") == -1) ? predictLeaveDate : ''
     this.data.predictLeaveDate.datelong = tax_info.predict_leave_date
     // this.data.professionData.selected = tax_info.profession.three_level_name
-
+    // this.data.taxReasonData.selected = tax_info.tax_reason
     this.data.birthDate.end = curdate
     this.data.startDate.end = curdate
     this.data.endDate.end = curdate
@@ -491,6 +500,7 @@ Page({
       long_end_date: tax_info.separate_date ? tax_info.separate_date : 0,
       endDate: this.data.endDate,
       firstEntryDate: this.data.firstEntryDate,
+      // taxReasonData: this.data.taxReasonData,
       predictLeaveDate: this.data.predictLeaveDate,
       isIdCard: '居民身份证' == tax_info.id_card_type ? true : false,
       card_number: this.data.card_number,
@@ -724,6 +734,7 @@ Page({
     // const new_type = cardTypeDicts[parseInt(new_type_code)-1]['name']
     // this.data.cardtypeData.selected_code = new_type_code
     this.data.cardtypeData.selected = new_type
+    this.data.otherCardtypeData.selected = ''
     this.data.nameText = ''
     if ('居民身份证' == new_type) {
       is_idcard = true
@@ -750,34 +761,41 @@ Page({
       this.data.countryData.selected = ''
       this.data.countryData.disabled = false
       this.data.nameText = '英文名'
-      // if (new_type.indexOf('通行证') != -1){
-        // this.data.otherCardtypeData.values = [{ 'code': '4', 'name': '港澳居民居住证'}];
-      // }else{
-      this.data.otherCardtypeData.values = ['港澳居民来往内地通行证'];// [{ 'code': '3', 'name': '港澳居民来往内地通行证'}];
-      this.data.otherCardtypeData.selected = '港澳居民来往内地通行证'; 
-      // }
+      if (new_type.indexOf('通行证') != -1){
+        this.data.otherCardtypeData.values = ['港澳居民居住证'];// [{ 'code': '4', 'name': '港澳居民居住证'}];
+        this.data.otherCardtypeData.isrequre = false
+      }else{
+        this.data.otherCardtypeData.values = ['港澳居民来往内地通行证'];// [{ 'code': '3', 'name': '港澳居民来往内地通行证'}];
+        this.data.otherCardtypeData.selected = '港澳居民来往内地通行证'; 
+        this.data.otherCardtypeData.isrequre = true
+      }
     } else if (new_type.indexOf("台湾") != -1) {
       this.data.countryData.selected = '中国台湾'
       this.data.countryData.disabled = true
       this.data.nameText = '英文名'
-      // if (new_type.indexOf('通行证') != -1) {
-        // this.data.otherCardtypeData.values = [{ 'code': '6', 'name': '台湾居民居住证' }];
-      // } else {
-      this.data.otherCardtypeData.values = ['台湾居民来往大陆通行证']; //[{ 'code': '5', 'name': '台湾居民来往大陆通行证' }];
-      this.data.otherCardtypeData.selected = '台湾居民来往大陆通行证'; 
-      // }
+      if (new_type.indexOf('通行证') != -1) {
+        this.data.otherCardtypeData.values = ['台湾居民居住证'];//[{ 'code': '6', 'name': '台湾居民居住证' }];
+        this.data.otherCardtypeData.isrequre = false
+      } else {
+        this.data.otherCardtypeData.values = ['台湾居民来往大陆通行证']; //[{ 'code': '5', 'name': '台湾居民来往大陆通行证' }];
+        this.data.otherCardtypeData.selected = '台湾居民来往大陆通行证'; 
+        this.data.otherCardtypeData.isrequre = true
+      }
 
     } else {
       this.data.countryData.selected = ''
       this.data.countryData.values = this.countrys ? this.countrys : []
       this.data.countryData.disabled = false
       this.data.nameText = '中文名'
-      // if (new_type.indexOf("外国护照") != -1) {
+      if (new_type.indexOf("外国护照") != -1) {
       //   this.data.otherCardtypeData.values = [{ 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）' }];
-      // } else {
-      this.data.otherCardtypeData.values = ['外国护照']; //[{ 'code': '7', 'name': '外国护照' }];
-      this.data.otherCardtypeData.selected = '外国护照'; 
-      // }
+        this.data.otherCardtypeData.values = ['外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）','外国人工作许可证（C类）'];
+        this.data.otherCardtypeData.isrequre = false
+      } else {
+        this.data.otherCardtypeData.values = ['外国护照']; //[{ 'code': '7', 'name': '外国护照' }];
+        this.data.otherCardtypeData.selected = '外国护照'; 
+        this.data.otherCardtypeData.isrequre = true
+      }
     }
     this.setData({
       isIdCard: is_idcard,
@@ -817,8 +835,6 @@ Page({
           if ((new_type.indexOf('外国人') != -1) && (selected.indexOf('外国人') != -1)) {
             console.log('外国人', new_type, selected)
           }else {
-            // this.data.otherCardtypeData.selected = ''
-            // setData.otherCardtypeData = this.data.otherCardtypeData
             setData.other_card_number = ''
           }
           this.setData(setData)
@@ -858,6 +874,16 @@ Page({
           })
         }
         break;
+      // case 'tax_reason':
+      //   var taxReasonData = this.data.taxReasonData
+      //   var reason = taxReasonData.values[e.detail.value]
+      //   if (reason != taxReasonData.selected) {
+      //     taxReasonData.selected = reason
+      //     this.setData({
+      //       taxReasonData: taxReasonData
+      //     })
+      //   }
+      //   break;
       case 'taxpayerType':
         var taxpayerTypeData = this.data.taxpayerTypeData
           taxpayerTypeData.selected = taxpayerTypeData.values[e.detail.value]
@@ -1095,7 +1121,10 @@ Page({
       this.showtoast('证照号码有误');
       return
     }
-    
+    if (this.data.cardtypeData.selected.indexOf('永久居留') > -1 && !reg_15_n_a.test(idCardNo)) {
+      this.showtoast('证照号码有误');
+      return
+    }
   },
   bindinputcardnum: function(e) {
     var idCardNo = e.detail.value
@@ -1122,6 +1151,12 @@ Page({
         return
       }
     }
+    if (e.detail.value.length == 15) {
+      if (this.data.cardtypeData.selected.indexOf('永久居留') > -1 && !reg_15_n_a.test(idCardNo)) {
+        this.showtoast('证照号码有误');
+        return
+      }
+    }
   },
   //根据身份证号码，获取相关信息
   dealIdInfo: function (idCardNum) {
@@ -1181,6 +1216,9 @@ Page({
     } else if (this.data.cardtypeData.selected.indexOf('居住证') > -1 && !reg_18_Number.test(this.data.card_number)) {
       this.showtoast('证照号码有误');
       return
+    } else if (this.data.cardtypeData.selected.indexOf('永久居留') > -1 && !reg_15_n_a.test(this.data.card_number)) {
+      this.showtoast('证照号码有误');
+      return
     } else if (this.data.cardtypeData.selected.indexOf('中国护照') > -1 && !reg_9_n_a.test(this.data.card_number)) {
       this.showtoast('证照号码有误');
       return
@@ -1216,20 +1254,28 @@ Page({
       this.showtoast('请选择预计离境时间');
       return
     }
-    if (this.data.hasOtherCard && !this.data.otherCardtypeData.selected) {
+    // if (this.data.hasOtherCard && !this.data.taxReasonData.selected) {
+    //   this.showtoast('请选择涉税事由');
+    //   return
+    // }
+    let otherTypeSel = this.data.otherCardtypeData.selected
+    let otherHasInput = formdata.other_card_number && formdata.other_card_number.length
+
+    if (this.data.hasOtherCard && !otherTypeSel && this.data.otherCardtypeData.isrequre) {
       this.showtoast('请选择其他证照类型');
       return
     } 
-    if (this.data.hasOtherCard && !formdata.other_card_number.length) {
+    if (this.data.hasOtherCard && !otherHasInput && this.data.otherCardtypeData.isrequre) {
       this.showtoast('请输入其他证照号码');
       return
-    } else if (this.data.otherCardtypeData.selected.indexOf('居住证') > -1 && !reg_18_Number.test(formdata.other_card_number)) {
+    }
+    if (otherTypeSel.indexOf('居住证') > -1 && otherHasInput &&  !reg_18_Number.test(formdata.other_card_number)) {
       this.showtoast('其他证照号码有误');
       return
-    } else if (this.data.otherCardtypeData.selected.indexOf('中国护照') > -1 && !reg_9_n_a.test(formdata.other_card_number)) {
+    }else if (otherTypeSel.indexOf('永久居留') > -1 && otherHasInput && !reg_15_n_a.test(formdata.other_card_number)) {
       this.showtoast('其他证照号码有误');
       return
-    }
+    } 
     if (this.data.hasOtherCard && !this.data.birthCountryData.selected) {
       this.showtoast('请选择出生国家');
       return
@@ -1376,11 +1422,12 @@ Page({
         "id_card_type": that.data.cardtypeData.selected, //selected_code,
         "id_card_no": that.data.card_number,
         "other_id_card_type": that.data.hasOtherCard ?  that.data.otherCardtypeData.selected : '', //selected_code,
-        "other_id_card_no": that.data.hasOtherCard ? formdata.other_card_number : '',
+        "other_id_card_no": that.data.hasOtherCard ? (formdata.other_card_number ? formdata.other_card_number : '') : '',
         "gender": that.data.genderData.selected,
         "birth_date": that.data.long_birth_date,
         "first_entry_date": that.data.hasOtherCard ? that.data.firstEntryDate.datelong : null,
         "predict_leave_date": that.data.hasOtherCard ? that.data.predictLeaveDate.datelong : null,
+        // "tax_reason": that.data.hasOtherCard ? that.data.taxReasonData.selected : null,
         "mobile": that.data.mobile,
         "current_address": request_current_address,
         "current_address_detail": formdata.current_address_detail,

@@ -73,20 +73,24 @@
           <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...predictLeaveDate}}" />
           <view class="divide_line_30"></view>
-          <template is="picker_cell_normal" data="{{...otherCardtypeData}}" />
-          <view class="divide_line_30"></view>
-          <view class='item_body'>
-            <text class='red_star_right_10'>*</text>
-            <text class='text_777_30 float_left' style='line-height: 90rpx'>其他证照号码</text>
-            <view>
-              <input class='input_wrap' placeholder="请输入证照号码" value="{{other_card_number}}" name='other_card_number' maxlength='20'></input>
-            </view>
-          </view>
-          <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...birthCountryData}}" />
+          <!-- <view class="divide_line_30"></view>
+          <template is="picker_cell_normal" data="{{...taxReasonData}}" /> -->
         </view>          
-        <view hidden='{{!isshow01}}'>
-          <view wx:if='{{hasOtherCard}}'>
+        <view wx:if='{{hasOtherCard}}'>
+          <view wx:if='{{isshow01 || otherCardtypeData.isrequre}}'>
+            <view class="divide_line_30"></view>
+            <template is="picker_cell_normal" data="{{...otherCardtypeData}}" />
+            <view class="divide_line_30"></view>
+            <view class='item_body'>
+              <text wx:if='{{otherCardtypeData.isrequre}}' class='red_star_right_10'>*</text>
+              <text class="text_777_30 float_left {{otherCardtypeData.isrequre?'':'head_in'}}"style='line-height: 90rpx'>其他证照号码</text>
+              <view>
+                <input class='input_wrap' placeholder="请输入证照号码" value="{{other_card_number}}" name='other_card_number' maxlength='20'></input>
+              </view>
+            </view>
+          </view>
+          <view wx:if='{{isshow01}}'>
             <view class="divide_line_30"></view>
             <view class='item_body'>
               <text class='text_777_30 float_left head_in' style='line-height: 90rpx'>{{nameText}}</text>