modified template files

leoleoasd · leoleoasd · commit d185bcfc20b4 · 2017-11-29T18:41:09.000+08:00
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
@@ -35,14 +35,27 @@
 class PaymentController extends Controller
 {
     protected static $config;
-
-    function __construct()
+    /**
+     * 构造函数
+     */
+    public function __construct()
     {
         self::$config = $this->systemConfig();
     }
+
+    /**
+     * 查询订单状态(ajax)
+     * @param  Request $request [description]
+     * @return Payment          订单 JSON
+     */
     public function query(Request $request){
         return Payment::find($request->pid)->toarray();
     }
+    /**
+     * 发起订单创建请求
+     * @param  Request $request 请求
+     * @return JSON    订单信息
+     */
     public function new(Request $request){
         $type = $request->type;
         $price = $request->price;
@@ -87,6 +100,12 @@ public function new(Request $request){
         }
         return $result;
     }
+    /**
+     * 支付宝接口返回
+     * @param  Request $req  [description]
+     * @param  [type]  $type [description]
+     * @return [type]        [description]
+     */
     public function return(Request $req, $type){
     $money = $_GET['money'];
      echo "您已经成功支付 $money 元,正在跳转..";
@@ -97,6 +116,12 @@ public function return(Request $req, $type){
 HTML;
     return;
     }
+    /**
+     * 回调处理 标记订单状态
+     * @param  Request  $request [description]
+     * @param  [type]   $type    [description]
+     * @return function          [description]
+     */
     public function callback(Request $request, $type){
         $order_data = $_POST;
         $status    = $order_data['status'];         //获取传递过来的交易状态
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -55,6 +55,7 @@ public function index(Request $request)
         $view['articleList'] = Article::query()->where('type', 1)->where('is_del', 0)->orderBy('sort', 'desc')->orderBy('id', 'desc')->paginate(5);
         $view['wechat_qrcode'] = self::$config['wechat_qrcode'];
         $view['alipay_qrcode'] = self::$config['alipay_qrcode'];
+        $view['payment_enabled'] = (self::$config['qqpay_enabled'] or self::$config['wepay_enabled']or self::$config['alipay_enabled']);
 
         // 推广返利是否可见
         if (!$request->session()->has('referral_status')) {
diff --git a/resources/views/user/index.blade.php b/resources/views/user/index.blade.php
@@ -91,7 +91,11 @@
                         <p class="text-muted">
                             余额：{{$info['balance']}}
                             <span class="badge badge-danger">
-                                <a href="javascript:;" data-toggle="modal" data-target="#charge_modal" style="color:#FFF;">充值</a>
+                                @if (!$payment_enabled)
+                                    <a href="javascript:;" data-toggle="modal" data-target="#charge_modal" style="color:#FFF;">充值</a>
+                                @else
+                                    <a href="/user/payment"  style="color:#FFF;">充值</a>
+                                @endif
                             </span>
                             &ensp;&ensp;积分：{{$info['score']}}
                             <span class="badge badge-danger">
diff --git a/resources/views/user/payment.blade.php b/resources/views/user/payment.blade.php
@@ -129,6 +129,7 @@
                 'type':"POST",
                 'dataType':"json",
                 success:function(data){
+                    $("#submit").button("reset");
                     console.log(data);
                     if(data.errcode==0){
                         pid = data.pid;
@@ -143,6 +144,9 @@
                         }
                     }
                 },
+                error:function(data){
+                    $("#submit").button("reset");
+                },
             });
         });
         function f(){
