景龙 / xiaofang · 提交

转到一个项目

作者 景龙
提交 92a47782ba06ed6c9cfffea660b87b77b51eb63b 1 个父辈 4bc18135
1 个管道 的构建 通过 耗费 1 秒

总领导去掉消息审批模块

内嵌 并排对比
正在显示 9 个修改的文件 包含 264 行增加 和 10 行删除
... ... @@ -663,4 +663,73 @@ class PersonController extends RestBaseController
return $os_str;
}
/**
* @title 获取联系客服
* @description 接口说明
* @author 开发者
* @url /api/admin/person/getServiceMobile
* @method get
* @header name:token type:string require:1 default: other: desc:header
*
* @return service_mobile:联系客服
*
*/
public function getServiceMobile(){
if($this->request->isGet()){
$res = $this->getAboutUs('service_mobile');
$this->success('成功',$res);
}else{
$this->error('请求方式错误！');
}
}
/**
* @title 获取使用说明
* @description 接口说明
* @author 开发者
* @url /api/admin/person/getExplain
* @method get
* @header name:token type:string require:1 default: other: desc:header
*
* @return platform_explain:使用说明
*
*/
public function getExplain(){
if($this->request->isGet()){
$res = $this->getAboutUs('platform_explain');
$this->success('成功',$res);
}else{
$this->error('请求方式错误！');
}
}
/**
* @title 获取平台介绍
* @description 接口说明
* @author 开发者
* @url /api/admin/person/getIntroduce
* @method get
* @header name:token type:string require:1 default: other: desc:header
*
* @return introduce:平台介绍
*
*/
public function getIntroduce(){
if($this->request->isGet()){
$res = $this->getAboutUs('introduce');
$this->success('成功',$res);
}else{
$this->error('请求方式错误！');
}
}
private function getAboutUs($field){
$res = Db::name('about_us')
->where('id',1)
->field($field)
->find();
return $res;
}
}
... ...
... ... @@ -103,7 +103,7 @@ class CommonController extends RestBaseController
}
//查找企业拥有的服务权限
public function getRule($res,$mark=''){
public function getRule($res,$mark='',$leaders=''){
$rule = Db::name('service_rule')
->alias('r')
->join('service s','r.s_id = s.id','LEFT')
... ... @@ -133,13 +133,16 @@ class CommonController extends RestBaseController
}
$identity = $this->user['identity'];
if($identity != 0){
$information = [
'id' => 101,
'name' => '消息审批',
'english_name' => 'Message approval',
'icon' => $host.'/uploads/20190626/4404bf86c659e82c3d22e5587865bdc4.png'
];
array_push($rule,$information);
if(empty($leaders)){
//不是总领导，即领导
$information = [
'id' => 101,
'name' => '消息审批',
'english_name' => 'Message approval',
'icon' => $host.'/uploads/20190626/4404bf86c659e82c3d22e5587865bdc4.png'
];
array_push($rule,$information);
}
}
return $rule;
}
... ...
... ... @@ -93,7 +93,7 @@ class IndexController extends RestBaseController
$i+=0;
//查找企业拥有的服务
$data['c_id'] = $value['id'];
$rule = $common->getRule($data);
$rule = $common->getRule($data,'',1);
$value['service'] = $rule;
foreach($value['service'] as &$value1){
if($value1['id'] != 101 && $value1['id'] != 102){
... ...
<?php
// +----------------------------------------------------------------------
// | ThinkCMF [ WE CAN DO IT MORE SIMPLE ]
// +----------------------------------------------------------------------
// | Copyright (c) 2013-2019 http://www.thinkcmf.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
// +----------------------------------------------------------------------
// | Author: 小夏 < 449134904@qq.com>
// +----------------------------------------------------------------------
namespace app\admin\controller;
use cmf\controller\AdminBaseController;
use app\admin\model\AboutUsModel;
use think\Db;
use app\portal\model\PortalPostModel;
//使用说明
class SysExplainController extends AdminBaseController
{
//编辑页面
public function edit(){
$res = Db::name('about_us')->where(['id'=>1])->field('id,platform_explain')->find();
$contentModel = new PortalPostModel();
$res['platform_explain'] = $contentModel->getPostContentAttr($res['platform_explain']);
$this->assign('post', $res);
return $this->fetch();
}
//编辑保存页面
public function editPost(){
$data = $this->request->param();
$AboutUsModel = new AboutUsModel();
$contentModel = new PortalPostModel();
$data['platform_explain'] = $contentModel->setPostContentAttr($data['platform_explain']);
$AboutUsModel->allowField(true)->isUpdate(true)->save($data);
$this->success("保存成功！");
}
}
\ No newline at end of file
... ...
<?php
// +----------------------------------------------------------------------
// | ThinkCMF [ WE CAN DO IT MORE SIMPLE ]
// +----------------------------------------------------------------------
// | Copyright (c) 2013-2019 http://www.thinkcmf.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
// +----------------------------------------------------------------------
// | Author: 小夏 < 449134904@qq.com>
// +----------------------------------------------------------------------
namespace app\admin\controller;
use cmf\controller\AdminBaseController;
use app\admin\model\AboutUsModel;
use think\Db;
use app\portal\model\PortalPostModel;
//平台介绍
class SysIntroduceController extends AdminBaseController
{
//编辑页面
public function edit(){
$res = Db::name('about_us')->where(['id'=>1])->field('id,introduce')->find();
$contentModel = new PortalPostModel();
$res['introduce'] = $contentModel->getPostContentAttr($res['introduce']);
$this->assign('post', $res);
return $this->fetch();
}
//编辑保存页面
public function editPost(){
$data = $this->request->param();
$AboutUsModel = new AboutUsModel();
$contentModel = new PortalPostModel();
$data['introduce'] = $contentModel->setPostContentAttr($data['introduce']);
$AboutUsModel->allowField(true)->isUpdate(true)->save($data);
$this->success("保存成功！");
}
}
\ No newline at end of file
... ...
... ... @@ -93,7 +93,9 @@ return array (
'ADMIN_SLIDEITEM_LISTORDER' => '幻灯片页面排序',
'ADMIN_STORAGE_INDEX' => '文件存储',
'ADMIN_STORAGE_SETTINGPOST' => '文件存储设置提交',
'ADMIN_SYSEXPLAIN_EDIT' => '使用说明',
'ADMIN_SYSINFORMATION_EDIT' => '系统消息',
'ADMIN_SYSINTRODUCE_EDIT' => '平台介绍',
'ADMIN_SYSSERVICE_EDIT' => '联系客服',
'ADMIN_THEME_ACTIVE' => '启用模板',
'ADMIN_THEME_DATASOURCE' => '模板文件设置数据源',
... ...
<include file="public@header"/>
<style type="text/css">
.pic-list li {
margin-bottom: 5px;
}
</style>
</head>
<body>
<div class="wrap js-check-wrap">
<ul class="nav nav-tabs">
<li class="active"><a href="#">编辑使用说明</a></li>
</ul>
<form action="{:url('SysExplain/editPost')}" method="post" class="form-horizontal js-ajax-form margin-top-20">
<div class="row">
<div class="col-md-9">
<table class="table table-bordered">
<tr>
<th width="100">使用说明<span class="form-required">*</span></th>
<td>
<input id="post-id" type="hidden" name="id" value="{$post.id}">
<script type="text/plain" id="content" name="platform_explain">{$post.platform_explain}</script>
</td>
</tr>
</table>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-primary js-ajax-submit">{:lang('SAVE')}</button>
</div>
</div>
</form>
</div>
<script type="text/javascript" src="__STATIC__/js/admin.js"></script>
<script type="text/javascript">
//编辑器路径定义
var editorURL = GV.WEB_ROOT;
</script>
<script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.config.js"></script>
<script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.all.min.js"></script>
<script>
$(function(){
editorcontent = new baidu.editor.ui.Editor();
editorcontent.render('content');
try {
editorcontent.sync();
} catch (err) {
}
});
</script>
</body>
</html>
... ...
<include file="public@header"/>
<style type="text/css">
.pic-list li {
margin-bottom: 5px;
}
</style>
</head>
<body>
<div class="wrap js-check-wrap">
<ul class="nav nav-tabs">
<li class="active"><a href="#">编辑平台介绍</a></li>
</ul>
<form action="{:url('SysIntroduce/editPost')}" method="post" class="form-horizontal js-ajax-form margin-top-20">
<div class="row">
<div class="col-md-9">
<table class="table table-bordered">
<tr>
<th width="100">平台介绍<span class="form-required">*</span></th>
<td>
<input id="post-id" type="hidden" name="id" value="{$post.id}">
<script type="text/plain" id="content" name="introduce">{$post.introduce}</script>
</td>
</tr>
</table>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-primary js-ajax-submit">{:lang('SAVE')}</button>
</div>
</div>
</form>
</div>
<script type="text/javascript" src="__STATIC__/js/admin.js"></script>
<script type="text/javascript">
//编辑器路径定义
var editorURL = GV.WEB_ROOT;
</script>
<script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.config.js"></script>
<script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.all.min.js"></script>
<script>
$(function(){
editorcontent = new baidu.editor.ui.Editor();
editorcontent.render('content');
try {
editorcontent.sync();
} catch (err) {
}
});
</script>
</body>
</html>
... ...
... ... @@ -4,7 +4,7 @@
<div class="wrap">
<ul class="nav nav-tabs">
<li class="active"><a>服务管理</a></li>
<li><a href="{:url('AdminService/add')}">添加服务</a></li>
<!--<li><a href="{:url('AdminService/add')}">添加服务</a></li>-->
</ul>
<form class="well form-inline margin-top-20" method="post" action="{:url('AdminService/index')}">
服务名称：
... ...