郭盛 / community · 提交

转到一个项目

作者 刘朕
提交 663c0ba101505b2d450d1ae9bf8603f68e73cdae 2 个父辈 4ce0fd6c b8aeb3a3
1 个管道 的构建 通过 耗费 1 秒

合并分支 'Branch_liuzhen' 到 'master' 

Branch liuzhen



查看合并请求 !154
内嵌 并排对比
正在显示 7 个修改的文件 包含 40 行增加 和 26 行删除
... ... @@ -27,6 +27,7 @@ class UserHouse extends Backend
{
parent::_initialize();
$this->model = new \app\admin\model\user\UserHouse;
$this->view->assign("statusList", $this->model->getStatusList());
}
... ...
... ... @@ -5,7 +5,10 @@ return [
'User_id' => '用户id',
'House_id' => '小区id',
'Name' => '姓名',
'Status' => '状态1申请中2已绑定3已拒绝',
'Status' => '状态',
'Status 1' => '申请中',
'Status 2' => '已绑定',
'Status 3' => '已拒绝',
'Phone' => '手机号',
'Remark' => '备注',
'Createtime' => '创建时间',
... ...
... ... @@ -25,7 +25,7 @@ class UserHouse extends Model
// 追加属性
protected $append = [
'status_text',
];
... ... @@ -33,7 +33,18 @@ class UserHouse extends Model
public function getStatusList()
{
return ['1' => __('Status 1'), '2' => __('Status 2'), '3' => __('Status 3')];
}
public function getStatusTextAttr($value, $data)
{
$value = $value ? $value : (isset($data['status']) ? $data['status'] : '');
$list = $this->getStatusList();
return isset($list[$value]) ? $list[$value] : '';
}
... ...
... ... @@ -7,18 +7,18 @@
<div class="widget-body no-padding">
<div id="toolbar" class="toolbar">
<a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user/user_house/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('user/user_house/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user/user_house/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
<a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('user/user_house/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
<!-- <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user/user_house/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
<!-- <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('user/user_house/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
<!-- <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user/user_house/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
<!-- <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('user/user_house/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>-->
<div class="dropdown btn-group {:$auth->check('user/user_house/multi')?'':'hide'}">
<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
<ul class="dropdown-menu text-left" role="menu">
<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
</ul>
</div>
<!-- <div class="dropdown btn-group {:$auth->check('user/user_house/multi')?'':'hide'}">-->
<!-- <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
<!-- <ul class="dropdown-menu text-left" role="menu">-->
<!-- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>-->
<!-- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>-->
<!-- </ul>-->
<!-- </div>-->
</div>
... ...
... ... @@ -178,8 +178,8 @@ function send_sms($data){
//todo 短信账号密码
// require_once EXTEND_PATH . 'nsms/nsms.php';
$url = "http://www.ztsms.cn/sendNSms.do";
$username = 'xiaoweiwenwen';
$password = 'Cxz307312';
$username = 'shequ';
$password = 'cxz307311';
$sendAPI = new nsms($url, $username, $password);
$sendAPI->data = $data;/*初始化数据包*/
$return = $sendAPI->sendSMS('POST');
... ...
... ... @@ -48,7 +48,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
title: '通过',
classname: 'btn btn-xs btn-primary btn-ajax',
icon: '',
url: $.fn.bootstrapTable.defaults.extend.examine_url+'/status/3',
url: $.fn.bootstrapTable.defaults.extend.examine_url+'/status/2',
confirm: '是否确认通过审核？',
visible:function (row) {
if(row.status == 1){
... ...
... ... @@ -6,10 +6,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
Table.api.init({
extend: {
index_url: 'user/user_house/index' + location.search,
add_url: 'user/user_house/add',
edit_url: 'user/user_house/edit',
del_url: 'user/user_house/del',
// add_url: 'user/user_house/add',
// edit_url: 'user/user_house/edit',
// del_url: 'user/user_house/del',
multi_url: 'user/user_house/multi',
examine_url: 'user/user_house/examine',
table: 'user_house',
}
});
... ... @@ -25,16 +26,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
[
{checkbox: true},
{field: 'id', title: __('Id')},
{field: 'user_id', title: __('User_id')},
{field: 'house_id', title: __('House_id')},
{field: 'user.nickname', title: __('User.nickname')},
{field: 'house.name', title: __('House.name')},
{field: 'name', title: __('Name')},
{field: 'status', title: __('Status')},
{field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2'),"3":__('Status 3')}, formatter: Table.api.formatter.status},
{field: 'phone', title: __('Phone')},
{field: 'remark', title: __('Remark')},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'user.nickname', title: __('User.nickname')},
{field: 'house.name', title: __('House.name')},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate,
buttons: [
{
... ... @@ -46,7 +45,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
url: $.fn.bootstrapTable.defaults.extend.examine_url+'/status/2',
confirm: '是否确认通过审核？',
visible:function (row) {
if(row.status == 0){
if(row.status == 1){
return true;
}else{
return false;
... ... @@ -65,7 +64,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
url: $.fn.bootstrapTable.defaults.extend.examine_url+'/status/3',
confirm: '是否确认驳回审核？',
visible:function (row) {
if(row.status == 0){
if(row.status == 1){
return true;
}else{
return false;
... ...