谢百川 / seniors_say · 提交

转到一个项目

作者 谢百川
提交 87c22da9580a4a2d027425b44c29574a6e5ae447 1 个父辈 c53406f2

ok

内嵌 并排对比
正在显示 11 个修改的文件 包含 47 行增加 和 22 行删除
... ... @@ -50,13 +50,13 @@ class University extends Backend
}
list($where, $sort, $order, $offset, $limit) = $this->buildparams();
$total = $this->model
->with(['universitylevel','province','city'])
->with(['province','city','universitylevel'])
->where($where)
->order($sort, $order)
->count();
$list = $this->model
->with(['universitylevel','province','city'])
->with(['province','city','universitylevel'])
->where($where)
->order($sort, $order)
->limit($offset, $limit)
... ... @@ -64,9 +64,9 @@ class University extends Backend
foreach ($list as $row) {
$row->getRelation('universitylevel')->visible(['name']);
$row->getRelation('province')->visible(['name']);
$row->getRelation('city')->visible(['name']);
$row->getRelation('universitylevel')->visible(['name']);
}
$list = collection($list)->toArray();
$result = array("total" => $total, "rows" => $list);
... ...
... ... @@ -15,5 +15,6 @@ return [
'Province_id' => '省份ID',
'City_id' => '城市ID',
'Level_id' => '985/211等',
'Name_en' => '英文校名',
'Universitylevel.name' => '名称'
];
... ...
... ... @@ -45,12 +45,6 @@ class University extends Model
public function universitylevel()
{
return $this->belongsTo('UniversityLevel', 'level_id', 'id', [], 'LEFT')->setEagerlyType(0);
}
public function province()
{
return $this->belongsTo('Province', 'province_id', 'code', [], 'LEFT')->setEagerlyType(0);
... ... @@ -61,4 +55,10 @@ class University extends Model
{
return $this->belongsTo('City', 'city_id', 'code', [], 'LEFT')->setEagerlyType(0);
}
public function universitylevel()
{
return $this->belongsTo('UniversityLevel', 'level_id', 'id', [], 'LEFT')->setEagerlyType(0);
}
}
... ...
... ... @@ -78,7 +78,13 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Level_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-level_id" data-rule="required" data-source="university_level/index" class="form-control selectpage" name="row[level_id]" type="text" value="">
<input id="c-level_id" data-rule="required" data-source="level/index" class="form-control selectpage" name="row[level_id]" type="text" value="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Name_en')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-name_en" data-rule="required" class="form-control" name="row[name_en]" type="text" value="">
</div>
</div>
<div class="form-group layer-footer">
... ...
... ... @@ -82,7 +82,13 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Level_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-level_id" data-rule="required" data-source="university_level/index" class="form-control selectpage" name="row[level_id]" type="text" value="{$row.level_id|htmlentities}">
<input id="c-level_id" data-rule="required" data-source="level/index" class="form-control selectpage" name="row[level_id]" type="text" value="{$row.level_id|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Name_en')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-name_en" data-rule="required" class="form-control" name="row[name_en]" type="text" value="{$row.name_en|htmlentities}">
</div>
</div>
<div class="form-group layer-footer">
... ...
... ... @@ -10,15 +10,15 @@
<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('university/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('university/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('university/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
<!-- <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('university/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-danger btn-import {:$auth->check('university/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('university/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('university/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>
<a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('university/recyclebin')?'':'hide'}" href="university/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
</div>
... ...
... ... @@ -467,6 +467,8 @@ class Student extends Api
$studentInfo['endtime'] = date('Y', $studentInfo['endtime']);
$graduated = new Graduated();
$studentInfo['graduated_info'] = $graduated->infoById($studentInfo['graduated_id']);
$this->success('获取个人信息成功', $studentInfo);
}
... ...
... ... @@ -38,7 +38,7 @@ class Thank extends Api
{
$userId = $this->auth->id;
$money = $this->request->param('price', 0, 'int');
$money = $this->request->param('money', 0, 'int');
if(!$money || $money <= 0) {
$this->error('您的操作有误');
}
... ...
... ... @@ -375,6 +375,10 @@ class University extends Api
}
$universityInfo['college_list'] = $collegeList;
$likeUniversity = new LikeUniversity();
$likeUniversityInfo = $likeUniversity->infoById($userId, $universityId);
$universityInfo['is_like'] = $likeUniversityInfo ? 1 : 0;
$this->success('获取大学的详细信息成功', $universityInfo);
}
... ...
... ... @@ -18,4 +18,9 @@ class Graduated extends Model
{
return $this->where(['show_switch' => ['=', 1]])->useSoftDelete($this->deleteTime)->order('weigh', 'desc')->select();
}
public function infoById($id)
{
return $this->where(['show_switch' => ['=', 1], 'id' => ['=', $id]])->useSoftDelete($this->deleteTime)->find();
}
}
\ No newline at end of file
... ...
... ... @@ -31,15 +31,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
// {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'url', title: __('Url'), formatter: Table.api.formatter.url},
{field: 'wechat', title: __('Wechat')},
{field: 'show_switch', title: __('Show_switch'), searchList: {"1":__('Yes'),"0":__('No')}, table: table, formatter: Table.api.formatter.toggle},
{field: 'icon_image', title: __('Icon_image'), events: Table.api.events.image, formatter: Table.api.formatter.image},
{field: 'weigh', title: __('Weigh')},
// {field: 'province_id', title: __('Province_id')},
// {field: 'city_id', title: __('City_id')},
// {field: 'level_id', title: __('Level_id')},
{field: 'universitylevel.name', title: __('Universitylevel.name')},
{field: 'name_en', title: __('Name_en')},
{field: 'province.name', title: __('Province.name')},
{field: 'city.name', title: __('City.name')},
{field: 'universitylevel.name', title: __('Universitylevel.name')},
{field: 'show_switch', title: __('Show_switch'), searchList: {"1":__('Yes'),"0":__('No')}, table: table, formatter: Table.api.formatter.toggle},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]
]
... ...