diff --git a/app/admin/controller/nk/Community.php b/app/admin/controller/nk/Community.php index 6f4b190..07c8f17 100644 --- a/app/admin/controller/nk/Community.php +++ b/app/admin/controller/nk/Community.php @@ -8,7 +8,7 @@ use think\facade\View; /** - * 文章投诉 + * 村民互动(逛逛) * * @icon fa fa-circle-o */ @@ -38,7 +38,6 @@ class Community extends BaseController if (request()->isAjax()) { $params= get_params(); $where['status']=1; - $where = []; if (isset($params['keywords'])){ // $where[]=['title','like','%'.$params['keywords'].'%']; } @@ -57,7 +56,6 @@ class Community extends BaseController $where['village_id'] = ''; } } - $total = Db::connect('shop')->name('community_address') ->where($where) ->count(); diff --git a/app/admin/controller/nk/User.php b/app/admin/controller/nk/User.php index 2549c64..07b9c6c 100644 --- a/app/admin/controller/nk/User.php +++ b/app/admin/controller/nk/User.php @@ -44,16 +44,14 @@ class User extends BaseController $map[] = ['m.phone', 'LIKE', '%' . $post['phone'] . '%']; } - //权限组信息 if ($this->adminInfo['group_access'] != 1) { $find = Db::table('fa_szxc_information_useraddress')->where('admin_id', $this->adminInfo['id'])->find(); if ($find) { if ($find['auth_range'] == 1) { - $mmm['village_id'] = $find['village_id']; - } elseif ($find['auth_range'] == 2) { + $mmm['area_id'] = $find['area_id']; $mmm['street_id'] = $find['street_id']; - } elseif ($find['auth_range'] == 3) { + } elseif ($find['auth_range'] == 2) { $mmm['area_id'] = $find['area_id']; } } @@ -72,14 +70,11 @@ 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') @@ -743,14 +738,12 @@ class User extends BaseController $find = Db::table('fa_szxc_information_useraddress')->where('user_id', $this->adminInfo['user_id'])->find(); if ($find) { if ($find['auth_range'] == 1) { - $where['village_id'] = $find['village_id']; + $mmm['area_id'] = $find['area_id']; + $mmm['street_id'] = $find['street_id']; } elseif ($find['auth_range'] == 2) { - $where['street_id'] = $find['street_id']; - } elseif ($find['auth_range'] == 3) { - $where['area_id'] = $find['area_id']; + $mmm['area_id'] = $find['area_id']; } } - if (!empty($post['village_id'])) { $where['village_id'] = $post['village_id']; } diff --git a/app/admin/view/nk/agrotechnical/index.html b/app/admin/view/nk/agrotechnical/index.html index 106b167..04928d0 100644 --- a/app/admin/view/nk/agrotechnical/index.html +++ b/app/admin/view/nk/agrotechnical/index.html @@ -47,7 +47,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/article/index.html b/app/admin/view/nk/article/index.html index 65b9c11..9af757a 100644 --- a/app/admin/view/nk/article/index.html +++ b/app/admin/view/nk/article/index.html @@ -45,7 +45,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/broadcast/index.html b/app/admin/view/nk/broadcast/index.html index 875e5db..2621f11 100644 --- a/app/admin/view/nk/broadcast/index.html +++ b/app/admin/view/nk/broadcast/index.html @@ -43,7 +43,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/comment/index.html b/app/admin/view/nk/comment/index.html index e3bc290..6544394 100644 --- a/app/admin/view/nk/comment/index.html +++ b/app/admin/view/nk/comment/index.html @@ -45,7 +45,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/community/index.html b/app/admin/view/nk/community/index.html index 2b9c2e6..8ff064d 100644 --- a/app/admin/view/nk/community/index.html +++ b/app/admin/view/nk/community/index.html @@ -45,7 +45,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/complaint/index.html b/app/admin/view/nk/complaint/index.html index b106912..becc18d 100644 --- a/app/admin/view/nk/complaint/index.html +++ b/app/admin/view/nk/complaint/index.html @@ -45,7 +45,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/farmers/index.html b/app/admin/view/nk/farmers/index.html index 106b167..04928d0 100644 --- a/app/admin/view/nk/farmers/index.html +++ b/app/admin/view/nk/farmers/index.html @@ -47,7 +47,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/maturity/index.html b/app/admin/view/nk/maturity/index.html index 991a424..c72ee8d 100644 --- a/app/admin/view/nk/maturity/index.html +++ b/app/admin/view/nk/maturity/index.html @@ -45,7 +45,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/merchant/index.html b/app/admin/view/nk/merchant/index.html index 9ccd509..96bbd9d 100644 --- a/app/admin/view/nk/merchant/index.html +++ b/app/admin/view/nk/merchant/index.html @@ -35,7 +35,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/party/article/index.html b/app/admin/view/nk/party/article/index.html index 39a60f8..ce2fa79 100644 --- a/app/admin/view/nk/party/article/index.html +++ b/app/admin/view/nk/party/article/index.html @@ -45,7 +45,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/party/branch/index.html b/app/admin/view/nk/party/branch/index.html index 5c498c1..7fdba7d 100644 --- a/app/admin/view/nk/party/branch/index.html +++ b/app/admin/view/nk/party/branch/index.html @@ -45,7 +45,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/party/branchpaylist/index.html b/app/admin/view/nk/party/branchpaylist/index.html index 0df5f3e..a148904 100644 --- a/app/admin/view/nk/party/branchpaylist/index.html +++ b/app/admin/view/nk/party/branchpaylist/index.html @@ -45,7 +45,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/party/branchpayuser/index.html b/app/admin/view/nk/party/branchpayuser/index.html index 7026ba0..fc5e1aa 100644 --- a/app/admin/view/nk/party/branchpayuser/index.html +++ b/app/admin/view/nk/party/branchpayuser/index.html @@ -45,7 +45,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/party/info/index.html b/app/admin/view/nk/party/info/index.html index 7c0ae57..df66300 100644 --- a/app/admin/view/nk/party/info/index.html +++ b/app/admin/view/nk/party/info/index.html @@ -45,7 +45,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/party/vote/index.html b/app/admin/view/nk/party/vote/index.html index 5d67965..3bb2ed4 100644 --- a/app/admin/view/nk/party/vote/index.html +++ b/app/admin/view/nk/party/vote/index.html @@ -45,7 +45,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/party/votecomment/index.html b/app/admin/view/nk/party/votecomment/index.html index f496804..4bf83b6 100644 --- a/app/admin/view/nk/party/votecomment/index.html +++ b/app/admin/view/nk/party/votecomment/index.html @@ -45,7 +45,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/policy/index.html b/app/admin/view/nk/policy/index.html index 106b167..04928d0 100644 --- a/app/admin/view/nk/policy/index.html +++ b/app/admin/view/nk/policy/index.html @@ -47,7 +47,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/products/index.html b/app/admin/view/nk/products/index.html index f40fc18..28c9181 100644 --- a/app/admin/view/nk/products/index.html +++ b/app/admin/view/nk/products/index.html @@ -47,7 +47,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/regioncommission/index.html b/app/admin/view/nk/regioncommission/index.html index e8f16b1..9d612f1 100644 --- a/app/admin/view/nk/regioncommission/index.html +++ b/app/admin/view/nk/regioncommission/index.html @@ -78,7 +78,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/seekers/index.html b/app/admin/view/nk/seekers/index.html index 106b167..04928d0 100644 --- a/app/admin/view/nk/seekers/index.html +++ b/app/admin/view/nk/seekers/index.html @@ -47,7 +47,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/skills/index.html b/app/admin/view/nk/skills/index.html index 106b167..04928d0 100644 --- a/app/admin/view/nk/skills/index.html +++ b/app/admin/view/nk/skills/index.html @@ -47,7 +47,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/slide/index.html b/app/admin/view/nk/slide/index.html index 2b808f4..92c52da 100644 --- a/app/admin/view/nk/slide/index.html +++ b/app/admin/view/nk/slide/index.html @@ -45,7 +45,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/slideinfo/index.html b/app/admin/view/nk/slideinfo/index.html index 5bc8f14..1af3251 100644 --- a/app/admin/view/nk/slideinfo/index.html +++ b/app/admin/view/nk/slideinfo/index.html @@ -47,7 +47,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/spread/index.html b/app/admin/view/nk/spread/index.html index 6e3723c..b564ee4 100644 --- a/app/admin/view/nk/spread/index.html +++ b/app/admin/view/nk/spread/index.html @@ -78,7 +78,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/street/index.html b/app/admin/view/nk/street/index.html index 5179344..0f511db 100644 --- a/app/admin/view/nk/street/index.html +++ b/app/admin/view/nk/street/index.html @@ -45,7 +45,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/transaction/index.html b/app/admin/view/nk/transaction/index.html index 106b167..04928d0 100644 --- a/app/admin/view/nk/transaction/index.html +++ b/app/admin/view/nk/transaction/index.html @@ -47,7 +47,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/user/auths.html b/app/admin/view/nk/user/auths.html index 5cf1ef7..567cc53 100644 --- a/app/admin/view/nk/user/auths.html +++ b/app/admin/view/nk/user/auths.html @@ -42,6 +42,7 @@ {volist name='street' id='vo'} {if $address.area_id==$vo.code} + {/if} {/volist} {/if} diff --git a/app/admin/view/nk/vegetable/index.html b/app/admin/view/nk/vegetable/index.html index 106b167..04928d0 100644 --- a/app/admin/view/nk/vegetable/index.html +++ b/app/admin/view/nk/vegetable/index.html @@ -47,7 +47,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/village/index.html b/app/admin/view/nk/village/index.html index 8d66918..4e0e2c4 100644 --- a/app/admin/view/nk/village/index.html +++ b/app/admin/view/nk/village/index.html @@ -45,7 +45,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/welfare/index.html b/app/admin/view/nk/welfare/index.html index 106b167..04928d0 100644 --- a/app/admin/view/nk/welfare/index.html +++ b/app/admin/view/nk/welfare/index.html @@ -47,7 +47,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/api/controller/Census.php b/app/api/controller/Census.php index 561f970..3a361d7 100644 --- a/app/api/controller/Census.php +++ b/app/api/controller/Census.php @@ -58,7 +58,7 @@ class Census extends BaseController $num_1 = Db::connect('shop')->table('eb_merchant')->alias('a')->join('eb_merchant_address b','a.mer_id = b.mer_id')->where($mmm)->where($map)->count(); //企业通过我们平台采购的农产品(差用户标签条件) - $num_3 = Db::connect('shop')->table('eb_user')->alias('a')->join('eb_nk_user b','a.uid = b.user_id')->join('eb_product_order_log c','a.uid = c.uid')->join('nk_lihaink_cn.fa_szxc_information_useraddress d','b.n_user_id = d.user_id')->where($www)->where('a.status',1)->where('c.status',1)->count(); + $num_3 = Db::connect('shop')->table('eb_user')->alias('a')->join('eb_nk_user b','a.uid = b.user_id')->join(['eb_product_order_log'=>'c'],'a.uid = c.uid')->join('nk_lihaink_cn.fa_szxc_information_useraddress d','b.n_user_id = d.user_id')->where($www)->where('a.status',1)->where('c.status',1)->count(); //镇农产品需求量分析（事业单位、企业、居民） //农产品市场行情分析、显示