Skip to content

T
tl_estate
Commit 15d755ff authored by clone's avatar clone
Browse files
Options

Merge branch 'test'

parents 30b08921 92b4e3cc
Hide whitespace changes
Inline Side-by-side
Showing with 254 additions and 7 deletions
application/api/controller/Member.php
View file @ 15d755ff
...@@ -94,6 +94,12 @@ class Member extends Basic ...@@ -94,6 +94,12 @@ class Member extends Basic
* @param Request $this->request * @param Request $this->request
* @return type * @return type
*/ */
/**
* @return \think\Response
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function sendSms() { public function sendSms() {
$data['data'] = array(); $data['data'] = array();
$data['status'] = 101; $data['status'] = 101;
...@@ -109,7 +115,7 @@ class Member extends Basic ...@@ -109,7 +115,7 @@ class Member extends Basic
->select(); ->select();
$num = count($send_time); //发送数量 $num = count($send_time); //发送数量
if ((time() - strtotime($send_time[$num-1]->send_time) < 58) && $num != 0) { if (!empty($send_time[$num-1]) && (time() - strtotime($send_time[$num-1]->send_time) < 58) && $num != 0) {
$data['msg'] = '1分钟内不能再次获取验证码'; $data['msg'] = '1分钟内不能再次获取验证码';
} elseif ($num > 7){ } elseif ($num > 7){
$data['msg'] = '短信发送超过上限'; $data['msg'] = '短信发送超过上限';
......
application/index/controller/Auth.php
View file @ 15d755ff
...@@ -300,7 +300,7 @@ class Auth extends Basic ...@@ -300,7 +300,7 @@ class Auth extends Basic
if($table->saveStatus('status',$data['status'],$ids)){ if($table->saveStatus('status',$data['status'],$ids)){
return $this->response(200,'成功',$data); return $this->response(200,'成功',$data);
}else{ }else{
return $this->response(100,'失败',$data); return $this->response(100,'未改动或者角色名重复！',$data);
} }
} }
//权限表界面 //权限表界面
......
application/index/controller/Label.php
View file @ 15d755ff
...@@ -144,7 +144,8 @@ class Label extends Basic ...@@ -144,7 +144,8 @@ class Label extends Basic
$result['msg'] = ''; $result['msg'] = '';
//获取当前模块可操作按钮start******************************** //获取当前模块可操作按钮start********************************
$userRule = Session::get('userRule'); $userRule = Session::get('userRule');
$result['data']['cz']=$userRule['cz']; // $result['data']['cz']=$userRule['cz'];
$result['data']['cz']=1;
//获取当前模块可操作按钮end********************************** //获取当前模块可操作按钮end**********************************
$pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo']; $pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
$pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize']; $pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
......
application/index/controller/Setting.php 0 → 100644
View file @ 15d755ff
<?php
/**
* Created by PhpStorm.
* User: hu jun
* Date: 2018/3/7
* Time: 9:49
*/
namespace app\index\controller;
use app\index\extend\Basic;
use think\Cache;
class Setting extends Basic
{
/**
* 页面视图
*
* @return \think\response\View
*/
public function index() {
return view('setting/index');
}
/**
* 修改和新增
*
* @return \think\Response
*/
public function getSetting() {
$data = [];
if ($this->request->isGet()) {
$data = Cache::get('Setting');
} else {
$data['is_privacy'] = $this->params['is_privacy'];
$data['day_num'] = $this->params['day_num'];
Cache::set('Setting',$data);
}
return $this->response(200, '', $data);
}
}
\ No newline at end of file
application/index/view/auth/auth_rule_index.html
View file @ 15d755ff
...@@ -67,4 +67,71 @@ ...@@ -67,4 +67,71 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file <!--编辑-->
<div class="modal fade" id="modal-edit" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title">
编辑信息
</h4>
</div>
<div class="modal-body">
<form class="form-horizontal">
<div class="form-group">
<label class="col-sm-3 control-label">标题：</label>
<input type="text" value="" name="title" class="form-control btn6" placeholder="用于后台显示的配置标题">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">上级菜单：</label>
<select class="form-control btn6" name="pid" id="pid">
</select>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">链接：</label>
<input type="text" value="" name="name" class="form-control btn6">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">后台菜单：</label>
<div class="col-md-4">
<div class="oh mb-10 pl-5">
<div class="radio radio-primary mr-10">
<label class="radio-label1" for="is_menu1">
<div class="iradio_minimal-blue checked" style="position: relative;" aria-checked="false" aria-disabled="false">
<input type="radio" value="1" id="is_menu1" name="is_menu" style="">
</div>是</label>
</div>
<div class="radio radio-primary mr-10">
<label class="radio-label2" >
<div class="iradio_minimal-blue" style="position: relative;" aria-checked="false" aria-disabled="false">
<input type="radio" value="0" id="is_menu2" name="is_menu" style="">
</div>否</label>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">排序：</label>
<input type="number" value="1" name="sort" class="form-control btn6">
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>
<button type="button" class="btn btn-primary submit_edit" data-dismiss="modal">
提交
</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
application/index/view/global/navigation.html
View file @ 15d755ff
...@@ -76,6 +76,12 @@ ...@@ -76,6 +76,12 @@
<!--<li role="presentation">--> <!--<li role="presentation">-->
<!--<a href="/admin.php/index/bindPhoneListIndex.html">号码绑定列表</a>--> <!--<a href="/admin.php/index/bindPhoneListIndex.html">号码绑定列表</a>-->
<!--</li>--> <!--</li>-->
<li role="presentation">
<a href="/admin.php/index/setting_index.html">参数设置</a>
</li>
<li role="presentation">
<a href="/admin.php/index/uLabelIndex.html">客户标签</a>
</li>
</ul> </ul>
</nav> </nav>
......
application/index/view/setting/index.html 0 → 100644
View file @ 15d755ff
{layout name="global/frame_tpl" /}
<input type="hidden" class="page-load" id="setting"/>
<!--导航star-->
<!-- Sidebar -->
<!-- /#sidebar-wrapper -->
<!-- Page Content -->
<div id="page-content-wrapper">
<div class="container">
<div class="row">
<div class="col-lg-10 col-lg-offset-0">
<div class="panel panel-default">
<div class="panel-heading breadcrumb">
<li><a href="javascript:;">参数管理</a></li>
</div>
<div class="panel-body">
<form class="form-horizontal">
<div id="info">
</div>
<div class="form-group">
<label class="col-sm-3 control-label" style="text-align: right">&nbsp;</label>
<div class="col-sm-9" style="text-align: left;">
<button type="button" class="btn btn-primary" id="save">保存修改</button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
application/route.php
View file @ 15d755ff
...@@ -161,8 +161,8 @@ Route::group('index', [ ...@@ -161,8 +161,8 @@ Route::group('index', [
'useraction_search' => ['index/remark/useraction_search', [ 'method' => 'get|post' ] ], //后台客户详情 'useraction_search' => ['index/remark/useraction_search', [ 'method' => 'get|post' ] ], //后台客户详情
'select_by_phone' => ['index/remark/select_by_phone', [ 'method' => 'get|post' ] ], //后台客户详情--客方搜索 'select_by_phone' => ['index/remark/select_by_phone', [ 'method' => 'get|post' ] ], //后台客户详情--客方搜索
'setting_index' => ['index/Setting/index', [ 'method' => 'get' ] ], //全局参数设置页面
'getSetting' => ['index/Setting/getSetting', [ 'method' => 'get|post' ] ], //新增和修改全局参数设置
]); ]);
......
public/resource/css/home.css
View file @ 15d755ff
...@@ -221,3 +221,4 @@ body{ ...@@ -221,3 +221,4 @@ body{
width: 100%; width: 100%;
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
}
public/resource/js/setting.js 0 → 100644
View file @ 15d755ff
/**
* Created by zw on 2017/12/15.
*/
define (['doT', 'text!temp/setting_template_tpl.html', 'css!style/home.css'], function (doT, template) {
var Setting = {
init: function () {
//初始化dot
$ ("body").append (template);
Setting.event ();
Setting.getInfo();
},
event: function () {
$("#save").click(function () {
Setting.saveSetting();
});
},
getInfo: function () {
var param = {};
$.ajax ({
url: '/admin.php/index/getSetting',
type: 'GET',
async: true,
data: param,
dataType: 'json',
success: function (data) {
console.log (data.data);
var temp = document.getElementById ('setting_list_tpl').innerHTML;
var doTtmpl = doT.template (temp);
$ ("#info").html (doTtmpl (data.data));
}
});
},
saveSetting : function () {
var param = {};
param.is_privacy= $("input[type='radio']:checked").val();
param.day_num= $("input[name='day_num']").val();
$.ajax ({
url: '/admin.php/index/getSetting',
type: 'POST',
async: true,
data: param,
dataType: 'json',
success: function (data) {
if (data.code == 200) {
Setting.getInfo();
alert('添加成功');
} else {
alert('操作失败');
}
}
});
}
};
return Setting;
});
public/resource/template/setting_template_tpl.html 0 → 100644
View file @ 15d755ff
<script id="setting_list_tpl" type="text/template">
<div class="form-group">
<label class="col-sm-3 control-label" style="text-align: right">是否使用隐号系统：</label>
<div class="col-sm-9">
<div class="radio" style="display: inline-block">
<label>
<input type="radio" name="optionsRadios" id="optionsRadios1" value="0"
[% if(it.is_privacy == 0) { %] checked [% } %]>关闭
</label>
</div>
<div class="radio" style="display: inline-block">
<label>
<input type="radio" name="optionsRadios" id="optionsRadios2" value="1" [% if(it.is_privacy == 1) { %] checked [% } %]>开启
</label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" style="text-align: right">隐号绑定有效期（天数）：</label>
<div class="col-sm-9">
<input type="number" class="form-control btn5" name="day_num" placeholder="隐号绑定天数" value="[%= it['day_num'] %]">
</div>
</div>
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment