From 21afb048de6f950ff01d83df8758116f895050da Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 14 Feb 2023 11:13:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Index.php | 23 +++++++++++++++++++++++ app/admin/controller/nk/Article.php | 7 +++++++ app/admin/controller/nk/Meeting.php | 2 ++ app/admin/view/nk/article/add.html | 14 ++++++++++++-- app/admin/view/nk/article/edit.html | 14 ++++++++++++-- app/api/controller/Userinfo.php | 14 ++++++++++++-- 6 files changed, 68 insertions(+), 6 deletions(-) diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php index fe33dae..4c5d9ee 100644 --- a/app/admin/controller/Index.php +++ b/app/admin/controller/Index.php @@ -44,6 +44,29 @@ class Index extends BaseController public function main() { + if ($this->adminInfo['group_access']==4){ + return ' +
+ 跳转大屏 +
+ + +'; + } if ($this->adminInfo['id']!=1){ $find = Db::table('fa_szxc_information_useraddress')->where('user_id', $this->adminInfo['user_id'])->find(); if ($find) { diff --git a/app/admin/controller/nk/Article.php b/app/admin/controller/nk/Article.php index 4059188..a54f976 100644 --- a/app/admin/controller/nk/Article.php +++ b/app/admin/controller/nk/Article.php @@ -101,6 +101,10 @@ class Article extends BaseController } $res=Db::table('fa_article')->strict(false)->field(true)->insertGetId($param); if ($res){ + if(!empty($param['is_vote']) && $param['is_vote']==1){ + $data=['start_time'=>date('Y-m-d H:i:s'),'end_time'=>$param['end_time'],'article_id'=>$res,'county'=>$adds['area_id'],'township'=>$adds['street_id'],'village'=>$adds['village_id']]; + Db::table('fa_article_vote_side_tables')->insert($data); + } return to_assign(0,'操作成功',['aid'=>$res]); } return to_assign(1, '操作失败，原因：'.$res); @@ -115,6 +119,9 @@ class Article extends BaseController } $res=Db::table('fa_article')->where('id',$param['id'])->strict(false)->field(true)->update($param); if ($res){ + if(!empty($param['is_vote']) && $param['is_vote']==1){ + Db::table('fa_article_vote_side_tables')->where('article_id',$param['id'])->update(['end_time'=>$param['end_time']]); + } return to_assign(); }else{ return to_assign(1, '操作失败，原因：'.$res); diff --git a/app/admin/controller/nk/Meeting.php b/app/admin/controller/nk/Meeting.php index 5f99018..36ffa03 100644 --- a/app/admin/controller/nk/Meeting.php +++ b/app/admin/controller/nk/Meeting.php @@ -52,6 +52,7 @@ class Meeting extends BaseController }else{ View::assign('editor', get_system_config('other','editor')); View::assign('url', $this->url); + View::assign('is_vote', 1); return view('nk/article/add'); } } @@ -62,6 +63,7 @@ class Meeting extends BaseController { $params= get_params(); (new Article())->edit($params); + View::assign('is_vote', 1); return view('nk/article/edit',['url'=>$this->url]); } /** diff --git a/app/admin/view/nk/article/add.html b/app/admin/view/nk/article/add.html index b2ce05d..9d1b4b6 100644 --- a/app/admin/view/nk/article/add.html +++ b/app/admin/view/nk/article/add.html @@ -15,6 +15,14 @@ + {notempty name="is_vote"} + + 结束时间* + + + + + {/notempty} 文章摘要 @@ -56,8 +64,10 @@ var moduleInit = ['tool', 'tagpicker', 'tinymce']; function gouguInit() { - var form = layui.form, tool = layui.tool,tagspicker = layui.tagpicker; - + var form =layui.form, tool = layui.tool,tagspicker = layui.tagpicker,laydate=layui.laydate; + laydate.render({ + elem: '#test1' //指定元素 + }); //上传缩略图 var upload_thumb = layui.upload.render({ elem: '#upload_btn_thumb', diff --git a/app/admin/view/nk/article/edit.html b/app/admin/view/nk/article/edit.html index c590db5..7e094b2 100644 --- a/app/admin/view/nk/article/edit.html +++ b/app/admin/view/nk/article/edit.html @@ -21,6 +21,14 @@ autocomplete="off" placeholder="请输入文章标题" class="layui-input" value="{$detail.title}"> + {notempty name="is_vote"} + + 结束时间* + + + + + {/notempty} 摘要 @@ -74,8 +82,10 @@ } function gouguInit() { - var form = layui.form, tool = layui.tool, tagpicker = layui.tagpicker; - + var form =layui.form, tool = layui.tool,tagspicker = layui.tagpicker,laydate=layui.laydate; + laydate.render({ + elem: '#test1' //指定元素 + }); //上传缩略图 var upload_thumb = layui.upload.render({ elem: '#upload_btn_thumb', diff --git a/app/api/controller/Userinfo.php b/app/api/controller/Userinfo.php index 6dfa098..6f87bbd 100644 --- a/app/api/controller/Userinfo.php +++ b/app/api/controller/Userinfo.php @@ -146,8 +146,7 @@ class Userinfo extends BaseController Db::table('fa_user')->where($where)->update($u_up); // $header = Request::header('x-Token'); // if(isset($header['x-token']) && !empty($header['x-token'])){ -// $phone['mobile'] = $post['phone']??''; -// Db::table('fa_user')->where($where)->update($phone); + // }else{ // $post['phone'] = $user['mobile']??''; // } @@ -170,6 +169,9 @@ class Userinfo extends BaseController if (!$msg){ Db::table('fa_szxc_information_usermsg')->strict(false)->insert($data); } + $fa_user['mobile'] = $post['phone']??''; + $fa_user['nickname'] = $post['name']??''; + Db::table('fa_user')->where($where)->update($fa_user); // else{ // $this->apiError('请勿重新提交'); // } @@ -184,6 +186,14 @@ class Userinfo extends BaseController $add=Db::table('fa_szxc_information_useraddress')->where('user_id',$post['user_id'])->find(); if (!$add){ Db::table('fa_szxc_information_useraddress')->strict(false)->insert($address_data); + $eb_nk_user=Db::connect('shop')->table('eb_nk_user')->where('n_user_id',$post['user_id'])->find(); + if ($eb_nk_user){ + Db::connect('shop')->table('eb_nk_user')->where('id',$eb_nk_user['id']) + ->update(['area_id'=>$post['area_id'],'street_id'=>$post['street_id'],'village_id'=>$post['village_id_id'],'village_code'=>$post['village_id']]); + if ($fa_user['nickname']){ + Db::connect('shop')->table('eb_user')->where('uid',$eb_nk_user['user_id'])->update(['nickname'=>$fa_user['nickname']]); + } + } } // else{ // $this->apiError('请勿重新提交');