开飞机的舒克 / Campus · 提交

转到一个项目

作者 开飞机的舒克
提交 3c6d2e1551dafdf6b68506c0738b6bf1248d6729 1 个父辈 68640abe

大屏功能修改

内嵌 并排对比
正在显示 6 个修改的文件 包含 17 行增加 和 3 行删除
@@ -63,7 +63,7 @@ class Screen extends Backend @@ -63,7 +63,7 @@ class Screen extends Backend
63 ->paginate($limit); 63 ->paginate($limit);
64 64
65 foreach ($list as $row) { 65 foreach ($list as $row) {
66 - $row->visible(['id', 'ronda_id', 'campus', 'images', 'starttime', 'endtime', 'is_view']); 66 + $row->visible(['id', 'title','ronda_id', 'campus', 'images', 'starttime', 'endtime', 'is_view']);
67 $row->visible(['ronda']); 67 $row->visible(['ronda']);
68 $row->getRelation('ronda')->visible(['title']); 68 $row->getRelation('ronda')->visible(['title']);
69 } 69 }
1 <?php 1 <?php
2 2
3 return [ 3 return [
4 - 'Ronda_id' => '场次ID', 4 + 'Ronda_id' => '场次名称',
  5 + 'Title' => '活动名称',
5 'Ronda_title' => '场次标题', 6 'Ronda_title' => '场次标题',
6 'Campus' => '届次名称', 7 'Campus' => '届次名称',
7 'Images' => '背景图', 8 'Images' => '背景图',
1 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action=""> 1 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
2 2
3 <div class="form-group"> 3 <div class="form-group">
  4 + <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
  5 + <div class="col-xs-12 col-sm-8">
  6 + <input id="c-title" class="form-control" name="row[title]" type="text">
  7 + </div>
  8 + </div>
  9 + <div class="form-group">
4 <label class="control-label col-xs-12 col-sm-2">{:__('Ronda_id')}:</label> 10 <label class="control-label col-xs-12 col-sm-2">{:__('Ronda_id')}:</label>
5 <div class="col-xs-12 col-sm-8"> 11 <div class="col-xs-12 col-sm-8">
6 <input id="c-ronda_id" class="form-control" data-source="ronda/index" data-field="title" name="row[ronda_id]" type="text"> 12 <input id="c-ronda_id" class="form-control" data-source="ronda/index" data-field="title" name="row[ronda_id]" type="text">
1 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action=""> 1 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
2 2
3 <div class="form-group"> 3 <div class="form-group">
  4 + <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
  5 + <div class="col-xs-12 col-sm-8">
  6 + <input id="c-title" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}">
  7 + </div>
  8 + </div>
  9 + <div class="form-group">
4 <label class="control-label col-xs-12 col-sm-2">{:__('Ronda_id')}:</label> 10 <label class="control-label col-xs-12 col-sm-2">{:__('Ronda_id')}:</label>
5 <div class="col-xs-12 col-sm-8"> 11 <div class="col-xs-12 col-sm-8">
6 <input id="c-ronda_id" class="form-control selectpage" data-source="ronda/index" name="row[ronda_id]" type="text" data-field="title" value="{$row.ronda_id|htmlentities}"> 12 <input id="c-ronda_id" class="form-control selectpage" data-source="ronda/index" name="row[ronda_id]" type="text" data-field="title" value="{$row.ronda_id|htmlentities}">
@@ -31,7 +31,7 @@ class Screen extends Api @@ -31,7 +31,7 @@ class Screen extends Api
31 $data = db('screen')->find(); 31 $data = db('screen')->find();
32 $list['images'] = cdnurl($data['images'],true); 32 $list['images'] = cdnurl($data['images'],true);
33 $list['count_down'] = $data['endtime']; 33 $list['count_down'] = $data['endtime'];
34 - $list['screen_name'] = db('ronda')->where('id',$data['ronda_id'])->value('title'); 34 + $list['screen_name'] = $data['title'];
35 $list['campus_name'] = $data['campus']; 35 $list['campus_name'] = $data['campus'];
36 $list['time'] = date('Y-m-d H:i:s',time()); 36 $list['time'] = date('Y-m-d H:i:s',time());
37 $list['team_rank'] = \db('team_score') 37 $list['team_rank'] = \db('team_score')
@@ -33,6 +33,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -33,6 +33,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
33 {checkbox: true}, 33 {checkbox: true},
34 {field: 'id', title: __('ID'), operate: false}, 34 {field: 'id', title: __('ID'), operate: false},
35 //{field: 'ronda_id', title: __('Ronda_id'), operate: 'LIKE'}, 35 //{field: 'ronda_id', title: __('Ronda_id'), operate: 'LIKE'},
  36 + {field: 'title', title: __('Title'), operate: 'LIKE'},
36 {field: 'ronda_title', title: __('Ronda_title'), operate: 'LIKE'}, 37 {field: 'ronda_title', title: __('Ronda_title'), operate: 'LIKE'},
37 {field: 'count_time', title: __('倒计时')}, 38 {field: 'count_time', title: __('倒计时')},
38 //{field: 'campus_id', title: __('Campus_id')}, 39 //{field: 'campus_id', title: __('Campus_id')},