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

@@ -53,7 +53,7 @@
             <div class="panel-body">
             <div class="panel-body">
                 <div class="row cl">
                 <div class="row cl">
                     <div class="form-group col-sm-4 col-md-2">
                     <div class="form-group col-sm-4 col-md-2">
-                        <input type="text" class="form-control input-text Wdate" value="" onfocus="WdatePicker()">
+                        <input type="text" name="loanDate" class="form-control input-text Wdate" value="" onfocus="WdatePicker()">
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
@@ -66,8 +66,9 @@
                     <div class="form-group col-sm-4 col-md-2">
                     <div class="form-group col-sm-4 col-md-2">
                         <span class="form-control select-box">
                         <span class="form-control select-box">
                             <select class="select" size="1">
                             <select class="select" size="1">
-                                <option>线下打款</option>
-                                <option>支付宝</option>
+                                <?php foreach ($this->session->repayments as $k=>$v):?>
+                                <option <?=$item == payBackType ? 'selected'  : '' ?> value="<?=$k?>"><?=$v?></option>
+                                <?php endforeach;?>
                             </select>
                             </select>
                         </span>
                         </span>
                     </div>
                     </div>
@@ -92,10 +93,9 @@
             var orderId = "<?=$id?>";
             var orderId = "<?=$id?>";
             $.ajax({
             $.ajax({
                 type: 'put',
                 type: 'put',
-                url: apiBaseUrl + 'flow/confirm/loan/' + orderId,
+                url: apiBaseUrl + 'flow/confirm/loan/' + orderId + '?loanDate' + $('[name=loanDate]').val(),
                 cache: false,
                 cache: false,
                 dataType: 'json',
                 dataType: 'json',
-                data: JSON.stringify(data),
                 contentType: "application/json; charset=UTF-8",
                 contentType: "application/json; charset=UTF-8",
                 success: function (data) {
                 success: function (data) {
                     if (data.msg) {
                     if (data.msg) {