Merge branch 'rmaster' of 39.97.239.116:gyfl/xyzshop into rmaster

admin/control/provider_info.php

@@ -154,7 +154,7 @@ class provider_infoControl extends SystemControl
             if (!$result) {
                 showMessage('编辑失败');
             }
-            showMessage('编辑成功','index.php?act=merchant&op=provider_evidence');
+            showMessage('编辑成功','index.php?act=provider_info&op=provider_evidence');
         }
         else
         {

admin/templates/default/merchant.evidence.list.php

@@ -158,7 +158,6 @@
             type: 'datetime'
         });
         $('#ncsubmit').click(function () {
-            $('input[name="op"]').val('provider_evidence');
             $('#formSearch').submit();
         });
         // 表格hover时背景