Merge branch 'dev2.0' into 海峡

# Conflicts: # app.js # pages/getPhone/getPhone.json # pages/login/login.json # pages/main/guide/guide.json # pages/main/taxperson/home.json

Merge branch 'dev2.0' into 海峡
# Conflicts: # app.js # pages/getPhone/getPhone.json # pages/login/login.json # pages/main/guide/guide.json # pages/main/taxperson/home.json
wangyu
app.js
images/additional_deduction.png
images/advance_payment.png
images/guide_bg.png
images/tax_person.png
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
pages/main/addtionalreduce/additiondetail/additiondetail.wxml
pages/main/addtionalreduce/godetail/godetail.js
pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
pages/main/advancepayment/adPayDetails/adPayDetails.js
pages/main/advancepayment/adPayDetails/adPayDetails.wxml
pages/main/advancepayment/adPayHome.js
pages/main/advancepayment/adPayHome.json
pages/main/advancepayment/adPayHome.wxml
pages/main/guide/guide.wxml
pages/main/guide/guide.wxss
pages/main/taxperson/addinfo/addinfo.js
pages/main/taxperson/addinfo/addinfo.wxml
pages/main/taxperson/editinfo/editinfo.js
--- a/app.js
查看文件 @6052a0a
+++ b/app.js
查看文件 @6052a0a
 const appId = 'wx04262fa98a7de5b6';
-
 App({
   onLaunch: function() {
     var that = this;
--- a/images/additional_deduction.png
查看文件 @6052a0a
+++ b/images/additional_deduction.png
查看文件 @6052a0a
--- a/images/advance_payment.png
查看文件 @6052a0a
+++ b/images/advance_payment.png
查看文件 @6052a0a
--- a/images/guide_bg.png
查看文件 @6052a0a
+++ b/images/guide_bg.png
查看文件 @6052a0a
--- a/images/tax_person.png
查看文件 @6052a0a
+++ b/images/tax_person.png
查看文件 @6052a0a
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @6052a0a
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @6052a0a
 // pages/main/addtionalreduce/addextrainfo/addextrainfo.js
 var format = require('../../../../utils/util.js');
-var countryInfo = require('../../../../utils/country.js');
+// var countryInfo = require('../../../../utils/country.js');
 var OSSInit;
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
@@ -313,10 +313,10 @@ Page({
     },
     studyEndDate: {
       label: '受教育时间止',
-      isrequre: true,
+      // isrequre: true,
       bindtype: 'study_end_date',
       selected: '',
-      isblack: 'true',
+      // isblack: 'true',
       values: ["是", "否"],
       placeholder: '请选择时间',
       onChange: 'onPickerSelect',
@@ -384,7 +384,7 @@ Page({
       selected: '',
       isrequre: true,
       isblack: 'true',
-      values: ["企业", "个人"],
+      values: ["组织", "个人"],
       placeholder: '请选择出租方类型',
       onChange: 'onPickerSelect'
     },
@@ -500,32 +500,32 @@ Page({
       label: '就读国家(地区)',
       bindtype: 'school_country',
       isrequre: true,
-      selected: '中国(大陆)',
+      selected: '中国',
       isblack: 'true',
       values: [],
-      placeholder: '中国(大陆)',
+      placeholder: '中国',
       onChange: 'onPickerSelect',
     },
-    bankInfo: {
-      label: '公积金贷款银行',
-      bindtype: 'bank',
-      maxWidth: 400,
-      isrequre: true,
-      placeholder: '请选择贷款银行',
-      selected: '',
-      values: [],
-      onChange: 'onPickerSelect'
-    },
-    bankInfo_2: {
-      label: '商业贷款银行',
-      bindtype: 'bank_2',
-      maxWidth: 430,
-      isrequre: true,
-      placeholder: '请选择贷款银行',
-      selected: '',
-      values: [],
-      onChange: 'onPickerSelect'
-    },
+    // bankInfo: {
+    //   label: '公积金贷款银行',
+    //   bindtype: 'bank',
+    //   maxWidth: 400,
+    //   isrequre: true,
+    //   placeholder: '请选择贷款银行',
+    //   selected: '',
+    //   values: [],
+    //   onChange: 'onPickerSelect'
+    // },
+    // bankInfo_2: {
+    //   label: '商业贷款银行',
+    //   bindtype: 'bank_2',
+    //   maxWidth: 430,
+    //   isrequre: true,
+    //   placeholder: '请选择贷款银行',
+    //   selected: '',
+    //   values: [],
+    //   onChange: 'onPickerSelect'
+    // },
     edu_lable: "school",
     oldersupport_lable: "",
     img_path: "/images/upload_img.png"
@@ -536,6 +536,7 @@ Page({
    */
   onLoad: function(options) {
+    this.getTaxHostInfo()
     var pages = getCurrentPages()
     var frontPage = pages[pages.length - 2]
     console.log('---------frontPage', frontPage.data)
@@ -556,10 +557,14 @@ Page({
       //   deduction_amount = Deduce_amounts_year[nameKey] ? Deduce_amounts_year[nameKey] : 0
     }
     if ("children_education" == options.status) {
-      this.loadCountry()
+      this.getCountry()
       if (options.isedit != 'true'){
         this.getTaxList()
       }
+      this.data.taxperson_relativeData.values = ['子','女']
+      this.setData({
+        taxperson_relativeData: this.data.taxperson_relativeData
+      })
     } else if ("continuing_education" == options.status) {
       this.getCertificates()
       var studystart_date = this.data.studystartdate
@@ -590,7 +595,7 @@ Page({
         deduction_amount: deduction_amount
       })
     } else if (frontPage.data.house_type == "rent" || frontPage.data.house_type == "house_fund_rent") { 
-      this.getbanklist()
+      // this.getbanklist()
       if (options.isedit != 'true') {
         this.getTaxList()
       }
@@ -604,7 +609,7 @@ Page({
         reduce_typeData.selected = '年度'
       }
     } else if (frontPage.data.house_type == "house_fund_loan") {
-      this.getbanklist()
+      // this.getbanklist()
       if (options.isedit != 'true') {
         this.getTaxList()
       }
@@ -642,6 +647,37 @@ Page({
       }
     }
   },
+
+  getTaxHostInfo: function () {
+    var that = this;
+    var Authorization = app.globalData.Authorization;
+    wx.request({
+      url: baseUrl + 'persontax/v1/personal-taxes',
+      method: "GET",
+      header: {
+        'content-type': 'application/json', // 默认值
+        "Authorization": Authorization
+      },
+      data: {
+        'all': true
+      },
+      success: function (res) {
+        if (res.statusCode == 200) {
+          var data = res.data
+          if (data.items && data.items.length > 0) {
+            for (var i = 0; i < data.items.length; i++) {
+              if (data.items[i].family_ties == "本人") {
+                app.globalData.hostInfo = data.items[i]
+                break;
+              }
+            }
+          }
+        }
+      }
+    })
+  },
+
+
   getTaxList: function () {
     var that = this;
     wx.showLoading({
@@ -690,16 +726,56 @@ Page({
       }
     })
   },
-  loadCountry: function() {
-    countryInfo.init(this)
-    var countrylist = this.data.country
-    var country_data = this.data.schoolCountryData
-    for (var i = 0; i < countrylist.length; i++) {
-      country_data.values.push(countrylist[i].name)
-    }
-    console.log("countrydata", country_data)
-    this.setData({
-      schoolCountryData: country_data
+  // loadCountry: function() {
+  //   countryInfo.init(this)
+  //   var countrylist = this.data.country
+  //   var country_data = this.data.schoolCountryData
+  //   for (var i = 0; i < countrylist.length; i++) {
+  //     country_data.values.push(countrylist[i].name)
+  //   }
+  //   console.log("countrydata", country_data)
+  //   this.setData({
+  //     schoolCountryData: country_data
+  //   })
+  // },
+
+  //****************获取国籍数据************/
+  getCountry: function () {
+    var that = this
+    wx.showLoading()
+    var Authorization = app.globalData.Authorization;
+    wx.request({
+      url: baseUrl + 'persontax/v1/nation-list',
+      method: "GET",
+      header: {
+        'content-type': 'application/json', // 默认值
+        "Authorization": Authorization
+      },
+      success: function (res) {
+        var countrys = res.data.concat()
+        if (countrys.indexOf('中国') > -1) {
+          countrys.splice(countrys.indexOf('中国'), 1);
+        }
+        if (countrys.indexOf('中国台湾') > -1) {
+          countrys.splice(countrys.indexOf('中国台湾'), 1);
+        }
+        if (countrys.indexOf('香港') > -1) {
+          countrys.splice(countrys.indexOf('香港'), 1);
+        }
+        if (countrys.indexOf('澳门') > -1) {
+          countrys.splice(countrys.indexOf('澳门'), 1);
+        }
+        // that.data.countryData.values = countrys
+        that.data.schoolCountryData.values = res.data
+        that.countrys = countrys
+        that.setData({
+          // countryData: that.data.countryData,
+          schoolCountryData: that.data.schoolCountryData
+        })
+      },
+      complete() {
+        wx.hideLoading()
+      }
     })
   },
   handlEditData: function (data) {
@@ -709,6 +785,10 @@ Page({
     switch (this.data.cur_index + '') {
       case 'children_education':
         var setData = {}
+        if (data.relationship && data.relationship.length) {
+          this.data.taxperson_relativeData.selected = data.relationship
+          setData.taxperson_relativeData = this.data.taxperson_relativeData
+        }
         var commonbirthDate = this.data.commonbirthDate
         commonbirthDate.selected = format.formatTime_date(data.birth_date)
         commonbirthDate.datelong = data.birth_date
@@ -721,9 +801,11 @@ Page({
         studystartdate.datelong = data.education_start
         setData.studystartdate = studystartdate
         var studyEndDate = this.data.studyEndDate
-        studyEndDate.selected = format.formatTime_month(data.education_end)
-        studyEndDate.datelong = data.education_end
-        setData.studyEndDate = studyEndDate
+        if (data.education_end > 0) {
+          studyEndDate.selected = format.formatTime_month(data.education_end)
+          studyEndDate.datelong = data.education_end
+          setData.studyEndDate = studyEndDate
+        }
         var studyPeriodDate = this.data.studyPeriodDate
         if (data.education_period_end > 0){
           studyPeriodDate.selected = format.formatTime_month(data.education_period_end)
@@ -905,7 +987,7 @@ Page({
           })
           var leasetype_Data = this.data.leasetypeData
           leasetype_Data.selected = data.owner_type
-          this.data.cardtypeData.hidden = data.owner_type == "企业"
+          this.data.cardtypeData.hidden = data.owner_type == "组织"
           setData.leasetypeData = leasetype_Data,
           setData.cardtypeData = this.data.cardtypeData
           setData.owner_name = data.owner_name
@@ -973,9 +1055,9 @@ Page({
             setData.loan_contract_no = data.loan_contract_no
           }
           if (data.loan_bank && data.loan_bank.length) {
-            var bank_data = this.data.bankInfo
-            bank_data.selected = data.loan_bank
-            setData.bankInfo = bank_data
+            // var bank_data = this.data.bankInfo
+            // bank_data.selected = data.loan_bank
+            setData.loan_bank = data.loan_bank
           }
           var firstpayback_Date = this.data.firstpaybackDate
           firstpayback_Date.selected = format.formatTime_date(data.loan_start)
@@ -988,9 +1070,10 @@ Page({
             setData.sec_loan_contract_no = data.sec_loan_contract_no
           }
           if (data.sec_loan_bank && data.sec_loan_bank.length) {
-            var bank_data = this.data.bankInfo_2
-            bank_data.selected = data.sec_loan_bank
-            setData.bankInfo_2 = bank_data
+            // var bank_data = this.data.bankInfo_2
+            // bank_data.selected = data.sec_loan_bank
+            // setData.bankInfo_2 = bank_data
+            setData.sec_loan_bank = data.sec_loan_bank
           }
           var firstpaybackDate_2 = this.data.firstpaybackDate_2
           firstpaybackDate_2.selected = format.formatTime_date(data.sec_loan_start)
@@ -1024,6 +1107,11 @@ Page({
         if (data.name && data.name.length) {
           setData.children_name = data.name
         }
+        if (data.family_ties && data.family_ties.length) {
+          var taxperson_relativeData = this.data.taxperson_relativeData
+          taxperson_relativeData.selected = data.family_ties
+          setData.taxperson_relativeData = taxperson_relativeData
+        }
         this.setData(setData)
         break;
       case 'support_duty':
@@ -1039,6 +1127,11 @@ Page({
           setData.id_card_no = data.id_card_no
           this.dealIdInfo(data.id_card_no, 'older_id_card_no_input')
         }
+        if (data.family_ties && data.family_ties.length) {
+          var older_relativeData = this.data.older_relativeData
+          older_relativeData.selected = data.family_ties
+          setData.older_relativeData = older_relativeData
+        }
         this.setData(setData)
         break;
       case 'medical_fund':
@@ -1185,36 +1278,36 @@ Page({
     })
   },
-  getbanklist: function() {
-    var that = this
-    var Authorization = app.globalData.Authorization;
-    var bank_info = that.data.bankInfo
-    var bank_info_2 = that.data.bankInfo_2
-    wx.request({
-      url: baseUrl + 'persontax/v1/bank-list',
-      method: "GET",
-      header: {
-        'content-type': 'application/json', // 默认值
-        "Authorization": Authorization
-      },
-      success: function(res) {
-        console.log(res)
-        bank_info.values = res.data.banks//that.handleBankinfo(res.data.items)
-        bank_info_2.values = res.data.banks//that.handleBankinfo(res.data.items)
-        that.setData({
-          bankInfo: bank_info,
-          bankInfo_2: bank_info_2
-        })
-        console.log("bankInfo", that.data.bankInfo)
-      },
-      fail(res) {
-        console.log(res)
-      },
-      complete() {
-        wx.hideLoading()
-      }
-    })
-  },
+  // getbanklist: function() {
+  //   var that = this
+  //   var Authorization = app.globalData.Authorization;
+  //   var bank_info = that.data.bankInfo
+  //   var bank_info_2 = that.data.bankInfo_2
+  //   wx.request({
+  //     url: baseUrl + 'persontax/v1/bank-list',
+  //     method: "GET",
+  //     header: {
+  //       'content-type': 'application/json', // 默认值
+  //       "Authorization": Authorization
+  //     },
+  //     success: function(res) {
+  //       console.log(res)
+  //       bank_info.values = res.data.banks//that.handleBankinfo(res.data.items)
+  //       bank_info_2.values = res.data.banks//that.handleBankinfo(res.data.items)
+  //       that.setData({
+  //         bankInfo: bank_info,
+  //         bankInfo_2: bank_info_2
+  //       })
+  //       console.log("bankInfo", that.data.bankInfo)
+  //     },
+  //     fail(res) {
+  //       console.log(res)
+  //     },
+  //     complete() {
+  //       wx.hideLoading()
+  //     }
+  //   })
+  // },
   getCertificates: function () {
     var that = this
     var Authorization = app.globalData.Authorization;
@@ -1249,13 +1342,13 @@ Page({
       }
     })
   },
-  handleBankinfo: function(data) {
-    var bank_name = []
-    for (var i = 0; i < data.length; i++) {
-      bank_name.push(data[i].bank_name)
-    }
-    return bank_name
-  },
+  // handleBankinfo: function(data) {
+  //   var bank_name = []
+  //   for (var i = 0; i < data.length; i++) {
+  //     bank_name.push(data[i].bank_name)
+  //   }
+  //   return bank_name
+  // },
   formSubmit: function(e) {
     console.log("formSubmit", e);
@@ -1277,6 +1370,10 @@ Page({
           this.showToast('子女年龄小于3岁,不可申报')
           return
         }
+        if (this.data.commonbirthDate.datelong < app.globalData.hostInfo.birth_date) {
+          this.showToast('子女年龄不得大于本人');
+          return
+        }
         if (!formdata.children_name || formdata.children_name.length < 1) {
           this.showToast('请填写子女姓名')
           return
@@ -1285,6 +1382,11 @@ Page({
         //   this.showToast('请选择子女出生日期')
         //   return
         // }
+
+        if (this.data.taxperson_relativeData.selected.length < 1) {
+          this.showToast('请选择与纳税人关系')
+          return
+        }
         if (this.data.childrenpercentData.selected.length < 1) {
           this.showToast('请选择分配比例')
           return
@@ -1302,8 +1404,8 @@ Page({
           return
         }
         if (this.data.studyEndDate.selected.length < 1) {
-          this.showToast('请选择受教育时间止')
-          return
+          // this.showToast('请选择受教育时间止')
+          // return
         }else{
           var activedDate = (Date.parse(new Date('2019-01-01')) / 1000)
           if (this.data.studyEndDate.datelong < activedDate) {
@@ -1457,6 +1559,10 @@ Page({
           this.showToast('被赡养人年龄不足60岁,不可申报')
           return
         }
+        if (this.data.olderbirthDate.datelong > app.globalData.hostInfo.birth_date) {
+          this.showToast('被赡养人年龄应大于本人');
+          return
+        }
         if (this.data.older_relativeData.selected.length < 1) {
           this.showToast('请选择与纳税人关系')
           return
@@ -1553,7 +1659,7 @@ Page({
             if (!formdata.loan_contract_no || formdata.loan_contract_no.length < 1) {
               this.showToast('请填写公积金贷款合同编号')
               return
-            } else if (this.data.bankInfo.selected.length < 1) {
+            } else if (!formdata.loan_bank || formdata.loan_bank.length < 1) {
               this.showToast('请选择公积金贷款银行')
               return
             } else if (this.data.firstpaybackDate.selected.length < 1) {
@@ -1563,7 +1669,7 @@ Page({
               this.showToast('请填写公积金贷款期限')
               return
             }
-            newdata.loan_bank = this.data.bankInfo.selected
+            newdata.loan_bank = formdata.loan_bank
             newdata.loan_start = this.data.firstpaybackDate.datelong
             newdata.loan_months = parseInt(formdata.loan_months)
           } 
@@ -1571,7 +1677,7 @@ Page({
             if (!formdata.sec_loan_contract_no || formdata.sec_loan_contract_no.length < 1) {
               this.showToast('请填写商业贷款合同编号')
               return
-            } else if (this.data.bankInfo_2.selected.length < 1) {
+            } else if (!formdata.sec_loan_bank || formdata.sec_loan_bank.length < 1) {
               this.showToast('请选择商业贷款银行')
               return
             } else if (this.data.firstpaybackDate_2.selected.length < 1) {
@@ -1581,7 +1687,7 @@ Page({
               this.showToast('请填写商业贷款期限')
               return
             }
-            newdata.sec_loan_bank = this.data.bankInfo_2.selected
+            newdata.sec_loan_bank = formdata.sec_loan_bank
             newdata.sec_loan_start = this.data.firstpaybackDate_2.datelong
             newdata.sec_loan_months = parseInt(formdata.sec_loan_months)
           }
@@ -1608,7 +1714,7 @@ Page({
             this.showToast('请填写出租方名称')
             return
           } 
-          if (this.data.leasetypeData.selected=='企业'){
+          if (this.data.leasetypeData.selected =='组织'){
             if (!formdata.owner_credit_no || formdata.owner_credit_no.length < 1) {
               this.showToast('请填写统一社会信用代码')
               return
@@ -1734,6 +1840,7 @@ Page({
       },
       data: newdata,
       success(res) {
+        wx.hideLoading()
         if (res && res.statusCode < 300) {
           wx.navigateBack({
             delta: 1
@@ -1741,7 +1848,8 @@ Page({
         } else {
           wx.showToast({
             title: res.data.message ? res.data.message : '请求出错',
-            icon: 'none'
+            icon: 'none',
+            duration: 2000
           })
         }
       },
@@ -2228,7 +2336,7 @@ Page({
       case 'lease_type':
         var leasetype_Data = this.data.leasetypeData
         leasetype_Data.selected = leasetype_Data.values[e.detail.value]
-        this.data.cardtypeData.hidden = leasetype_Data.selected == "企业"
+        this.data.cardtypeData.hidden = leasetype_Data.selected == "组织"
         this.setData({
           leasetypeData: leasetype_Data,
           cardtypeData: this.data.cardtypeData
@@ -2254,20 +2362,20 @@ Page({
           this.showToast('终止日期不符合要求，无法申报')
         }
         break;
-      case 'bank':
-        var bank_data = this.data.bankInfo
-        bank_data.selected = bank_data.values[e.detail.value]
-        this.setData({
-          bankInfo: bank_data
-        })
-        break;
-      case 'bank_2':
-        var bank_data_2 = this.data.bankInfo_2
-        bank_data_2.selected = bank_data_2.values[e.detail.value]
-        this.setData({
-          bankInfo_2: bank_data_2
-        })
-        break;
+      // case 'bank':
+      //   var bank_data = this.data.bankInfo
+      //   bank_data.selected = bank_data.values[e.detail.value]
+      //   this.setData({
+      //     bankInfo: bank_data
+      //   })
+      //   break;
+      // case 'bank_2':
+      //   var bank_data_2 = this.data.bankInfo_2
+      //   bank_data_2.selected = bank_data_2.values[e.detail.value]
+      //   this.setData({
+      //     bankInfo_2: bank_data_2
+      //   })
+      //   break;
       case 'house_locate':
         console.log('house_locate', e)
         var house_address = this.data.houseLocateInfo;
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @6052a0a
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @6052a0a
@@ -33,6 +33,8 @@
           <text class='text_777_30 float_left'>国籍</text>
           <text class='text_black_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text>
         </view>
+        <view class='divide_line_30'></view>
+        <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" />
       </view>
       <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>
@@ -235,8 +237,14 @@
         <text class='text_777_30 float_left'>公积金贷款合同编号</text>
         <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入贷款合同编号' name='loan_contract_no' value='{{loan_contract_no}}' bindinput="loan_input"  id='loan_contract_no'></input>
       </view>
+      <!-- <view class='divide_line_30'></view>
+      <template is="picker_cell_normal" data="{{...bankInfo}}" /> -->
       <view class='divide_line_30'></view>
-      <template is="picker_cell_normal" data="{{...bankInfo}}" />
+      <view style='height:90rpx'>
+        <text class='red_star_right_10'>*</text>
+        <text class='text_777_30 float_left'>公积金贷款银行</text>
+        <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入贷款合同编号' name='loan_bank' value='{{loan_bank}}'></input>
+      </view>
       <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...firstpaybackDate}}" />
       <view class='divide_line_30'></view>
@@ -254,8 +262,14 @@
         <text class='text_777_30 float_left'>商业贷款合同编号</text>
         <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;width:400rpx;' placeholder='请输入贷款合同编号' name='sec_loan_contract_no' value='{{sec_loan_contract_no}}' bindinput="loan_input"  id='sec_loan_contract_no' ></input>
       </view>
+      <!-- <view class='divide_line_30'></view>
+      <template is="picker_cell_normal" data="{{...bankInfo_2}}" /> -->
       <view class='divide_line_30'></view>
-      <template is="picker_cell_normal" data="{{...bankInfo_2}}" />
+      <view style='height:90rpx'>
+        <text class='red_star_right_10'>*</text>
+        <text class='text_777_30 float_left'>商业贷款银行</text>
+        <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入商业贷款银行' name='sec_loan_bank' value='{{sec_loan_bank}}'></input>
+      </view>
       <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...firstpaybackDate_2}}" />
       <view class='divide_line_30'></view>
--- a/pages/main/addtionalreduce/additiondetail/additiondetail.wxml
查看文件 @6052a0a
+++ b/pages/main/addtionalreduce/additiondetail/additiondetail.wxml
查看文件 @6052a0a
@@ -54,7 +54,7 @@
       </view>
       <view style='height:90rpx;width:100%;clear:both;'>
         <text class='text_left'>就读国家(地区)</text>
-        <text class='text_right_333'>{{datas.school_country&&datas.school_country.length>0?datas.school_country:'中国(大陆)'}}</text>
+        <text class='text_right_333'>{{datas.school_country&&datas.school_country.length>0?datas.school_country:'中国'}}</text>
       </view>
       <view style='width:100%;clear:both;'>
         <text class='text_left'>就读学校名称</text>
--- a/pages/main/addtionalreduce/godetail/godetail.js
查看文件 @6052a0a
+++ b/pages/main/addtionalreduce/godetail/godetail.js
查看文件 @6052a0a
@@ -82,7 +82,7 @@ Page({
       // if (newstatus == 'house_fund_rent' || newstatus == 'house_fund_loan'){
       //   newstatus = "house_fund"
       // }
-      wx.navigateTo({
+      wx.redirectTo({
         url: '../lookandupdate/lookandupdate?status=' + newstatus + "&legal_entity_id=" + this.data.additiondata.legal_entity_id + "&legal_entity=" + this.data.additiondata.legal_entity,
       })
     }
@@ -92,7 +92,7 @@ Page({
     console.log("lookandadd02", e);
     if (this.data.additiondata.addition_items && this.data.additiondata.addition_items.length > 0) {
       var newstatus = this.data.additiondata.addition_items[e.currentTarget.id].addition_category
-      wx.navigateTo({
+      wx.redirectTo({
         url: '../lookandupdate/lookandupdate?status=' + newstatus + "&legal_entity_id=" + this.data.additiondata.legal_entity_id + "&legal_entity=" + this.data.additiondata.legal_entity,
       })
     }
--- a/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
查看文件 @6052a0a
+++ b/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
查看文件 @6052a0a
@@ -53,7 +53,7 @@
             <view style='height:110rpx'>
               <text class='text_gray_36 float_left' style='line-height:110rpx'>{{item.children_name}}</text>
               <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
-              <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
+              <view wx:elif="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
               <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
             </view>
@@ -63,7 +63,7 @@
                 <text class='text_999_28 ' style='line-height:70rpx'>子女姓名：</text>
                 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.children_name}}</text>
               </view>
-              <view style='height:70rpx'> 
+              <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>分配比例：</text>
                 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.percent}}%</text>
               </view>
@@ -92,8 +92,8 @@
           <view style='margin:30rpx;padding-left: 30rpx;padding-bottom: 20rpx' class='card_rectangle_bg_column'>
             <view style='height:110rpx'>
               <text class='text_gray_36' style='line-height:110rpx'>学历(学位)继续教育</text>
-              <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
-              <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
+              <view wx:if="{{additionInfo[0].title_items[0].status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
+              <view wx:elif="{{additionInfo[0].title_items[0].status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
               <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
             </view>
             <view wx:for="{{additionInfo[0].title_items}}">
@@ -133,8 +133,8 @@
           <view style='margin:30rpx;padding-left: 30rpx;padding-bottom: 20rpx' class='card_rectangle_bg_column'>
             <view style='height:110rpx'>
               <text class='text_gray_36' style='line-height:110rpx'>职业资格继续教育</text>
-              <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
-              <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
+              <view wx:if="{{additionInfo[0].profession_items[0].status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
+              <view wx:elif="{{additionInfo[0].profession_items[0].status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
               <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
             </view>
             <view wx:for="{{additionInfo[0].profession_items}}">
@@ -186,8 +186,8 @@
           <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
             <view style='height:110rpx'>
               <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text>
-              <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
-              <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
+              <view wx:if="{{additionInfo[0].support_duties[0].status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
+              <view wx:elif="{{additionInfo[0].support_duties[0].status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
               <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
             </view>
             <view wx:for="{{additionInfo[0].support_duties}}">
@@ -249,7 +249,7 @@
                     <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
                     <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.relationship}}</text>
                   </view>
-                  <view class='float_right' wx:if="{{employee_status!='inactive'}}">
+                  <view class='float_right' wx:if="{{employee_status!='inactive'&&(item.status=='failed'||item.status=='to_declare')}}">
                     <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id="{{'co_supporter'+index}}" bindtap='godelete'>删除</text>
                     <text class='text_blue_28 ' style='line-height:90rpx;' id="{{'co_supporter'+index}}" bindtap='goedit'>编辑</text>
                   </view>
@@ -278,13 +278,13 @@
           <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>可扣除金额</text>
           <text class='text_orange_28 float_right' style='line-height:100rpx'>￥{{remaining_amount}}</text>
         </view>
-        <view class='divide_line_f5f5f5' ></view>
+        <view class='divide_line_f5f5f5'></view>
         <view wx:for="{{additionInfo}}">
           <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
             <view style='height:110rpx'>
               <text class='text_gray_36' style='line-height:110rpx'>支出明细</text>
               <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
-              <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
+              <view wx:elif="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
               <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
             </view>
             <view style='padding-right:30rpx'>
@@ -336,10 +336,10 @@
             <view style='height:110rpx'>
               <text class='text_gray_36 float_left' style='line-height:110rpx'>住房</text>
               <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
-              <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
+              <view wx:elif="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
               <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
             </view>
-            <view style='padding-right: 30rpx' >
+            <view style='padding-right: 30rpx'>
               <view class='divide_line_f5f5f5' style="margin-bottom:6rpx"></view>
               <view style='display:flex;flex-direction:row'>
                 <view wx:if="{{house_type=='house_fund_rent'}}">
@@ -382,29 +382,29 @@
   </view>
   <!-- <view class='bottom_btn_wrap' hidden="{{additionInfo.length>0&&((cur_status=='support_duty'&&(additionInfo[0].co_supporters.length>0||additionInfo[0].support_duties.length>0))||(cur_status=='house_fund'&&house_type=='house_fund_loan'))}}"> -->
-  <view class='bottom_btn_wrap' wx:if="{{btn_show&&employee_status!='inactive'}}" >
+  <view class='bottom_btn_wrap' wx:if="{{btn_show&&employee_status!='inactive'}}">
     <view class='btn_blue_radius' bindtap="goadd">
       <view class='text_white_34'>添加</view>
     </view>
   </view>
   <view class="mask" hidden="{{!showModal_img&&!showModal_reducetype&&!showModal_addtype}}" bindtap='closeModalImg'></view>
-<!-- 申报说明 -->
-<view style='top:200rpx;position:absolute;z-index:10;width:325px;right:0;left:0;margin:auto' hidden="{{!showModal_img}}">
-  <image wx:if="{{cur_status!='house_fund'}}" class='modal_img' src="{{modal_images[cur_status]}}"></image>
-  <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'>
-    <image style='width:30rpx;height:30rpx;' src='/images/close.png'></image>
+  <!-- 申报说明 -->
+  <view style='top:200rpx;position:absolute;z-index:10;width:325px;right:0;left:0;margin:auto' hidden="{{!showModal_img}}">
+    <image wx:if="{{cur_status!='house_fund'}}" class='modal_img' src="{{modal_images[cur_status]}}"></image>
+    <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'>
+      <image style='width:30rpx;height:30rpx;' src='/images/close.png'></image>
+    </view>
   </view>
-</view>
-<!-- 扣除类型 -->
-<view class='modal_lg' style='' wx:if="{{showModal_reducetype}}">
-  <text class='text_modal_title'>请选择扣除方式</text>
-  <view class='divide_line_f5f5f5'></view>
-  <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
+  <!-- 扣除类型 -->
+  <view class='modal_lg' style='' wx:if="{{showModal_reducetype}}">
+    <text class='text_modal_title'>请选择扣除方式</text>
+    <view class='divide_line_f5f5f5'></view>
+    <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
     <view wx:for="{{reducetypeData}}" wx:for-index="idx">
       <view wx:if="{{selected_reduceindex==idx}}">
         <text class='text_item_blue float_left'>{{item}}</text>
@@ -416,32 +416,32 @@
       <view class='divide_line_f5f5f5'></view>
     </view>
   </view> -->
-  <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'>
-    <view wx:for="{{reducetypeData}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
-      <view wx:if="{{idx==selected_reduceindex}}" style='display:flex;flex-direction:row;'>
-        <view class='text_item_blue float_left'>{{item}}</view>
-        <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
-      </view>
-      <view wx:else style='display:flex'>
-        <text class='text_item_black float_left'>{{item}}</text>
+    <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'>
+      <view wx:for="{{reducetypeData}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
+        <view wx:if="{{idx==selected_reduceindex}}" style='display:flex;flex-direction:row;'>
+          <view class='text_item_blue float_left'>{{item}}</view>
+          <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
+        </view>
+        <view wx:else style='display:flex'>
+          <text class='text_item_black float_left'>{{item}}</text>
+        </view>
+        <view class='divide_line_f5f5f5'></view>
       </view>
-      <view class='divide_line_f5f5f5'></view>
     </view>
-  </view>
-  <view class='divide_line_f5f5f5'></view>
+    <view class='divide_line_f5f5f5'></view>
-  <view style='width:100%;display: flex;'>
-    <text class='text_cancel' bindtap='reduce_modalLeft'>取消</text>
-    <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
-    <text class='text_confirm' bindtap='reduce_modalRight'>确认</text>
+    <view style='width:100%;display: flex;'>
+      <text class='text_cancel' bindtap='reduce_modalLeft'>取消</text>
+      <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
+      <text class='text_confirm' bindtap='reduce_modalRight'>确认</text>
+    </view>
   </view>
-</view>
-<!--  添加子女 老人 大病-->
-<view class='modal_lg' style='' wx:if="{{showModal_addtype}}">
-  <text class='text_modal_title'>{{modalData.title}}</text>
-  <view class='divide_line_f5f5f5'></view>
-  <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
+  <!--  添加子女 老人 大病-->
+  <view class='modal_lg' style='' wx:if="{{showModal_addtype}}">
+    <text class='text_modal_title'>{{modalData.title}}</text>
+    <view class='divide_line_f5f5f5'></view>
+    <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
     <block wx:for="{{modalData.datas}}" wx:for-index="idx">
       <view wx:if="{{idx==selected_addindex}}">
         <text class='text_item_blue float_left'>{{item.name}}</text>
@@ -453,26 +453,24 @@
       <view class='divide_line_f5f5f5'></view>
     </block>
   </view> -->
-  <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'>
-    <view wx:for="{{modalData.datas}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
-      <view wx:if="{{idx==selected_addindex}}" style='display:flex;flex-direction:row;'>
-        <text class='text_item_blue float_left'>{{item.name}}</text>
-        <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
-      </view>
-      <view wx:else style='display:flex'>
-        <text class='text_item_black float_left'>{{item.name}}</text>
+    <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'>
+      <view wx:for="{{modalData.datas}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
+        <view wx:if="{{idx==selected_addindex}}" style='display:flex;flex-direction:row;'>
+          <text class='text_item_blue float_left'>{{item.name}}</text>
+          <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
+        </view>
+        <view wx:else style='display:flex'>
+          <text class='text_item_black float_left'>{{item.name}}</text>
+        </view>
+        <view class='divide_line_f5f5f5'></view>
       </view>
-      <view class='divide_line_f5f5f5'></view>
+    </view>
+    <view class='divide_line_f5f5f5'></view>
+    <view style='width:100%;display: flex;'>
+      <text class='text_cancel01' bindtap='modalLeft'>{{modalData.lefttext}}</text>
+      <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
+      <text class='text_confirm01' bindtap='modalRight'>{{modalData.righttext}}</text>
     </view>
   </view>
-  <view class='divide_line_f5f5f5'></view>
-  <view style='width:100%;display: flex;'>
-    <text class='text_cancel01' bindtap='modalLeft'>{{modalData.lefttext}}</text>
-    <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
-    <text class='text_confirm01' bindtap='modalRight'>{{modalData.righttext}}</text>
-  </view>
-</view>
-
-</view>
-
+</view>
--- a/pages/main/advancepayment/adPayDetails/adPayDetails.js
查看文件 @6052a0a
+++ b/pages/main/advancepayment/adPayDetails/adPayDetails.js
查看文件 @6052a0a
@@ -11,13 +11,15 @@ Page({
     currentTab: 0,
     taxDatas: {},
     choosed_date: '',
-    long_date: 0
+    long_date: 0,
+    isForeign:false
   },
   onLoad: function (options) {
     if (options.date){
       var mydate = new Date();
       this.setData({
         choosed_date: options.date,
+        isForeign: options.taxpayer_type == 'non-resident'
       })
     }
     if (!options.id) return
@@ -33,7 +35,7 @@ Page({
       success: function (result) {
         console.log('成功', result)
         self.setData({
-          taxDatas: result.data
+          taxDatas: that.handleTaxData(result.data)
         })
       },
       fail: function (res) {
@@ -46,7 +48,21 @@ Page({
     })
   },
-
+  handleTaxData: function (items) {
+    for (var i = 0; i < items.length; ++i) {
+      var item = items[i]
+      var donation_way
+      if (item.donation_way == 'quota') {
+        method = '限额扣除'
+      } else if (item.donation_way == 'full') {
+        method = '全额扣除'
+      } else if (item.donation_way == 'mix') {
+        method = '混合'
+      }
+      item.method = method
+    }
+    return items;
+  },
 })
--- a/pages/main/advancepayment/adPayDetails/adPayDetails.wxml
查看文件 @6052a0a
+++ b/pages/main/advancepayment/adPayDetails/adPayDetails.wxml
查看文件 @6052a0a
 <!--pages/main/advancepayment/adPayDetails/adPayDetails.wxml-->
 <view>
   <scroll-view style='margin-bottom:40rpx'>
-    <view style='padding:0rpx 30rpx 30rpx 30rpx;background:#ffffff'>
-      <view>
-        <text class='text_blue_32'>{{choosed_date}}</text>
-        <view class='float_right'>
-          <image class='arrow_wrap' src='/images/arrow_right.png'></image>
+    <view wx:if="{{!isForeign}}">
+      <view  style='padding:0rpx 30rpx 30rpx 30rpx;background:#ffffff'>
+        <view>
+          <text class='text_blue_32'>{{choosed_date}}</text>
+          <view class='float_right'>
+            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
+          </view>
+        </view>
+        <!-- <picker  mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange">
+        </picker> -->
+        <view class='divide_line_f5f5f5'></view>
+        <view style='padding:30rpx 0'>
+          <text class='text_666_30 float_left'>当期收入额</text>
+          <text class='text_number float_right'>{{taxDatas.personal_income}}</text>
+        </view>
+        <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+        <view style='padding:30rpx 0'>
+          <text class='text_666_30 float_left'>当期免税收入</text>
+          <text class='text_number float_right'>{{taxDatas.tax_free_income}}</text>
+        </view>
+        <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+        <view style='padding:30rpx 0'>
+          <text class='text_666_30 float_left'>专项扣除合计</text>
+          <text class='text_number float_right'>{{taxDatas.special_deduction}}</text>
+        </view>
+        <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+        <view style='padding:30rpx 0'>
+          <text class='text_666_30 float_left'>减除费用</text>
+          <text class='text_number float_right'>{{taxDatas.reduction_cost}}</text>
+        </view>
+        <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+        <view style='padding:30rpx 0'>
+          <text class='text_666_30 float_left'>专项附加扣除合计</text>
+          <text class='text_number float_right'>{{taxDatas.special_additional_deduction}}</text>
+        </view>
+        <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+        <view style='padding:30rpx 0'>
+          <text class='text_666_30 float_left'>其他扣除合计</text>
+          <text class='text_number float_right'>{{taxDatas.other_deduction}}</text>
+        </view>
+        <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+        <view style='padding:30rpx 0'>
+          <text class='text_666_30 float_left'>累计应纳税所得额</text>
+          <text class='text_number float_right'>{{taxDatas.accumulated_taxable_income}}</text>
+        </view>
+        <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+        <view style='padding:30rpx 0'>
+          <text class='text_666_30 float_left'>税率</text>
+          <text class='text_number float_right'>{{taxDatas.tax_rate}}%</text>
+        </view>
+        <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+        <view style='padding:30rpx 0'>
+          <text class='text_666_30 float_left'>速算扣除数</text>
+          <text class='text_number float_right'>{{taxDatas.deduction_number}}</text>
         </view>
       </view>
-      <!-- <picker  mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange">
-      </picker> -->
-      <view class='divide_line_f5f5f5'></view>
-      <view style='padding:30rpx 0'>
-        <text class='text_666_30 float_left'>当期收入额</text>
-        <text class='text_number float_right'>{{taxDatas.personal_income}}</text>
-      </view>
-      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
-      <view style='padding:30rpx 0'>
-        <text class='text_666_30 float_left'>当期免税收入</text>
-        <text class='text_number float_right'>{{taxDatas.tax_free_income}}</text>
-      </view>
-      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
-      <view style='padding:30rpx 0'>
-        <text class='text_666_30 float_left'>专项扣除合计</text>
-        <text class='text_number float_right'>{{taxDatas.special_deduction}}</text>
-      </view>
-      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
-      <view style='padding:30rpx 0'>
-        <text class='text_666_30 float_left'>减除费用</text>
-        <text class='text_number float_right'>{{taxDatas.reduction_cost}}</text>
-      </view>
-      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
-      <view style='padding:30rpx 0'>
-        <text class='text_666_30 float_left'>专项附加扣除合计</text>
-        <text class='text_number float_right'>{{taxDatas.special_additional_deduction}}</text>
-      </view>
-      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
-      <view style='padding:30rpx 0'>
-        <text class='text_666_30 float_left'>其他扣除合计</text>
-        <text class='text_number float_right'>{{taxDatas.other_deduction}}</text>
-      </view>
-      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
-      <view style='padding:30rpx 0'>
-        <text class='text_666_30 float_left'>累计应纳税所得额</text>
-        <text class='text_number float_right'>{{taxDatas.accumulated_taxable_income}}</text>
-      </view>
-      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
-      <view style='padding:30rpx 0'>
-        <text class='text_666_30 float_left'>税率</text>
-        <text class='text_number float_right'>{{taxDatas.tax_rate}}%</text>
-      </view>
-      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
-      <view style='padding:30rpx 0'>
-        <text class='text_666_30 float_left'>速算扣除数</text>
-        <text class='text_number float_right'>{{taxDatas.deduction_number}}</text>
+      <view style='margin:30rpx;positive:relative;width:92%;height:312rpx'>
+        <image class=' payment_img_bg ' src='/images/payment_bg.png ' style='position:absolute;z-index: 1;'></image>
+        <view>
+          <view class='view_bg_wrap' style='margin-top: 44rpx;'>
+            <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
+              <text class='text_num_wrap'>{{taxDatas.accumulated_withholding_tax}}</text>
+              <text class='text_text_wrap'>累计应扣缴税额</text>
+            </view>
+            <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
+            <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
+              <text class='text_num_wrap'>{{taxDatas.prepay_tax}}</text>
+              <text class='text_text_wrap'>已扣缴税额</text>
+            </view>
+            
+          </view>
+
+          <view class='view_bg_wrap' style='margin-top: 180rpx;'>
+            <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
+              <text class='text_num_wrap'>{{taxDatas.refund_tax}}</text>
+              <text class='text_text_wrap'>本期应缴税额</text>
+            </view>
+          </view>
+        </view>
       </view>
     </view>
-    <view style='margin:30rpx;positive:relative;width:92%;height:312rpx'>
-      <image class=' payment_img_bg ' src='/images/payment_bg.png ' style='position:absolute;z-index: 1;'></image>
-      <view>
-        <view class='view_bg_wrap' style='margin-top: 44rpx;'>
-          <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
-            <text class='text_num_wrap'>{{taxDatas.accumulated_withholding_tax}}</text>
-            <text class='text_text_wrap'>累计应扣缴税额</text>
-          </view>
-          <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
-          <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
-            <text class='text_num_wrap'>{{taxDatas.prepay_tax}}</text>
-            <text class='text_text_wrap'>已扣缴税额</text>
+    
+    <view  wx:else>
+      <view style='padding:0rpx 30rpx 30rpx 30rpx;background:#ffffff'>
+        <view>
+          <text class='text_blue_32'>{{choosed_date}}</text>
+          <view class='float_right'>
+            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
           </view>
-          
         </view>
-
-        <view class='view_bg_wrap' style='margin-top: 180rpx;'>
-          <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
-            <text class='text_num_wrap'>{{taxDatas.refund_tax}}</text>
-            <text class='text_text_wrap'>本期应缴税额</text>
+        <!-- <picker  mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange">
+        </picker> -->
+        <view class='divide_line_f5f5f5'></view>
+        <view style='padding:30rpx 0'>
+          <text class='text_666_30 float_left'>收入额</text>
+          <text class='text_number float_right'>{{taxDatas.personal_income}}</text>
+        </view>
+        <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+        <view style='padding:30rpx 0'>
+          <text class='text_666_30 float_left'>免税收入</text>
+          <text class='text_number float_right'>{{taxDatas.tax_free_income}}</text>
+        </view>
+        <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+        <view style='padding:30rpx 0'>
+          <text class='text_666_30 float_left'>其他扣除</text>
+          <text class='text_number float_right'>{{taxDatas.other_deduction}}</text>
+        </view>
+        <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+        <view style='padding:30rpx 0'>
+          <text class='text_666_30 float_left'>实际捐赠额</text>
+          <text class='text_number float_right'>{{taxDatas.actual_donation}}</text>
+        </view>
+        <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+        <view style='padding:30rpx 0'>
+          <text class='text_666_30 float_left'>捐赠方式</text>
+          <text class='text_number float_right'>{{taxDatas.donation_way}}</text>
+        </view>
+        <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+        <view style='padding:30rpx 0'>
+          <text class='text_666_30 float_left'>减免税额</text>
+          <text class='text_number float_right'>{{taxDatas.tax_savings}}</text>
+        </view>
+        <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+        <view style='padding:30rpx 0'>
+          <text class='text_666_30 float_left'>应纳税所得额</text>
+          <text class='text_number float_right'>{{taxDatas.accumulated_taxable_income}}</text>
+        </view>
+        <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>      
+        <view style='padding:30rpx 0'>
+          <text class='text_666_30 float_left'>税率</text>
+          <text class='text_number float_right'>{{taxDatas.tax_rate}}%</text>
+        </view>
+        <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+        <view style='padding:30rpx 0'>
+          <text class='text_666_30 float_left'>速算扣除数</text>
+          <text class='text_number float_right'>{{taxDatas.deduction_number}}</text>
+        </view>
+      </view>
+      <view style='margin:30rpx;positive:relative;width:92%;height:312rpx'>
+        <image class=' payment_img_bg ' src='/images/payment_bg.png ' style='position:absolute;z-index: 1;'></image>
+        <view>
+          <view class='view_bg_wrap' style='margin-top: 44rpx;'>
+            <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
+              <text class='text_num_wrap'>{{taxDatas.accumulated_withholding_tax}}</text>
+              <text class='text_text_wrap'>应扣缴税额</text>
+            </view>
+            <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
+            <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
+              <text class='text_num_wrap'>{{taxDatas.prepay_tax}}</text>
+              <text class='text_text_wrap'>已扣缴税额</text>
+            </view>
           </view>
-          
-          <!-- <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
-          <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
-            <text class='text_num_wrap'>30.8%</text>
-            <text class='text_text_wrap'>使用税率</text>
+          <view class='view_bg_wrap' style='margin-top: 180rpx;'>
+            <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
+              <text class='text_num_wrap'>{{taxDatas.refund_tax}}</text>
+              <text class='text_text_wrap'>应补（退）税额</text>
+            </view>
           </view>
-          <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
-          <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
-            <text class='text_num_wrap'>19106.91</text>
-            <text class='text_text_wrap'>速算扣除数</text>
-          </view> -->
         </view>
       </view>
     </view>
-
-    <!-- <view style='padding-left:30rpx;background:#ffffff'>
-      <image class='icon_wrap' src="/images/rectangle_icon.png"></image>
-      <text style='padding-left:20rpx' class='text_gray_32'>工资明细</text>
-    </view>
-    <view style='margin-top:2rpx;background:#ffffff;padding-bottom:30rpx'>
-      <view style='padding:30rpx'>
-        <text class='text_wrap_left'>公司名称</text>
-        <text class='text_wrap_right'>北京小爱智能科技</text>
-      </view>
-      <view style='padding:30rpx'>
-        <text class='text_wrap_left'>计薪时间</text>
-        <text class='text_wrap_right'>2018/09/09 20:10</text>
-      </view>
-      <view style='padding:30rpx'>
-        <text class='text_wrap_left'>发薪时间</text>
-        <text class='text_wrap_right'>2018/09/10 09:00 </text>
-      </view>
-      <view style='padding:30rpx'>
-        <text class='text_wrap_left'>实发工资</text>
-        <text class='text_wrap_right'>13860.00</text>
-      </view>
-    </view> -->
+   
   </scroll-view>
 </view>
--- a/pages/main/advancepayment/adPayHome.js
查看文件 @6052a0a
+++ b/pages/main/advancepayment/adPayHome.js
查看文件 @6052a0a
@@ -9,7 +9,7 @@ Page({
   Authorization: null,
   data: {
     // tab切换  
-    isshow : false,
+    // isshow : false,
     currentTab: 0,
     taxDatas: [],
     salaryDatas: {},
@@ -96,7 +96,11 @@ Page({
       } else if (item.taxation_method == '0103') {
         method = '全年一次性奖金'
       } 
-      item.method = method
+      if (item.taxpayer_type == 'non-resident'){//非居民
+        item.method = '外籍人' + method
+      }else{
+        item.method = method
+      }
     }
     return items;
   },
@@ -106,6 +110,7 @@ Page({
       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.detals = this.handleDetailsData(item)
+      item.isshow = false
     }
     return items;
   },
@@ -151,9 +156,14 @@ Page({
   gospan:function(e){
     console.log(e)
+    var item = this.data.salaryDatas[e.currentTarget.id]
+    item.isshow = !item.isshow
     this.setData({
-      isshow: !this.data.isshow
+      salaryDatas: this.data.salaryDatas
     })
+    // this.setData({
+    //   isshow: !this.data.isshow
+    // })
     // console.log('idddddd',e.currentTarget.id)
     // if (!e.currentTarget.id) return
     // var that = this
@@ -183,11 +193,14 @@ Page({
     var detail = JSON.parse(data['detail'])
     var details = []
     for (var i = 0; i < titles.length; ++i) {
-       var titleData = titles[i]
-       var value = detail[titleData['key']]
-
+      var titleData = titles[i]
+      var value = detail[titleData['key']]
+      var title = titleData['title']
+      if (!title){
+        title = titleData['original_column']
+      }
       details.push({
-        title: titleData['title'],
+        title: title,
         value: value
       })
     }
@@ -196,8 +209,9 @@ Page({
   },
   goItemDetails: function (e) {
+    var item =  this.data.taxDatas[e.currentTarget.id]
     wx.navigateTo({
-      url: "adPayDetails/adPayDetails?id=" + e.currentTarget.id + "&date=" + this.data.choosed_date
+      url: "adPayDetails/adPayDetails?id=" + item.id + "&date=" + this.data.choosed_date + "&taxpayer_type=" + item.taxpayer_type
     })
   },
 })
--- a/pages/main/advancepayment/adPayHome.json
查看文件 @6052a0a
+++ b/pages/main/advancepayment/adPayHome.json
查看文件 @6052a0a
 {
-  "navigationBarTitleText": "预扣预缴"
+  "navigationBarTitleText": "收入"
 }
--- a/pages/main/advancepayment/adPayHome.wxml
查看文件 @6052a0a
+++ b/pages/main/advancepayment/adPayHome.wxml
查看文件 @6052a0a
@@ -20,7 +20,7 @@
         <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'>
-        <view class='card_rectangle_bg_column' style='padding:30rpx' id='{{item.id}}' bindtap='goItemDetails'>
+        <view class='card_rectangle_bg_column' style='padding:30rpx' id='{{index}}' bindtap='goItemDetails'>
           <text class='text_blue_36'>扣缴义务人: {{item.declaring_unit}}</text>          
           <text class='text_blue_36'>所得项目: {{item.method}}</text>          
           <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view>
@@ -40,23 +40,23 @@
       </view>
       <view wx:for="{{salaryDatas}}" style='margin-bottom:20rpx'>
         <view class='card_rectangle_bg_column' style='padding:30rpx'>
-          <text class='text_blue_36'>薪酬批次工资:  {{item.program}}</text>
+          <text class='text_blue_36'>薪酬批次工资:  {{item.cycle_name}}</text>
           <view class='divide_line_f5f5f5' style='margin:20rpx 0'></view>
           <text class='text_999_28'>发薪日:<text class='text_333_28'>{{item.payroll_date}}</text></text>
           <text class='text_999_28'>计薪时间:<text class='text_333_28'>{{item.count_date}}</text></text>
           <text class='text_999_28'>应发金额:<text class='text_333_28'>{{item.pay_salary}}</text></text>
           <text class='text_999_28'>实发:<text class='text_333_28 text_color_28'>¥{{item.salary}}</text></text>
           <view class='divide_line_f5f5f5' style='margin:20rpx 0'></view>
-          <view wx:if="{{!isshow}}" bindtap='gospan' id='{{item.id}}'>
+          <view wx:if="{{!item.isshow}}" bindtap='gospan' id='{{index}}'>
             <text style='font-size:28rpx;color:#4e8fe7;text-align:left'>展开</text>
             <image class='head_image_wrap_down' src='/images/arrow_blue_down.png'></image>
           </view>
-          <view wx:if="{{isshow}}" bindtap='gospan'>
+          <view wx:if="{{item.isshow}}" bindtap='gospan' id='{{index}}'>
             <text style='font-size:28rpx;color:#4e8fe7;text-align:left'>收起</text>
             <image class='head_image_wrap_up' src='/images/arrow_blue_up.png'></image>
             <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view>
           </view>
-          <view wx:if="{{isshow}}" wx:for="{{item.detals}}" wx:for-item='detal'>
+          <view wx:if="{{item.isshow}}" wx:for="{{item.detals}}" wx:for-item='detal'>
             <view>
               <text class='text_999_28'>{{detal.title}}</text>
               <text class='text_999_28' style='color:#333;text-align:right;float: right'>{{detal.value}}</text>
--- a/pages/main/guide/guide.wxml
查看文件 @6052a0a
+++ b/pages/main/guide/guide.wxml
查看文件 @6052a0a
@@ -10,8 +10,8 @@
         <image class="icon_wrap" src="/images/tax_person.png"></image>
         <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
         <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
-          <text style='font-size: 36rpx;color: #000;font-weight:bold;text-align: left;'>自然人信息采集</text>
-          <text style='font-size:28rpx;color: #999;text-align: left;margin-top:6rpx'>采集本人和家庭成员的基本信息</text>
+          <text style='font-size: 36rpx;color: #000;font-weight:bold;text-align: left;'>个人和家庭信息</text>
+          <text style='font-size:28rpx;color: #999;text-align: left;margin-top:6rpx'>个人和家庭成员的基本信息</text>
         </view>
         <image class='arrow_wrap' src='/images/arrow_right.png'></image>
       </view>
@@ -21,7 +21,7 @@
         <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
         <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
           <text style='font-size: 36rpx;color: #000;font-weight:bold;'>专项附加扣除</text>
-          <text style='font-size:28rpx;color: #999;margin-top:6rpx'>申报专项附加扣除，提交详细信息</text>
+          <text style='font-size:28rpx;color: #999;margin-top:6rpx'>个人的专项附加扣除信息</text>
         </view>
         <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
       </view>
@@ -30,8 +30,8 @@
         <image class="icon_wrap" src="/images/advance_payment.png"></image>
         <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
         <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
-          <text style='font-size: 36rpx;color: #000;font-weight:bold;'>预扣预缴</text>
-          <text style='font-size:28rpx;color: #999;margin-top:6rpx'>查看本人的个税扣缴明细</text>
+          <text style='font-size: 36rpx;color: #000;font-weight:bold;'>收入</text>
+          <text style='font-size:28rpx;color: #999;margin-top:6rpx'>个人的收入和个税明细</text>
         </view>
         <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
       </view>
@@ -60,4 +60,4 @@
   <image class='chat-img' bindtap='gochat' src='/images/icon_chat.png'></image>
-</view>
+</view>
--- a/pages/main/guide/guide.wxss
查看文件 @6052a0a
+++ b/pages/main/guide/guide.wxss
查看文件 @6052a0a
@@ -33,8 +33,8 @@
 }
 .icon_wrap {
-  width: 112rpx;
-  height: 102rpx;
+  width: 102rpx;
+  height: 96rpx;
   align-self: center;
 }
--- a/pages/main/taxperson/addinfo/addinfo.js
查看文件 @6052a0a
+++ b/pages/main/taxperson/addinfo/addinfo.js
查看文件 @6052a0a
@@ -2,6 +2,8 @@
 var app = getApp();
 var format = require('../../../../utils/util.js');
 var baseUrl = app.globalData.baseUrl;
+const cardTypeArray8 = ['居民身份证', '中国护照', '港澳居民居住证', '台湾居民居住证', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
+
 Page({
   cur_id:null,
   /**
@@ -22,7 +24,7 @@ Page({
     requestBody: {},
     idInfoData: '',
     profession_index: [],
-
+    overseas:'否',
     relativeData: {
       isrequre: true,
       label: '与本人关系',
@@ -37,13 +39,13 @@ Page({
     cardtypeData: {
       isrequre: true,
       disabled: true,
+      selected:'居民身份证',
       label: '证照类型',
       bindtype: 'cardtype',
-      selected: '居民身份证',
       placeholder: '请选择证照类型',
-      values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
-        '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
-      ],
+      values: cardTypeArray8,
+      // values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照','外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'],
+      // range_key: 'name',
       onChange: 'onPickerSelect'
     },
     forignerInfo: {
@@ -58,14 +60,24 @@ Page({
     genderData: {
       label: '性别',
       bindtype: 'gender',
-      disabled: true,
+      isrequre: true,
+      // disabled: true,
       selected: '',
-      // placeholder: '请选择性别',
-      placeholder: '性别',
+      placeholder: '请选择性别',
+      // placeholder: '性别',
       values: ["男", "女"],
       onChange: 'onPickerSelect'
     },
-
+    countryData: {
+      label: '国籍',
+      bindtype: 'country',
+      isrequre: true,
+      selected: '中国',
+      disabled: true,
+      // range_key:'name',
+      placeholder: '请选择国籍',
+      onChange: 'onPickerSelect',
+    },
   },
   /**
@@ -77,8 +89,50 @@ Page({
       this.cur_id = options.id
       this.getpersonalTax(options.id)
     }
+    this.getCountry()
+  },
+  //****************获取国籍数据************/
+  getCountry: function () {
+    var that = this
+    wx.showLoading({
+      title: '',
+    })
+    var Authorization = app.globalData.Authorization;
+    wx.request({
+      url: baseUrl + 'persontax/v1/nation-list',
+      method: "GET",
+      header: {
+        'content-type': 'application/json', // 默认值
+        "Authorization": Authorization
+      },
+      success: function (res) {
+        var countrys = res.data
+        if (countrys.indexOf('中国') > -1) {
+          countrys.splice(countrys.indexOf('中国'), 1);
+        }
+        if (countrys.indexOf('中国台湾') > -1) {
+          countrys.splice(countrys.indexOf('中国台湾'), 1);
+        }
+        if (countrys.indexOf('香港') > -1) {
+          countrys.splice(countrys.indexOf('香港'), 1);
+        }
+        if (countrys.indexOf('澳门') > -1) {
+          countrys.splice(countrys.indexOf('澳门'), 1);
+        }
+        that.data.countryData.values = countrys
+        that.countrys = countrys
+        that.setData({
+          countryData: that.data.countryData,
+        })
+      },
+      fail(res) {
+        wx.hideLoading()
+      },
+      complete() {
+        wx.hideLoading()
+      }
+    })
   },
-
   //****************获取自然人数据************/
   getpersonalTax: function (id) {
     var that = this
@@ -112,25 +166,28 @@ Page({
   },
   //对各参数初始赋值
   handleDatas: function (tax_info) {
+    this.dealCardType(tax_info.id_card_type)//为防止干扰其他字段，需要先执行
     var isDisable = tax_info.certification_status == 'active' && tax_info.id_card_no.length//已通过拍摄身份证认证过，不能修改
     this.data.relativeData.selected = tax_info.family_ties
-    // this.data.cardtypeData.selected = tax_info.id_card_type
     this.data.genderData.selected = tax_info.gender
+    this.data.countryData.selected = tax_info.native
     // this.data.genderData.disabled = isDisable
     this.setData({
       isDisable: isDisable,
       relativeData: this.data.relativeData,
       name: tax_info.name,
-      // cardtypeData: this.data.cardtypeData,
+      cardtypeData: this.data.cardtypeData,
+      age: tax_info.age,
       mobile: tax_info.mobile,
       genderData: this.data.genderData,
       isIdCard: '居民身份证' == tax_info.id_card_type ? true : false,
-      card_number: tax_info.id_card_no
+      card_number: tax_info.id_card_no,
+      countryData: this.data.countryData
     })
-    this.dealIdInfo(tax_info.id_card_no)//处理了性别和年龄
+    // this.dealIdInfo(tax_info.id_card_no)//处理了性别和年龄
   },
   /**
@@ -162,8 +219,9 @@ Page({
           } else if (id_info.birthday.month < 10 && id_info.birthday.day < 10) {
             birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
           }
-          // var cardtype_Data = that.data.cardtypeData
-          // cardtype_Data.selected = '居民身份证'
+          var cardtype_Data = that.data.cardtypeData
+          cardtype_Data.selected = '居民身份证'
+          // cardtypeData.selected_code = '1'
           var gender_Data = that.data.genderData
           gender_Data.selected = id_info.gender
@@ -181,7 +239,7 @@ Page({
             idInfoData: id_info,
             name: id_info.name,
             // birthday: birth_day,
-            // cardtypeData: cardtype_Data,
+            cardtypeData: cardtype_Data,
             genderData: gender_Data,
             // long_birth_date: Date.parse(new Date(birth_day)) / 1000,
             // birthDate: that.data.birthDate,
@@ -199,6 +257,46 @@ Page({
     })
   },
+  dealCardType: function (new_type) {
+    var is_idcard = this.data.isIdCard
+    this.data.cardtypeData.selected = new_type
+
+    if ('居民身份证' == new_type) {
+      is_idcard = true
+      this.data.genderData.disabled = true
+    } else {
+      is_idcard = false
+      this.data.genderData.disabled = false
+    }
+    this.data.overseas = '否'
+    if ('居民身份证' == new_type || '中国护照' == new_type) {
+      this.data.countryData.selected = '中国'
+      this.data.countryData.disabled = true
+    } else if (new_type.indexOf("港澳") != -1) {
+      this.data.countryData.values = ['中国香港', '中国澳门']
+      this.data.countryData.selected = ''
+      this.data.countryData.disabled = false
+    } else if (new_type.indexOf("台湾") != -1) {
+      this.data.countryData.selected = '中国台湾'
+      this.data.countryData.disabled = true
+    } else {
+      this.data.overseas = '是'
+      this.data.countryData.selected = ''
+      this.data.countryData.values = this.countrys ? this.countrys : []
+      this.data.countryData.disabled = false
+    }
+    this.setData({
+      isIdCard: is_idcard,
+      genderData: this.data.genderData,
+      countryData: this.data.countryData,
+      cardtypeData: this.data.cardtypeData,
+      overseas: this.data.overseas,
+    })
+
+
+  },
+
+
   // =============普通单列picker选中处理==============
   onPickerSelect: function(e) {
     console.log('picker发送选择改变，携带值为', e)
@@ -211,18 +309,15 @@ Page({
         })
         break;
       case 'cardtype':
-        var is_idcard = this.data.isIdCard
-        var cardtype_data = this.data.cardtypeData
-        cardtype_data.selected = cardtype_data.values[e.detail.value]
-        if (0 == e.detail.value) {
-          is_idcard = true
-        } else {
-          is_idcard = false
+        var cardtypeData = this.data.cardtypeData
+        var new_type = cardtypeData.values[e.detail.value] //['name']
+        // var new_type_code = cardtypeData.values[e.detail.value]['code']
+        if (new_type != cardtypeData.selected) {
+          this.dealCardType(new_type)
+          this.setData({
+            card_number: ""
+          })
         }
-        this.setData({
-          isIdCard: is_idcard,
-          cardtypeData: cardtype_data
-        })
         break;
       case 'gender':
         var gender_data = this.data.genderData
@@ -231,7 +326,16 @@ Page({
           genderData: gender_data
         })
         break;
-     
+      case 'country':
+        var countryData = this.data.countryData
+        var new_country = countryData.values[e.detail.value]
+        if (new_country != countryData.selected) {
+          countryData.selected = new_country
+          this.setData({
+            countryData: countryData
+          })
+        }
+        break;
     }
   },
@@ -263,7 +367,8 @@ Page({
     // console.log("date", Date.parse(new Date(this.data.birthday)) / 1000)
     var regMoney = /^[0-9]*(\.[0,10]{1,2})?$/;
     var regMobile = /^(13[0-9]|14[5-9]|15[012356789]|166|17[0-8]|18[0-9]|19[8-9])[0-9]{8}$/;
-    var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,}$/;
+    var regname = /^[\u4E00-\u9FA5A-Za-z·s]{2,20}$/;
+    // var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,}$/;
     var regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,20}[a-z0-9]+$");
     var formdata = e.detail.value;
     console.log("formdata", formdata);
@@ -271,6 +376,7 @@ Page({
       this.showtoast('请选择关系');
       return
     }
+    var rel = this.data.relativeData.selected
     if (this.data.card_number.length < 1) {
       this.showtoast('请填写证照号码');
       return
@@ -278,41 +384,52 @@ Page({
       this.showtoast('证照号码有误');
       return
     }
-    var rel = this.data.relativeData.selected
-    var hostInfo = format.analyzeIDCard(app.globalData.hostInfo.id_card_no)
-    if ((rel == '子' || rel =='女') && formdata.age > hostInfo.age) {
-      this.showtoast('子女年龄有误');
-      return
-    }
-    if (rel == '父母' && formdata.age < hostInfo.age) {
-      this.showtoast('父母年龄有误');
-      return
-    }
     var name = formdata.person_name.length ? formdata.person_name : this.data.name
     if (name.length < 1 ) {
-      this.showtoast('姓名未填写');
+      this.showtoast('请输入姓名');
       return
     } else if (!regname.test(name)) {
       this.showtoast('请输入正确姓名');
       return
     }
-    if (formdata.mobile.length > 0 && !format.isMobile(formdata.mobile)) {
-      this.showtoast('手机号码有误');
+    if (this.data.genderData.selected.length < 1) {
+      this.showtoast('请选择性别');
       return
-    } 
-    if (this.data.genderData.selected == '男') {
-      if (rel == '女'){
+    }else {
+      if (this.data.genderData.selected == '男') {
+        if (rel == '女') {
+          this.showtoast('关系和性别冲突');
+          return
+        }
+      } else {
+        if (rel == '子') {
+          this.showtoast('关系和性别冲突');
+          return
+        }
+      }
+      if (rel == '配偶' && this.data.genderData.selected == app.globalData.hostInfo.gender) {
         this.showtoast('关系和性别冲突');
         return
       }
-    }else{
-      if (rel == '子') {
-        this.showtoast('关系和性别冲突');
+    }
+    if (!formdata.age) {
+      this.showtoast('请填写年龄');
+      return
+    } else {
+      var host_birth = format.formatTime_date(app.globalData.hostInfo.birth_date) 
+      var host_age = format.getAge(host_birth)
+      console.log('host_age',host_age,'hostInfo', app.globalData.hostInfo)
+      if ((rel == '子' || rel == '女') && formdata.age > host_age) {
+        this.showtoast('子女年龄有误');
+        return
+      }
+      if (rel == '父母' && formdata.age < host_age) {
+        this.showtoast('父母年龄有误');
         return
       }
-    } 
-    if (rel == '配偶' &&  this.data.genderData.selected == app.globalData.hostInfo.gender) {
-      this.showtoast('关系和性别冲突');
+    }
+    if (formdata.mobile.length > 0 && !format.isMobile(formdata.mobile)) {
+      this.showtoast('手机号码有误');
       return
     }
     this.goCommit(formdata);
@@ -338,14 +455,15 @@ Page({
       data: {
         'certification_status': that.getCertifyStatus(formdata),
         "family_ties": that.data.relativeData.selected,
-        "id_card_type": '居民身份证',//that.data.cardtypeData.selected,
+        "id_card_type": that.data.cardtypeData.selected,//_code,
         "id_card_no": that.data.card_number,
         "name": name,
         "gender": that.data.genderData.selected,
         "mobile": formdata.mobile,
         //"age": formdata.age ? formdata.age : '',//不传
-        "native": "中国",
-        "is_overseas_personnel": "否",
+        "age": formdata.age ? formdata.age : '',
+        "native": that.data.countryData.selected,
+        "is_overseas_personnel": that.data.overseas,
       },
       header: {
         'content-type': 'application/json', // 默认值
@@ -391,7 +509,8 @@ Page({
     wx.showToast({
       title: title,
       duration: 2000,
-      image: '/images/error.png'
+      icon:'none'
+      // image: '/images/error.png'
     })
   },
@@ -418,6 +537,9 @@ Page({
     this.setData({
       card_number: idCardNo
     })
+    if (!this.data.isIdCard) {
+      return;
+    }
     if (e.detail.value.length == 18){
       if (!format.isIDCardNum(idCardNo)) {
         wx.showToast({
@@ -434,6 +556,9 @@ Page({
     this.setData({
       card_number: idCardNo
     })
+    if (!this.data.isIdCard) {
+      return;
+    }
     if (!idCardNo.length) {
       wx.showToast({
         image: "../../../../images/warn.png",
--- a/pages/main/taxperson/addinfo/addinfo.wxml
查看文件 @6052a0a
+++ b/pages/main/taxperson/addinfo/addinfo.wxml
查看文件 @6052a0a
@@ -10,12 +10,12 @@
         <template is="picker_cell_normal" data="{{...relativeData}}" />
         <view class="divide_line_30"></view>
-
-        <view class='item_body'>
+        <template is="picker_cell_normal" data="{{...cardtypeData}}" />
+        <!-- <view class='item_body'>
           <text class='red_star_right_10'>*</text>
           <text class='text_777_30 float_left'>证照类型</text>
           <text class='text_black_30 float_right' style='line-height: 90rpx'>居民身份证</text>
-        </view>
+        </view> -->
         <view class="divide_line_30"></view>
         <view class='item_body'>
@@ -27,7 +27,7 @@
              <input class='input_wrap' placeholder='请输入或拍摄身份证'  placeholder-class='text_999_30' name='id_card_no' maxlength='18' value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}' type='idcard' ></input>
           </view>
           <view wx:else>
-            <input class='input_wrap' placeholder='请输入证照号码'  placeholder-class='text_999_30' name='id_card_no' maxlength='18' type="idcard" value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input>
+            <input class='input_wrap' placeholder='请输入证照号码'  placeholder-class='text_999_30' name='id_card_no' maxlength='30' value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input>
           </view>
         </view>
         <view class="divide_line_30"></view>
@@ -42,22 +42,22 @@
         <template is="picker_cell_normal" data="{{...genderData}}" />
           <view class="divide_line_30"></view>
           <view class='item_body'>
-            <text class='text_777_30 float_left head_in' style='line-height: 90rpx'>年龄</text>
-            <input class='input_wrap' name='age' type='number'  placeholder-class='text_999_30' placeholder='年龄' maxlength='2' value='{{age}}' disabled='true'></input>
+            <text class='red_star_right_10'>*</text>
+            <text class='text_777_30 float_left' style='line-height: 90rpx'>年龄</text>
+            <input class='input_wrap' name='age' type='number'  placeholder-class='text_999_30' placeholder='年龄' maxlength='2' value='{{age}}' disabled='{{isIdCard}}'></input>
           </view>
-          <view class="divide_line_30"></view>
-
-
-        <view class='item_body'>
+        <view class="divide_line_30"></view>
+        <template is="picker_cell_normal" data="{{...countryData}}" />
+        <!-- <view class='item_body'>
           <text class='red_star_right_10'>*</text>
           <text class='text_777_30 float_left' style='line-height: 90rpx'>国籍</text>
           <text class='text_black_30 float_right' style='line-height: 90rpx' >中国</text>
-        </view>
+        </view> -->
         <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>
-          <text class='text_black_30 float_right' style='line-height: 90rpx' >否</text>
+          <text class='text_black_30 float_right' style='line-height: 90rpx' >{{overseas}}</text>
         </view>
         <!-- <template is="picker_cell_normal" data="{{...forignerInfo}}" /> -->
         <view class="divide_line_30"></view>
--- a/pages/main/taxperson/editinfo/editinfo.js
查看文件 @6052a0a
+++ b/pages/main/taxperson/editinfo/editinfo.js
查看文件 @6052a0a
 var format = require('../../../../utils/util.js');
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
+// var countryInfo = require('../../../../utils/country.js');
+// 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类）' }];
+
 Page({
   /**
@@ -10,6 +16,7 @@ Page({
     isshow01: false,
     isshow02: false,
     isshow03: false,
+    hasOtherCard:false,
     taxInfo: {},
     proffessionlist: {},
     banklist: {},
@@ -44,21 +51,56 @@ Page({
     },
     cardtypeData: {
       isrequre: true,
-      disabled: true,
       label: '证照类型',
       bindtype: 'cardtype',
-      placeholder: '居民身份证',
+      placeholder: '请选择证照类型',
+      selected: '',
+      values: cardTypeArray8,
+      // range_key:'name',
+      // values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
+      //   '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
+      // ],
+      onChange: 'onPickerSelect'
+    },
+    otherCardtypeData: {
+      isrequre: true,
+      label: '其他证照类型',
+      bindtype: 'other_cardtype',
+      placeholder: '请选择证照类型',
+      selected: '',
+      values: [],
+      // range_key: 'name',
+      onChange: 'onPickerSelect'
+    },
+    countryData: {
+      label: '国籍',
+      bindtype: 'country',
+      isrequre: true,
       selected: '',
-      values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
-        '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
-      ],
+      // range_key:'name',
+      placeholder: '请选择国籍',
+      onChange: 'onPickerSelect',
+    },
+    birthCountryData: {
+      isrequre: true,
+      label: '出生国家（地区）',
+      bindtype: 'brith_country',
+      placeholder: '请选择国籍',
+      onChange: 'onPickerSelect',
+    },
+    taxpayerTypeData: {
+      isrequre: true,
+      label: '纳税人类型',
+      bindtype: 'taxpayerType',
+      placeholder: '请选择纳税人类型',
+      values: ["居民", "非居民"],
       onChange: 'onPickerSelect'
-},
+    },
     forignerInfo: {
       isrequre: true,
       label: '是否境外人员',
       bindtype: 'forigner',
-      placeholder: '否',
+      placeholder: '请选择',
       disabled: true,
       values: ["否", "是"],
       onChange: 'onPickerSelect'
@@ -73,8 +115,9 @@ Page({
     },
     genderData: {
       label: '性别',
+      isrequre: true,
       bindtype: 'gender',
-      disabled: true,
+      // disabled: true,
       placeholder: '性别',
       values: ["男", "女"],
       selected: '',
@@ -159,14 +202,15 @@ Page({
     },
     // 时间picker
     birthDate: {
-      label: '出生年月',
-      disabled:true,
+      label: '出生日期',
+      isrequre:true,
       bindtype: 'birthday',
       placeholder: '出生日期',
       selected: '',
       mode: "date",
       fields: "day",
       start: '1949-01-01',
+      end: format.curDateTime(),
       onChange: 'birthdayChange',
     },
     startDate: {
@@ -189,10 +233,32 @@ Page({
       start: '2010-01-01',
       onChange: 'endChange',
     },
+
+    firstEntryDate: {
+      label: '首次入境时间',
+      isrequre: true,
+      bindtype: 'entry_date',
+      placeholder: '出生日期',
+      selected: '',
+      mode: "date",
+      fields: "day",
+      onChange: 'onPickerSelect',
+    },
+    predictLeaveDate: {
+      label: '预计离境时间',
+      isrequre: true,
+      bindtype: 'leave_date',
+      placeholder: '出生日期',
+      selected: '',
+      mode: "date",
+      fields: "day",
+      onChange: 'onPickerSelect',
+    },
     // 地址选择器
     contactaddressInfo: {
       label: '联系地址',
       mode: 'region',
+      maxWidth: 490,
       address_code: ['', '', ''],
       address_value: ['', '', ''],
       selected: '',
@@ -227,7 +293,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-
+    
     console.log('options.id', options.id)
     if (options.id && options.id.length > 0) {
       this.setData({
@@ -237,7 +303,54 @@ Page({
     }
     this.getproffessiondata()
     this.getbanklist()
+    this.getCountry()
+  },
+//****************获取国籍数据************/
+  getCountry: function () {
+    var that = this
+    wx.showLoading({
+      title: '',
+    })
+    var Authorization = app.globalData.Authorization;
+    wx.request({
+      url: baseUrl + 'persontax/v1/nation-list',
+      method: "GET",
+      header: {
+        'content-type': 'application/json', // 默认值
+        "Authorization": Authorization
+      },
+      success: function (res) {
+        var countrys = res.data.concat()
+        that.data.birthCountryData.values = res.data
+        if (countrys.indexOf('中国') > -1) {
+          countrys.splice(countrys.indexOf('中国'), 1);
+        }
+        if (countrys.indexOf('中国台湾') > -1) {
+          countrys.splice(countrys.indexOf('中国台湾'), 1);
+        }
+        if (countrys.indexOf('香港') > -1) {
+          countrys.splice(countrys.indexOf('香港'), 1);
+        }
+        if (countrys.indexOf('澳门') > -1) {
+          countrys.splice(countrys.indexOf('澳门'), 1);
+        }
+        that.data.countryData.values = countrys
+        that.countrys = countrys
+        that.setData({
+          countryData: that.data.countryData,
+          birthCountryData: that.data.birthCountryData
+        })
+      },
+      fail(res) {
+        wx.hideLoading()
+      },
+      complete() {
+        wx.hideLoading()
+      }
+    })
   },
+
+
 //****************获取自然人数据************/
   getpersonalTax: function(id) {
     var that = this
@@ -274,10 +387,12 @@ Page({
   //对各参数初始赋值
   handleDatas: function (tax_info) {
     //todo
+    console.log('tax_info', tax_info)
     var curdate = format.curDateTime()
-    console.log('curdate', curdate)
+    this.dealCardType(tax_info.id_card_type)//为防止干扰其他字段，需要先执行
     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
@@ -285,14 +400,23 @@ Page({
     }
     this.data.personstatusData.selected = tax_info.taxpayer_status
-
-    this.data.cardtypeData.selected = tax_info.id_card_type
-    console.log('cardtypeData', this.data.cardtypeData)
+    this.data.cardtypeData.selected = tax_info.id_card_type //cardTypeDicts[parseInt(tax_info.id_card_type) - 1]['name']
+    // this.data.cardtypeData.selected_code = tax_info.id_card_type
     this.data.card_number = tax_info.id_card_no
+
+    this.data.otherCardtypeData.selected = tax_info.other_id_card_type //cardTypeDicts[parseInt(tax_info.other_id_card_type) - 1]['name']
+    // this.data.otherCardtypeData.selected_code = tax_info.other_id_card_type
+
+    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
+    this.data.birthCountryData.selected = tax_info.birth_native
+    this.data.taxpayerTypeData.selected = tax_info.taxpayer_type =='resident'?'居民':'非居民'
+
     this.data.mobile = tax_info.mobile
     this.data.investInfo.selected = tax_info.is_investor
     this.data.specificIndustryInfo.selected = tax_info.is_specific_profession
-    //非必填
+    
     this.data.genderData.selected = tax_info.gender
     if (tax_info.birth_date == -62135596800 || tax_info.birth_date == 0) {
       this.data.birthDate.selected = ''
@@ -300,7 +424,7 @@ Page({
       // this.data.birthDate.selected = format.yearFormString(tax_info.birth_date) + '-' + format.monthFormString(tax_info.birth_date) + '-' + format.dayFormString(tax_info.birth_date)
       this.data.birthDate.selected = format.formatTime_date(tax_info.birth_date) 
     }
-
+//非必填
     console.log('this.data.birthDate', new Date(tax_info.birth_date).toLocaleDateString())
     if (tax_info.join_date > 1000) {
       // this.data.startDate.selected = format.yearFormString(tax_info.join_date) + '-' + format.monthFormString(tax_info.join_date) + '-' + format.dayFormString(tax_info.join_date)
@@ -309,7 +433,12 @@ Page({
     if (tax_info.separate_date > 1000) {
       this.data.endDate.selected = format.formatTime_date(tax_info.separate_date) 
     }
-
+    const firstEntryDate = format.formatTime_date(tax_info.first_entry_date)
+    const predictLeaveDate = format.formatTime_date(tax_info.predict_leave_date)
+    this.data.firstEntryDate.selected = (firstEntryDate.indexOf("01-01-01") == -1) ? firstEntryDate:''
+    this.data.firstEntryDate.datelong = tax_info.first_entry_date
+    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.birthDate.end = curdate
@@ -320,16 +449,18 @@ Page({
     this.data.lieshuInfo.selected = tax_info.is_martyr_family
     this.data.lonelyolderInfo.selected = tax_info.is_lonely_man
     this.data.bankInfo.selected = tax_info.bank
-    // this.data.contactaddressInfo.selected = tax_info.contact_address.province + tax_info.contact_address.city + tax_info.contact_address.district
+    this.data.contactaddressInfo.selected = tax_info.contact_address.province + tax_info.contact_address.city + tax_info.contact_address.district
     this.data.currentaddressInfo.selected = tax_info.current_address.province + tax_info.current_address.city + tax_info.current_address.district
     this.data.birthaddressInfo.selected = (tax_info.huji_address.province + tax_info.huji_address.city + tax_info.huji_address.district).replace(/(^\s*)|(\s*$)/g, "")
     this.data.employeeInfo.selected = tax_info.is_employee
     this.data.investpersonalInfo.selected = tax_info.is_business_angel
     this.setData({
-      huji_address_detail: tax_info.huji_address_detail.replace(/(^\s*)|(\s*$)/g, ""),
+      // huji_address_detail: tax_info.huji_address_detail.replace(/(^\s*)|(\s*$)/g, ""),
       name: this.data.name,
+      other_name: this.data.other_name,
       personstatusData: this.data.personstatusData,
       cardtypeData: this.data.cardtypeData,
+      otherCardtypeData: this.data.otherCardtypeData,
       mobile: this.data.mobile,
       investInfo: this.data.investInfo,
       specificIndustryInfo: this.data.specificIndustryInfo,
@@ -355,9 +486,15 @@ Page({
       startDate: this.data.startDate,
       long_end_date: tax_info.separate_date ? tax_info.separate_date : 0,
       endDate: this.data.endDate,
+      firstEntryDate: this.data.firstEntryDate,
+      predictLeaveDate: this.data.predictLeaveDate,
       isIdCard: '居民身份证' == tax_info.id_card_type ? true : false,
-      card_number: this.data.card_number
-
+      card_number: this.data.card_number,
+      other_card_number: this.data.other_card_number,
+      countryData: this.data.countryData,
+      birthCountryData: this.data.birthCountryData,
+      overseas: this.data.overseas,
+      taxpayerTypeData: this.data.taxpayerTypeData
     })
   },
@@ -512,8 +649,9 @@ Page({
             birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
           }
-          var cardtype_Data = that.data.cardtypeData
-          cardtype_Data.selected = '居民身份证'
+          var cardtypeData = that.data.cardtypeData
+          cardtypeData.selected = '居民身份证'
+          // cardtypeData.selected_code = '1'
           var gender_Data = that.data.genderData
           gender_Data.selected = id_info.gender
@@ -535,7 +673,7 @@ Page({
             idInfoData: id_info,
             name: id_info.name,
             birthday: birth_day,
-            cardtypeData: cardtype_Data,
+            cardtypeData: cardtypeData,
             genderData: gender_Data,
             long_birth_date: Date.parse(new Date(birth_day)) / 1000,
             birthDate: that.data.birthDate,
@@ -572,6 +710,85 @@ Page({
   },
+  dealCardType: function (new_type){
+    // console.log('cardtype_code', new_type_code)
+    console.log('cardtype', new_type)
+    var is_idcard = this.data.isIdCard
+    // 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.nameText = ''
+    if ('居民身份证' == new_type) {
+      is_idcard = true
+      this.data.genderData.disabled = true
+      this.data.birthDate.disabled = true
+    } else {
+      is_idcard = false
+      this.data.genderData.disabled = false
+      this.data.birthDate.disabled = false
+    }
+    this.data.hasOtherCard = true
+    this.data.overseas = '是'
+    this.data.taxpayerTypeData.disabled = false
+    this.data.taxpayerTypeData.selected = ''
+    if ('居民身份证' == new_type || '中国护照' == new_type) {
+      this.data.overseas = '否'
+      this.data.countryData.selected = '中国'
+      this.data.countryData.disabled = true
+      this.data.hasOtherCard = false
+      this.data.taxpayerTypeData.selected = '居民'
+      this.data.taxpayerTypeData.disabled = true
+    } else if (new_type.indexOf("港澳") != -1) {
+      this.data.countryData.values = ['中国香港', '中国澳门']
+      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 = '港澳居民来往内地通行证'; 
+      // }
+    } 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 = '台湾居民来往大陆通行证'; 
+      // }
+
+    } 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) {
+      //   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.setData({
+      isIdCard: is_idcard,
+      hasOtherCard: this.data.hasOtherCard,
+      genderData: this.data.genderData,
+      birthDate: this.data.birthDate,
+      countryData: this.data.countryData,
+      cardtypeData: this.data.cardtypeData,
+      otherCardtypeData: this.data.otherCardtypeData,
+      nameText: this.data.nameText,
+      overseas: this.data.overseas,
+      taxpayerTypeData: this.data.taxpayerTypeData
+    })
+    
+    
+  },
+
+
   onPickerSelect: function(e) {
     console.log('picker发送选择改变，携带值为', e)
     switch (e.currentTarget.id) {
@@ -583,24 +800,64 @@ Page({
         })
         break;
       case 'cardtype':
-        var cardtype_data = this.data.cardtypeData
-        var new_type = cardtype_data.values[e.detail.value]
-        console.log('cardtype', cardtype_data.values[e.detail.value])
-        if (new_type != this.data.cardtypeData.selected) {
-          var is_idcard = this.data.isIdCard
-          cardtype_data.selected = cardtype_data.values[e.detail.value]
-          if (0 == e.detail.value) {
-            is_idcard = true
-          } else {
-            is_idcard = false
+        var cardtypeData = this.data.cardtypeData
+        var new_type = cardtypeData.values[e.detail.value] //['name']
+        // var new_type_code = cardtypeData.values[e.detail.value]['code']
+        var selected = cardtypeData.selected
+        if (new_type != selected) {
+          this.dealCardType(new_type)
+          var setData = { card_number: ''}
+          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)
+        }
+        break;
+      case 'other_cardtype':
+        var otherCardtypeData = this.data.otherCardtypeData
+        var new_type = otherCardtypeData.values[e.detail.value] //['name']
+        // var new_type_code = otherCardtypeData.values[e.detail.value]['code']
+
+        if (new_type != otherCardtypeData.selected) {
+          otherCardtypeData.selected = new_type
+          // otherCardtypeData.selected_code = new_type_code
+          this.setData({
+            other_card_number: "",
+            otherCardtypeData: this.data.otherCardtypeData
+          })
+        }
+        break;
+      case 'country':
+        var countryData = this.data.countryData
+        var new_country = countryData.values[e.detail.value]
+        if (new_country != countryData.selected) {
+          countryData.selected = new_country
           this.setData({
-            card_number:"",
-            isIdCard: is_idcard,
-            cardtypeData: cardtype_data
+            countryData: countryData
           })
         }
         break;
+      case 'brith_country':
+        var birthCountryData = this.data.birthCountryData
+        var new_country = birthCountryData.values[e.detail.value]
+        if (new_country != birthCountryData.selected) {
+          birthCountryData.selected = new_country
+          this.setData({
+            birthCountryData: birthCountryData
+          })
+        }
+        break;
+      case 'taxpayerType':
+        var taxpayerTypeData = this.data.taxpayerTypeData
+          taxpayerTypeData.selected = taxpayerTypeData.values[e.detail.value]
+        this.setData({
+          taxpayerTypeData: taxpayerTypeData
+        })
+        break;
       case 'forigner':
         var forigner_data = this.data.forignerInfo
         forigner_data.selected = forigner_data.values[e.detail.value]
@@ -689,6 +946,25 @@ Page({
           investpersonalInfo: investpersonal_data
         })
         break;
+      case 'entry_date':
+        this.data.firstEntryDate.selected = e.detail.value
+        this.data.firstEntryDate.datelong = Date.parse(new Date(e.detail.value)) / 1000
+        this.data.predictLeaveDate.start = e.detail.value
+        if (this.data.firstEntryDate.datelong>this.data.predictLeaveDate.datelong){
+          this.data.predictLeaveDate.selected = ''
+        }
+        this.setData({
+          firstEntryDate: this.data.firstEntryDate,
+          predictLeaveDate: this.data.predictLeaveDate
+        })
+        break;
+      case 'leave_date':
+        this.data.predictLeaveDate.selected = e.detail.value
+        this.data.predictLeaveDate.datelong = Date.parse(new Date(e.detail.value)) / 1000
+        this.setData({
+          predictLeaveDate: this.data.predictLeaveDate
+        })
+        break;
     }
   },
@@ -786,12 +1062,19 @@ Page({
       name: e.detail.value
     })
   },
-
+  bindOtherName: function(e) {
+    this.setData({
+      other_name: e.detail.value
+    })
+  },
   idcardblur: function (e) {
     var idCardNo = e.detail.value
     this.setData({
       card_number: idCardNo
     })
+    if (!this.data.isIdCard) {
+      return;
+    }
     if (!idCardNo.length) {
       wx.showToast({
         image: "../../../../images/warn.png",
@@ -812,6 +1095,9 @@ Page({
     this.setData({
       card_number: idCardNo
     })
+    if (!this.data.isIdCard) {
+      return;
+    }
     if (e.detail.value.length == 18) {
       if (!format.isIDCardNum(idCardNo)) {
         wx.showToast({
@@ -858,10 +1144,10 @@ Page({
   },
   formSubmit: function(e) {
-    console.log("date", Date.parse(new Date(this.data.birthday)) / 1000)
     var regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,20}[a-z0-9]+$");
     var regMobile = /^(13[0-9]|14[5-9]|15[012356789]|166|17[0-8]|18[0-9]|19[8-9])[0-9]{8}$/;
-    var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/;
+    var regname = /^[\u4E00-\u9FA5A-Za-z·s]{2,20}$/;
+    // var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/;
     // var regMoney = /^[0-9]*(\.[0,9]{1,2})?$/;
     var regMoney = /^([1-9][\d]{0,10}|0)(\.[\d]{1,2})?$/
     var formdata = e.detail.value;
@@ -880,6 +1166,43 @@ Page({
       this.showtoast('请输入正确姓名');
       return
     } 
+    if (this.data.genderData.selected.length < 1) {
+      this.showtoast('请选择性别');
+      return
+    }
+    if (this.data.birthDate.selected.length < 1) {
+      this.showtoast('请选择出生日期');
+      return
+    } 
+    if (this.data.countryData.selected.length < 1) {
+      this.showtoast('请选择国籍');
+      return
+    }
+    if (this.data.taxpayerTypeData.selected.length < 1) {
+      this.showtoast('请选择纳税人类型');
+      return
+    } 
+    if (this.data.hasOtherCard && !this.data.firstEntryDate.selected) {
+      this.showtoast('请选择首次入境时间');
+      return
+    } 
+    if (this.data.hasOtherCard && !this.data.predictLeaveDate.selected) {
+      this.showtoast('请选择预计离境时间');
+      return
+    }
+    if (this.data.hasOtherCard && !this.data.otherCardtypeData.selected) {
+      this.showtoast('请选择其他证照类型');
+      return
+    } 
+    if (this.data.hasOtherCard && !formdata.other_card_number.length) {
+      this.showtoast('请输入其他证照号码');
+      return
+    } 
+    if (this.data.hasOtherCard && !this.data.birthCountryData.selected) {
+      this.showtoast('请选择出生国家');
+      return
+    } 
+
     if (this.data.mobile.length < 1) {
       this.showtoast('请输入手机号码');
       return
@@ -887,23 +1210,28 @@ Page({
       this.showtoast('手机号码有误');
       return
     }
-    if (this.data.curAddress_haschanged || this.data.taxInfo.current_address.province_code) {//选择了地址
+    if (this.data.curAddress_haschanged) {//选择了地址 || this.data.taxInfo.current_address.province_code
       if (formdata.current_address_detail.length < 1) {
         this.showtoast('请填写详细居住地址');
         return
       }
     }
-    if (this.data.birthAddress_haschanged || this.data.taxInfo.huji_address.province_code) {//选择了地址
+    if (this.data.birthAddress_haschanged) {//选择了地址 || this.data.taxInfo.huji_address.province_code
       if (formdata.huji_address_detail.length < 1) {
         this.showtoast('请填写详细户籍地址');
         return
       }
     }
-    
-    // if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
-    //   this.showtoast('邮箱格式有误');
-    //   return
-    // }
+    if (this.data.contactAddress_haschanged) {//选择了地址 || this.data.taxInfo.contact_address.province_code
+      if (formdata.contact_address_detail.length < 1) {
+        this.showtoast('请填写详细联系地址');
+        return
+      }
+    }
+    if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
+      this.showtoast('邮箱格式有误');
+      return
+    }
     // if (formdata.email && formdata.email.length > 0 && !format.checkEmail(formdata.email)) {
     //   this.showtoast('邮箱格式有误');
     //   return
@@ -988,15 +1316,20 @@ Page({
       data: {
         'certification_status': that.getCertifyStatus(formdata),
         "name": that.data.name,
+        "other_name": that.data.other_name,
         "family_ties": '本人',//that.data.relativeData.selected,
-        "native": "中国",
-        "taxpayer_type":"居民",
-        "is_overseas_personnel": "否",
-        "id_card_type": that.data.cardtypeData.selected,
+        "native": that.data.countryData.selected,
+        "taxpayer_type": that.data.taxpayerTypeData.selected == '居民' ? 'resident' :'non-resident',
+        "is_overseas_personnel": that.data.overseas,
+        'birth_native': that.data.birthCountryData.selected,
+        "id_card_type": that.data.cardtypeData.selected, //selected_code,
         "id_card_no": that.data.card_number,
+        "other_id_card_type": that.data.otherCardtypeData.selected, //selected_code,
+        "other_id_card_no": formdata.other_card_number,
         "gender": that.data.genderData.selected,
         "birth_date": that.data.long_birth_date,
-
+        "first_entry_date": that.data.firstEntryDate.datelong,
+        "predict_leave_date": that.data.predictLeaveDate.datelong,
         "mobile": that.data.mobile,
         "current_address": request_current_address,
         "current_address_detail": formdata.current_address_detail,
@@ -1017,8 +1350,8 @@ Page({
         "is_lonely_man": that.data.lonelyolderInfo.selected,
         "comment": formdata.comment,
-        // "contact_address": request_contact_address ? request_contact_address : that.data.taxInfo.contact_address_detail,
-        // "contact_address_detail": formdata.contact_address_detail.length > 0 ? formdata.contact_address_detail : that.data.taxInfo.contact_address_detail,
+        "contact_address": request_contact_address,
+        "contact_address_detail": formdata.contact_address_detail,
         // "join_date": that.data.startDate.selected.length > 0 ? Date.parse(new Date(that.data.startDate.selected)) / 1000 : this.data.taxInfo.join_date,
         // "separate_date": that.data.endDate.selected.length > 0 ? Date.parse(new Date(that.data.endDate.selected)) / 1000 : this.data.taxInfo.separate_date,
@@ -1126,7 +1459,8 @@ Page({
     wx.showToast({
       title: str,
       duration: 2000,
-      image: '/images/error.png'
+      icon:'none'
+      // image: '/images/error.png'
     })
   },
--- a/pages/main/taxperson/editinfo/editinfo.json
查看文件 @6052a0a
+++ b/pages/main/taxperson/editinfo/editinfo.json
查看文件 @6052a0a
 {
-  "navigationBarTitleText": "自然人基础信息",
+  "navigationBarTitleText": "个人基础信息",
   "navigationBarTextStyle": "black",
   "navigationBarBackgroundColor": "#FFFFFF"
 }
--- a/pages/main/taxperson/editinfo/editinfo.wxml
查看文件 @6052a0a
+++ b/pages/main/taxperson/editinfo/editinfo.wxml
查看文件 @6052a0a
@@ -29,9 +29,10 @@
           <text class='text_777_30 float_left' style='line-height: 90rpx'>证照号码</text>
           <view>
             <image  wx:if="{{isIdCard}}" class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active' && taxInfo.id_card_no.length>0}}"></image>
-            <input class='input_wrap' disabled="{{taxInfo.certification_status=='active' && taxInfo.id_card_no.length>0}}" placeholder="请输入证照号码" value="{{card_number}}" name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum' type='idcard'></input>
+            <input class='input_wrap' disabled="{{taxInfo.certification_status=='active' && taxInfo.id_card_no.length>0}}" placeholder="请输入证照号码" value="{{card_number}}" name='id_card_no' maxlength='30' bindblur='idcardblur' bindinput = 'bindinputcardnum' type="{{isIdCard.length?'idcard':''}}"></input>
             <!-- <input class='input_wrap' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value='{{card_number}}' name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
             <input class='input_wrap' hidden="{{taxInfo.certification_status!='active'}}"  placeholder="{{card_number?card_number:'身份证号获取失败'}}" name='id_card_no' disabled='true'></input> -->
+             <view class="divide_line_30"></view>
           </view>
         </view>
         <view class='item_body' hidden="{{!isself}}">
@@ -42,31 +43,57 @@
           <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap' placeholder="{{name}}" disabled="true" bindblur='bindinputname' style='line-height: 90rpx'></input> -->
         </view>
         <view class="divide_line_30"></view>
+        <template is="picker_cell_normal" data="{{...genderData}}" />
+        <view class="divide_line_30"></view>
+        <template is="picker_cell_normal" data="{{...birthDate}}" />
+        <view class="divide_line_30"></view>
+        <template is="picker_cell_normal" data="{{...countryData}}" />
-        <view class='item_body'>
+        <!-- <view class='item_body'>
           <text class='red_star_right_10'>*</text>
           <text class='text_777_30 float_left' style='line-height: 90rpx'>国籍</text>
           <text class='text_black_30 float_right' style='line-height: 90rpx'>中国</text>
-        </view>
+        </view> -->
         <view class="divide_line_30"></view>
-        <view class='item_body'>
+        <template is="picker_cell_normal" data="{{...taxpayerTypeData}}" />
+        <!-- <view class='item_body'>
           <text class='red_star_right_10'>*</text>
           <text class='text_777_30 float_left' style='line-height: 90rpx'>纳税人类型</text>
           <text class='text_black_30 float_right' style='line-height: 90rpx'>居民</text>
-        </view>
+        </view> -->
         <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>
-          <text class='text_black_30 float_right' style='line-height: 90rpx'>否</text>
-        </view>
-        <view class="divide_line_30"></view>
-        
-        <view hidden='{{!isshow01}}'>
+          <text class='text_black_30 float_right' style='line-height: 90rpx'>{{overseas}}</text>
+        </view>  
+        <view wx:if='{{hasOtherCard}}'>
+          <view class="divide_line_30"></view>
+          <template is="picker_cell_normal" data="{{...firstEntryDate}}" />
           <view class="divide_line_30"></view>
-          <template is="picker_cell_normal" data="{{...genderData}}" />
+          <template is="picker_cell_normal" data="{{...predictLeaveDate}}" />
           <view class="divide_line_30"></view>
-          <template is="picker_cell_normal" data="{{...birthDate}}" />          
+          <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='30'></input>
+            </view>
+          </view>
+          <view class="divide_line_30"></view>
+          <template is="picker_cell_normal" data="{{...birthCountryData}}" />
+        </view>          
+        <view hidden='{{!isshow01}}'>
+          <view wx:if='{{hasOtherCard}}'>
+            <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>
+              <input class='input_wrap' placeholder="请输入{{nameText}}" value='{{other_name}}' bindblur='bindOtherName' style='line-height: 90rpx'></input>
+            </view>
+
+          </view>     
         </view>
       </view>
     </view>
@@ -108,10 +135,19 @@
           <view class="divide_line_30"></view>
           <view class='item_body '>
             <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>详细地址</text>
-            <input class='input_wrap ' name='huji_address_detail' placeholder-class='text_999_30' placeholder='请输入详细户籍地址' value='{{huji_address_detail}}'></input>
+            <input class='input_wrap ' name='huji_address_detail' placeholder-class='text_999_30' placeholder='请输入详细户籍地址' value='{{taxInfo.huji_address_detail}}'></input>
           </view>
           <view class="divide_line_30"></view>
-
+          <view  wx:if='{{hasOtherCard}}' >
+            <template is="picker_cell_normal" data="{{...contactaddressInfo}}" />
+            <view class="divide_line_30"></view>
+            <view class='item_body '>
+              <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>详细地址</text>
+              <input class='input_wrap ' name='contact_address_detail' placeholder-class='text_999_30' placeholder='请输入详细联系地址' value='{{taxInfo.contact_address_detail}}'></input>
+            </view>
+            <view class="divide_line_30"></view>
+          </view>
+          
           <view class='item_body'>
             <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>电子邮箱</text>
             <input class='input_wrap' name='email' value='{{taxInfo.email}}' placeholder='请输入电子邮箱' placeholder-class='text_999_30' maxlength='32'></input>
@@ -224,9 +260,10 @@
       </view>
     </view>
-
-    <view hidden='{{isshow02}}' style='background:#f8f8f8;height:500rpx'></view>
-    <view hidden='{{!isshow02}}' style='background:#f8f8f8;height:200rpx'></view>
+    <view class="divide_line_30"></view>
+    <view style='background:#FFF;height:84rpx'></view>
+    <!-- <view hidden='{{isshow02}}' style='background:#f8f8f8;height:500rpx'></view>
+    <view hidden='{{!isshow02}}' style='background:#f8f8f8;height:200rpx'></view> -->
     <view class="btn_bottom">
       <button class="btn_bottom" formType="submit"> 保存</button>
--- a/project.config.json
查看文件 @6052a0a
+++ b/project.config.json
查看文件 @6052a0a
@@ -11,9 +11,16 @@
     "newFeature": true
   },
   "compileType": "miniprogram",
-  "libVersion": "2.2.2",
-  "appid": "wx04262fa98a7de5b6",
-  "projectname": "%E8%87%AA%E7%84%B6%E4%BA%BA%E7%A8%8E%E6%94%B6",
+  // "libVersion": "2.2.2",
+  // "appid": "wx04262fa98a7de5b6",
+  // "projectname": "%E8%87%AA%E7%84%B6%E4%BA%BA%E7%A8%8E%E6%94%B6",
+    "libVersion": "2.4.2",
+    "appid": "wx04262fa98a7de5b6",
+    "projectname": "%E6%B5%B7%E5%B3%A1%E8%87%AA%E7%84%B6%E4%BA%BA",
+    "debugOptions": {
+      "hidedInDevtools": []
+    },
+    
   "isGameTourist": false,
   "condition": {
     "search": {