备份

application/index/controller/Auth.php

@@ -435,8 +435,23 @@ class Auth extends Basic
     }
 
     public function getMenu() {
-        $menu_data = Session::get('user_info');
-        return $this->response(200, '取值', $menu_data);
+        $where_rule['status']  = 0;
+        $where_rule['is_menu'] = 1;
+        //超级管理员
+        $auth = new AuthRule();
+        $nav   = $auth->getRule('',$where_rule);
+
+        $menu_data = [];
+
+        foreach ($nav as $k=>$v) {
+            $menu_data[$k]['id']    = $v['id'];
+            $menu_data[$k]['name']  = $v['name'];
+            $menu_data[$k]['title'] = $v['title'];
+            $menu_data[$k]['pid']   = $v['pid'];
+        }
+
+        $data = list_to_tree($menu_data);
+        return $this->response(200, '', $data);
     }
 
 

application/index/controller/Finance.php

@@ -43,7 +43,7 @@ class Finance extends Basic
                 $where['e.audit_level'] = 0;
                 $where['a.status'] = 10;
 
-                $check_status = [1,2,3,4];
+                $check_status = [0,1,2,3,4];
                 if (in_array($this->params['check_status'], $check_status)) {
                     switch ($this->params['check_status']) {
                         case 1 :
@@ -374,4 +374,13 @@ class Finance extends Basic
 
         return $this->response($data['code'], $data['msg']);
     }
+
+    /**
+     * 退款列表和已退款列表
+     *
+     * @return \think\response\View
+     */
+    public function refundList() {
+        return view('refundList');
+    }
 }
\ No newline at end of file

application/index/view/finance/refund.html → application/index/view/finance/refundList.html

 {layout name="global/frame_tpl" /}
-退款列表
+退款列表 和 已退款列表
\ No newline at end of file

application/model/AuthRule.php

@@ -178,6 +178,7 @@ class AuthRule extends BaseModel
     public function getRule($field = 'id,name,title,pid,is_menu', $where) {
         return $this->field($field)
             ->where($where)
+            ->order('sort ASC')
             ->select();
     }
 

application/route.php

@@ -192,7 +192,8 @@ Route::group('index', [
     'reportListStatement/:check_status' => ['index/Finance/reportList', [ 'method' => 'get' ] ,['check_status'=>4]], //财务 成交报告-已结单
     'reportListBackout/:status' => ['index/Finance/reportList', [ 'method' => 'get' ] ,['status'=>5]], //财务 成交报告-待撤销
     'reportListUndone/:status' => ['index/Finance/reportList', [ 'method' => 'get' ] ,['status'=>6]], //财务 成交报告-已撤销
-    'refundList' => ['index/Finance/refundList', [ 'method' => 'get|post' ] ], //财务 退款
+    'refundList/:status' => ['index/Finance/refundList', [ 'method' => 'get|post' ], ['status'=>1] ], //财务 退款
+    'refundList/:status' => ['index/Finance/refundList', [ 'method' => 'get|post' ], ['status'=>2] ], //财务 已退款
     'accountList' => ['index/Finance/accountList', [ 'method' => 'get|post' ] ], //财务 账户列表
     'checkReportAttache/:check_status' => ['index/Finance/checkReport', [ 'method' => 'post' ], ['check_status'=>0]], //审核成交报告-专员审核
     'checkReportManager/:check_status' => ['index/Finance/checkReport', [ 'method' => 'post' ], ['check_status'=>1]], //审核成交报告-经理审核

public/resource/template/menu_template_tpl.html

@@ -3,7 +3,7 @@
     [% for(var item in it){ %]
         <li class="dropdown">
             [% if(it[item]["_child"] == undefined || it[item]["_child"].length == 0) { %]
-                <a href="/[%= it[item]['name'] %]" ><span class="glyphicon glyphicon-credit-card" aria-hidden="true"></span> <span class="span-list">[%= it[item]["title"] %]</span></a>
+                <a href="javascript:;" ><span class="glyphicon glyphicon-credit-card" aria-hidden="true"></span> <span class="span-list">[%= it[item]["title"] %]</span></a>
             [% } else { %]
                 <a href="" class="dropdown-toggle" data-toggle="dropdown"> <span class="glyphicon glyphicon-credit-card" aria-hidden="true"></span><span class="span-list">[%= it[item]["title"] %]</span>
                     <span class="glyphicon glyphicon-hand-down" aria-hidden="true"></span></a>