mkm/nk-lihaink-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复错误

Browse Source
This commit is contained in:
mkm 2023-03-22 13:35:24 +08:00
parent b9e42c632a
commit 3a97605c1c
11 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/admin/controller/nk/Street.php
View File

@ -81,6 +81,7 @@ class Street extends BaseController
$params['address']='泸州市'.$area_code.$street_code; $params['address']='泸州市'.$area_code.$street_code;
$params['createtime']=time(); $params['createtime']=time();
$params['people_num']=0;
$res=Db::table('fa_szxc_village')->strict(false)->field(true)->insertGetId($params); $res=Db::table('fa_szxc_village')->strict(false)->field(true)->insertGetId($params);
if ($res){ if ($res){
return to_assign(0,'操作成功',['aid'=>$res]); return to_assign(0,'操作成功',['aid'=>$res]);

2
app/admin/controller/nk/Village.php
View File

@ -110,13 +110,13 @@ class Village extends BaseController
$village_id=Db::table('fa_geo_village')->where('village_id',$params['village_id'])->value('village_name'); $village_id=Db::table('fa_geo_village')->where('village_id',$params['village_id'])->value('village_name');
$params['address']='泸州市'.$area_code.$street_code.$village_id; $params['address']='泸州市'.$area_code.$street_code.$village_id;
$params['createtime']=time(); $params['createtime']=time();
$params['people_num']=0;
$res=Db::table('fa_szxc_village')->strict(false)->field(true)->insertGetId($params); $res=Db::table('fa_szxc_village')->strict(false)->field(true)->insertGetId($params);
if ($res){ if ($res){
return to_assign(0,'操作成功',['aid'=>$res]); return to_assign(0,'操作成功',['aid'=>$res]);
} }
return to_assign(1, '操作失败，原因：'.$res); return to_assign(1, '操作失败，原因：'.$res);
} }
if($this->adminInfo['position_id'] != 1){ //不是超级管理员 if($this->adminInfo['position_id'] != 1){ //不是超级管理员
$www['admin_id'] = $this->adminInfo['id']; $www['admin_id'] = $this->adminInfo['id'];
$user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find(); $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find();

6
app/admin/view/nk/street/add.html
View File

@ -22,11 +22,7 @@
</tr> </tr>
<tr> <tr>
<td class="layui-td-gray">人数<font>*</font></td> <td class="layui-td-gray">标签</td>
<td colspan="3">
<input type="text" name="people_num" lay-verify="required" lay-reqText="请输入人数"
autocomplete="off" placeholder="请输入人数" class="layui-input"></td>
<td class="layui-td-gray">标签(多选)<font>*</font></td>
<td> <td>
<input type="checkbox" name="is_hot" title="热门"> <input type="checkbox" name="is_hot" title="热门">
<input type="checkbox" name="is_tourism" title="文旅"> <input type="checkbox" name="is_tourism" title="文旅">

6
app/admin/view/nk/street/edit.html
View File

@ -22,11 +22,7 @@
</tr> </tr>
<tr> <tr>
<td class="layui-td-gray">人数<font>*</font></td> <td class="layui-td-gray">标签</td>
<td colspan="3">
<input type="text" name="people_num" lay-verify="required" lay-reqText="请输入人数"
autocomplete="off" placeholder="请输入人数" class="layui-input" value="{$detail.people_num}"></td>
<td class="layui-td-gray">标签(多选)<font>*</font></td>
<td> <td>
<input type="checkbox" name="is_hot" title="热门" {if $detail.is_hot==1} checked {/if}> <input type="checkbox" name="is_hot" title="热门" {if $detail.is_hot==1} checked {/if}>
<input type="checkbox" name="is_tourism" title="文旅" {if $detail.is_tourism==1} checked {/if}> <input type="checkbox" name="is_tourism" title="文旅" {if $detail.is_tourism==1} checked {/if}>

4
app/admin/view/nk/street/read.html
View File

@ -19,8 +19,8 @@
<td colspan="3">{$detail.people_num}</td> <td colspan="3">{$detail.people_num}</td>
<td class="layui-td-gray">标签(多选)<font>*</font></td> <td class="layui-td-gray">标签(多选)<font>*</font></td>
<td> <td>
<input type="checkbox" name="is_hot" title="热门" {if $detail.is_hot==1} checked {/if}> <input type="checkbox" name="is_hot" title="热门" {if $detail.is_hot==1} checked {/if} >
<input type="checkbox" name="is_tourism" title="文旅" {if $detail.is_tourism==1} checked {/if> <input type="checkbox" name="is_tourism" title="文旅" {if $detail.is_tourism==1} checked {/if}>
</td> </td>
</tr> </tr>
<tr> <tr>

12
app/admin/view/nk/village/add.html
View File

@ -22,11 +22,7 @@
</tr> </tr>
<tr> <tr>
<td class="layui-td-gray">人数<font>*</font></td> <td class="layui-td-gray">标签(多选)</td>
<td colspan="3">
<input type="text" name="people_num" lay-verify="required" lay-reqText="请输入人数"
autocomplete="off" placeholder="请输入人数" class="layui-input"></td>
<td class="layui-td-gray">标签(多选)<font>*</font></td>
<td> <td>
<input type="checkbox" name="is_hot" title="热门"> <input type="checkbox" name="is_hot" title="热门">
<input type="checkbox" name="is_tourism" title="文旅"> <input type="checkbox" name="is_tourism" title="文旅">
@ -114,8 +110,8 @@
const editorType = '{$editor}'; const editorType = '{$editor}';
var moduleInit = ['tool', 'tagpicker', 'tinymce']; var moduleInit = ['tool', 'tagpicker', 'tinymce'];
var group_access = "{:session('gougu_admin')['group_access']}" var group_access = "{:session('gougu_admin')['group_access']}"
var area_id = "{$detail.area_id}" var area_id = "{$detail.area_id|default=0}"
var street_id = "{$detail.street_id}" var street_id = "{$detail.street_id|default=0}"
var admin_id = "{$admin_id}" var admin_id = "{$admin_id}"
function gouguInit() { function gouguInit() {
var form = layui.form, tool = layui.tool, tagspicker = layui.tagpicker; var form = layui.form, tool = layui.tool, tagspicker = layui.tagpicker;
@ -148,7 +144,7 @@
var demo1 = xmSelect.render({ var demo1 = xmSelect.render({
name: 'street_id', name: 'street_id',
el: '#demo1', el: '#demo1',
initValue: group_access == 2 ||group_access == 4? ["{$detail.street_id}"] : [], initValue: group_access == 2 ||group_access == 4? ["{$detail.street_id|default=0}"] : [],
prop: { prop: {
name: 'name', name: 'name',
value: 'code', value: 'code',

4
app/admin/view/nk/village/edit.html
View File

@ -22,10 +22,6 @@
</tr> </tr>
<tr> <tr>
<td class="layui-td-gray">人数<font>*</font></td>
<td colspan="3">
<input type="text" name="people_num" lay-verify="required" lay-reqText="请输入人数"
autocomplete="off" placeholder="请输入人数" class="layui-input" value="{$detail.people_num}"></td>
<td class="layui-td-gray">标签(多选)<font>*</font></td> <td class="layui-td-gray">标签(多选)<font>*</font></td>
<td> <td>
<input type="checkbox" name="is_hot" title="热门" {if $detail.is_hot==1} checked {/if}> <input type="checkbox" name="is_hot" title="热门" {if $detail.is_hot==1} checked {/if}>

2
app/admin/view/nk/village/read.html
View File

@ -20,7 +20,7 @@
<td class="layui-td-gray">标签(多选)<font>*</font></td> <td class="layui-td-gray">标签(多选)<font>*</font></td>
<td> <td>
<input type="checkbox" name="is_hot" title="热门" {if $detail.is_hot==1} checked {/if}> <input type="checkbox" name="is_hot" title="热门" {if $detail.is_hot==1} checked {/if}>
<input type="checkbox" name="is_tourism" title="文旅" {if $detail.is_tourism==1} checked {/if> <input type="checkbox" name="is_tourism" title="文旅" {if $detail.is_tourism==1} checked {/if}>
</td> </td>
</tr> </tr>
<tr> <tr>

5
app/api/controller/Article.php
View File

@ -404,9 +404,8 @@ class Article extends BaseController
} }
$find['nickname'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $value['user_id'])->value('name'); $find['nickname'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $value['user_id'])->value('name');
} }
$config_find = Db::table('fa_config')->where('id', 20)->find(); //是否查询提案数 分类id
//是否查询提案数 if (in_array($value['category_id'],[152,147,165,164,163,162,161,160,148,149,150])) {
if (in_array($value['category_id'], explode(',', $config_find['value']))) {
//提案总数 //提案总数
$where = [ $where = [
['category_id', '=', $value['category_id']], ['category_id', '=', $value['category_id']],

5
app/api/controller/Cultural.php
View File

@ -438,9 +438,8 @@ class Cultural extends BaseController
} }
$find['nickname'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $value['user_id'])->value('name'); $find['nickname'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $value['user_id'])->value('name');
} }
$config_find = Db::table('fa_config')->where('id', 20)->find(); //是否查询提案数 分类id
//是否查询提案数 if (in_array($value['category_id'],[152,147,165,164,163,162,161,160,148,149,150])) {
if (in_array($value['category_id'], explode(',', $config_find['value']))) {
//提案总数 //提案总数
$where = [ $where = [
['category_id', '=', $value['category_id']], ['category_id', '=', $value['category_id']],

5
app/api/controller/MyArticle.php
View File

@ -116,9 +116,8 @@ class MyArticle extends BaseController
$find = $user; $find = $user;
} }
} }
$config_find = Db::table('fa_config')->where('id', 20)->find(); //是否查询提案数 //分类id
//是否查询提案数 if (in_array($value['category_id'], [152,147,165,164,163,162,161,160,148,149,150])) {
if (in_array($value['category_id'], explode(',', $config_find['value']))) {
//提案总数 //提案总数
$where = [ $where = [
['category_id', '=', $value['category_id']], ['category_id', '=', $value['category_id']],