From 79b1c64fb911d0769787ec70ee86a9a1fa5c15ba Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Tue, 7 May 2019 18:14:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E5=85=85=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/plugins/view/wallet/public/nav.html | 17 +----------------
 application/plugins/wallet/Recharge.php         |  9 ++++++++-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/application/plugins/view/wallet/public/nav.html b/application/plugins/view/wallet/public/nav.html
index 10d010641..df413dee3 100755
--- a/application/plugins/view/wallet/public/nav.html
+++ b/application/plugins/view/wallet/public/nav.html
@@ -78,7 +78,7 @@
             <span data-am-modal-close class="am-close">&times;</span>
         </div>
         <div class="am-popup-bd">
-            <form class="am-form form-validation-plugins-recharge-popup" action="{{:PluginsHomeUrl('wallet', 'recharge', 'pay')}}" method="POST" request-type="ajax-fun" request-value="PluginsRechargePayBack">
+            <form class="am-form form-validation-plugins-recharge-popup" action="{{:PluginsHomeUrl('wallet', 'recharge', 'pay')}}" method="POST" request-type="form">
                 <div class="base">
                     <p>充值单号：<span class="recharge-no">...</span></p>
                     <p class="price">充值金额：<strong>...</strong></p>
@@ -136,19 +136,4 @@ function PluginsRechargeBack(e)
         Prompt(e.msg);
     }
 }
-
-/**
- * 支付回调
- */
-function PluginsRechargePayBack(e)
-{
-    if(e.code == 0)
-    {
-        window.location.href = e.data;
-    } else {
-        $('form.form-validation-plugins-recharge-popup').find('button[type="submit"]').button('reset');
-        $.AMUI.progress.done();
-        Prompt(e.msg);
-    }
-}
 </script>
\ No newline at end of file
diff --git a/application/plugins/wallet/Recharge.php b/application/plugins/wallet/Recharge.php
index f975fd272..05ff5868f 100755
--- a/application/plugins/wallet/Recharge.php
+++ b/application/plugins/wallet/Recharge.php
@@ -117,7 +117,14 @@ class Recharge extends Common
     {
         // 用户
         $params['user'] = $this->user;
-        return PayService::Pay($params);
+        $ret = PayService::Pay($params);
+        if($ret['code'] == 0)
+        {
+            return redirect($ret['data']);
+        } else {
+            $this->assign('msg', $ret['msg']);
+            return $this->fetch('public/tips_error');
+        }
     }
 
     /**
-- 
GitLab