优化

wangyu
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
pages/main/addtionalreduce/addextrainfo/addextrainfo.wxss
pages/main/addtionalreduce/additiondetail/additiondetail.wxml
pages/main/addtionalreduce/godetail/godetail.js
pages/main/addtionalreduce/lookandupdate/lookandupdate.js
pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @2a45f26
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @2a45f26
@@ -83,13 +83,13 @@ Page({
       onChange: 'onPickerSelect'
     },
     childrencardtypeData: {
-      label: '子女身份证件类型',
+      label: '子女证照类型',
       isrequre: true,
       bindtype: 'childrencardtype',
       selected: '居民身份证',
       disabled: true,
       isblack: 'true',
-      placeholder: '请选择身份证件类型',
+      placeholder: '请选择证照类型',
       values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
         '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
       ],
@@ -168,26 +168,26 @@ Page({
       onChange: 'onPickerSelect'
     },
     oldercardtypeData: {
-      label: '被赡养人证件类型',
+      label: '被赡养人证照类型',
       isrequre: true,
       disabled: true,
       bindtype: 'oldercardtype',
       selected: '居民身份证',
       isblack: 'true',
-      placeholder: '请选择被赡养人证件类型',
+      placeholder: '请选择被赡养人证照类型',
       values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
         '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
       ],
       onChange: 'onPickerSelect'
     },
     cardtypeData: {
-      label: '身份证件类型',
+      label: '证照类型',
       isrequre: true,
       bindtype: 'cardtype',
       selected: '居民身份证',
       disabled: true,
       isblack: 'true',
-      placeholder: '请选择证件类型',
+      placeholder: '证照类型',
       values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
         '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
       ],
@@ -206,19 +206,20 @@ Page({
       end: '2018-01-01',
       onChange: 'onPickerSelect',
     },
-    singlechildData: {
-      label: '是否独生子女',
-      bindtype: 'single_child',
-      selected: '',
-      isblack: 'true',
-      values: ["是", "否"],
-      placeholder: '请选择是否独生子女',
-      onChange: 'onPickerSelect'
-    },
+    // singlechildData: {
+    //   label: '是否独生子女',
+    //   bindtype: 'single_child',
+    //   selected: '',
+    //   isblack: 'true',
+    //   values: ["是", "否"],
+    //   placeholder: '请选择是否独生子女',
+    //   onChange: 'onPickerSelect'
+    // },
     beforemarryData: {
       label: '是否首套婚前贷款且婚后各自扣除',
       bindtype: 'before_marry',
       selected: '',
+      isrequre: true,
       isblack: 'true',
       values: ["是", "否"],
       placeholder: '请选择',
@@ -228,6 +229,7 @@ Page({
       label: '是否本人借款',
       bindtype: 'is_self_loan',
       selected: '',
+      isrequre: true,
       isblack: 'true',
       values: ["是", "否"],
       placeholder: '请选择',
@@ -235,7 +237,7 @@ Page({
     },
     reducetypeData: {
       label: '扣除方式',
-      isrequre: true,
+      isrequre: false,
       bindtype: 'reduce_type',
       selected: '',
       isblack: 'true',
@@ -289,6 +291,7 @@ Page({
       label: '证书类型',
       bindtype: 'identify_type',
       selected: '',
+      isrequre: true,
       isblack: 'true',
       values: ["产权证", "不动产权登记证", "出售合同号", "预售合同号"],
       placeholder: '请选择证书类型',
@@ -298,6 +301,7 @@ Page({
       label: '贷款类型',
       bindtype: 'loan_type',
       selected: '',
+      isrequre: true,
       isblack: 'true',
       values: ["公积金贷款", "商业贷款"],
       placeholder: '请选择贷款类型',
@@ -307,6 +311,7 @@ Page({
       label: '出租方类型',
       bindtype: 'lease_type',
       selected: '',
+      isrequre: true,
       isblack: 'true',
       values: ["组织", "自然人"],
       placeholder: '请选择出租方类型',
@@ -315,6 +320,7 @@ Page({
     workingcityInfo: {
       label: '主要工作城市',
       mode: 'region',
+      isrequre: true,
       bindtype: 'working_city',
       isblack: 'true',
       address_code: ['', ''],
@@ -326,6 +332,8 @@ Page({
     houseLocateInfo: {
       label: '房屋坐落地址',
       mode: 'region',
+      isrequre: true,
+      isrequre: true,
       bindtype: 'house_locate',
       isblack: 'true',
       address_code: ['', '', ''],
@@ -334,10 +342,24 @@ Page({
       placeholder: '请选择地址',
       onChange: 'onPickerSelect'
     },
+    rentLocateInfo: {
+      label: '租赁房屋坐落地址',
+      mode: 'region',
+      isrequre: true,
+      isrequre: true,
+      bindtype: 'rent_house_locate',
+      isblack: 'true',
+      address_code: ['', '', ''],
+      address_value: ['', '', ''],
+      selected: '',
+      placeholder: '请选择地址',
+      onChange: 'onPickerSelect'
+    },
     firstpaybackDate: {
       label: '首次还款日期',
       bindtype: 'payback_date',
       selected: '',
+      isrequre: true,
       isblack: 'true',
       values: ["是", "否"],
       placeholder: '请选择日期',
@@ -351,6 +373,7 @@ Page({
       label: '租赁期起',
       bindtype: 'lease_start_date',
       selected: '',
+      isrequre: true,
       isblack: 'true',
       values: ["是", "否"],
       placeholder: '请选择日期',
@@ -362,8 +385,9 @@ Page({
     },
     leaseendDate: {
       label: '租赁期止',
-      bindtype: 'lease_start_date',
+      bindtype: 'lease_end_date',
       selected: '',
+      isrequre: true,
       isblack: 'true',
       values: ["是", "否"],
       placeholder: '请选择日期',
@@ -377,32 +401,20 @@ Page({
       label: '贷款期限(月数)',
       bindtype: 'loan_datelong',
       selected: '',
+      isrequre: true,
       isblack: 'true',
       values: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"],
       placeholder: '请选择贷款期限',
       onChange: 'onPickerSelect'
     },
-    reducedateData: {
-      label: '扣除时间',
-      bindtype: 'reduce_date',
-      selected: '',
-      isblack: 'true',
-      values: ["是", "否"],
-      placeholder: '请选择扣除时间',
-      onChange: 'onPickerSelect',
-      mode: "date",
-      fields: "month",
-      start: '1970-01',
-      datelong: 0,
-    },
-    eduCountryData: {
+    schoolCountryData: {
       label: '就读国家',
-      bindtype: 'edu_country',
+      bindtype: 'school_country',
       isrequre: true,
-      selected: '',
+      selected: '中国(大陆)',
       isblack: 'true',
       values: [],
-      placeholder: '中国',
+      placeholder: '中国(大陆)',
       onChange: 'onPickerSelect',
     },
     edu_lable: "school",
@@ -455,14 +467,12 @@ Page({
         commonbirthDate: commonbirth_date
       })
     }
-
-
-    var title = '添加' +  AddTypeNames[nameKey]
+    var title = '添加' + AddTypeNames[nameKey]
     this.setData({
       title: title,
       cur_index: nameKey,
-      house_type : frontPage.data.house_type,
+      house_type: frontPage.data.house_type,
       reducetypeData: reduce_typeData,
       deduction_amount: deduction_amount
     })
@@ -479,13 +489,13 @@ Page({
   loadCountry: function() {
     countryInfo.init(this)
     var countrylist = this.data.country
-    var country_data = this.data.eduCountryData
+    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({
-      eduCountryData: country_data
+      schoolCountryData: country_data
     })
   },
@@ -541,9 +551,9 @@ Page({
         // }
         this.setData(setData)
         break;
-      // case 'continuing_education':
-      //     var setData = {}
-      //   break;
+        // case 'continuing_education':
+        //     var setData = {}
+        //   break;
       case 'medical_fund':
         var setData = {}
         if (data.name && data.name.length) {
@@ -686,7 +696,7 @@ Page({
       case 'children_education':
         subUrl = 'persontax/v1/children-educations'
         if (!formdata.children_id_card_no || formdata.children_id_card_no.length < 1) {
-          this.showToast('请填写子女证件号码')
+          this.showToast('请填写子女证照号码')
           return
         }
         if (!formdata.children_name || formdata.children_name.length < 1) {
@@ -719,8 +729,8 @@ Page({
           this.showToast('请选择受教育终止日期')
           return
         }
-        if (this.data.eduCountryData.selected.length < 1) {
-          this.showToast('请选择就读地区')
+        if (!formdata.school_name || formdata.school_name.length < 1) {
+          this.showToast('请选择就读学校')
           return
         }
@@ -729,17 +739,12 @@ Page({
             this.showToast('请填写配偶姓名')
             return
           } else if (!formdata.spouse_id_card_no || formdata.spouse_id_card_no.length < 1) {
-            this.showToast('请填写配偶证件号码')
+            this.showToast('请填写配偶证照号码')
             return
           } else if (this.data.loverbirthDate.selected.length < 1) {
             this.showToast('请选择配偶出生日期')
             return
           }
-          // if (this.data.taxperson_relativeData.selected.length < 1) {
-          //   this.showToast('请选择与纳税人关系')
-          //   return
-          // }
-
         }
         newdata.relationship = this.data.taxperson_relativeData.selected
         newdata.children_id_card_type = '1' //this.data.childrencardtypeData.selected
@@ -747,6 +752,7 @@ Page({
         newdata.education_end = this.data.studystartdate.datelong
         newdata.education_start = this.data.studyenddate.datelong
         newdata.education_period = this.data.childedudegreeData.selected
+        newdata.school_name = this.data.schoolCountryData.selected
         newdata.children_nation = "中国"
         newdata.spouse_id_card_type = '1' //this.data.lovercardtypeData.selected
         newdata.spouse_birthday = this.data.loverbirthDate.datelong > 0 ? this.data.loverbirthDate.datelong : 0
@@ -764,11 +770,11 @@ Page({
             return
           }
           if (this.data.studystartdate.selected.length < 1) {
-            this.showToast('请选择受入学日期')
+            this.showToast('请选择受入学时间')
             return
           }
           if (this.data.studyenddate.selected.length < 1) {
-            this.showToast('请选择受预计毕业日期')
+            this.showToast('请选择受毕业时间')
             return
           }
           newdata.education_start = this.data.studystartdate.datelong
@@ -810,10 +816,10 @@ Page({
           this.showToast('请填写赡养人姓名')
           return
         } else if (this.data.oldercardtypeData.selected.length < 1) {
-          this.showToast('请选择赡养人证件类型')
+          this.showToast('请选择赡养人证照类型')
           return
         } else if (!formdata.older_idno || formdata.older_idno.length < 1) {
-          this.showToast('请填写赡养人证件号')
+          this.showToast('请填写赡养人证照号')
           return
         }
         if (this.data.olderbirthDate.selected.length < 1) {
@@ -824,6 +830,12 @@ Page({
           this.showToast('请选择与纳税人关系')
           return
         }
+        if (!formdata.percent || formdata.percent.length < 1) {
+          this.showToast('请填写扣除分摊比例')
+          return
+        } else {
+          newdata.percentage = parseFloat(formdata.percent)
+        }
         newdata.older_birthday = this.data.olderbirthDate.datelong
         newdata.older_relative = this.data.older_relativeData.selected
         newdata.support_type = this.data.supporttypeData.selected
@@ -835,15 +847,15 @@ Page({
           this.showToast('请填写姓名')
           return
         } else if (this.data.cardtypeData.selected.length < 1) {
-          this.showToast('请选择证件类型')
+          this.showToast('请选择证照类型')
           return
         } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
-          this.showToast('请填写证件号码')
+          this.showToast('请填写证照号码')
           return
         } else if (this.data.commonbirthDate.selected.length < 1) {
           this.showToast('请选择病人出生日期')
           return
-        }else if (this.data.taxperson_relativeData.selected.length < 1) {
+        } else if (this.data.taxperson_relativeData.selected.length < 1) {
           this.showToast('请选择与纳税人关系')
           return
         } else if (!formdata.total_amount || formdata.total_amount < 0) {
@@ -862,24 +874,10 @@ Page({
         newdata.patient_birthday = "中国"
         break;
       case 'house_fund':
-        // subUrl = 'persontax/v1/medical-funds'
+        subUrl = 'persontax/v1/house-funds'
         console.log('TITLE', this.data.title)
-        if (!formdata.lover_name || formdata.lover_name.length < 1) {
-          this.showToast('请填写配偶姓名')
-          return
-        } else if (!formdata.lover_idno || formdata.lover_idno.length < 1) {
-          this.showToast('请填写配偶证件号码')
-          return
-        }
-        if (this.data.lovercardtypeData.selected.length < 1) {
-          this.showToast('请选择配偶证件类型')
-          return
-        }
-        if (this.data.loverbirthDate.selected.length < 1) {
-          this.showToast('请选择配偶出生日期')
-          return
-        }
-        if (this.data.title == "添加住房贷款利息") {
+
+        if (this.data.house_type == "house_fund_loan") {
           if (this.data.houseLocateInfo.address_value.length < 1) {
             this.showToast('请选择住房地址')
             return
@@ -889,6 +887,12 @@ Page({
           } else if (!formdata.identify_no || formdata.identify_no.length < 1) {
             this.showToast('请填写证书号码')
             return
+          } else if (this.data.beforemarryData.selected.length < 1) {
+            this.showToast('请选择是否首套贷款')
+            return
+          } else if (this.data.isselfData.selected.length < 1) {
+            this.showToast('请选择是否本人借款')
+            return
           } else if (this.data.loantypeData.selected.length < 1) {
             this.showToast('请选择贷款类型')
             return
@@ -903,23 +907,36 @@ Page({
             return
           }
           newdata.house_location = this.data.houseLocateInfo.address_value[0] + this.data.houseLocateInfo.address_value[1] + this.data.houseLocateInfo.address_value[2]
+          newdata.loan_before_marry = this.data.beforemarryData.selected == "是" ? 'y' : 'n'
+          newdata.loan_by_self = this.data.isselfData.selected == "是" ? 'y' : 'n'
+          newdata.identify_type = this.data.identifytypeData.selected
+
           newdata.identify_type = this.data.identifytypeData.selected
           newdata.loan_type = this.data.loantypeData.selected
           newdata.payback_date = this.data.firstpaybackDate.selected
           newdata.loan_datelong = this.data.loandatelongData.selected
-        } else if (this.data.title == "添加住房租金") {
-          if (this.data.houseLocateInfo.address_value.length < 1) {
-            this.showToast('请选择住房地址')
+        } else if (this.data.house_type == "house_fund_rent") {
+          if (this.data.workingcityInfo.address_value.length < 1) {
+            this.showToast('请选择工作城市')
             return
           } else if (this.data.leasetypeData.selected.length < 1) {
             this.showToast('请选择出租方类型')
             return
+          } else if (!formdata.lease_name || formdata.lease_name.length < 1) {
+            this.showToast('请填写出租方名称')
+            return
+          } else if (!formdata.lease_idno || formdata.lease_idno.length < 1) {
+            this.showToast('请填写纳税人识别号')
+            return
           } else if (!formdata.identify_no || formdata.identify_no.length < 1) {
             this.showToast('请填写出租方号码')
             return
           } else if (this.data.identifytypeData.selected.length < 1) {
             this.showToast('请选择证件类型')
             return
+          } else if (this.data.rentLocateInfo.address_value.length < 1) {
+            this.showToast('请选择房屋地址')
+            return
           } else if (!formdata.identify_no || formdata.identify_no.length < 1) {
             this.showToast('请填写证件号码')
             return
@@ -930,12 +947,25 @@ Page({
             this.showToast('请选择日期')
             return
           }
-          newdata.house_location = this.data.houseLocateInfo.address_value[0] + this.data.houseLocateInfo.address_value[1] + this.data.houseLocateInfo.address_value[2]
+          newdata.house_address = this.data.rentLocateInfo.address_value[0] + this.data.rentLocateInfo.address_value[1] + this.data.rentLocateInfo.address_value[2]
+          newdata.work_city = this.data.workingcityInfo.address_value[0] + this.data.workingcityInfo.address_value[1] + this.data.workingcityInfo.address_value[2]
           newdata.lease_type = this.data.leasetypeData.selected
           newdata.identify_type = this.data.identifytypeData.selected
           newdata.lease_startdate = this.data.leasestartDate.selected
           newdata.lease_enddate = this.data.leaseendDate.selected
-          Console.log('houseLocateInfo', this.data.houseLocateInfo)
+          console.log('houseLocateInfo', this.data.houseLocateInfo)
+        }
+        if (formdata.spouse_name || formdata.spouse_id_card_no || this.data.loverbirthDate.selected) {
+          if (!formdata.spouse_name || formdata.spouse_name.length < 1) {
+            this.showToast('请填写配偶姓名')
+            return
+          } else if (!formdata.spouse_id_card_no || formdata.spouse_id_card_no.length < 1) {
+            this.showToast('请填写配偶证照号码')
+            return
+          } else if (this.data.loverbirthDate.selected.length < 1) {
+            this.showToast('请选择配偶出生日期')
+            return
+          }
         }
         newdata.lover_cardtype = this.data.lovercardtypeData.selected
         newdata.lover_birthdate = this.data.loverbirthDate.selected
@@ -1079,11 +1109,11 @@ Page({
         //     edudegreeData: edudegree_data
         //   })
         //   break;
-      case 'edu_country':
-        var eduCountry_data = this.data.eduCountryData
+      case 'school_country':
+        var eduCountry_data = this.data.schoolCountryData
         eduCountry_data.selected = eduCountry_data.values[e.detail.value]
         this.setData({
-          eduCountryData: eduCountry_data
+          schoolCountryData: eduCountry_data
         })
         break;
       case 'support_type':
@@ -1168,6 +1198,21 @@ Page({
           identifytypeData: identifytype_Data
         })
         break;
+      case 'before_marry':
+        var beforemarry_Data = this.data.beforemarryData
+        beforemarry_Data.selected = beforemarry_Data.values[e.detail.value]
+        this.setData({
+          beforemarryData: beforemarry_Data
+        })
+        break;
+      case 'is_self_loan':
+        var isself_Data = this.data.isselfData
+        isself_Data.selected = isself_Data.values[e.detail.value]
+        this.setData({
+          isselfData: isself_Data
+        })
+        break;
+
       case 'loan_type':
         var loantype_Data = this.data.loantypeData
         loantype_Data.selected = loantype_Data.values[e.detail.value]
@@ -1178,7 +1223,7 @@ Page({
       case 'payback_date':
         var firstpayback_Date = this.data.firstpaybackDate
         firstpayback_Date.selected = e.detail.value
-        console.log('reduce_date', Date.parse(new Date(e.detail.value)))
+        console.log('payback_date', Date.parse(new Date(e.detail.value)))
         this.setData({
           firstpaybackDate: firstpayback_Date
         })
@@ -1200,7 +1245,7 @@ Page({
       case 'lease_start_date':
         var leasestart_Date = this.data.leasestartDate
         leasestart_Date.selected = e.detail.value
-        console.log('reduce_date', Date.parse(new Date(e.detail.value)))
+        console.log('lease_start_date', Date.parse(new Date(e.detail.value)))
         this.setData({
           leasestartDate: leasestart_Date
         })
@@ -1208,7 +1253,7 @@ Page({
       case 'lease_end_date':
         var leaseend_Date = this.data.leaseendDate
         leaseend_Date.selected = e.detail.value
-        console.log('reduce_date', Date.parse(new Date(e.detail.value)))
+        console.log('lease_end_date', Date.parse(new Date(e.detail.value)))
         this.setData({
           leaseendDate: leaseend_Date
         })
@@ -1227,13 +1272,32 @@ Page({
           houseLocateInfo: house_address
         })
         break;
-      case 'reduce_date':
-        var reducedate_data = this.data.reducedateData
-        reducedate_data.selected = e.detail.value
-        reducedate_data.datelong = Date.parse(new Date(e.detail.value)) / 1000,
-          console.log('reduce_date', Date.parse(new Date(e.detail.value)))
+      case 'working_city':
+        console.log('working_city', e)
+        var work_address = this.data.workingcityInfo;
+        work_address.address_value = e.detail.value
+        if (e.detail.value[0] == e.detail.value[1]) {
+          work_address.selected = e.detail.value[1] + e.detail.value[2]
+        } else {
+          work_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
+
+        }
+        this.setData({
+          workingcityInfo: work_address
+        })
+        break;
+      case 'rent_house_locate':
+        console.log('rent_house_locate', e)
+        var rent_address = this.data.rentLocateInfo;
+        rent_address.address_value = e.detail.value
+        if (e.detail.value[0] == e.detail.value[1]) {
+          rent_address.selected = e.detail.value[1] + e.detail.value[2]
+        } else {
+          rent_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
+
+        }
         this.setData({
-          reducedateData: reducedate_data
+          rentLocateInfo: rent_address
         })
         break;
     }
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @2a45f26
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @2a45f26
@@ -61,12 +61,12 @@
         <template is="picker_cell_normal" data="{{...studyenddate}}" />
         <view class='divide_line_f5f5f5'></view>
-        <template is="picker_cell_normal" data="{{...eduCountryData}}" />
+        <template is="picker_cell_normal" data="{{...schoolCountryData}}" />
         <view class='divide_line_f5f5f5'></view>
         <view style='height:90rpx'>
           <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
           <text class='text_black_30 float_left'>就读学校名称</text>
-          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入就读学校' name='educate_school'></input>
+          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入就读学校' name='school_name'></input>
         </view>
         <view class='divide_line_f5f5f5'></view>
       </view>
@@ -173,12 +173,12 @@
       </view>
       <view class='divide_line_f5f5f5'></view>
       <template is="picker_cell_normal" data="{{...commonbirthDate}}" />
-        <view class='divide_line_f5f5f5'></view>
-        <view style='height:90rpx'>
-          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_30 float_left'>病人国籍</text>
-          <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text>
-        </view>
+      <view class='divide_line_f5f5f5'></view>
+      <view style='height:90rpx'>
+        <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
+        <text class='text_black_30 float_left'>病人国籍</text>
+        <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text>
+      </view>
       <view class='divide_line_f5f5f5'></view>
       <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" />
       <view class='divide_line_f5f5f5'></view>
@@ -204,6 +204,7 @@
           <template is="picker_cell_normal" data="{{...identifytypeData}}" />
           <view class='divide_line_f5f5f5'></view>
           <view style='height:90rpx'>
+            <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
             <text class='text_black_30 float_left'>证书号码</text>
             <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书号码' name='identify_no'></input>
           </view>
@@ -220,6 +221,7 @@
           <template is="picker_cell_normal" data="{{...loantypeData}}" />
           <view class='divide_line_f5f5f5'></view>
           <view style='height:90rpx'>
+            <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
             <text class='text_black_30 float_left'>贷款合同编号</text>
             <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入贷款合同编号' name='contract_no'></input>
           </view>
@@ -238,28 +240,35 @@
           <template is="picker_cell_normal" data="{{...leasetypeData}}" />
           <view class='divide_line_f5f5f5'></view>
           <view style='height:90rpx'>
+            <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
             <text class='text_black_30 float_left'>出租方名称</text>
             <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入出租方名称' name='lease_name'></input>
           </view>
           <view class='divide_line_f5f5f5'></view>
           <view style='height:90rpx'>
+            <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
             <text class='text_black_30 float_left'>出租方纳税人识别号</text>
-            <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='统一社会信用代码' name='lease_idno'></input>
+            <input class='input_wrap01 float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='统一社会信用代码' name='lease_idno'></input>
           </view>
           <view class='divide_line_f5f5f5'></view>
           <template is="picker_cell_normal" data="{{...identifytypeData}}" />
           <view class='divide_line_f5f5f5'></view>
           <view style='height:90rpx'>
+            <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
             <text class='text_black_30 float_left'>证书号码</text>
             <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书号码' name='identify_no'></input>
           </view>
         </view>
         <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>
         <view style='padding:0 30rpx;'>
-          <template is="picker_cell_normal" data="{{...contactLocateInfo}}" />
+          <template is="picker_cell_normal" data="{{...rentLocateInfo}}" />
           <view class='divide_line_f5f5f5'></view>
-
           <view style='height:90rpx'>
+            <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入详细地址，精确到楼牌号' name='detail_address'></input>
+          </view>
+          <view class='divide_line_f5f5f5'></view>
+          <view style='height:90rpx'>
+            <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
             <text class='text_black_30 float_left'>租赁合同编号</text>
             <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输合同编号' name='contract_no'></input>
           </view>
@@ -280,7 +289,7 @@
         <text class='text_black_30 float_left'>扣除金额</text>
         <text wx:if="{{reducetypeData.selected=='月度'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥{{deduction_amount}}/月</text>
         <text wx:if="{{reducetypeData.selected=='年度'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥{{deduction_amount}}/年</text>
-        <!-- <input class='input_wrap01 float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#FF9F00;' placeholder='请输入扣除金额' type='digit' name='reduce_money'></input> -->
+        <!-- <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#FF9F00;' placeholder='请输入扣除金额' type='digit' name='reduce_money'></input> -->
       </view>
       <view class='divide_line_f5f5f5'></view>
@@ -305,19 +314,12 @@
             <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="lover"></image>
             <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' type='idcard' value='{{spouse_id_card_no}}'></input>
           </view>
-          <!-- <view wx:else>
-              <input class='input_wrap float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='24' value='{{spouse_id_card_no}}'></input>
-            </view> -->
-          <!-- <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入身份证件号码' name='spouse_id_card_no'></input> -->
         </view>
-
-
         <view class='divide_line_f5f5f5'></view>
         <template is="picker_cell_normal" data="{{...loverbirthDate}}" />
         <view class='divide_line_f5f5f5'></view>
         <view style='height:90rpx'>
           <text class='text_black_30 float_left'>国籍</text>
-          <!-- <image class='arrow_wrap' src='/images/arrow_right.png'></image> -->
           <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='lover_country'>中国</text>
         </view>
       </view>
@@ -337,19 +339,12 @@
             <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="lover"></image>
             <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='lover_idno' maxlength='18' type='idcard' value='{{lover_idno}}'></input>
           </view>
-          <!-- <view wx:else>
-              <input class='input_wrap float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='lover_idno' maxlength='24' value='{{lover_idno}}'></input>
-            </view> -->
-          <!-- <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入身份证件号码' name='lover_idno'></input> -->
         </view>
-
-
         <view class='divide_line_f5f5f5'></view>
         <template is="picker_cell_normal" data="{{...loverbirthDate}}" />
         <view class='divide_line_f5f5f5'></view>
         <view style='height:90rpx'>
           <text class='text_black_30 float_left'>国籍</text>
-          <!-- <image class='arrow_wrap' src='/images/arrow_right.png'></image> -->
           <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='lover_country'>中国</text>
         </view>
       </view>
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxss
查看文件 @2a45f26
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxss
查看文件 @2a45f26
@@ -19,7 +19,7 @@
 }
 .input_wrap01 {
-  width: 420rpx;
+  width: 400rpx;
   height: 90rpx;
   font-size: 30rpx;
   color: #333;
--- a/pages/main/addtionalreduce/additiondetail/additiondetail.wxml
查看文件 @2a45f26
+++ b/pages/main/addtionalreduce/additiondetail/additiondetail.wxml
查看文件 @2a45f26
@@ -49,7 +49,7 @@
       <text class='text_right_333'>{{datas.school_country}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
-      <text class='text_left'>就读学校</text>
+      <text class='text_left'>就读学校名称</text>
       <text class='text_right_333'>{{datas.school_name}}</text>
     </view>
     <!-- <view style='height:90rpx;width:100%'>
@@ -70,11 +70,11 @@
       <text class='text_right_333'>{{datas.spouse_name}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
-      <text class='text_left'>配偶证件类型</text>
+      <text class='text_left'>配偶证照类型</text>
       <text class='text_right_333'>{{datas.spouse_id_card_type=='1'?"居民身份证":datas.spouse_id_card_type}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
-      <text class='text_left'>配偶身份证件号码</text>
+      <text class='text_left'>配偶身份证照号码</text>
       <text class='text_right_333'>{{datas.spouse_id_card_no}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
@@ -247,11 +247,11 @@
       <text class='text_right_333'>{{datas.spouse_name}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
-      <text class='text_left'>配偶证件类型</text>
+      <text class='text_left'>配偶证照类型</text>
       <text class='text_right_333'>{{datas.spouse_id_card_type=='1'?"居民身份证":datas.spouse_id_card_type}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
-      <text class='text_left'>配偶身份证件号码</text>
+      <text class='text_left'>配偶身份证照号码</text>
       <text class='text_right_333'>{{datas.spouse_id_card_no}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
--- a/pages/main/addtionalreduce/godetail/godetail.js
查看文件 @2a45f26
+++ b/pages/main/addtionalreduce/godetail/godetail.js
查看文件 @2a45f26
@@ -39,9 +39,9 @@ Page({
     console.log("lookandadd", e);
     if (this.data.additiondata.options && this.data.additiondata.options.length>0){
       var newstatus = this.data.additiondata.options[e.currentTarget.id]
-      if (newstatus == 'house_fund_rent' || newstatus == 'house_fund_loan'){
-        newstatus = "house_fund"
-      }
+      // if (newstatus == 'house_fund_rent' || newstatus == 'house_fund_loan'){
+      //   newstatus = "house_fund"
+      // }
       wx.navigateTo({
         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.js
查看文件 @2a45f26
+++ b/pages/main/addtionalreduce/lookandupdate/lookandupdate.js
查看文件 @2a45f26
@@ -79,15 +79,28 @@ Page({
    */
   onLoad: function(options) {
     var that = this
+    var housetype, housestatus
     console.log("options", options);
+    if (options.status == 'house_fund_rent') {
+      housetype = 'house_fund_rent'
+      housestatus = 'house_fund'
+    } else if (options.status == 'house_fund_loan') {
+      housetype = 'house_fund_loan'
+      housestatus = 'house_fund'
+    } else {
+      housetype = ''
+      housestatus = options.status
+    }
     this.setData({
-      cur_status: options.status,
+      cur_status: housestatus,
+      house_type: housetype,
       legal_entity_id: options.legal_entity_id,
       legal_entity: options.legal_entity
     })
     wx.setNavigationBarTitle({
-      "title": that.data.additiontitle[options.status],
+      "title": that.data.additiontitle[this.data.cur_status],
     })
+    
   },
   /**
@@ -126,7 +139,6 @@ Page({
   handleAddition: function(data) {
     var newdata = data.items
-    var housetype = ""
     for (var i = 0; i < newdata.length; i++) {
       if (newdata[i].education_start && newdata[i].education_start > 0) {
         newdata[i].education_start = format.formatTime_date(newdata[i].education_start)
@@ -137,7 +149,6 @@ Page({
     }
     this.setData({
-      house_type: "house_fund" == this.data.cur_status ? newdata[0].type:"",
       additionInfo: newdata
     })
   },
--- a/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
查看文件 @2a45f26
+++ b/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
查看文件 @2a45f26
@@ -263,12 +263,12 @@
             </view>
             <view style='padding-right: 30rpx'>
               <view class='divide_line_f5f5f5'></view>
-              <view wx:if="{{item.type=='house_fund_rent'}}">
+              <view wx:if="{{house_type=='house_fund_rent'}}">
                 <text class='text_999_28 ' style='line-height:70rpx'>租赁房屋坐落地址：</text>
                 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_address}}</text>
                 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text>
               </view>
-              <view wx:if="{{item.type=='house_fund_loan'}}">
+              <view wx:if="{{house_type=='house_fund_loan'}}">
                 <text class='text_999_28 ' style='line-height:70rpx'>房屋坐落地址：</text>
                 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_address}}</text>
                 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text>