谢百川 / seniors_say · 提交

转到一个项目

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

ok

内嵌 并排对比
正在显示 11 个修改的文件 包含 47 行增加 和 22 行删除
@@ -50,13 +50,13 @@ class University extends Backend @@ -50,13 +50,13 @@ class University extends Backend
50 } 50 }
51 list($where, $sort, $order, $offset, $limit) = $this->buildparams(); 51 list($where, $sort, $order, $offset, $limit) = $this->buildparams();
52 $total = $this->model 52 $total = $this->model
53 - ->with(['universitylevel','province','city']) 53 + ->with(['province','city','universitylevel'])
54 ->where($where) 54 ->where($where)
55 ->order($sort, $order) 55 ->order($sort, $order)
56 ->count(); 56 ->count();
57 57
58 $list = $this->model 58 $list = $this->model
59 - ->with(['universitylevel','province','city']) 59 + ->with(['province','city','universitylevel'])
60 ->where($where) 60 ->where($where)
61 ->order($sort, $order) 61 ->order($sort, $order)
62 ->limit($offset, $limit) 62 ->limit($offset, $limit)
@@ -64,9 +64,9 @@ class University extends Backend @@ -64,9 +64,9 @@ class University extends Backend
64 64
65 foreach ($list as $row) { 65 foreach ($list as $row) {
66 66
67 - $row->getRelation('universitylevel')->visible(['name']);  
68 $row->getRelation('province')->visible(['name']); 67 $row->getRelation('province')->visible(['name']);
69 $row->getRelation('city')->visible(['name']); 68 $row->getRelation('city')->visible(['name']);
  69 + $row->getRelation('universitylevel')->visible(['name']);
70 } 70 }
71 $list = collection($list)->toArray(); 71 $list = collection($list)->toArray();
72 $result = array("total" => $total, "rows" => $list); 72 $result = array("total" => $total, "rows" => $list);
@@ -15,5 +15,6 @@ return [ @@ -15,5 +15,6 @@ return [
15 'Province_id' => '省份ID', 15 'Province_id' => '省份ID',
16 'City_id' => '城市ID', 16 'City_id' => '城市ID',
17 'Level_id' => '985/211等', 17 'Level_id' => '985/211等',
  18 + 'Name_en' => '英文校名',
18 'Universitylevel.name' => '名称' 19 'Universitylevel.name' => '名称'
19 ]; 20 ];
@@ -45,12 +45,6 @@ class University extends Model @@ -45,12 +45,6 @@ class University extends Model
45 45
46 46
47 47
48 - public function universitylevel()  
49 - {  
50 - return $this->belongsTo('UniversityLevel', 'level_id', 'id', [], 'LEFT')->setEagerlyType(0);  
51 - }  
52 -  
53 -  
54 public function province() 48 public function province()
55 { 49 {
56 return $this->belongsTo('Province', 'province_id', 'code', [], 'LEFT')->setEagerlyType(0); 50 return $this->belongsTo('Province', 'province_id', 'code', [], 'LEFT')->setEagerlyType(0);
@@ -61,4 +55,10 @@ class University extends Model @@ -61,4 +55,10 @@ class University extends Model
61 { 55 {
62 return $this->belongsTo('City', 'city_id', 'code', [], 'LEFT')->setEagerlyType(0); 56 return $this->belongsTo('City', 'city_id', 'code', [], 'LEFT')->setEagerlyType(0);
63 } 57 }
  58 +
  59 +
  60 + public function universitylevel()
  61 + {
  62 + return $this->belongsTo('UniversityLevel', 'level_id', 'id', [], 'LEFT')->setEagerlyType(0);
  63 + }
64 } 64 }
@@ -78,7 +78,13 @@ @@ -78,7 +78,13 @@
78 <div class="form-group"> 78 <div class="form-group">
79 <label class="control-label col-xs-12 col-sm-2">{:__('Level_id')}:</label> 79 <label class="control-label col-xs-12 col-sm-2">{:__('Level_id')}:</label>
80 <div class="col-xs-12 col-sm-8"> 80 <div class="col-xs-12 col-sm-8">
81 - <input id="c-level_id" data-rule="required" data-source="university_level/index" class="form-control selectpage" name="row[level_id]" type="text" value=""> 81 + <input id="c-level_id" data-rule="required" data-source="level/index" class="form-control selectpage" name="row[level_id]" type="text" value="">
  82 + </div>
  83 + </div>
  84 + <div class="form-group">
  85 + <label class="control-label col-xs-12 col-sm-2">{:__('Name_en')}:</label>
  86 + <div class="col-xs-12 col-sm-8">
  87 + <input id="c-name_en" data-rule="required" class="form-control" name="row[name_en]" type="text" value="">
82 </div> 88 </div>
83 </div> 89 </div>
84 <div class="form-group layer-footer"> 90 <div class="form-group layer-footer">
@@ -82,7 +82,13 @@ @@ -82,7 +82,13 @@
82 <div class="form-group"> 82 <div class="form-group">
83 <label class="control-label col-xs-12 col-sm-2">{:__('Level_id')}:</label> 83 <label class="control-label col-xs-12 col-sm-2">{:__('Level_id')}:</label>
84 <div class="col-xs-12 col-sm-8"> 84 <div class="col-xs-12 col-sm-8">
85 - <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}"> 85 + <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}">
  86 + </div>
  87 + </div>
  88 + <div class="form-group">
  89 + <label class="control-label col-xs-12 col-sm-2">{:__('Name_en')}:</label>
  90 + <div class="col-xs-12 col-sm-8">
  91 + <input id="c-name_en" data-rule="required" class="form-control" name="row[name_en]" type="text" value="{$row.name_en|htmlentities}">
86 </div> 92 </div>
87 </div> 93 </div>
88 <div class="form-group layer-footer"> 94 <div class="form-group layer-footer">
@@ -10,15 +10,15 @@ @@ -10,15 +10,15 @@
10 <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('university/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a> 10 <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('university/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
11 <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> 11 <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>
12 <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> 12 <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>
13 -<!-- <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>--> 13 + <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>
14 14
15 -<!-- <div class="dropdown btn-group {:$auth->check('university/multi')?'':'hide'}">-->  
16 -<!-- <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->  
17 -<!-- <ul class="dropdown-menu text-left" role="menu">-->  
18 -<!-- <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>-->  
19 -<!-- <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>-->  
20 -<!-- </ul>-->  
21 -<!-- </div>--> 15 + <div class="dropdown btn-group {:$auth->check('university/multi')?'':'hide'}">
  16 + <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
  17 + <ul class="dropdown-menu text-left" role="menu">
  18 + <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>
  19 + <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>
  20 + </ul>
  21 + </div>
22 22
23 <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> 23 <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>
24 </div> 24 </div>
@@ -467,6 +467,8 @@ class Student extends Api @@ -467,6 +467,8 @@ class Student extends Api
467 467
468 $studentInfo['endtime'] = date('Y', $studentInfo['endtime']); 468 $studentInfo['endtime'] = date('Y', $studentInfo['endtime']);
469 469
  470 + $graduated = new Graduated();
  471 + $studentInfo['graduated_info'] = $graduated->infoById($studentInfo['graduated_id']);
470 $this->success('获取个人信息成功', $studentInfo); 472 $this->success('获取个人信息成功', $studentInfo);
471 } 473 }
472 474
@@ -38,7 +38,7 @@ class Thank extends Api @@ -38,7 +38,7 @@ class Thank extends Api
38 { 38 {
39 $userId = $this->auth->id; 39 $userId = $this->auth->id;
40 40
41 - $money = $this->request->param('price', 0, 'int'); 41 + $money = $this->request->param('money', 0, 'int');
42 if(!$money || $money <= 0) { 42 if(!$money || $money <= 0) {
43 $this->error('您的操作有误'); 43 $this->error('您的操作有误');
44 } 44 }
@@ -375,6 +375,10 @@ class University extends Api @@ -375,6 +375,10 @@ class University extends Api
375 } 375 }
376 $universityInfo['college_list'] = $collegeList; 376 $universityInfo['college_list'] = $collegeList;
377 377
  378 + $likeUniversity = new LikeUniversity();
  379 + $likeUniversityInfo = $likeUniversity->infoById($userId, $universityId);
  380 + $universityInfo['is_like'] = $likeUniversityInfo ? 1 : 0;
  381 +
378 $this->success('获取大学的详细信息成功', $universityInfo); 382 $this->success('获取大学的详细信息成功', $universityInfo);
379 } 383 }
380 384
@@ -18,4 +18,9 @@ class Graduated extends Model @@ -18,4 +18,9 @@ class Graduated extends Model
18 { 18 {
19 return $this->where(['show_switch' => ['=', 1]])->useSoftDelete($this->deleteTime)->order('weigh', 'desc')->select(); 19 return $this->where(['show_switch' => ['=', 1]])->useSoftDelete($this->deleteTime)->order('weigh', 'desc')->select();
20 } 20 }
  21 +
  22 + public function infoById($id)
  23 + {
  24 + return $this->where(['show_switch' => ['=', 1], 'id' => ['=', $id]])->useSoftDelete($this->deleteTime)->find();
  25 + }
21 } 26 }
@@ -31,15 +31,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -31,15 +31,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
31 // {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 31 // {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
32 {field: 'url', title: __('Url'), formatter: Table.api.formatter.url}, 32 {field: 'url', title: __('Url'), formatter: Table.api.formatter.url},
33 {field: 'wechat', title: __('Wechat')}, 33 {field: 'wechat', title: __('Wechat')},
34 - {field: 'show_switch', title: __('Show_switch'), searchList: {"1":__('Yes'),"0":__('No')}, table: table, formatter: Table.api.formatter.toggle},  
35 {field: 'icon_image', title: __('Icon_image'), events: Table.api.events.image, formatter: Table.api.formatter.image}, 34 {field: 'icon_image', title: __('Icon_image'), events: Table.api.events.image, formatter: Table.api.formatter.image},
36 {field: 'weigh', title: __('Weigh')}, 35 {field: 'weigh', title: __('Weigh')},
37 // {field: 'province_id', title: __('Province_id')}, 36 // {field: 'province_id', title: __('Province_id')},
38 // {field: 'city_id', title: __('City_id')}, 37 // {field: 'city_id', title: __('City_id')},
39 // {field: 'level_id', title: __('Level_id')}, 38 // {field: 'level_id', title: __('Level_id')},
40 - {field: 'universitylevel.name', title: __('Universitylevel.name')}, 39 + {field: 'name_en', title: __('Name_en')},
41 {field: 'province.name', title: __('Province.name')}, 40 {field: 'province.name', title: __('Province.name')},
42 {field: 'city.name', title: __('City.name')}, 41 {field: 'city.name', title: __('City.name')},
  42 + {field: 'universitylevel.name', title: __('Universitylevel.name')},
  43 + {field: 'show_switch', title: __('Show_switch'), searchList: {"1":__('Yes'),"0":__('No')}, table: table, formatter: Table.api.formatter.toggle},
43 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 44 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
44 ] 45 ]
45 ] 46 ]