证照类型切换联动 和必选非必选逻辑

@@ -95,7 +95,7 @@ Page({
       label: '涉税事由',
       bindtype: 'tax_reason',
       placeholder: '请选择涉税事由',
-      values: ["理由1", "理由2"],
+      values: ["任职受雇","提供临时劳务","转让财产","从事投资和经营活动","其他"],
       onChange: 'onPickerSelect',
     },
     taxpayerTypeData: {
@@ -733,6 +733,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
@@ -761,9 +762,11 @@ Page({
       this.data.nameText = '英文名'
       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.selected = '港澳居民来往内地通行证'; 
+        this.data.otherCardtypeData.isrequre = true
       }
     } else if (new_type.indexOf("台湾") != -1) {
       this.data.countryData.selected = '中国台湾'
@@ -771,9 +774,11 @@ Page({
       this.data.nameText = '英文名'
       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.selected = '台湾居民来往大陆通行证'; 
+        this.data.otherCardtypeData.isrequre = true
       }
 
     } else {
@@ -784,9 +789,11 @@ Page({
       if (new_type.indexOf("外国护照") != -1) {
       //   this.data.otherCardtypeData.values = [{ 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）' }];
         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.selected = '外国护照'; 
+        this.data.otherCardtypeData.isrequre = true
       }
     }
     this.setData({
@@ -827,8 +834,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)
@@ -1240,13 +1245,13 @@ Page({
       this.showtoast('请选择涉税事由');
       return
     }
-    if (this.data.hasOtherCard && !this.data.otherCardtypeData.selected) {
-      // this.showtoast('请选择其他证照类型');
-      // return
+    if (this.data.hasOtherCard && !this.data.otherCardtypeData.selected && this.data.otherCardtypeData.isrequre) {
+      this.showtoast('请选择其他证照类型');
+      return
     } 
-    if (this.data.hasOtherCard && !formdata.other_card_number.length) {
-      // this.showtoast('请输入其他证照号码');
-      // return
+    if (this.data.hasOtherCard && !(formdata.other_card_number && formdata.other_card_number.length) && this.data.otherCardtypeData.isrequre) {
+      this.showtoast('请输入其他证照号码');
+      return
     } else if (this.data.otherCardtypeData.selected.indexOf('居住证') > -1 && !reg_18_Number.test(formdata.other_card_number)) {
       this.showtoast('其他证照号码有误');
       return

@@ -77,18 +77,20 @@
           <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 class='red_star_right_10'>*</text> -->
-              <text class='text_777_30 float_left head_in' style='line-height: 90rpx'>其他证照号码</text>
+              <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>