修正bug

app/Http/Controllers/UserController.php

@@ -46,7 +46,7 @@ class UserController extends BaseController
         $view['articleList'] = Article::where('is_del', 0)->orderBy('sort', 'desc')->orderBy('id', 'desc')->paginate(5);
         $user = $request->session()->get('user');
         $user['totalTransfer'] = $this->flowAutoShow($user['transfer_enable'] - $user['u'] - $user['d']);
-        $user['usedTransfer'] = $this->flowAutoShow($user['u'] - $user['d']);
+        $user['usedTransfer'] = $this->flowAutoShow($user['u'] + $user['d']);
         $user['usedPercent'] = round(($user['u'] + $user['d']) / $user['transfer_enable'], 2);
         $view['info'] = $user;
         $view['wechat_qrcode'] = static::$config['wechat_qrcode'];
@@ -745,7 +745,8 @@ TXT;
                     // 写入日志
                     $couponLogObj = new CouponLog();
                     $couponLogObj->coupon_id = $coupon->id;
-                    $couponLogObj->order_id = $order->id;
+                    $couponLogObj->goods_id = $goods_id;
+                    $couponLogObj->order_id = $order->oid;
                     $couponLogObj->save();
                 }
 
@@ -755,9 +756,9 @@ TXT;
             } catch (\Exception $e) {
                 DB::rollBack();
 
-                Log::error('支付订单失败：' . $e);
+                Log::error('支付订单失败：' . $e->getMessage());
 
-                return Response::json(['status' => 'fail', 'data' => '', 'message' => '支付失败']);
+                return Response::json(['status' => 'fail', 'data' => '', 'message' => '支付失败：' . $e->getMessage()]);
             }
         } else {
             $view['goods'] = Goods::where('id', $goods_id)->first();

resources/views/user/index.blade.php

@@ -73,13 +73,13 @@
                                     <li class="list-group-item">
                                         余额：{{$info['balance']}}
                                         <span class="badge badge-danger">
-                                            <a href="javascript:;" data-toggle="modal" data-target="#charge_modal">充值</a>
+                                            <a href="javascript:;" data-toggle="modal" data-target="#charge_modal" style="color:#FFF;">充值</a>
                                         </span>
                                     </li>
                                     <li class="list-group-item">
                                         积分：{{$info['score']}}
-                                        <span class="badge badge-default">
-                                            <a href="javascript:;" data-toggle="modal" data-target="#excharge_modal">兑换流量</a>
+                                        <span class="badge badge-info">
+                                            <a href="javascript:;" data-toggle="modal" data-target="#excharge_modal" style="color:#FFF;">兑换流量</a>
                                         </span>
                                     </li>
                                     <li class="list-group-item">
@@ -120,19 +120,19 @@
                                     </li>
                                     <li class="list-group-item">
                                         加密方式：{{$info['method']}}
-                                        <span class="badge badge-warning"><a href="{{url('user/profile#tab_2')}}">修改</a></span>
+                                        <span class="badge badge-success"><a href="{{url('user/profile#tab_2')}}" style="color:#FFF;">修改</a></span>
                                     </li>
                                     <li class="list-group-item">
                                         连接密码：{{$info['passwd']}}
-                                        <span class="badge badge-warning"><a href="{{url('user/profile#tab_2')}}">修改</a></span>
+                                        <span class="badge badge-success"><a href="{{url('user/profile#tab_2')}}" style="color:#FFF;">修改</a></span>
                                     </li>
                                     <li class="list-group-item">
                                         协议：{{$info['protocol']}}
-                                        <span class="badge badge-warning"><a href="{{url('user/profile#tab_2')}}">修改</a></span>
+                                        <span class="badge badge-success"><a href="{{url('user/profile#tab_2')}}" style="color:#FFF;">修改</a></span>
                                     </li>
                                     <li class="list-group-item">
                                         混淆：{{$info['obfs']}}
-                                        <span class="badge badge-warning"><a href="{{url('user/profile#tab_2')}}">修改</a></span>
+                                        <span class="badge badge-success"><a href="{{url('user/profile#tab_2')}}" style="color:#FFF;">修改</a></span>
                                     </li>
                                     <li class="list-group-item">
                                         最后使用：{{empty($info['t']) ? '从未使用' : date('Y-m-d H:i:s', $info['t'])}}

resources/views/user/orderList.blade.php

@@ -46,7 +46,7 @@
                                 <tbody>
                                 @if($orderList->isEmpty())
                                     <tr>
-                                        <td colspan="3">暂无数据</td>
+                                        <td colspan="4">暂无数据</td>
                                     </tr>
                                 @else
                                     @foreach($orderList as $key => $order)