diff --git a/app/Request.php b/app/Request.php
index 6a1b0c3..2b28f92 100644
--- a/app/Request.php
+++ b/app/Request.php
@@ -5,6 +5,7 @@ namespace app;
class Request extends \think\Request
{
//过滤空格
- protected $filter = ['trim','htmlspecialchars','strip_tags'];
+ //protected $filter = ['trim','htmlspecialchars','strip_tags'];
+ protected $filter = ['trim'];
}
diff --git a/app/admin/controller/Set.php b/app/admin/controller/Set.php
index 608fc9b..53ff404 100644
--- a/app/admin/controller/Set.php
+++ b/app/admin/controller/Set.php
@@ -33,11 +33,8 @@ class Set extends AdminController
//网站设置
public function website()
{
- if(Request::isAjax()){
- $data = Request::param();
- unset($data['file']);
- //$system = System::find(1);
- //$result = $system->allowField(['webname','webtitle','domain','keywords','descript','copyright','blackname'])->save($data);
+ if(Request::isPost()){
+ $data = Request::only(['webname','template','cache','upsize','uptype','blackname','webtitle','keywords','descript','copyright']);
$result = Db::name('system')->cache('system')->where('id', 1)->update($data);
if($result){
return json(['code'=>0,'msg'=>'更新成功']);
diff --git a/app/admin/controller/Slider.php b/app/admin/controller/Slider.php
index 671ad26..12518f3 100644
--- a/app/admin/controller/Slider.php
+++ b/app/admin/controller/Slider.php
@@ -38,9 +38,9 @@ class Slider extends AdminController
$data['slid_over'] = strtotime($data['slid_over']);
$result = Db::name('slider')->save($data);
if($result){
- $res = ['code'=>1,'msg'=>'添加成功'];
+ $res = ['code'=>0,'msg'=>'添加成功'];
}else{
- $res = ['code'=>0,'msg'=>'添加失败'];
+ $res = ['code'=>-1,'msg'=>'添加失败'];
}
return json($res);
}
@@ -66,9 +66,9 @@ class Slider extends AdminController
$data['slid_over'] = strtotime($data['slid_over']);
$result = Db::name('slider')->where('id',$id)->save($data);
if($result){
- $res = ['code'=>1,'msg'=>'编辑成功'];
+ $res = ['code'=>0,'msg'=>'编辑成功'];
}else{
- $res = ['code'=>0,'msg'=>'编辑失败'];
+ $res = ['code'=>-1,'msg'=>'编辑失败'];
}
return json($res);
}
@@ -118,9 +118,9 @@ class Slider extends AdminController
$slider = SliderModel::find($id);
$res = $slider->delete();
if($res){
- return json(['code'=>1,'msg'=>'删除成功']);
+ return json(['code'=>0,'msg'=>'删除成功']);
} else {
- return json(['code'=>0,'msg'=>'删除失败']);
+ return json(['code'=>-1,'msg'=>'删除失败']);
}
}
}
diff --git a/app/admin/controller/Upgrade.php b/app/admin/controller/Upgrade.php
index d7c3762..89c98fb 100644
--- a/app/admin/controller/Upgrade.php
+++ b/app/admin/controller/Upgrade.php
@@ -58,15 +58,15 @@ class Upgrade extends AdminController
//设置key
public function key()
{
- $data = Request::param();
- if($data['key']== ''){
+ $data = Request::only(['key']);
+ if(empty($data['key'])){
return json(['code'=>0,'msg'=>'请填写正确的key']);
}
$res = Db::name('system')->update(['key'=>$data['key'],'id'=>1]);
if($res){
- $res = ['code'=>1,'msg'=>'保存成功'];
+ $res = ['code'=>0,'msg'=>'保存成功'];
} else {
- $res = ['code'=>0,'msg'=>'保存失败'];
+ $res = ['code'=>-1,'msg'=>'保存失败'];
}
return json($res);
}
@@ -77,15 +77,15 @@ class Upgrade extends AdminController
$key = Db::name('system')->field('key,upcheck_url,upgrade_url')->find(1);
if(Request::isAjax()){
- $data = Request::param();
- if($data['key']== ''){
- return json(['code'=>0,'msg'=>'请正确填写申请到的key']);
+ $data = Request::only(['key','upcheck_url','upgrade_url']);
+ if(empty($data['key'])){
+ return json(['code'=>-1,'msg'=>'请正确填写申请到的key']);
}
$res = Db::name('system')->update(['key'=>$data['key'],'upcheck_url'=>$data['upcheck_url'],'upgrade_url'=>$data['upgrade_url'],'id'=>1]);
if($res){
- $res = ['code'=>1,'msg'=>'修改成功'];
+ $res = ['code'=>0,'msg'=>'修改成功'];
} else {
- $res = ['code'=>0,'msg'=>'修改失败'];
+ $res = ['code'=>-1,'msg'=>'修改失败'];
}
return json($res);
}
@@ -109,7 +109,6 @@ class Upgrade extends AdminController
}
if($version_code == 0){
$res = json(['code'=>$versions->code,'msg'=>$versions->msg]);
-
}
return $res;
diff --git a/app/admin/view/set/system/website.html b/app/admin/view/set/system/website.html
index f4a8a9a..792d552 100644
--- a/app/admin/view/set/system/website.html
+++ b/app/admin/view/set/system/website.html
@@ -174,10 +174,8 @@
base: '/static/admin/' //静态资源所在路径
}).extend({
index: 'lib/index' //主入口模块
- }).use(['index', 'set', 'element', 'upload'], function(){
+ }).use(['index', 'set', 'upload'], function(){
var $ = layui.$
- ,element = layui.element
- ,table = layui.table
,form = layui.form
,upload = layui.upload;
diff --git a/app/admin/view/slider/add.html b/app/admin/view/slider/add.html
index c914864..0d2eea2 100644
--- a/app/admin/view/slider/add.html
+++ b/app/admin/view/slider/add.html
@@ -2,7 +2,7 @@
{block name="body"}
-
@@ -67,14 +70,22 @@
base: '/static/admin/' //静态资源所在路径
}).extend({
index: 'lib/index' //主入口模块
- }).use(['index', 'form', 'upload','laydate','table'], function(){
+ }).use(['index', 'form', 'upload','laydate','colorpicker'], function(){
var $ = layui.$
- ,table = layui.table
,form = layui.form
,laydate = layui.laydate
,upload = layui.upload ;
+ var colorpicker = layui.colorpicker;
-
+ //颜色表单赋值
+ colorpicker.render({
+ elem: '#coloer-form'
+ ,color: '#1c97f5'
+ ,done: function(color){
+ $('#color-select').val(color);
+ }
+ });
+
//开始时间
laydate.render({
elem: '#start-time'
diff --git a/app/admin/view/slider/index.html b/app/admin/view/slider/index.html
index ef40ee6..163b065 100644
--- a/app/admin/view/slider/index.html
+++ b/app/admin/view/slider/index.html
@@ -70,17 +70,11 @@
base: '/static/admin/' //静态资源所在路径
}).extend({
index: 'lib/index' //主入口模块
- }).use(['index', 'set']);
-
-
-
-