郭盛 / cloud · 提交

转到一个项目

作者 郭盛
提交 db721b949b8885ee0e37c7793635bcf11d486865 1 个父辈 9e3e2641
1 个管道 的构建 通过 耗费 5 秒

修改二维码

内嵌 并排对比
正在显示 3 个修改的文件 包含 80 行增加 和 151 行删除
... ... @@ -3,6 +3,7 @@
namespace app\admin\controller\user;
use app\common\controller\Backend;
use think\Db;
/**
* 会员管理
... ... @@ -60,16 +61,68 @@ class User extends Backend
return $this->view->fetch();
}
// public function edit($ids = NULL)
// {
// $row = $this->model->get($ids);
// if (!$row)
// $this->error(__('No Results were found'));
// $this->view->assign('groupList', build_select('row[group_id]', \app\admin\model\UserGroup::column('id,name'), $row['group_id'], ['class' => 'form-control selectpicker']));
// return parent::edit($ids);
// }
/**
* 编辑
*/
public function edit($ids = NULL)
public function edit($ids = null)
{
$row = $this->model->get($ids);
if (!$row)
if (!$row) {
$this->error(__('No Results were found'));
$this->view->assign('groupList', build_select('row[group_id]', \app\admin\model\UserGroup::column('id,name'), $row['group_id'], ['class' => 'form-control selectpicker']));
return parent::edit($ids);
$this->view->assign('groupList', build_select('row[group_id]', \app\admin\model\UserGroup::column('id,name'), $row['group_id'], ['class' => 'form-control selectpicker']));
}
$adminIds = $this->getDataLimitAdminIds();
if (is_array($adminIds)) {
if (!in_array($row[$this->dataLimitField], $adminIds)) {
$this->error(__('You have no permission'));
}
}
if ($this->request->isPost()) {
$params = $this->request->post("row/a");
if ($params) {
$params = $this->preExcludeFields($params);
$params['expirationtime'] = strtotime($params['expirationtime']);
$result = false;
Db::startTrans();
try {
//是否采用模型验证
if ($this->modelValidate) {
$name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
$validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
$row->validateFailException(true)->validate($validate);
}
$result = $row->allowField(true)->save($params);
Db::commit();
} catch (ValidateException $e) {
Db::rollback();
$this->error($e->getMessage());
} catch (PDOException $e) {
Db::rollback();
$this->error($e->getMessage());
} catch (Exception $e) {
Db::rollback();
$this->error($e->getMessage());
}
if ($result !== false) {
$this->success();
} else {
$this->error(__('No rows were updated'));
}
}
$this->error(__('Parameter %s can not be empty', ''));
}
$this->view->assign("row", $row);
return $this->view->fetch();
}
}
... ...
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<!--<div class="form-group">-->
<!--<label for="c-group_id" class="control-label col-xs-12 col-sm-2">{:__('Group')}:</label>-->
<!--<div class="col-xs-12 col-sm-4">-->
<!--{$groupList}-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-username" class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label>-->
<!--<div class="col-xs-12 col-sm-4">-->
<!--<input id="c-username" data-rule="required" class="form-control" name="row[username]" type="text" value="{$row.username|htmlentities}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>-->
<!--<div class="col-xs-12 col-sm-4">-->
<!--<input id="c-nickname" data-rule="required" class="form-control" name="row[nickname]" type="text" value="{$row.nickname|htmlentities}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-password" class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>-->
<!--<div class="col-xs-12 col-sm-4">-->
<!--<input id="c-password" data-rule="password" class="form-control" name="row[password]" type="text" value="" placeholder="{:__('Leave password blank if dont want to change')}" autocomplete="new-password" />-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-email" class="control-label col-xs-12 col-sm-2">{:__('Email')}:</label>-->
<!--<div class="col-xs-12 col-sm-4">-->
<!--<input id="c-email" data-rule="" class="form-control" name="row[email]" type="text" value="{$row.email|htmlentities}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-mobile" class="control-label col-xs-12 col-sm-2">{:__('Mobile')}:</label>-->
<!--<div class="col-xs-12 col-sm-4">-->
<!--<input id="c-mobile" data-rule="" class="form-control" name="row[mobile]" type="text" value="{$row.mobile|htmlentities}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-avatar" class="control-label col-xs-12 col-sm-2">{:__('Avatar')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<div class="input-group">-->
<!--<input id="c-avatar" data-rule="" class="form-control" size="50" name="row[avatar]" type="text" value="{$row.avatar}">-->
<!--<div class="input-group-addon no-border no-padding">-->
<!--<span><button type="button" id="plupload-avatar" class="btn btn-danger plupload" data-input-id="c-avatar" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-avatar"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>-->
<!--<span><button type="button" id="fachoose-avatar" class="btn btn-primary fachoose" data-input-id="c-avatar" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>-->
<!--</div>-->
<!--<span class="msg-box n-right" for="c-avatar"></span>-->
<!--</div>-->
<!--<ul class="row list-inline plupload-preview" id="p-avatar"></ul>-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-level" class="control-label col-xs-12 col-sm-2">{:__('Level')}:</label>-->
<!--<div class="col-xs-12 col-sm-4">-->
<!--<input id="c-level" data-rule="required" class="form-control" name="row[level]" type="number" value="{$row.level}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-gender" class="control-label col-xs-12 col-sm-2">{:__('Gender')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--{:build_radios('row[gender]', ['1'=>__('Male'), '0'=>__('Female')], $row['gender'])}-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-birthday" class="control-label col-xs-12 col-sm-2">{:__('Birthday')}:</label>-->
<!--<div class="col-xs-12 col-sm-4">-->
<!--<input id="c-birthday" data-rule="" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[birthday]" type="text" value="{$row.birthday}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-bio" class="control-label col-xs-12 col-sm-2">{:__('Bio')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<input id="c-bio" data-rule="" class="form-control" name="row[bio]" type="text" value="{$row.bio|htmlentities}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-money" class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>-->
<!--<div class="col-xs-12 col-sm-4">-->
<!--<input id="c-money" data-rule="required" class="form-control" name="row[money]" type="number" value="{$row.money}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-score" class="control-label col-xs-12 col-sm-2">{:__('Score')}:</label>-->
<!--<div class="col-xs-12 col-sm-4">-->
<!--<input id="c-score" data-rule="required" class="form-control" name="row[score]" type="number" value="{$row.score}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-successions" class="control-label col-xs-12 col-sm-2">{:__('Successions')}:</label>-->
<!--<div class="col-xs-12 col-sm-4">-->
<!--<input id="c-successions" data-rule="required" class="form-control" name="row[successions]" type="number" value="{$row.successions}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-maxsuccessions" class="control-label col-xs-12 col-sm-2">{:__('Maxsuccessions')}:</label>-->
<!--<div class="col-xs-12 col-sm-4">-->
<!--<input id="c-maxsuccessions" data-rule="required" class="form-control" name="row[maxsuccessions]" type="number" value="{$row.maxsuccessions}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-prevtime" class="control-label col-xs-12 col-sm-2">{:__('Prevtime')}:</label>-->
<!--<div class="col-xs-12 col-sm-4">-->
<!--<input id="c-prevtime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[prevtime]" type="text" value="{$row.prevtime|datetime}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-logintime" class="control-label col-xs-12 col-sm-2">{:__('Logintime')}:</label>-->
<!--<div class="col-xs-12 col-sm-4">-->
<!--<input id="c-logintime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[logintime]" type="text" value="{$row.logintime|datetime}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-loginip" class="control-label col-xs-12 col-sm-2">{:__('Loginip')}:</label>-->
<!--<div class="col-xs-12 col-sm-4">-->
<!--<input id="c-loginip" data-rule="required" class="form-control" name="row[loginip]" type="text" value="{$row.loginip}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-loginfailure" class="control-label col-xs-12 col-sm-2">{:__('Loginfailure')}:</label>-->
<!--<div class="col-xs-12 col-sm-4">-->
<!--<input id="c-loginfailure" data-rule="required" class="form-control" name="row[loginfailure]" type="number" value="{$row.loginfailure}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-joinip" class="control-label col-xs-12 col-sm-2">{:__('Joinip')}:</label>-->
<!--<div class="col-xs-12 col-sm-4">-->
<!--<input id="c-joinip" data-rule="required" class="form-control" name="row[joinip]" type="text" value="{$row.joinip}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="c-jointime" class="control-label col-xs-12 col-sm-2">{:__('Jointime')}:</label>-->
<!--<div class="col-xs-12 col-sm-4">-->
<!--<input id="c-jointime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[jointime]" type="text" value="{$row.jointime|datetime}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label for="content" class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--{:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}-->
<!--</div>-->
<!--</div>-->
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('审核状态')}:</label>
<div class="col-xs-12 col-sm-8">
... ...
... ... @@ -51,7 +51,7 @@ class Create extends Api
public function publish_folder()
{
$user_id = $this->auth->id;
$user = Db::name('user')->where('id',$user_id)->field('id,identity,audit')->find();
$user = Db::name('user')->where('id',$user_id)->field('id,identity,audit,expirationtime')->find();
//判断用户身份是否审核通过
if($user['audit'] != 1){
$this->error('身份身份通过才可发布!');
... ... @@ -60,6 +60,11 @@ class Create extends Api
if($user['identity'] == 1){
$this->error('您的权限不足');
}
//判断用户过期时间是否已到
if($user['expirationtime'] < time()){
$this->error('您的有效期已过');
}
$id = $this->request->param('id');
$res['user_id'] = $user_id;
... ... @@ -117,7 +122,7 @@ class Create extends Api
public function publish_pic()
{
$user_id = $this->auth->id;
$user = Db::name('user')->where('id',$user_id)->field('id,identity,audit,username')->find();
$user = Db::name('user')->where('id',$user_id)->field('id,identity,audit,username,expirationtime')->find();
//判断用户身份是否审核通过
if($user['audit'] != 1){
$this->error('身份身份通过才可发布!');
... ... @@ -126,6 +131,10 @@ class Create extends Api
if($user['identity'] == 1){
$this->error('您的权限不足');
}
//判断用户过期时间是否已到
if($user['expirationtime'] < time()){
$this->error('您的有效期已过');
}
$folder_id = $this->request->param('folder_id');
$images = $this->request->param('images');
if(empty($images)){
... ... @@ -200,7 +209,7 @@ class Create extends Api
public function publish_video()
{
$user_id = $this->auth->id;
$user = Db::name('user')->where('id',$user_id)->field('id,identity,audit,username')->find();
$user = Db::name('user')->where('id',$user_id)->field('id,identity,audit,username,expirationtime')->find();
//判断用户身份是否审核通过
if($user['audit'] != 1){
$this->error('身份身份通过才可发布!');
... ... @@ -209,6 +218,10 @@ class Create extends Api
if($user['identity'] == 1){
$this->error('您的权限不足');
}
//判断用户过期时间是否已到
if($user['expirationtime'] < time()){
$this->error('您的有效期已过');
}
$folder_id = $this->request->param('folder_id');
$video = $this->request->param('video');
if(empty($video)){
... ... @@ -278,7 +291,7 @@ class Create extends Api
public function publish_note()
{
$user_id = $this->auth->id;
$user = Db::name('user')->where('id',$user_id)->field('id,identity,audit,username')->find();
$user = Db::name('user')->where('id',$user_id)->field('id,identity,audit,username,expirationtime')->find();
//判断用户身份是否审核通过
if($user['audit'] != 1){
$this->error('身份身份通过才可发布!');
... ... @@ -287,6 +300,10 @@ class Create extends Api
if($user['identity'] == 1){
$this->error('您的权限不足');
}
//判断用户过期时间是否已到
if($user['expirationtime'] < time()){
$this->error('您的有效期已过');
}
$folder_id = $this->request->param('folder_id');
$content = $_POST['content'];
if(empty($content)){
... ... @@ -1496,13 +1513,13 @@ class Create extends Api
}
if(!empty($id)){
$info = Db::name('savemes')->where('id',$id)->field('id,type,share_url')->find();
$info = Db::name('savemes')->where('id',$id)->field('id,share_url')->find();
//生成二维码
$page = $info['share_url'];
$data['thumbnail'] = $this->qrcode($page,$user_id);
}
if(!empty($folder_id)){
$info = Db::name('folder')->where('id',$id)->field('id,type,share_url')->find();
$info = Db::name('folder')->where('id',$id)->field('id,share_url')->find();
//生成二维码
$page = $info['share_url'];
$data['thumbnail'] = $this->qrcode($page,$user_id);
... ...