Merge branch 'dev_py' into dev2.0

@@ -43,7 +43,7 @@ Page({
     loanAddress_haschanged: false,
     loanAddress_haschanged: false,
     rentAddress_haschanged: false,
     rentAddress_haschanged: false,
     extrainfo_arr: ["请上传子女出生证明、学籍信息凭证、学费凭证、本人结婚证和分摊协议", "请上传学历学籍凭证", "请上传出生证明或关系证明、独生子女证、分摊协议、其他法定赡养人赡养证明", "请上传诊断书和医疗费用收据", "请上传首套房证明、还款证明、不动产登记证、结婚证和夫妻约定抵扣协议"],
     extrainfo_arr: ["请上传子女出生证明、学籍信息凭证、学费凭证、本人结婚证和分摊协议", "请上传学历学籍凭证", "请上传出生证明或关系证明、独生子女证、分摊协议、其他法定赡养人赡养证明", "请上传诊断书和医疗费用收据", "请上传首套房证明、还款证明、不动产登记证、结婚证和夫妻约定抵扣协议"],
-    cur_index: 'continuing_education',
+    cur_index: '',
     lovercardtypeData: {
     lovercardtypeData: {
       label: '配偶证照类型',
       label: '配偶证照类型',
       bindtype: 'lovercardtype',
       bindtype: 'lovercardtype',
@@ -655,8 +655,8 @@ Page({
         if (data.certification_no && data.certification_no.length) {
         if (data.certification_no && data.certification_no.length) {
           setData.certification_no = data.certification_no
           setData.certification_no = data.certification_no
         }
         }
-        if (data.certification_autority && data.certification_autority.length) {
-          setData.certification_autority = data.certification_autority
+        if (data.certification_authority && data.certification_authority.length) {
+          setData.certification_authority = data.certification_authority
         }
         }
         this.setData(setData)
         this.setData(setData)
         break;
         break;
@@ -1067,7 +1067,7 @@ Page({
             this.showToast('请填写证书编号')
             this.showToast('请填写证书编号')
             return
             return
           }
           }
-          if (!formdata.certification_autority || formdata.certification_autority.length < 1) {
+          if (!formdata.certification_authority || formdata.certification_authority.length < 1) {
             this.showToast('请填写发证机关')
             this.showToast('请填写发证机关')
             return
             return
           }
           }

@@ -109,7 +109,7 @@
     <view style='height:90rpx'>
     <view style='height:90rpx'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
       <text class='text_black_30 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='certification_autority'></input>
+      <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入发证机关' name='certification_authority'></input>
     </view>
     </view>
   </view>
   </view>