diff --git a/module/mr/js/view.js b/module/mr/js/view.js index a6433ab5d2..dcfdf941ef 100644 --- a/module/mr/js/view.js +++ b/module/mr/js/view.js @@ -1,17 +1,17 @@ $(document).ready(function() { $('#mergeButton,.mergeButton').click(function() - { + { link = $(this).attr('href'); $.getJSON(link, function(response) - { + { if(response.result == 'success') { - $.zui.messager.success(response.message); - setTimeout(function(){ location.href=response.locate }, 2500); + $.zui.messager.success(response.message); + setTimeout(function(){ location.href=response.locate }, 2500); } if(response.result == 'fail') $.zui.messager.danger(response.message); - }); + }); return false; - }); - }); + }); +}); diff --git a/module/mr/view/view.html.php b/module/mr/view/view.html.php index 83323b76c2..b22dd9df96 100644 --- a/module/mr/view/view.html.php +++ b/module/mr/view/view.html.php @@ -37,7 +37,7 @@ -
+
-
+