修正merge导致的bug

app/Http/Controllers/AdminController.php

@@ -1000,7 +1000,7 @@ class AdminController extends Controller
             return Redirect::to('admin/userList');
         }
 
-        $nodeList = SsNode::query()->paginate(10)->appends($request->except('page'));
+        $nodeList = SsNode::query()->where('status', 1)->paginate(10)->appends($request->except('page'));
         foreach ($nodeList as &$node) {
             // 生成ssr scheme
             $obfs_param = $node->single ? '' : $user->obfs_param;
@@ -1756,12 +1756,8 @@ class AdminController extends Controller
         return Response::view('admin/userBalanceLogList', $view);
     }
 
-    /**
-     * 以某用户登录
-     * @param Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function loginas(Request $request)
+    // 转换成某个用户的身份
+    public function switchToUser(Request $request)
     {
         $id = $request->get('user_id');
         $user = User::query()->find($id);

app/Http/Controllers/PaymentController.php

@@ -1,198 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use App\Http\Models\User;
-use App\Http\Models\Payment;
-use Redirect;
-use Response;
-use Log;
-
-class PaymentController extends Controller
-{
-    protected static $config;
-    protected static $url = 'https://api.daimiyun.cn/v2/';
-
-    public function __construct()
-    {
-        self::$config = $this->systemConfig();
-    }
-
-    /**
-     * 查询订单状态(ajax)
-     * @param  Request $request [description]
-     * @return Payment          订单 JSON
-     */
-    public function query(Request $request)
-    {
-        $pid = $request->get('pid');
-        $payment = Payment::query()->find($pid);
-
-        return Response::json($payment);
-    }
-
-    /**
-     * 发起订单创建请求
-     * @param  Request $request 请求
-     * @return JSON    订单信息
-     */
-    public function new(Request $request)
-    {
-        $type = $request->get('type');
-        $price = $request->get('price');
-
-        if (empty($type)) {
-            return Response::json(['errcode' => -1, 'errmsg'=> '请选择支付方式']);
-        } else if (self::$config['dmf_' . $type] == 0) {
-            return Response::json(['errcode' => -1, 'errmsg' => '支付方式不合法']);
-        } else if ($price <= 0) {
-            return Response::json(['errcode' => -1, 'errmsg' => '请输入正确的充值金额']);
-        }
-
-        $user = $request->session()->get('user');
-        $user = User::query()->find($user['id']);
-
-        $payment = new Payment();
-        $payment->user_id = $user->id;
-        $payment->pay_way = '黛米云-' . self::$config['dmf_' . $type];
-        $payment->money = $price * 100;
-        $payment->status = 0;
-        $payment->save();
-
-        $settings = [
-            'phone' => self::$config['dmf_' . $type . "_phone"],
-            'mchid' => self::$config['dmf_' . $type . "_mchid"],
-            'token' => self::$config['dmf_' . $type . "_token"],
-        ];
-
-        $data = [
-            'trade'   => $payment->id,
-            'price'   => $price,
-            'phone'   => $settings['phone'],
-            'mchid'   => $settings['mchid'],
-            'subject' => '[SSRPanel]' . self::$config['website_name'] . "充值" . $price . "元",
-            'body'    => '[SSRPanel]' . self::$config['website_name'] . "充值" . $price . "元",
-        ];
-
-        $data = $this->sign($data, $settings['token']);
-        $ret = $this->post(self::$url . $type . "/create", $data);
-        $result = json_decode($ret, true);
-        if ($result and $result['errcode'] == 0) {
-            $result['pid'] = $payment->id;
-
-            return Response::json($result);
-        } else {
-            return json_encode([
-                'errcode' => -1,
-                'errmsg'  => "接口调用失败!" . $ret,
-            ]);
-        }
-
-        return $result;
-    }
-
-    /**
-     * 支付宝接口返回
-     * @param  Request $req [description]
-     * @param  [type]  $type [description]
-     * @return [type]        [description]
-     */
-    public function return (Request $req, $type)
-    {
-        $money = $_GET['money'];
-        echo "您已经成功支付 $money 元,正在跳转..";
-        echo <<<HTML
-<script>
-location.href="/user/payment";
-</script>
-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']; // 获取传递过来的交易状态
-        $invoiceid = $order_data['out_trade_no']; // 订单号
-        $transid = $order_data['trade_no']; // 转账交易号
-        $amount = $order_data['money']; // 获取递过来的总价格
-
-        if (!$this->checksign($_POST, self::$config['dmf_' . $type . "_token"])) {
-            return Response::json(['errcode' => 2333]);
-        }
-
-        if ($status == 'success') {
-            $payment = Payment::query()->find($invoiceid);
-            if ($payment->status == 1) {
-                return Response::json(['errcode' => 0]);
-            }
-
-            $payment->status = 1;
-            $payment->save();
-
-            // 用户加余额
-            $user = User::query()->find($payment->user_id);
-            $user->balance += $payment->money * 100;
-            $user->save();
-
-            return json_encode(['errcode' => 0]);
-        } else {
-            return '';
-        }
-    }
-
-    private function getSign($array, $key)
-    {
-        unset($array['sign']);
-        ksort($array);
-        $sss = http_build_query($array);
-        $sign = hash("sha256", $sss . $key);
-        $sign = sha1($sign . hash("sha256", $key));
-
-        return $sign;
-    }
-
-    private function sign($array, $key)
-    {
-        $array['sign'] = $this->getSign($array, $key);
-
-        return $array;
-    }
-
-    private function checkSign($array, $key)
-    {
-        $new = $array;
-        $new = $this->sign($new, $key);
-        if (!isset($array['sign'])) {
-            return false;
-        }
-
-        return $array['sign'] == $new['sign'];
-    }
-
-    private function post($url, $data = null)
-    {
-        $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, $url);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
-        if (!empty($data)) {
-            curl_setopt($curl, CURLOPT_POST, 1);
-            curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
-        }
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-        $output = curl_exec($curl);
-        curl_close($curl);
-
-        return $output;
-    }
-}

app/Http/Controllers/UserController.php

@@ -56,7 +56,6 @@ class UserController extends Controller
         $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['dmf_qqpay'] || self::$config['dmf_wepay'] || self::$config['dmf_alipay'];
 
         // 推广返利是否可见
         if (!$request->session()->has('referral_status')) {
@@ -961,21 +960,8 @@ class UserController extends Controller
         return Response::view('/user/subscribe', $view);
     }
 
-    /**
-     * 充值余额
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function payment(Request $request)
-    {
-        $view = self::$config;
-        $view['paymentList'] = Payment::query()->where("user_id", $request->session()->get('user')['id'])->get();
-
-        return Response::view("user.payment", $view);
-    }
-
-    // 管理员切换到用户身份后恢复到管理员权限
-    public function loginasadmin(Request $request)
+    // 转换成管理员的身份
+    public function switchToAdmin(Request $request)
     {
         if (!$request->session()->has('admin') || !$request->session()->has('user')) {
             return Response::json(['status' => 'fail', 'data' => '', 'message' => '非法请求']);

resources/views/admin/editUser.blade.php

@@ -34,7 +34,7 @@
                                                 <div class="row">
                                                     <span class="caption-subject font-dark bold uppercase col-md-4">账号信息</span>
                                                     <div class="text-right col-md-8" style="">
-                                                        <button type="button" class="btn btn-sm btn-danger btn-outline" onclick="loginas()">切换身份</button>
+                                                        <button type="button" class="btn btn-sm btn-danger btn-outline" onclick="switchToUser()">切换身份</button>
                                                     </div>
                                                 </div>
                                             </div>
@@ -366,10 +366,10 @@
     <script src="/js/layer/layer.js" type="text/javascript"></script>
 
     <script type="text/javascript">
-        // 切换用户身份：以某用户的身份登录
-        function loginas() {
+        // 切换用户身份
+        function switchToUser() {
             $.ajax({
-                'url': "{{url("/admin/loginas")}}",
+                'url': "{{url("/admin/switchToUser")}}",
                 'data': {
                     'user_id': '{{$user->id}}',
                     '_token': '{{csrf_token()}}'

resources/views/admin/system.blade.php

@@ -48,11 +48,6 @@
                                         <li>
                                             <a href="#tab_6" data-toggle="tab"> 充值二维码设置 </a>
                                         </li>
-                                        <!--
-                                        <li>
-                                            <a href="#tab_7" data-toggle="tab"> 黛米付接口设置 </a>
-                                        </li>
-                                        -->
                                     </ul>
                                 </div>
                                 <div class="portlet-body">
@@ -517,153 +512,6 @@
                                                 </div>
                                             </form>
                                         </div>
-                                        <!--
-                                        <div class="tab-pane" id="tab_7">
-                                            <form class="form-horizontal">
-                                                <div class="form-body">
-                                                    <div class="portlet-body">
-                                                        <div class="alert alert-info">
-                                                            <h4>风险提示：本支付接口为第四方支付接口，请谨慎使用！</h4>
-                                                            使用本支付接口，请先到 <a href="//www.daimiyun.cn" target="_blank">黛米付</a> 签约，并填写下列配置信息，然后到黛米付后台进行域名配置。
-                                                            <br>
-                                                            通知地址: {{$website_url}}/payment/callback/wepay
-                                                            <br>
-                                                            回调地址: {{$website_url}}/payment/return/wepay
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <div class="col-md-6">
-                                                                <label for="dmf_wepay" class="col-md-3 control-label">微信支付</label>
-                                                                <div class="col-md-9">
-                                                                    <input type="checkbox" id="dmf_wepay" class="make-switch pay_enabled" @if($dmf_wepay) checked @endif data-enabled-type="wepay" data-on-color="success" data-off-color="danger" data-on-text="启用" data-off-text="关闭">
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-6">
-                                                                <label for="" class="col-md-3 control-label">[微信]商户ID</label>
-                                                                <div class="col-md-9">
-                                                                    <div class="input-group">
-                                                                        <input class="form-control" type="text" name="dmf_wepay_mchid" value="{{$dmf_wepay_mchid}}" id="dmf_wepay_mchid" />
-                                                                        <span class="input-group-btn">
-                                                                            <button class="btn btn-success payment_commit" type="button" data-for="dmf_wepay_mchid">提交</button>
-                                                                        </span>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <div class="col-md-6">
-                                                                <label for="" class="control-label col-md-3">[微信]商户手机号</label>
-                                                                <div class="col-md-9">
-                                                                    <div class="input-group">
-                                                                        <input class="form-control" type="text" name="dmf_wepay_phone" value="{{$dmf_wepay_phone}}" id="dmf_wepay_phone" />
-                                                                        <span class="input-group-btn">
-                                                                            <button class="btn btn-success payment_commit" type="button" data-for="dmf_wepay_phone">提交</button>
-                                                                        </span>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-6">
-                                                                <label for="" class="control-label col-md-3">[微信]商户TOKEN</label>
-                                                                <div class="col-md-9">
-                                                                    <div class="input-group">
-                                                                        <input class="form-control" type="text" name="dmf_wepay_token" value="{{$dmf_wepay_token}}" id="dmf_wepay_token" />
-                                                                        <span class="input-group-btn">
-                                                                            <button class="btn btn-success payment_commit" type="button" data-for="dmf_wepay_token">提交</button>
-                                                                        </span>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <div class="col-md-6">
-                                                                <label for="dmf_alipay" class="col-md-3 control-label">支付宝支付</label>
-                                                                <div class="col-md-9">
-                                                                    <input type="checkbox" id="dmf_alipay" class="make-switch pay_enabled" @if($dmf_alipay) checked @endif data-enabled-type="alipay" data-on-color="success" data-off-color="danger" data-on-text="启用" data-off-text="关闭">
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-6">
-                                                                <label for="" class="control-label col-md-3">[支付宝]商户ID</label>
-                                                                <div class="col-md-9">
-                                                                    <div class="input-group">
-                                                                        <input class="form-control" type="text" name="dmf_alipay_mchid" value="{{$dmf_alipay_mchid}}" id="dmf_alipay_mchid" />
-                                                                        <span class="input-group-btn">
-                                                                            <button class="btn btn-success payment_commit" type="button" data-for="dmf_alipay_mchid">提交</button>
-                                                                        </span>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <div class="col-md-6">
-                                                                <label for="" class="control-label col-md-3">[支付宝]商户TOKEN</label>
-                                                                <div class="col-md-9">
-                                                                    <div class="input-group">
-                                                                        <input class="form-control" type="text" name="dmf_alipay_token" value="{{$dmf_alipay_token}}" id="dmf_alipay_token" />
-                                                                        <span class="input-group-btn">
-                                                                            <button class="btn btn-success payment_commit" type="button" data-for="dmf_alipay_token">提交</button>
-                                                                        </span>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-6">
-                                                                <label for="" class="control-label col-md-3">[支付宝]商户手机号</label>
-                                                                <div class="col-md-9">
-                                                                    <div class="input-group">
-                                                                        <input class="form-control" type="text" name="dmf_alipay_phone" value="{{$dmf_alipay_phone}}" id="dmf_alipay_phone" />
-                                                                        <span class="input-group-btn">
-                                                                            <button class="btn btn-success payment_commit" type="button" data-for="dmf_alipay_phone">提交</button>
-                                                                        </span>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <div class="col-md-6">
-                                                                <label for="dmf_qqpay" class="col-md-3 control-label">QQ支付</label>
-                                                                <div class="col-md-9">
-                                                                    <input type="checkbox" id="dmf_qqpay" class="make-switch pay_enabled" @if($dmf_qqpay) checked @endif data-enabled-type="qqpay" data-on-color="success" data-off-color="danger" data-on-text="启用" data-off-text="关闭">
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-6">
-                                                                <label for="" class="control-label col-md-3">[QQ]商户ID</label>
-                                                                <div class="col-md-9">
-                                                                    <div class="input-group">
-                                                                        <input class="form-control" type="text" name="dmf_qqpay_mchid" value="{{$dmf_qqpay_mchid}}" id="dmf_qqpay_mchid" />
-                                                                        <span class="input-group-btn">
-                                                                            <button class="btn btn-success payment_commit" type="button" data-for="dmf_qqpay_mchid">提交</button>
-                                                                        </span>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <div class="col-md-6">
-                                                                <label for="" class="control-label col-md-3">[QQ]商户TOKEN</label>
-                                                                <div class="col-md-9">
-                                                                    <div class="input-group">
-                                                                        <input class="form-control" type="text" name="dmf_qqpay_token" value="{{$dmf_qqpay_token}}" id="dmf_qqpay_token" />
-                                                                        <span class="input-group-btn">
-                                                                            <button class="btn btn-success payment_commit" type="button" data-for="dmf_qqpay_token">提交</button>
-                                                                        </span>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-6">
-                                                                <label for="" class="control-label col-md-3">[QQ]商户手机号</label>
-                                                                <div class="col-md-9">
-                                                                    <div class="input-group">
-                                                                        <input class="form-control" type="text" name="dmf_qqpay_phone" value="{{$dmf_qqpay_phone}}" id="dmf_qqpay_phone" />
-                                                                        <span class="input-group-btn">
-                                                                            <button class="btn btn-success payment_commit" type="button" data-for="dmf_qqpay_phone">提交</button>
-                                                                        </span>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </form>
-                                        </div>
-                                        -->
                                     </div>
                                 </div>
                             </div>
@@ -683,50 +531,6 @@
     <script src="/js/layer/layer.js" type="text/javascript"></script>
 
     <script type="text/javascript">
-
-        $(".payment_commit").click(function () {
-            var inp;
-            inp = $("#" + $(this).data("for"));
-            $.ajax({
-                'url': "{{url('admin/setConfig')}}",
-                'data': {
-                    _token: '{{csrf_token()}}',
-                    name: $(this).data("for"),
-                    value: inp.val(),
-                },
-                'type': "POST",
-                'dataType': "json",
-                success: function (data) {
-                    console.log(data);
-                    layer.msg("保存成功!", {time: 1000});
-                },
-            });
-        });
-
-        $(".pay_enabled").on({
-            'switchChange.bootstrapSwitch': function (event, state) {
-                state = state ? 1 : 0;
-                console.log(state);
-                console.log($(this).data("enabled-type"))
-                var type = $(this).data("enabled-type");
-                $.ajax({
-                    'url': "{{url('admin/setConfig')}}",
-                    'data': {
-                        _token: '{{csrf_token()}}',
-                        name: "dmf_" + type,
-                        value: state,
-                    },
-                    success: function (data) {
-                        console.log(data);
-                        if (data.status == "success")
-                            layer.msg("保存成功!", {time: 1000});
-                    },
-                    'dataType': "JSON",
-                    'type': "POST"
-                });
-            }
-        });
-
         // 启用、禁用随机端口
         $('#is_rand_port').on({
             'switchChange.bootstrapSwitch': function(event, state) {

resources/views/admin/userList.blade.php

@@ -133,11 +133,18 @@
                                                 @endif
                                             </td>
                                             <td>
-                                                <button type="button" class="btn btn-sm blue btn-outline" onclick="editUser('{{$user->id}}')">编辑</button>
-                                                <!--<button type="button" class="btn btn-sm red btn-outline" onclick="delUser('{{$user->id}}')">删除</button>-->
-                                                <button type="button" class="btn btn-sm green btn-outline" onclick="doExport('{{$user->id}}')">配置信息</button>
-                                                <button type="button" class="btn btn-sm purple btn-outline" onclick="doMonitor('{{$user->id}}')">流量监控</button>
-                                                <button type="button" class="btn btn-sm green-meadow btn-outline" onclick="resetTraffic('{{$user->id}}')">重置流量</button>
+                                                <button type="button" class="btn btn-sm blue btn-outline" onclick="editUser('{{$user->id}}')">
+                                                    <i class="fa fa-pencil"></i>
+                                                </button>
+                                                <button type="button" class="btn btn-sm green btn-outline" onclick="doExport('{{$user->id}}')">
+                                                    <i class="fa fa-paper-plane-o"></i>
+                                                </button>
+                                                <button type="button" class="btn btn-sm purple btn-outline" onclick="doMonitor('{{$user->id}}')">
+                                                    <i class="fa fa-area-chart"></i>
+                                                </button>
+                                                <button type="button" class="btn btn-sm green-meadow btn-outline" onclick="resetTraffic('{{$user->id}}')">
+                                                    <i class="fa fa-refresh"></i>
+                                                </button>
                                             </td>
                                         </tr>
                                         @endforeach
@@ -223,10 +230,16 @@
 
         // 重置流量
         function resetTraffic(id) {
-            $.post("{{url('admin/resetUserTraffic')}}", {_token:'{{csrf_token()}}', id:id}, function (ret) {
-                layer.msg(ret.message, {time:1000}, function() {
-                    window.location.reload();
+            layer.confirm('确定重置该用户流量吗？', {icon: 2, title:'警告'}, function(index) {
+                $.post("{{url('admin/resetUserTraffic')}}", {_token:'{{csrf_token()}}', id:id}, function (ret) {
+                    layer.msg(ret.message, {time:1000}, function() {
+                        if (ret.status == 'success') {
+                            window.location.reload();
+                        }
+                    });
                 });
+
+                layer.close(index);
             });
         }
     </script>

resources/views/user/index.blade.php

@@ -91,11 +91,7 @@
                         <p class="text-muted">
                             余额：{{$info['balance']}}
                             <span class="badge badge-danger">
-                                @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
+                                <a href="javascript:;" data-toggle="modal" data-target="#charge_modal" style="color:#FFF;">充值</a>
                             </span>
                             &ensp;&ensp;积分：{{$info['score']}}
                             <span class="badge badge-danger">

resources/views/user/layouts.blade.php

@@ -144,14 +144,6 @@
                         <span class="title">我的工单</span>
                     </a>
                 </li>
-                <!--
-                <li class="nav-item {{Request::getRequestUri() == '/user/payment' ? 'active open' : ''}}">
-                    <a href="{{url('user/payment')}}" class="nav-link nav-toggle">
-                        <i class="icon-credit-card" aria-hidden="true"></i>
-                        <span class="title">充值余额</span>
-                    </a>
-                </li>
-                -->
                 @if(Session::get('referral_status'))
                 <li class="nav-item {{Request::getRequestUri() == '/user/referral' ? 'active open' : ''}}">
                     <a href="{{url('user/referral')}}" class="nav-link nav-toggle">
@@ -210,7 +202,7 @@
     <script type="text/javascript">
         $("#return_to_admin").click(function () {
             $.ajax({
-                'url': "{{url("/user/loginasadmin")}}",
+                'url': "{{url("/user/switchToAdmin")}}",
                 'data': {
                     '_token': "{{csrf_token()}}"
                 },

resources/views/user/payment.blade.php

@@ -1,218 +0,0 @@
-@extends('user.layouts')
-
-@section('css')
-@endsection
-@section('title', '控制面板')
-@section('content')
-    <!-- BEGIN CONTENT BODY -->
-    <div class="page-content" style="padding-top:0;">
-        <!-- BEGIN PAGE BASE CONTENT -->
-        <div class="row">
-            <div class="col-md-4">
-                <div class="tab-pane active">
-                    <div class="portlet light bordered">
-                        <div class="portlet-title">
-                            <div class="caption font-dark">
-                                <span class="caption-subject bold uppercase"> 充值余额 </span>
-                            </div>
-                        </div>
-                        <div class="portlet-body">
-                            <div class="form-group">
-                                <label for="usage" class="col-md-3 control-label">充值方式</label>
-                                <div class="col-md-8">
-                                    <div class="mt-radio-inline">
-                                        @if($dmf_wepay || $dmf_alipay || $dmf_qqpay)
-                                            @if($dmf_wepay)
-                                                <label class="mt-radio">
-                                                    <input type="radio" class="pay_type" data-type="wepay" name="pay_type">微信
-                                                    <span></span> </label>
-                                            @endif
-                                            @if($dmf_alipay)
-                                                <label class="mt-radio">
-                                                    <input type="radio" class="pay_type" data-type="alipay" name="pay_type">支付宝
-                                                    <span></span> </label>
-                                            @endif
-                                            @if($dmf_qqpay)
-                                                <label class="mt-radio">
-                                                    <input type="radio" class="pay_type" data-type="qqpay" name="pay_type">QQ支付
-                                                    <span></span> </label>
-                                            @endif
-                                        @else
-                                            <label class="mt-radio">
-                                                <input type="radio" class="pay_type" data-type="" name="pay_type" disabled>系统未启用在线支付
-                                                <span></span> </label>
-                                        @endif
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="balance" class="col-md-3 control-label">充值金额</label>
-                                <div class="col-md-8">
-                                    @if($dmf_wepay || $dmf_alipay || $dmf_qqpay)
-                                        <input type="text" class="form-control" name="money" value="" id="money" placeholder="88.88">
-                                    @else
-                                        <input type="text" class="form-control" name="money" value="" id="money" placeholder="88.88" disabled>
-                                    @endif
-                                </div>
-                            </div>
-                            <div class="form-actions">
-                                <div class="row">
-                                    <div class="col-md-4" style="padding-left: 30px;">
-                                        @if($dmf_wepay || $dmf_alipay || $dmf_qqpay)
-                                            <button id="submit" class="btn blue"> 支付</button>
-                                        @else
-                                            <button id="submit" class="btn blue" disabled> 支付</button>
-                                        @endif
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-md-8">
-                <div class="tab-pane active">
-                    <div class="portlet light bordered">
-                        <div class="portlet-title">
-                            <div class="caption">
-                                <span class="caption-subject font-dark bold uppercase">充值记录</span>
-                            </div>
-                        </div>
-                        <div class="portlet-body">
-                            <div class="table-scrollable table-scrollable-borderless">
-                                <table class="table table-hover table-light">
-                                    <thead>
-                                    <tr>
-                                        <th> ID</th>
-                                        <th> 充值金额</th>
-                                        <th> 充值时间</th>
-                                        <th> 状态</th>
-                                    </tr>
-                                    </thead>
-                                    <tbody>
-                                    @if($paymentList->isEmpty())
-                                        <tr>
-                                            <td colspan="4">暂无数据</td>
-                                        </tr>
-                                    @else
-                                        @foreach($paymentList as $key => $payment)
-                                            <tr class="odd gradeX">
-                                                <td> {{$key + 1}} </td>
-                                                <td> {{$payment->money}} </td>
-                                                <td> {{$payment->created_at}} </td>
-                                                <td> {{$payment->status > 0 ? '充值成功' : '充值失败'}} </td>
-                                            </tr>
-                                        @endforeach
-                                    @endif
-                                    </tbody>
-                                </table>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div id="charge_modal" class="modal fade" tabindex="-1" data-focus-on="input:first" data-keyboard="false">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
-                        <h4 class="modal-title"> 支付 </h4>
-                    </div>
-                    <div class="modal-body">
-                        <div class="row">
-                            <div class="col-md-4 col-md-offset-3" id="qrcode">
-
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-4 col-md-offset-4 text-center">
-                                <h3>请扫码支付</h3>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <!-- END PAGE BASE CONTENT -->
-    </div>
-    <!-- END CONTENT BODY -->
-@endsection
-@section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-    <script src="/assets/global/plugins/jquery-qrcode/jquery.qrcode.min.js" type="text/javascript"></script>
-    <script type="text/javascript">
-        var pay_type = '';
-        var pid = 0;
-
-        $("#submit").click(function () {
-            var pay_type = $("input:radio[name='pay_type']:checked").data('type');
-            if (pay_type == '' || pay_type == undefined) {
-                layer.msg('请选择支付类型');
-                return ;
-            }
-
-            var money = $("#money").val();
-            if (money == '' || money <= 0 || money == undefined) {
-                layer.msg('充值金额不正确');
-                return ;
-            }
-
-            $.ajax({
-                'url': "{{url("user/payment")}}",
-                'data': {
-                    '_token': "{{csrf_token()}}",
-                    'type': pay_type,
-                    'price': money,
-                },
-                'type': "POST",
-                'dataType': "json",
-                success: function (ret) {
-                    $("#submit").button("reset");
-                    console.log(ret);
-                    if (ret.errcode == 0) {
-                        pid = ret.pid;
-                        if (type != "alipay") {
-                            $("#charge_modal").modal();
-                            $("#qrcode").qrcode(ret.code);
-                            setTimeout(f, 1000);
-                        } else {
-                            $("#charge_modal").modal();
-                            $(".modal-body").html("跳转中...");
-                            $("body").append(ret.code);
-                        }
-                    } else {
-                        layer.msg(ret.errmsg);
-                    }
-                },
-                error: function (ret) {
-                    console.log(ret);
-                    $("#submit").button("reset");
-                }
-            });
-        });
-
-        function f() {
-            $.ajax({
-                type: "POST",
-                url: "/payment/query",
-                dataType: "json",
-                data: {
-                    _token: "{{csrf_token()}}",
-                    pid: pid
-                },
-                success: function (ret) {
-                    if (ret.status) {
-                        clearTimeout(tid);
-                        $("#result").modal();
-                        $(".modal-body").html("充值成功!");
-
-                        window.setTimeout("location.href=window.location.href", 1000);
-                    }
-                }
-            });
-
-            tid = setTimeout(f, 1000);
-        }
-    </script>
-@endsection

routes/web.php

@@ -77,7 +77,7 @@ Route::group(['middleware' => ['user', 'admin']], function() {
     Route::post('coupon/delCoupon', 'CouponController@delCoupon'); // 删除优惠券
     Route::get('coupon/exportCoupon', 'CouponController@exportCoupon'); // 导出优惠券
     Route::get('emailLog/logList', 'EmailLogController@logList'); // 邮件发送日志
-    Route::post("admin/loginas","AdminController@loginas");
+    Route::post("admin/switchToUser","AdminController@switchToUser"); // 转换成某个用户的身份
 });
 
 Route::group(['middleware' => ['user']], function() {
@@ -100,14 +100,5 @@ Route::group(['middleware' => ['user']], function() {
     Route::post('user/exchange', 'UserController@exchange'); // 积分兑换流量
     Route::get('user/referral', 'UserController@referral'); // 推广返利
     Route::post('user/extractMoney', 'UserController@extractMoney'); // 申请提现
-
-    // payment
-    Route::get("user/payment","UserController@payment");
-    Route::post("user/payment","PaymentController@new");
-
-    // 返回管理员页面
-    Route::post("user/loginasadmin","UserController@loginasadmin");
+    Route::post("user/switchToAdmin","UserController@switchToAdmin"); // 转换成管理员的身份
 });
-Route::post("/payment/query","PaymentController@query");
-Route::post("/payment/callback/{type}","PaymentController@callback");
-Route::get("/payment/return/{type}","PaymentController@return");

sql/db.sql

@@ -286,18 +286,6 @@ INSERT INTO `config` VALUES ('33', 'is_traffic_ban', 1);
 INSERT INTO `config` VALUES ('34', 'traffic_ban_value', 10);
 INSERT INTO `config` VALUES ('35', 'traffic_ban_time', 60);
 INSERT INTO `config` VALUES ('36', 'is_clear_log', 1);
-INSERT INTO `config` VALUES ('37', 'dmf_wepay', '0');
-INSERT INTO `config` VALUES ('38', 'dmf_alipay', '0');
-INSERT INTO `config` VALUES ('39', 'dmf_qqpay', '0');
-INSERT INTO `config` VALUES ('40', 'dmf_wepay_mchid', '');
-INSERT INTO `config` VALUES ('41', 'dmf_alipay_mchid', '');
-INSERT INTO `config` VALUES ('42', 'dmf_qqpay_mchid', '');
-INSERT INTO `config` VALUES ('43', 'dmf_wepay_token', '');
-INSERT INTO `config` VALUES ('44', 'dmf_alipay_token', '');
-INSERT INTO `config` VALUES ('45', 'dmf_qqpay_token', '');
-INSERT INTO `config` VALUES ('46', 'dmf_wepay_phone', '');
-INSERT INTO `config` VALUES ('47', 'dmf_alipay_phone', '');
-INSERT INTO `config` VALUES ('48', 'dmf_qqpay_phone', '');
 
 -- ----------------------------
 -- Table structure for `article`

sql/update/20171205.sql

@@ -1,16 +1,3 @@
-INSERT INTO `config` VALUES ('37', 'dmf_wepay', '0');
-INSERT INTO `config` VALUES ('38', 'dmf_alipay', '0');
-INSERT INTO `config` VALUES ('39', 'dmf_qqpay', '0');
-INSERT INTO `config` VALUES ('40', 'dmf_wepay_mchid', '');
-INSERT INTO `config` VALUES ('41', 'dmf_alipay_mchid', '');
-INSERT INTO `config` VALUES ('42', 'dmf_qqpay_mchid', '');
-INSERT INTO `config` VALUES ('43', 'dmf_wepay_token', '');
-INSERT INTO `config` VALUES ('44', 'dmf_alipay_token', '');
-INSERT INTO `config` VALUES ('45', 'dmf_qqpay_token', '');
-INSERT INTO `config` VALUES ('46', 'dmf_wepay_phone', '');
-INSERT INTO `config` VALUES ('47', 'dmf_alipay_phone', '');
-INSERT INTO `config` VALUES ('48', 'dmf_qqpay_phone', '');
-
 CREATE TABLE `payment` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `user_id` int(11) NOT NULL,
@@ -24,5 +11,3 @@ CREATE TABLE `payment` (
 
 
 ALTER TABLE `user` ADD `remember_token` VARCHAR(256) NULL DEFAULT '' AFTER `status`;
-
-