开飞机的舒克 / Campus · 提交

转到一个项目

作者 开飞机的舒克
提交 15077a2d954284a0d0f4aef1de28d7ab39c828fa 1 个父辈 f045dad2

后台系统校区名称更名为界次名称

内嵌 并排对比
正在显示 7 个修改的文件 包含 16 行增加 和 109 行删除
1 -<?php  
2 -  
3 -namespace app\admin\controller;  
4 -  
5 -use app\common\controller\Backend;  
6 -  
7 -/**  
8 - * 项目详情表  
9 -  
10 - *  
11 - * @icon fa fa-circle-o  
12 - */  
13 -class ItemDetails extends Backend  
14 -{  
15 -  
16 - /**  
17 - * ItemDetails模型对象  
18 - * @var \app\admin\model\ItemDetails  
19 - */  
20 - protected $model = null;  
21 -  
22 - public function _initialize()  
23 - {  
24 - parent::_initialize();  
25 - $this->model = new \app\admin\model\ItemDetails;  
26 - $this->view->assign("isSiftList", $this->model->getIsSiftList());  
27 - }  
28 -  
29 -  
30 -  
31 - /**  
32 - * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法  
33 - * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑  
34 - * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改  
35 - */  
36 -  
37 -  
38 - /**  
39 - * 查看  
40 - */  
41 - public function index()  
42 - {  
43 - //当前是否为关联查询  
44 - $this->relationSearch = true;  
45 - //设置过滤方法  
46 - $this->request->filter(['strip_tags', 'trim']);  
47 - if ($this->request->isAjax()) {  
48 - //如果发送的来源是Selectpage，则转发到Selectpage  
49 - if ($this->request->request('keyField')) {  
50 - return $this->selectpage();  
51 - }  
52 - list($where, $sort, $order, $offset, $limit) = $this->buildparams();  
53 -  
54 - $list = $this->model  
55 - ->with(['team','item'])  
56 - ->where($where)  
57 - ->order($sort, $order)  
58 - ->paginate($limit);  
59 -  
60 - foreach ($list as $row) {  
61 -  
62 - $row->getRelation('team')->visible(['title']);  
63 - $row->getRelation('item')->visible(['title']);  
64 - }  
65 -  
66 - $result = array("total" => $list->total(), "rows" => $list->items());  
67 -  
68 - return json($result);  
69 - }  
70 - return $this->view->fetch();  
71 - }  
72 -  
73 -}  
1 <?php 1 <?php
2 2
3 return [ 3 return [
4 - 'Title' => '校区名称', 4 + 'Title' => '届次',
5 'School_id' => '学校名称', 5 'School_id' => '学校名称',
6 'Activity_id' => '活动名称', 6 'Activity_id' => '活动名称',
7 'Date' => '举办日期', 7 'Date' => '举办日期',
1 <?php 1 <?php
2 2
3 return [ 3 return [
4 - 'Campus_id' => '所属校区', 4 + 'Campus_id' => '届次',
5 'Ronda_id' => '所属场次', 5 'Ronda_id' => '所属场次',
6 'Title' => '项目名称', 6 'Title' => '项目名称',
7 'Radar_id' => '所属维度', 7 'Radar_id' => '所属维度',
@@ -14,5 +14,5 @@ return [ @@ -14,5 +14,5 @@ return [
14 'User.teach_phone' => '老师手机号', 14 'User.teach_phone' => '老师手机号',
15 'Ronda.title' => '场次名称', 15 'Ronda.title' => '场次名称',
16 'Radar.title' => '维度名称', 16 'Radar.title' => '维度名称',
17 - 'Campus.title' => '校区名称' 17 + 'Campus.title' => '届次'
18 ]; 18 ];
1 -<?php  
2 -  
3 -return [  
4 - 'Item_id' => '所属项目',  
5 - 'Images' => '项目图片',  
6 - 'Is_sift' => '是否为精选',  
7 - 'Is_sift 0' => '否',  
8 - 'Is_sift 1' => '是',  
9 - 'Team_id' => '所属战队',  
10 - 'Createtime' => '创建时间',  
11 - 'Updatetime' => '更新时间',  
12 - 'Team.title' => '战队昵称',  
13 - 'Item.title' => '名称'  
14 -];  
1 <?php 1 <?php
2 2
3 return [ 3 return [
4 - 'Campus_id' => '所属校区', 4 + 'Campus_id' => '界次',
5 'Title' => '场次名称', 5 'Title' => '场次名称',
6 'Holdtime' => '举办日期', 6 'Holdtime' => '举办日期',
7 'Images' => '场次图片', 7 'Images' => '场次图片',
8 'Details' => '场次详情', 8 'Details' => '场次详情',
9 'Createtime' => '创建时间', 9 'Createtime' => '创建时间',
10 'Updatetime' => '更新时间', 10 'Updatetime' => '更新时间',
11 - 'Campus.title' => '校区名称' 11 + 'Campus.title' => '界次名称'
12 ]; 12 ];
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 return [ 3 return [
4 'Title' => '活动标题', 4 'Title' => '活动标题',
5 - 'Campus_id' => '校区名称', 5 + 'Campus_id' => '界次',
6 'Images' => '背景图', 6 'Images' => '背景图',
7 'Starttime' => '开始时间', 7 'Starttime' => '开始时间',
8 'Endtime' => '结束时间', 8 'Endtime' => '结束时间',
@@ -52,7 +52,7 @@ class Activity extends Api @@ -52,7 +52,7 @@ class Activity extends Api
52 } 52 }
53 53
54 /** 54 /**
55 - * @ApiTitle (项目校区) 55 + * @ApiTitle (届次)
56 * @ApiMethod (POST) 56 * @ApiMethod (POST)
57 * @ApiParams (name="id", type="interge", required=true, description="活动id") 57 * @ApiParams (name="id", type="interge", required=true, description="活动id")
58 * @ApiReturnParams (name="code", type="integer", required=true, description="状态码") 58 * @ApiReturnParams (name="code", type="integer", required=true, description="状态码")
@@ -74,15 +74,15 @@ class Activity extends Api @@ -74,15 +74,15 @@ class Activity extends Api
74 ->where('c.activity_id',$param['id']) 74 ->where('c.activity_id',$param['id'])
75 ->select(); 75 ->select();
76 if (empty($data)) { 76 if (empty($data)) {
77 - $this->error('当前还没有校区', ['status' => 2]); 77 + $this->error('当前还没有届次', ['status' => 2]);
78 } 78 }
79 - $this->success('项目校区', $data); 79 + $this->success('届次', $data);
80 } 80 }
81 81
82 /** 82 /**
83 * @ApiTitle (场次筛选) 83 * @ApiTitle (场次筛选)
84 * @ApiMethod (POST) 84 * @ApiMethod (POST)
85 - * @ApiParams (name="cid", type="string", required=false, description="校区id") 85 + * @ApiParams (name="cid", type="string", required=false, description="届次id")
86 * @ApiReturnParams (name="code", type="integer", required=true, description="状态码") 86 * @ApiReturnParams (name="code", type="integer", required=true, description="状态码")
87 * @ApiReturnParams (name="msg", type="string", required=true, description="提示语") 87 * @ApiReturnParams (name="msg", type="string", required=true, description="提示语")
88 * @ApiReturnParams (name="data", type="object", description="扩展数据返回") 88 * @ApiReturnParams (name="data", type="object", description="扩展数据返回")
@@ -90,7 +90,7 @@ class Activity extends Api @@ -90,7 +90,7 @@ class Activity extends Api
90 "code":"状态码", 90 "code":"状态码",
91 "msg": "提示消息", 91 "msg": "提示消息",
92 "data": { 92 "data": {
93 - "campus_title": "校区名称", 93 + "campus_title": "届次名称",
94 "ronda_title": "场次", 94 "ronda_title": "场次",
95 "ronda_holdtime": "场次时间", 95 "ronda_holdtime": "场次时间",
96 } 96 }
@@ -125,7 +125,7 @@ class Activity extends Api @@ -125,7 +125,7 @@ class Activity extends Api
125 "code":"状态码", 125 "code":"状态码",
126 "msg": "提示消息", 126 "msg": "提示消息",
127 "data": { 127 "data": {
128 - "campus_title": "校区名称", 128 + "campus_title": "届次名称",
129 "ronda_title": "场次", 129 "ronda_title": "场次",
130 "ronda_holdtime": "场次时间", 130 "ronda_holdtime": "场次时间",
131 } 131 }
@@ -189,7 +189,7 @@ class Activity extends Api @@ -189,7 +189,7 @@ class Activity extends Api
189 "code":"状态码", 189 "code":"状态码",
190 "msg": "提示消息", 190 "msg": "提示消息",
191 "data": { 191 "data": {
192 - "campus_title": "校区名称", 192 + "campus_title": "届次名称",
193 "ronda_title": "场次名称", 193 "ronda_title": "场次名称",
194 "images": "项目图片", 194 "images": "项目图片",
195 "details": "项目详情" 195 "details": "项目详情"
@@ -197,24 +197,18 @@ class Activity extends Api @@ -197,24 +197,18 @@ class Activity extends Api
197 */ 197 */
198 public function getItemDetails() 198 public function getItemDetails()
199 { 199 {
200 - $user = $this->auth->getUserinfo();  
201 $rid = $this->request->param('rid'); 200 $rid = $this->request->param('rid');
202 $id = $this->request->param('id'); 201 $id = $this->request->param('id');
203 $data = db('item i') 202 $data = db('item i')
204 ->join('ronda r','i.ronda_id = r.id') 203 ->join('ronda r','i.ronda_id = r.id')
205 ->join('campus c','c.id = r.campus_id') 204 ->join('campus c','c.id = r.campus_id')
206 - ->field('c.title as campus_title,r.title as ronda_title,r.holdtime,i.details') 205 + ->field('c.title as campus_title,r.title as ronda_title,r.holdtime,i.details,i.images')
207 ->where([ 206 ->where([
208 'i.ronda_id'=>$rid, 207 'i.ronda_id'=>$rid,
209 'i.id'=> $id, 208 'i.id'=> $id,
210 - ]) 209 + ])
211 ->find(); 210 ->find();
212 - $model = new ItemDetails();  
213 - $res = db('study')->where('user_id',$user['id'])->find();  
214 - if (!empty($res)) {  
215 - $list = $model->where(['item_id' => $id, 'team' => $res['team']])->find()->toArray();  
216 - $data['images'] = $list['images'];  
217 - } 211 +
218 $data['holdtime'] = date('Y-m-d',$data['holdtime']); 212 $data['holdtime'] = date('Y-m-d',$data['holdtime']);
219 $data['details'] = strip_tags($data['details']); 213 $data['details'] = strip_tags($data['details']);
220 $this->success('获取项目详情成功', $data); 214 $this->success('获取项目详情成功', $data);