diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php index 6506ab4..7fdb64a 100644 --- a/app/admin/controller/Index.php +++ b/app/admin/controller/Index.php @@ -133,6 +133,18 @@ class Index extends BaseController ->alias('u') ->where($where) ->join(['fa_szxc_information_planting'=>'p'], 'u.user_id = p.user_id and p.nature_of_land=69')->sum('p.land_area'); +// 荒地面积 + $sum_waste_land_area = Db::table('fa_szxc_information_useraddress') + ->alias('u') + ->where($where) + ->join(['fa_szxc_information_planting'=>'p'], 'u.user_id = p.user_id and p.nature_of_land=69')->sum('p.waste_land_area'); +// 养殖面积 + $breed_area = Db::table('fa_szxc_information_useraddress') + ->alias('u') + ->where($where) + ->join(['fa_szxc_information_planting'=>'p'], 'u.user_id = p.user_id and p.nature_of_land=69')->sum('p.breed_area'); + + $hd_num = $sum_waste_land_area - $breed_area; View::assign( [ 'totaluser' => $num,//User::where($whe)->count(),// 总用户数 @@ -153,6 +165,8 @@ class Index extends BaseController 'sum_214' => $sum_214, 'sum_70' => $sum_70, 'sum_69' => $sum_69, + 'sum_waste_land_area' => $hd_num<0 ?$hd_num:0, + 'breed_area' => $breed_area, ] ); return View(); diff --git a/app/admin/controller/Notice.php b/app/admin/controller/Notice.php index 064dcbe..b257f1b 100644 --- a/app/admin/controller/Notice.php +++ b/app/admin/controller/Notice.php @@ -26,8 +26,28 @@ class Notice extends BaseController { $this->model = new NoticeModel(); $this->uid = get_login_admin('id'); + $this->adminInfo = get_login_admin(); + if($this->adminInfo['position_id'] != 1){ //不是超级管理员 + $www['admin_id'] = $this->adminInfo['id']; + $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find(); + if ($user_address){ + if($user_address['auth_range'] == 1){ + $where[] = ['village_id','=',$user_address['village_id']]; + }elseif ($user_address['auth_range'] == 2){ + $where[] = ['street_id','=',$user_address['street_id']]; + }elseif ($user_address['auth_range'] == 3){ + $where[] = ['area_id','=',$user_address['area_id']]; + }else{ + $where[] = ['village_id','=',$user_address['village_id']]; + } + }else{ + $where[] = ['village_id','=','']; + } + }else{ + $where = []; + } // 获取用户信息 - $this->users = Db::table('fa_szxc_information_usermsg')->where('status',1)->field('user_id,name')->select(); + $this->users = Db::table('fa_szxc_information_usermsg')->where('status',1)->where($where)->field('user_id,name')->select(); } /** * 数据列表 @@ -37,7 +57,26 @@ class Notice extends BaseController if (request()->isAjax()) { $param = get_params(); $where = []; - + if (isset($param['keywords'])){ + $where[]=['title','like','%'.$param['keywords'].'%']; + } + if($this->adminInfo['position_id'] != 1){ //不是超级管理员 + $www['admin_id'] = $this->adminInfo['id']; + $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find(); + if ($user_address){ + if($user_address['auth_range'] == 1){ + $where[] = ['village_id','=',$user_address['village_id']]; + }elseif ($user_address['auth_range'] == 2){ + $where[] = ['street_id','=',$user_address['street_id']]; + }elseif ($user_address['auth_range'] == 3){ + $where[] = ['area_id','=',$user_address['area_id']]; + }else{ + $where[] = ['village_id','=',$user_address['village_id']]; + } + }else{ + $where[] = ['village_id','=','']; + } + } $list = $this->model->getNoticeList($where,$param); foreach ($list as $k =>$v){ $list[$k]['user_name'] = Db::table('fa_szxc_information_usermsg')->where('user_id',$v['user_id'])->value('name'); @@ -77,7 +116,11 @@ class Notice extends BaseController // 验证失败 输出错误信息 return to_assign(1, $e->getError()); } - + $adds=Db::table('fa_szxc_information_useraddress')->where('admin_id',$this->adminInfo['id'])->find(); + $param['area_id']=$adds['area_id']; + $param['street_id']=$adds['street_id']; + $param['village_id']=$adds['village_id']; + $this->model->addNotice($param); }else{ View::assign('users', $this->users); diff --git a/app/admin/controller/SzxcUserAuthentication.php b/app/admin/controller/SzxcUserAuthentication.php index 91bfe57..beeac88 100644 --- a/app/admin/controller/SzxcUserAuthentication.php +++ b/app/admin/controller/SzxcUserAuthentication.php @@ -26,6 +26,7 @@ class SzxcUserAuthentication extends BaseController { $this->model = new SzxcUserAuthenticationModel(); $this->uid = get_login_admin('id'); + $this->adminInfo = get_login_admin(); } /** * 数据列表 @@ -35,7 +36,26 @@ class SzxcUserAuthentication extends BaseController if (request()->isAjax()) { $param = get_params(); $where = []; - + if (isset($param['keywords'])){ + $where[]=['name','like','%'.$param['keywords'].'%']; + } + if($this->adminInfo['position_id'] != 1){ //不是超级管理员 + $www['admin_id'] = $this->adminInfo['id']; + $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find(); + if ($user_address){ + if($user_address['auth_range'] == 1){ + $where[] = ['village_id','=',$user_address['village_id']]; + }elseif ($user_address['auth_range'] == 2){ + $where[] = ['street_id','=',$user_address['street_id']]; + }elseif ($user_address['auth_range'] == 3){ + $where[] = ['area_id','=',$user_address['area_id']]; + }else{ + $where[] = ['village_id','=',$user_address['village_id']]; + } + }else{ + $where[] = ['village_id','=','']; + } + } $list = $this->model->getSzxcUserAuthenticationList($where,$param); foreach ($list as $k=>$v){ $list[$k]['sh_time'] = date('Y-m-d H:i:s',$v['sh_time']); @@ -63,7 +83,11 @@ class SzxcUserAuthentication extends BaseController // 验证失败 输出错误信息 return to_assign(1, $e->getError()); } - + $adds=Db::table('fa_szxc_information_useraddress')->where('admin_id',$this->adminInfo['id'])->find(); + $param['area_id']=$adds['area_id']; + $param['street_id']=$adds['street_id']; + $param['village_id']=$adds['village_id']; + $this->model->addSzxcUserAuthentication($param); }else{ return view(); diff --git a/app/admin/controller/nk/Article.php b/app/admin/controller/nk/Article.php index 0b563a4..bfdc6f0 100644 --- a/app/admin/controller/nk/Article.php +++ b/app/admin/controller/nk/Article.php @@ -23,8 +23,8 @@ class Article extends BaseController public function index($params) { - $where['status']=1; - if (isset($params['keywords'])){ + $where[]= ['status','=',1]; + if (isset($params['keywords']) && !empty($params['keywords'])){ $where[]=['title','like','%'.$params['keywords'].'%']; } if($this->adminInfo['position_id'] != 1){ //不是超级管理员 @@ -32,18 +32,19 @@ class Article extends BaseController $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find(); if ($user_address){ if($user_address['auth_range'] == 1){ - $where['village'] = $user_address['village_id']; + $where[] = ['village','=',$user_address['village_id']]; }elseif ($user_address['auth_range'] == 2){ - $where['township'] = $user_address['street_id']; + $where[] = ['township','=',$user_address['street_id']]; }elseif ($user_address['auth_range'] == 3){ - $where['county'] = $user_address['area_id']; + $where[] = ['county','=',$user_address['area_id']]; }else{ - $where['village'] = $user_address['village_id']; + $where[] = ['village','=',$user_address['village_id']]; } }else{ - $where['village'] = ''; + $where[] = ['village','=','']; } } + $category_id =$params['category_id']; if($category_id){ @@ -96,6 +97,12 @@ class Article extends BaseController $param['township']=$adds['street_id']; $param['village']=$adds['village_id']; $param['user_id']=$adds['user_id']; + if(empty($param['category_type'])){ + $param['category_type'] = 0; + } + if(empty($param['end_time'])){ + $param['end_time'] = date('Y-m-d H:i:s'); + } $res=Db::table('fa_article')->strict(false)->field(true)->insertGetId($param); if ($res){ return to_assign(0,'操作成功',['aid'=>$res]); diff --git a/app/admin/controller/nk/Products.php b/app/admin/controller/nk/Products.php new file mode 100644 index 0000000..3df6db0 --- /dev/null +++ b/app/admin/controller/nk/Products.php @@ -0,0 +1,177 @@ +adminInfo = get_login_admin(); + $this->url=[ + '/admin/nk.products/index', + '/admin/nk.products/add', + '/admin/nk.products/edit', + '/admin/nk.products/del', + '/admin/nk.products/read', + ]; + } + /** + * 数据列表 + */ + public function index() + { + if (request()->isAjax()) { + $params= get_params(); + $where[]= ['status','=',1]; + if (isset($params['keywords']) && !empty($params['keywords'])){ + $where[]= ['title','like','%'.$params['keywords'].'%']; + } + if($this->adminInfo['position_id'] != 1){ //不是超级管理员 + $www['admin_id'] = $this->adminInfo['id']; + $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find(); + if ($user_address){ + if($user_address['auth_range'] == 1){ + $where[] = ['village_id','=',$user_address['village_id']]; + }elseif ($user_address['auth_range'] == 2){ + $where[] = ['street_id','=',$user_address['street_id']]; + }elseif ($user_address['auth_range'] == 3){ + $where[] = ['area_id','=',$user_address['area_id']]; + }else{ + $where[] = ['village_id','=',$user_address['village_id']]; + } + }else{ + $where[] = ['village_id','=','']; + } + } + + $total = Db::table('cms_agriculture_products') + ->where($where) + ->count(); + $list = Db::table('cms_agriculture_products') + ->withAttr('area_id',function ($value,$data){ + return Db::table('fa_geo_area')->where('area_code',$data['area_id'])->value('area_name'); + }) + ->withAttr('street_id',function ($value,$data){ + return Db::table('fa_geo_street')->where('street_code',$data['street_id'])->value('street_name'); + }) + ->withAttr('village_id',function ($value,$data){ + return Db::table('fa_geo_village')->where('village_id',$data['village_id'])->value('village_name'); + }) + ->withAttr('status',function ($value,$data){ + if($value == 1){ + return '正常'; + }else{ + return '禁用'; + } + }) + ->where($where) + ->page($params['page']) + ->limit($params['limit']) + ->order('id desc') + ->select(); + $result = ['total' => $total, 'data' => $list]; + return table_assign(0, '', $result); + } + else{ + return view('nk/products/index',['url'=>$this->url]); + } + } + + public function add(){ + if (request()->isAjax()) { + $param= get_params(); + $adds=Db::table('fa_szxc_information_useraddress')->where('admin_id',$this->adminInfo['id'])->find(); + $param['area_id']=$adds['area_id']; + $param['street_id']=$adds['street_id']; + $param['village_id']=$adds['village_id']; + $param['add_time']=date('Y-m-d H:i:s'); + $param['title'] = Db::table('fa_szxc_planting_type')->where('id',$param['szxc_planting_type_id'])->value('name'); + $res=Db::table('cms_agriculture_products')->strict(false)->field(true)->insertGetId($param); + if ($res){ + return to_assign(0,'操作成功',['aid'=>$res]); + } + return to_assign(1, '操作失败，原因：'.$res); + }else{ + View::assign('editor', get_system_config('other','editor')); + $szxc_planting_type = Db::table('fa_szxc_planting_type')->select(); + View::assign('szxc_planting_type', $szxc_planting_type); + return view(); + } + } + + + public function edit(){ + $param= get_params(); + if (request()->isAjax()) { + $param['title'] = Db::table('fa_szxc_planting_type')->where('id',$param['szxc_planting_type_id'])->value('name'); + $res=Db::table('cms_agriculture_products')->where('id',$param['id'])->strict(false)->field(true)->update($param); + if ($res){ + return to_assign(); + }else{ + return to_assign(1, '操作失败，原因：'.$res); + } + }else{ + $id = isset($param['id']) ? $param['id'] : 0; + $detail = Db::table('cms_agriculture_products')->where('id',$id)->find(); + View::assign('editor', get_system_config('other','editor')); + if (!empty($detail)) { + View::assign('detail', $detail); + $szxc_planting_type = Db::table('fa_szxc_planting_type')->select(); + View::assign('szxc_planting_type', $szxc_planting_type); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + } + /** + * 查看信息 + */ + public function read() + { + $param= get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $detail = Db::table('cms_agriculture_products')->where('id',$id)->find(); + if (!empty($detail)) { + View::assign('detail', $detail); + $szxc_planting_type = Db::table('fa_szxc_planting_type')->select(); + View::assign('szxc_planting_type', $szxc_planting_type); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + /** + * 删除 + */ + public function del() + { + $param= get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $type = isset($param['type']) ? $param['type'] : 0; + $res = Db::table('cms_agriculture_products')->where('id',$id)->delete(); + if ($res){ + return to_assign(); + }else{ + return to_assign(1, '操作失败，原因：'.$res); + } + } + + +} diff --git a/app/admin/controller/nk/User.php b/app/admin/controller/nk/User.php index d813bd1..2549c64 100644 --- a/app/admin/controller/nk/User.php +++ b/app/admin/controller/nk/User.php @@ -35,13 +35,14 @@ class User extends BaseController { if (request()->isAjax()) { $mmm = []; + $map = []; $post = get_params(); if (!empty($post['keywords'])) { - $mmm[] = ['m.name', 'LIKE', '%' . $post['keywords'] . '%']; + $map[] = ['m.name', 'LIKE', '%' . $post['keywords'] . '%']; } if (!empty($post['phone'])) { - $mmm[] = ['m.phone', 'LIKE', '%' . $post['phone'] . '%']; + $map[] = ['m.phone', 'LIKE', '%' . $post['phone'] . '%']; } //权限组信息 @@ -71,14 +72,19 @@ class User extends BaseController $mmm['brigade_id'] = $post['brigade_id']; } } + //权限组信息 $total = Db::table('fa_szxc_information_usermsg') ->alias('m') ->where($mmm) + ->where($map) + ->join(['fa_user' => 'u'], 'm.user_id=u.id') + ->join(['fa_user_group' => 'g'], 'g.id=u.group_id') ->count(); $list = Db::table('fa_szxc_information_usermsg') ->alias('m') ->where($mmm) + ->where($map) ->join(['fa_user' => 'u'], 'm.user_id=u.id') ->join(['fa_user_group' => 'g'], 'g.id=u.group_id') ->field('u.id,m.name,m.phone,u.avatar,u.group_id,u.status,m.gender,m.age,g.name group_name,m.householder_id') diff --git a/app/admin/controller/nk/party/Article.php b/app/admin/controller/nk/party/Article.php index 640946d..125915e 100644 --- a/app/admin/controller/nk/party/Article.php +++ b/app/admin/controller/nk/party/Article.php @@ -32,8 +32,8 @@ class Article extends BaseController { if (request()->isAjax()) { $params= get_params(); - $where['status']=1; - if (isset($params['keywords'])){ + $where[]= ['status','=',1]; + if (isset($params['keywords']) && !empty($params['keywords'])){ $where[]=['title','like','%'.$params['keywords'].'%']; } if($this->adminInfo['position_id'] != 1){ //不是超级管理员 @@ -41,16 +41,16 @@ class Article extends BaseController $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find(); if ($user_address){ if($user_address['auth_range'] == 1){ - $where['village'] = $user_address['village_id']; + $where[] = ['village','=',$user_address['village_id']]; }elseif ($user_address['auth_range'] == 2){ - $where['township'] = $user_address['street_id']; + $where[] = ['township','=',$user_address['street_id']]; }elseif ($user_address['auth_range'] == 3){ - $where['county'] = $user_address['area_id']; + $where[] = ['county','=',$user_address['area_id']]; }else{ - $where['village'] = $user_address['village_id']; + $where[] = ['village','=',$user_address['village_id']]; } }else{ - $where['village'] = ''; + $where[] = ['village','=','']; } } diff --git a/app/admin/controller/nk/party/Branch.php b/app/admin/controller/nk/party/Branch.php index 9f5cf8d..be931e0 100644 --- a/app/admin/controller/nk/party/Branch.php +++ b/app/admin/controller/nk/party/Branch.php @@ -38,8 +38,8 @@ class Branch extends BaseController { if (request()->isAjax()) { $params= get_params(); - $where['status']=1; - if (isset($params['keywords'])){ + $where[]= ['status','=',1]; + if (isset($params['keywords']) && !empty($params['keywords'])){ $where[]=['title','like','%'.$params['keywords'].'%']; } if($this->adminInfo['position_id'] != 1){ //不是超级管理员 @@ -47,16 +47,16 @@ class Branch extends BaseController $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find(); if ($user_address){ if($user_address['auth_range'] == 1){ - $where['village'] = $user_address['village_id']; + $where[] = ['village','=',$user_address['village_id']]; }elseif ($user_address['auth_range'] == 2){ - $where['township'] = $user_address['street_id']; + $where[] = ['township','=',$user_address['street_id']]; }elseif ($user_address['auth_range'] == 3){ - $where['county'] = $user_address['area_id']; + $where[] = ['county','=',$user_address['area_id']]; }else{ - $where['village'] = $user_address['village_id']; + $where[] = ['village','=',$user_address['village_id']]; } }else{ - $where['village'] = ''; + $where[] = ['village','=','']; } } diff --git a/app/admin/controller/nk/party/BranchPayList.php b/app/admin/controller/nk/party/BranchPayList.php index e9427a6..2b1b885 100644 --- a/app/admin/controller/nk/party/BranchPayList.php +++ b/app/admin/controller/nk/party/BranchPayList.php @@ -39,8 +39,8 @@ class BranchPayList extends BaseController { if (request()->isAjax()) { $params= get_params(); - $where['status']=1; - if (isset($params['keywords'])){ + $where[]= ['status','=',1]; + if (isset($params['keywords']) && !empty($params['keywords'])){ $where[]=['title','like','%'.$params['keywords'].'%']; } if($this->adminInfo['position_id'] != 1){ //不是超级管理员 @@ -48,16 +48,16 @@ class BranchPayList extends BaseController $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find(); if ($user_address){ if($user_address['auth_range'] == 1){ - $where['village'] = $user_address['village_id']; + $where[] = ['village','=',$user_address['village_id']]; }elseif ($user_address['auth_range'] == 2){ - $where['township'] = $user_address['street_id']; + $where[] = ['township','=',$user_address['street_id']]; }elseif ($user_address['auth_range'] == 3){ - $where['county'] = $user_address['area_id']; + $where[] = ['county','=',$user_address['area_id']]; }else{ - $where['village'] = $user_address['village_id']; + $where[] = ['village','=',$user_address['village_id']]; } }else{ - $where['village'] = ''; + $where[] = ['village','=','']; } } diff --git a/app/admin/controller/nk/party/BranchPayUser.php b/app/admin/controller/nk/party/BranchPayUser.php index e755ab6..6b49c19 100644 --- a/app/admin/controller/nk/party/BranchPayUser.php +++ b/app/admin/controller/nk/party/BranchPayUser.php @@ -40,8 +40,8 @@ class BranchPayUser extends BaseController { if (request()->isAjax()) { $params= get_params(); - $where['status']=1; - if (isset($params['keywords'])){ + $where[]= ['status','=',1]; + if (isset($params['keywords']) && !empty($params['keywords'])){ $where[]=['title','like','%'.$params['keywords'].'%']; } if($this->adminInfo['position_id'] != 1){ //不是超级管理员 @@ -49,16 +49,16 @@ class BranchPayUser extends BaseController $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find(); if ($user_address){ if($user_address['auth_range'] == 1){ - $where['village'] = $user_address['village_id']; + $where[] = ['village','=',$user_address['village_id']]; }elseif ($user_address['auth_range'] == 2){ - $where['township'] = $user_address['street_id']; + $where[] = ['township','=',$user_address['street_id']]; }elseif ($user_address['auth_range'] == 3){ - $where['county'] = $user_address['area_id']; + $where[] = ['county','=',$user_address['area_id']]; }else{ - $where['village'] = $user_address['village_id']; + $where[] = ['village','=',$user_address['village_id']]; } }else{ - $where['village'] = ''; + $where[] = ['village','=','']; } } diff --git a/app/admin/controller/nk/party/Info.php b/app/admin/controller/nk/party/Info.php index 5889452..b73a515 100644 --- a/app/admin/controller/nk/party/Info.php +++ b/app/admin/controller/nk/party/Info.php @@ -39,8 +39,8 @@ class Info extends BaseController { if (request()->isAjax()) { $params= get_params(); - $where['status']=1; - if (isset($params['keywords'])){ + $where[]= ['status','=',1]; + if (isset($params['keywords']) && !empty($params['keywords'])){ $where[]=['title','like','%'.$params['keywords'].'%']; } if($this->adminInfo['position_id'] != 1){ //不是超级管理员 @@ -48,16 +48,16 @@ class Info extends BaseController $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find(); if ($user_address){ if($user_address['auth_range'] == 1){ - $where['village'] = $user_address['village_id']; + $where[] = ['village','=',$user_address['village_id']]; }elseif ($user_address['auth_range'] == 2){ - $where['township'] = $user_address['street_id']; + $where[] = ['township','=',$user_address['street_id']]; }elseif ($user_address['auth_range'] == 3){ - $where['county'] = $user_address['area_id']; + $where[] = ['county','=',$user_address['area_id']]; }else{ - $where['village'] = $user_address['village_id']; + $where[] = ['village','=',$user_address['village_id']]; } }else{ - $where['village'] = ''; + $where[] = ['village','=','']; } } diff --git a/app/admin/controller/nk/party/Vote.php b/app/admin/controller/nk/party/Vote.php index cf642dd..769b899 100644 --- a/app/admin/controller/nk/party/Vote.php +++ b/app/admin/controller/nk/party/Vote.php @@ -37,8 +37,8 @@ class Vote extends BaseController { if (request()->isAjax()) { $params= get_params(); - $where['status']=1; - if (isset($params['keywords'])){ + $where[]= ['status','=',1]; + if (isset($params['keywords']) && !empty($params['keywords'])){ $where[]=['title','like','%'.$params['keywords'].'%']; } if($this->adminInfo['position_id'] != 1){ //不是超级管理员 @@ -46,16 +46,16 @@ class Vote extends BaseController $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find(); if ($user_address){ if($user_address['auth_range'] == 1){ - $where['village'] = $user_address['village_id']; + $where[] = ['village','=',$user_address['village_id']]; }elseif ($user_address['auth_range'] == 2){ - $where['township'] = $user_address['street_id']; + $where[] = ['township','=',$user_address['street_id']]; }elseif ($user_address['auth_range'] == 3){ - $where['county'] = $user_address['area_id']; + $where[] = ['county','=',$user_address['area_id']]; }else{ - $where['village'] = $user_address['village_id']; + $where[] = ['village','=',$user_address['village_id']]; } }else{ - $where['village'] = ''; + $where[] = ['village','=','']; } } diff --git a/app/admin/controller/nk/party/VoteComment.php b/app/admin/controller/nk/party/VoteComment.php index 995c3a6..39740c4 100644 --- a/app/admin/controller/nk/party/VoteComment.php +++ b/app/admin/controller/nk/party/VoteComment.php @@ -38,7 +38,7 @@ class VoteComment extends BaseController if (request()->isAjax()) { $params= get_params(); $where=[]; - if (isset($params['keywords'])){ + if (isset($params['keywords']) && !empty($params['keywords'])){ $where[]=['title','like','%'.$params['keywords'].'%']; } if($this->adminInfo['position_id'] != 1){ //不是超级管理员 @@ -46,16 +46,16 @@ class VoteComment extends BaseController $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find(); if ($user_address){ if($user_address['auth_range'] == 1){ - $where['village'] = $user_address['village_id']; + $where[] = ['village','=',$user_address['village_id']]; }elseif ($user_address['auth_range'] == 2){ - $where['township'] = $user_address['street_id']; + $where[] = ['township','=',$user_address['street_id']]; }elseif ($user_address['auth_range'] == 3){ - $where['county'] = $user_address['area_id']; + $where[] = ['county','=',$user_address['area_id']]; }else{ - $where['village'] = $user_address['village_id']; + $where[] = ['village','=',$user_address['village_id']]; } }else{ - $where['village'] = ''; + $where[] = ['village','=','']; } } diff --git a/app/admin/view/index/main.html b/app/admin/view/index/main.html index c37c858..773da73 100644 --- a/app/admin/view/index/main.html +++ b/app/admin/view/index/main.html @@ -97,6 +97,10 @@
养殖
{$sum_216}
+ +
荒地面积
+
{$sum_waste_land_area}
+ diff --git a/app/admin/view/nk/products/add.html b/app/admin/view/nk/products/add.html new file mode 100644 index 0000000..bd4d4ac --- /dev/null +++ b/app/admin/view/nk/products/add.html @@ -0,0 +1,99 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+

添加

+ + + + + + + + + + + + + + + + + + + + +
农作物* +
+ +
+
简介* + +
内容 + +
+
+ + +
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/nk/products/edit.html b/app/admin/view/nk/products/edit.html new file mode 100644 index 0000000..629e222 --- /dev/null +++ b/app/admin/view/nk/products/edit.html @@ -0,0 +1,108 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+

编辑

+ + + + + + + + + + + + + + + + +
农作物* +
+ +
+
简介* + +
内容 + +
+
+ + + +
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/nk/products/index.html b/app/admin/view/nk/products/index.html new file mode 100644 index 0000000..3f4dd5c --- /dev/null +++ b/app/admin/view/nk/products/index.html @@ -0,0 +1,154 @@ +{extend name="common/base"/} + +{block name="body"} + +
+
+
+ +
+ +
+
+
+ + + + + + + + +{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/nk/products/read.html b/app/admin/view/nk/products/read.html new file mode 100644 index 0000000..4381623 --- /dev/null +++ b/app/admin/view/nk/products/read.html @@ -0,0 +1,57 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+

详情

+ + + + + + + + + + + + + + + + +
农作物* +
+ +
+
简介* + {$detail.synopsis} +
内容 + {$detail.content|raw} +
+
+{/block} + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/nk/user/index.html b/app/admin/view/nk/user/index.html index af1e0f0..67a3c7f 100644 --- a/app/admin/view/nk/user/index.html +++ b/app/admin/view/nk/user/index.html @@ -271,7 +271,8 @@ layui.pageTable.reload({ where: { keywords: data.field.keywords, - cate_id: data.field.cate_id + cate_id: data.field.cate_id, + phone:data.field.phone }, page: { curr: 1 diff --git a/app/api/controller/User.php b/app/api/controller/User.php index 6d0bdf6..9ec6f47 100644 --- a/app/api/controller/User.php +++ b/app/api/controller/User.php @@ -436,6 +436,12 @@ class User extends BaseController $uid = JWT_UID; $params['user_id'] = $uid; $is_have = Db::table('cms_szxc_user_authentication')->where('user_id',$uid)->find(); + + $adds=Db::table('fa_szxc_information_useraddress')->where('user_id',JWT_UID)->find(); + $params['area_id']=$adds['area_id']; + $params['street_id']=$adds['street_id']; + $params['village_id']=$adds['village_id']; + if($is_have){ if($is_have['status'] == 0){ $this->apiError('您的实名认证正在审核中','您的实名认证正在审核中');