合并之后出现的问题解决

application/config.php

@@ -13,16 +13,10 @@ define('IMG_PATH','https://admin.tonglianjituan.com/houseImg/');
 define('LOCAL_IMG_HOST','/resource/lib/Attachments/');
 define('PAGESIZE', 15); //分页每页条数
 define('ADMIN_URL_TL','https://admin.tonglianjituan.com/');  //B端网址
-<<<<<<< HEAD
 //define('TEST_ADMIN_URL_TL','https://dev.tonglianjituan.com/');  //B端网址
 define('CURRENT_URL', 'http://'.$_SERVER['HTTP_HOST'].DS); //取当前域名地址
 define('HEADERIMGURL', CURRENT_URL . 'static'. DS . 'head_portrait/'); //头像地址
 define('CHAT_IMG_URL', CURRENT_URL . 'static'. DS . 'chat_image/'); //聊天图片地址
-=======
-define('CURRENT_URL', 'http://'.$_SERVER['HTTP_HOST'].'/'); //取当前域名地址
-define('HEADERIMGURL', CURRENT_URL . 'static'. DS . 'head_portrait/'); //用户头像地址
-define('AGENTHEADERIMGURL', CURRENT_URL . 'static'. DS . 'agent_head_portrait/'); //经纪人头像地址
->>>>>>> test-hujun1.15-111
 define('CK_IMG_URL', CURRENT_URL . '/resource/lib/Attachments/'); //ck 资源文件
 define('_POOLKEY','FC100000022056027');//隐私号码
 define('_TLSYPoolKey','FC100000022056027');//隐私号码池

application/index/controller/Auth.php

@@ -211,41 +211,6 @@ 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;
-<<<<<<< HEAD
-        if (IS_POST && $group_id=0) {
-=======
-<<<<<<< HEAD
-        if (IS_POST && $group_id=0) {
->>>>>>> 8e62fd6... 合并test
-=======
-        if (IS_POST && $group_id==0) {
->>>>>>> cb14688... 编辑5
->>>>>>> test-hujun1.15-111
             //添加or修改
             $data['id']    = $group_id;
             $menu_auth     = input('post.menu_auth/a','');//获取所有授权菜单id

application/index/extend/Basic.php

@@ -69,21 +69,6 @@ class Basic extends Controller
         $this->userAuth($requestPath);
     }
 
-    /**
-     * 权限判定
-     *
-     * @param $requestPath
-     * @return Response
-     */
-
-    public function  userAuth($requestPath){
-       $session = Session::get("userinfo.nav");
-       $rule = 0;
-       if ($session != NULL) {
-           //判断当前控制器用户是否拥有进入权限
-           foreach ($session as $v){
-    }
-
     /**
      * 权限判定
      * @param $requestPath

application/index/view/auth/index.html

 {layout name="global/frame_tpl" /}
-<<<<<<< HEAD
-<h4>权限管理</h4>
-
-<a href="/index/roleedit">添加角色</a>
-
-<input type="hidden" class="page-load" id="auth" />
-<div id="page-content-wrapper">
-    <div class="container">
-        <div class="col-lg-10 col-lg-offset-0">
-            <table class="table table-striped table-bordered table-hover table-condensed">
-                <thead>
-                    <tr>
-                        <th class="text-center">ID</th>
-                        <th class="text-center">角色名</th>
-                        <th class="text-center">描述</th>
-                        <th class="text-center">状态</th>
-                        <th class="text-center">操作</th>
-                    </tr>
-                </thead>
-                <tbody id="auth_list">                                 
-                </tbody>
-            </table>
-        </div>
-        <!-- /#page-content-wrapper -->
-        <div class="text-right pageinfo" id="pagediv">
-
-        </div>
-    </div>
-</div>
-=======
 <!--角色管理页面-->
 <input type="hidden" class="page-load" id="auth" />
 <div id="page-content-wrapper">
@@ -157,4 +127,3 @@
         </div><!-- /.modal-content -->
     </div><!-- /.modal -->
 </div>
->>>>>>> test-hujun1.15-111

application/model/AAgents.php

@@ -296,46 +296,4 @@ public function saveList(){
             ->select();
         return $data;
     }
-
-    /**
-     *检查重复
-     *
-     */
-    public function repetition($name,$key){
-        $r=$this->field($name)
-            ->where($name,'=',$key)
-            ->select();
-        //$this->getLastSql();
-        if($r){
-            return true;
-        }else{
-            return false;
-        }
-    }
-    //更新数据
-    public function saveStatus($name,$key,$ids){
-      $r = $this->save([$name,$key],["id",'in',$ids]);
-       return $r;
-    }
-//删除数据
-    public function  delUid($name,$ids){
-        $this->where($name,'in',$ids)->delete();
-    }
-    //通过ids批量添加数据
-    public  function addAllAccess($ids,$data){
-        $idarr=explode($ids);
-        if(is_array($idarr)){
-            $arr=array();
-            foreach ($idarr as $v){
-                $data['uid']=$v;
-                 $arr[]=$data;
-            }
-           $r= $this->saveAll($arr);
-          }else{
-            $data['uid']=$ids;
-           $r= $this->save($data);
-        }
-        return $r;
-    }
-
 }
\ No newline at end of file

application/route.php

@@ -289,6 +289,4 @@ Route::group('broker', [
     'agentsPhone' => ['api_broker/CellPhone/agentsPhone', [ 'method' => 'get|post' ] ],  //获取经纪人拨打界面手机号
 
 ]);
-
-Route::group('task',[
 //Route::miss('api/index/miss');//处理错误的url
\ No newline at end of file