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

@@ -141,39 +141,41 @@
         </div>
         </div>
     </div>
     </div>
 
 
-    <div class="panel panel-default mb-20">
+    <!--<div class="panel panel-default mb-20">
         <div class="panel-header">3个月查询记录</div>
         <div class="panel-header">3个月查询记录</div>
         <div class="panel-body cl">
         <div class="panel-body cl">
             <div class="row cl">
             <div class="row cl">
                 <div class="form-group col-sm-6 col-md-6">
                 <div class="form-group col-sm-6 col-md-6">
                     <label>贷款</label>
                     <label>贷款</label>
-                    <input type="text" name="threeMonthLoan" class="form-control input-text" value="<?=$credit ? $credit->threeMonthLoan : ''?>">
+                    <input type="text" name="threeMonthLoan" class="form-control input-text" value="<?/*=$credit ? $credit->threeMonthLoan : ''*/?>">
                 </div>
                 </div>
             </div>
             </div>
             <div class="row cl">
             <div class="row cl">
                 <div class="form-group col-sm-6 col-md-6">
                 <div class="form-group col-sm-6 col-md-6">
                     <label>信用卡</label>
                     <label>信用卡</label>
-                    <input type="text" name="threeMonthCreditCard" class="form-control input-text" value="<?=$credit ? $credit->threeMonthCreditCard : ''?>">
+                    <input type="text" name="threeMonthCreditCard" class="form-control input-text" value="<?/*=$credit ? $credit->threeMonthCreditCard : ''*/?>">
                 </div>
                 </div>
             </div>
             </div>
             <div class="row cl">
             <div class="row cl">
                 <div class="form-group col-sm-6 col-md-6">
                 <div class="form-group col-sm-6 col-md-6">
                     <label>担保</label>
                     <label>担保</label>
-                    <input type="text" name="threeMonthGuarantee" class="form-control input-text" value="<?=$credit ? $credit->threeMonthGuarantee : ''?>">
+                    <input type="text" name="threeMonthGuarantee" class="form-control input-text" value="<?/*=$credit ? $credit->threeMonthGuarantee : ''*/?>">
                 </div>
                 </div>
             </div>
             </div>
             <div class="row cl">
             <div class="row cl">
                 <div class="form-group col-sm-6 col-md-6">
                 <div class="form-group col-sm-6 col-md-6">
                     <label>保前</label>
                     <label>保前</label>
-                    <input type="text" name="threeMonthGuaranteeBefore" class="form-control input-text" value="<?=$credit ? $credit->threeMonthGuaranteeBefore : ''?>">
+                    <input type="text" name="threeMonthGuaranteeBefore" class="form-control input-text" value="<?/*=$credit ? $credit->threeMonthGuaranteeBefore : ''*/?>">
                 </div>
                 </div>
             </div>
             </div>
             <div class="row cl">
             <div class="row cl">
                 <div class="form-group col-sm-6 col-md-6">
                 <div class="form-group col-sm-6 col-md-6">
                     <label>个人查询</label>
                     <label>个人查询</label>
-                    <input type="text" name="threeMonthPersonage" class="form-control input-text" value="<?=$credit ? $credit->threeMonthPersonage : ''?>">
+                    <input type="text" name="threeMonthPersonage" class="form-control input-text" value="<?/*=$credit ? $credit->threeMonthPersonage : ''*/?>">
                 </div>
                 </div>
             </div>
             </div>
         </div>
         </div>
-    </div>
+    </div>-->
+
+
 </form>
 </form>
\ No newline at end of file

@@ -27,7 +27,7 @@
     </div>
     </div>
 
 
     <div class="row cl pb-20 col-sm-12">
     <div class="row cl pb-20 col-sm-12">
-        <div class="col-sm-offset-3 col-sm-2">
+        <div class="col-sm-offset-4 col-sm-2">
             <button class="btn btn-warning btn-block">退回订单</button>
             <button class="btn btn-warning btn-block">退回订单</button>
         </div>
         </div>
         <div class="col-sm-2">
         <div class="col-sm-2">