合并test

application/api_broker/controller/FollowUp.php

+<?php
+
+use app\api_broker\extend\Basic;
+
+/**
+ * Created by PhpStorm.
+ * User : zw
+ * Date : 2018/1/24
+ * Time : 14:24
+ * Intro:
+ */
+
+class FollowUp extends Basic{
+    public function __construct($request = null)
+    {
+        parent::__construct($request);
+    }
+
+    /**
+     * 报备
+     */
+    public function report(){
+        $params = $this->params;
+        $params = array(
+            "user_id" => 1,
+            "shop_ids"=> "1,2,3",
+            ""
+        );
+
+        $this->response("200","request success",[]);
+    }
+}
\ No newline at end of file

application/index/controller/Auth.php

@@ -208,6 +208,33 @@ class Auth extends Basic
 //        echo $group_id;
 //        exit;
         if ($this->request->isPost()) {
+=======
+    
+    public function test(){
+//        $this->authRuleModel  = new AuthRule();
+//        dump($this->authRuleModel);die;
+//       $list=  $this->authRuleModel->find();
+        
+     //   return $this->response(200, '', $list);
+    }
+
+    
+
+    /**
+     * 权限分配
+     * @param  integer $group_id 组ID
+     * @return [type] [description]
+     * @date   2018-01-22
+     * @author zfc
+     */
+    public function accessLook($group_id=0){
+         $table= New AuthGroup();
+         $table2= New AuthRule();
+        $data['title']='权限分配';
+//        echo $group_id;
+//        exit;
+        if (IS_POST && $group_id=0) {
+>>>>>>> 8e62fd6... 合并test
             //添加or修改
             $data['id']    = $group_id;
             $menu_auth     = input('post.menu_auth/a','');//获取所有授权菜单id