Merge remote-tracking branch 'origin/develop' into develop

@@ -7,27 +7,27 @@
                 <div class="form-group col-sm-4 col-md-2">
                     <label>银行黑名单</label>
                     <span class="form-control select-box">
-                    <select class="select" size="1">
+                    <select class="select" size="1" name="hasBankBlacklist">
                         <option value="1">是</option>
-                        <option value="2">否</option>
+                        <option value="0">否</option>
                     </select>
                 </span>
                 </div>
                 <div class="form-group col-sm-4 col-md-2">
-                    <label>同行进件</label>
+                    <label>同业进件</label>
                     <span class="form-control select-box">
-                    <select class="select" size="1">
+                    <select class="select" size="1" name="hasTradeInto">
                         <option value="1">是</option>
-                        <option value="2">否</option>
+                        <option value="0">否</option>
                     </select>
                 </span>
                 </div>
                 <div class="form-group col-sm-4 col-md-2">
                     <label>征信五级分类异常</label>
                     <span class="form-control select-box">
-                    <select class="select" size="1">
+                    <select class="select" size="1" name="hasCreditTypeException">
                         <option value="1">是</option>
-                        <option value="2">否</option>
+                        <option value="0">否</option>
                     </select>
                 </span>
                 </div>
@@ -36,14 +36,14 @@
             <div class="row cl">
                 <div class="form-group col-sm-6 col-md-3">
                     <label>最近一次工作单位</label>
-                    <input type="text" class="form-control input-text" value="">
+                    <input type="text" class="form-control input-text" value="" name="lastTimeWorkUnit">
                 </div>
             </div>
 
             <div class="row cl">
                 <div class="form-group has-feedback col-sm-3 col-md-2">
                     <label>贷款记录</label>
-                    <input type="text" class="form-control input-text" name="loanRecord" value="">
+                    <input type="text" class="form-control input-text" name="loanRecord" value="" >
                     <span class="glyphicon form-control-feedback" aria-hidden="true">年</span>
                 </div>
             </div>

@@ -55,9 +55,11 @@
                 } else {
                     layer.alert('操作成功');
                 }
-                setTimeout(function () {
-                    loadIframe(url, '审核意见');
-                }, 500)
+                if(!data.code){
+                    setTimeout(function () {
+                        loadIframe(url, '审核意见');
+                    }, 500)
+                }
             },
             error: function () {
                 layer.alert("操作失败")