接口修改7

This commit is contained in:
mkm 2023-02-14 11:13:43 +08:00
parent 6a57f4c5f3
commit 21afb048de
6 changed files with 68 additions and 6 deletions

View File

@ -44,6 +44,29 @@ class Index extends BaseController
public function main()
{
if ($this->adminInfo['group_access']==4){
return '
<div id="your-element-selector" style="height: 100%">
<a href="https://www.baidu.com" target="_blank" style="font-size: 100px;
color: aliceblue;
display: block;
text-align: center;
text-decoration:none;
top: 40%;">跳转大屏</a>
</div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/r134/three.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/vanta@0.5.24/dist/vanta.waves.min.js"></script>
<script>
VANTA.WAVES({
el: "#your-element-selector",
mouseControls: true,
touchControls: true,
gyroControls: false,
scale: 1.00,
scaleMobile: 1.00
})
</script>';
}
if ($this->adminInfo['id']!=1){
$find = Db::table('fa_szxc_information_useraddress')->where('user_id', $this->adminInfo['user_id'])->find();
if ($find) {

View File

@ -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);

View File

@ -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]);
}
/**

View File

@ -15,6 +15,14 @@
<td colspan="7"><input type="text" name="title" lay-verify="required" lay-reqText="请输入文章标题"
autocomplete="off" placeholder="请输入文章标题" class="layui-input"></td>
</tr>
{notempty name="is_vote"}
<tr>
<td class="layui-td-gray">结束时间<font>*</font></td>
<td colspan="7"> <input type="text" placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input" id="test1" name="end_time">
<input type="hidden" name="is_vote" value="1">
</td>
</tr>
{/notempty}
<tr>
<td class="layui-td-gray" style="vertical-align:top;">文章摘要</td>
<td colspan="3">
@ -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',

View File

@ -21,6 +21,14 @@
autocomplete="off" placeholder="请输入文章标题" class="layui-input"
value="{$detail.title}"></td>
</tr>
{notempty name="is_vote"}
<tr>
<td class="layui-td-gray">结束时间<font>*</font></td>
<td colspan="7"> <input type="text" placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input" id="test1" name="end_time">
<input type="hidden" name="is_vote" value="1">
</td>
</tr>
{/notempty}
<tr>
<td class="layui-td-gray" style="vertical-align:top;">摘要</td>
<td colspan="3">
@ -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',

View File

@ -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('请勿重新提交');