王智 / xiche · 提交

转到一个项目

作者 王智
提交 a9eaff691a9342c5b96e57a110160b2dd84a5f24 1 个父辈 35e9d1db

daima

内嵌 并排对比
正在显示 4 个修改的文件 包含 21 行增加 和 13 行删除
@@ -102,6 +102,14 @@ class Renwu extends Model @@ -102,6 +102,14 @@ class Renwu extends Model
102 { 102 {
103 return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0); 103 return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
104 } 104 }
  105 + public function xiuser()
  106 + {
  107 + return $this->belongsTo('User', 'xi_id', 'id', [], 'LEFT')->setEagerlyType(0);
  108 + }
  109 + public function zhaouser()
  110 + {
  111 + return $this->belongsTo('User', 'zhao_id', 'id', [], 'LEFT')->setEagerlyType(0);
  112 + }
105 113
106 114
107 public function vip() 115 public function vip()
@@ -80,12 +80,12 @@ @@ -80,12 +80,12 @@
80 80
81 </div> 81 </div>
82 </div> 82 </div>
83 - <div class="form-group">  
84 - <label class="control-label col-xs-12 col-sm-2">{:__('Weight')}:</label>  
85 - <div class="col-xs-12 col-sm-8">  
86 - <input id="c-weight" data-rule="required" class="form-control" name="row[weight]" type="text">  
87 - </div>  
88 - </div> 83 + <!--<div class="form-group">-->
  84 + <!--<label class="control-label col-xs-12 col-sm-2">{:__('Weight')}:</label>-->
  85 + <!--<div class="col-xs-12 col-sm-8">-->
  86 + <!--<input id="c-weight" data-rule="required" class="form-control" name="row[weight]" type="text">-->
  87 + <!--</div>-->
  88 + <!--</div>-->
89 <div class="form-group layer-footer"> 89 <div class="form-group layer-footer">
90 <label class="control-label col-xs-12 col-sm-2"></label> 90 <label class="control-label col-xs-12 col-sm-2"></label>
91 <div class="col-xs-12 col-sm-8"> 91 <div class="col-xs-12 col-sm-8">
@@ -80,12 +80,12 @@ @@ -80,12 +80,12 @@
80 80
81 </div> 81 </div>
82 </div> 82 </div>
83 - <div class="form-group">  
84 - <label class="control-label col-xs-12 col-sm-2">{:__('Weight')}:</label>  
85 - <div class="col-xs-12 col-sm-8">  
86 - <input id="c-weight" data-rule="required" class="form-control" name="row[weight]" type="text" value="{$row.weight|htmlentities}">  
87 - </div>  
88 - </div> 83 + <!--<div class="form-group">-->
  84 + <!--<label class="control-label col-xs-12 col-sm-2">{:__('Weight')}:</label>-->
  85 + <!--<div class="col-xs-12 col-sm-8">-->
  86 + <!--<input id="c-weight" data-rule="required" class="form-control" name="row[weight]" type="text" value="{$row.weight|htmlentities}">-->
  87 + <!--</div>-->
  88 + <!--</div>-->
89 <div class="form-group layer-footer"> 89 <div class="form-group layer-footer">
90 <label class="control-label col-xs-12 col-sm-2"></label> 90 <label class="control-label col-xs-12 col-sm-2"></label>
91 <div class="col-xs-12 col-sm-8"> 91 <div class="col-xs-12 col-sm-8">
@@ -35,7 +35,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -35,7 +35,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
35 {field: 'opentime', title: __('Opentime')}, 35 {field: 'opentime', title: __('Opentime')},
36 {field: 'mobile', title: __('Mobile')}, 36 {field: 'mobile', title: __('Mobile')},
37 {field: 'is_show', title: __('Is_show'), searchList: {"1":__('Is_show 1'),"0":__('Is_show 0')}, formatter:Table.api.formatter.toggle}, 37 {field: 'is_show', title: __('Is_show'), searchList: {"1":__('Is_show 1'),"0":__('Is_show 0')}, formatter:Table.api.formatter.toggle},
38 - {field: 'weight', title: __('Weight')}, 38 + // {field: 'weight', title: __('Weight')},
39 // {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 39 // {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
40 {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 40 {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
41 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 41 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}