郭文星 / wyc.tenyes.cn · 提交

转到一个项目

作者 郭文星
提交 93ed151cad613a2f0b6b039b8f24006079841cc4 1 个父辈 3ea20ffe

123

内嵌 并排对比
正在显示 4 个修改的文件 包含 4 行增加 和 17 行删除
@@ -12,12 +12,7 @@ @@ -12,12 +12,7 @@
12 <input id="c-price" class="form-control" step="0.01" name="row[price]" type="number"> 12 <input id="c-price" class="form-control" step="0.01" name="row[price]" type="number">
13 </div> 13 </div>
14 </div> 14 </div>
15 - <div class="form-group">  
16 - <label class="control-label col-xs-12 col-sm-2">{:__('Intercity_price')}:</label>  
17 - <div class="col-xs-12 col-sm-8">  
18 - <input id="c-intercity_price" class="form-control" step="0.01" name="row[intercity_price]" type="number">  
19 - </div>  
20 - </div> 15 +
21 <div class="form-group layer-footer"> 16 <div class="form-group layer-footer">
22 <label class="control-label col-xs-12 col-sm-2"></label> 17 <label class="control-label col-xs-12 col-sm-2"></label>
23 <div class="col-xs-12 col-sm-8"> 18 <div class="col-xs-12 col-sm-8">
@@ -12,12 +12,7 @@ @@ -12,12 +12,7 @@
12 <input id="c-price" class="form-control" step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}"> 12 <input id="c-price" class="form-control" step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">
13 </div> 13 </div>
14 </div> 14 </div>
15 - <div class="form-group">  
16 - <label class="control-label col-xs-12 col-sm-2">{:__('Intercity_price')}:</label>  
17 - <div class="col-xs-12 col-sm-8">  
18 - <input id="c-intercity_price" class="form-control" step="0.01" name="row[intercity_price]" type="number" value="{$row.intercity_price|htmlentities}">  
19 - </div>  
20 - </div> 15 +
21 <div class="form-group layer-footer"> 16 <div class="form-group layer-footer">
22 <label class="control-label col-xs-12 col-sm-2"></label> 17 <label class="control-label col-xs-12 col-sm-2"></label>
23 <div class="col-xs-12 col-sm-8"> 18 <div class="col-xs-12 col-sm-8">
@@ -667,19 +667,17 @@ class Car extends Base @@ -667,19 +667,17 @@ class Car extends Base
667 ->where('car_id',$car_id) 667 ->where('car_id',$car_id)
668 ->field("seat_no") 668 ->field("seat_no")
669 ->select(); 669 ->select();
670 -  
671 if($order){ 670 if($order){
672 foreach ($order as $k=>$v){ 671 foreach ($order as $k=>$v){
673 $seat_no[$k]=$order[$k]["seat_no"]; 672 $seat_no[$k]=$order[$k]["seat_no"];
674 } 673 }
675 - }  
676 $seat_no = array_filter($seat_no, function($value) { 674 $seat_no = array_filter($seat_no, function($value) {
677 return !empty($value); 675 return !empty($value);
678 }); 676 });
679 $seat_no = implode(',', $seat_no); 677 $seat_no = implode(',', $seat_no);
680 678
681 $seat_no = explode(",", $seat_no); 679 $seat_no = explode(",", $seat_no);
682 - 680 + }
683 foreach ($seat['seat'] as $k=>$v){ 681 foreach ($seat['seat'] as $k=>$v){
684 if($order){ 682 if($order){
685 if( in_array($seat['seat'][$k]['seat_no'],$seat_no)){ 683 if( in_array($seat['seat'][$k]['seat_no'],$seat_no)){
@@ -28,8 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -28,8 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
28 {field: 'id', title: __('Id')}, 28 {field: 'id', title: __('Id')},
29 {field: 'name', title: __('Name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, 29 {field: 'name', title: __('Name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
30 {field: 'price', title: __('Price'), operate:'BETWEEN'}, 30 {field: 'price', title: __('Price'), operate:'BETWEEN'},
31 - {field: 'intercity_price', title: __('Intercity_price'), operate:'BETWEEN'},  
32 - {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 31 + {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
33 ] 32 ]
34 ] 33 ]
35 }); 34 });