Merge branch 'develop' of http://g.28ms.com:8000/yangjianbin/page into develop

@@ -118,7 +118,6 @@
             {data: "remark"},//备注
             {data: "remark"},//备注
         ]
         ]
     });
     });
-
     $.fn.dataTableExt.afnFiltering.push(
     $.fn.dataTableExt.afnFiltering.push(
         function (oSettings, aData, iDataIndex) {
         function (oSettings, aData, iDataIndex) {
             var min = document.getElementById('min').value;
             var min = document.getElementById('min').value;
@@ -181,7 +180,7 @@
                         layer.alert('操作失败');
                         layer.alert('操作失败');
                     } else {
                     } else {
                         layer.msg('重置成功');
                         layer.msg('重置成功');
-                    }
+                     }
                 },
                 },
                 error: function () {
                 error: function () {
                     layer.alert("操作失败")
                     layer.alert("操作失败")
@@ -209,6 +208,7 @@
                         layer.alert('操作失败');
                         layer.alert('操作失败');
                     } else {
                     } else {
                         layer.msg('冻结成功');
                         layer.msg('冻结成功');
+                        reload();
                     }
                     }
                 },
                 },
                 error: function () {
                 error: function () {
@@ -218,8 +218,6 @@
         });
         });
     }
     }
 
 
-
-    //
     function unfreeze(id) {
     function unfreeze(id) {
         layer.confirm('您确定要解冻这个员工账号吗?', {
         layer.confirm('您确定要解冻这个员工账号吗?', {
             btn: ['确认','取消'],
             btn: ['确认','取消'],
@@ -228,7 +226,8 @@
         }, function(){
         }, function(){
             $.ajax({
             $.ajax({
                 type: 'put',
                 type: 'put',
-                url: apiBaseUrl + 'manage/financial/confirm/' + id + '?realRepaymentDate=' + Date.now(),
+//                url: apiBaseUrl + 'manage/financial/confirm/' + id + '?realRepaymentDate=' + Date.now(),
+                url: apiBaseUrl + '/system/user/unfreeze/' + id,
                 cache: false,
                 cache: false,
                 dataType: 'json',
                 dataType: 'json',
                 contentType: "application/json; charset=UTF-8",
                 contentType: "application/json; charset=UTF-8",
@@ -239,6 +238,7 @@
                         layer.alert('操作失败');
                         layer.alert('操作失败');
                     } else {
                     } else {
                         layer.msg('解冻成功');
                         layer.msg('解冻成功');
+                        reload();
                     }
                     }
                 },
                 },
                 error: function () {
                 error: function () {