郭盛 / fang · 提交

转到一个项目

作者 郭盛
提交 c82b2eea248745b7c67aee948695bb1d6cd35064 1 个父辈 91b29f4d
1 个管道 的构建 通过 耗费 1 秒

修改model

内嵌 并排对比
正在显示 7 个修改的文件 包含 145 行增加 和 20 行删除
@@ -30,7 +30,7 @@ class Building extends Model @@ -30,7 +30,7 @@ class Building extends Model
30 30
31 public function shop() 31 public function shop()
32 { 32 {
33 - return $this->belongsTo('\app\admin\model\hotel\hotel', 'shop_id', 'id', [], 'LEFT')->setEagerlyType(0); 33 + return $this->belongsTo('\app\admin\model\hotel\Hotel', 'shop_id', 'id', [], 'LEFT')->setEagerlyType(0);
34 } 34 }
35 35
36 36
@@ -58,7 +58,7 @@ class CleanUser extends Model @@ -58,7 +58,7 @@ class CleanUser extends Model
58 58
59 public function shop() 59 public function shop()
60 { 60 {
61 - return $this->belongsTo('\app\admin\model\hotel\hotel', 'shop_id', 'id', [], 'LEFT')->setEagerlyType(0); 61 + return $this->belongsTo('\app\admin\model\hotel\Hotel', 'shop_id', 'id', [], 'LEFT')->setEagerlyType(0);
62 } 62 }
63 63
64 64
@@ -59,17 +59,17 @@ class CleanWork extends Model @@ -59,17 +59,17 @@ class CleanWork extends Model
59 59
60 public function cleanUser() 60 public function cleanUser()
61 { 61 {
62 - return $this->belongsTo('\app\admin\model\hotel\cleanUser', 'clean_user_id', 'id', [], 'LEFT')->setEagerlyType(0); 62 + return $this->belongsTo('\app\admin\model\hotel\CleanUser', 'clean_user_id', 'id', [], 'LEFT')->setEagerlyType(0);
63 } 63 }
64 64
65 public function shop() 65 public function shop()
66 { 66 {
67 - return $this->belongsTo('\app\admin\model\hotel\hotel', 'shop_id', 'id', [], 'LEFT')->setEagerlyType(0); 67 + return $this->belongsTo('\app\admin\model\hotel\Hotel', 'shop_id', 'id', [], 'LEFT')->setEagerlyType(0);
68 } 68 }
69 69
70 public function room() 70 public function room()
71 { 71 {
72 - return $this->belongsTo('\app\admin\model\hotel\room', 'room_id', 'id', [], 'LEFT')->setEagerlyType(0); 72 + return $this->belongsTo('\app\admin\model\hotel\Room', 'room_id', 'id', [], 'LEFT')->setEagerlyType(0);
73 } 73 }
74 74
75 // 计算时间差 75 // 计算时间差
@@ -59,7 +59,7 @@ class Hotel extends Model @@ -59,7 +59,7 @@ class Hotel extends Model
59 59
60 public function admin() 60 public function admin()
61 { 61 {
62 - return $this->belongsTo('\app\admin\model\admin', 'dl_admin_user_id', 'user_id', [], 'LEFT')->setEagerlyType(0); 62 + return $this->belongsTo('\app\admin\model\Admin', 'dl_admin_user_id', 'user_id', [], 'LEFT')->setEagerlyType(0);
63 } 63 }
64 64
65 // public function user() 65 // public function user()
@@ -69,7 +69,7 @@ class Hotel extends Model @@ -69,7 +69,7 @@ class Hotel extends Model
69 69
70 public function shopAdmin() 70 public function shopAdmin()
71 { 71 {
72 - return $this->belongsTo('\app\admin\model\hotel\shopAdmin', 'shop_admin_id', 'id', [], 'LEFT')->setEagerlyType(0); 72 + return $this->belongsTo('\app\admin\model\hotel\ShopAdmin', 'shop_admin_id', 'id', [], 'LEFT')->setEagerlyType(0);
73 } 73 }
74 74
75 75
@@ -45,12 +45,12 @@ class Room extends Model @@ -45,12 +45,12 @@ class Room extends Model
45 45
46 public function shop() 46 public function shop()
47 { 47 {
48 - return $this->belongsTo('\app\admin\model\hotel\hotel', 'shop_id', 'id', [], 'LEFT')->setEagerlyType(0); 48 + return $this->belongsTo('\app\admin\model\hotel\Hotel', 'shop_id', 'id', [], 'LEFT')->setEagerlyType(0);
49 } 49 }
50 50
51 public function building() 51 public function building()
52 { 52 {
53 - return $this->belongsTo('\app\admin\model\hotel\building', 'building_id', 'id', [], 'LEFT')->setEagerlyType(0); 53 + return $this->belongsTo('\app\admin\model\hotel\Building', 'building_id', 'id', [], 'LEFT')->setEagerlyType(0);
54 } 54 }
55 55
56 56
@@ -87,12 +87,12 @@ class ShopPostExamine extends Model @@ -87,12 +87,12 @@ class ShopPostExamine extends Model
87 87
88 public function user() 88 public function user()
89 { 89 {
90 - return $this->belongsTo('\app\admin\model\user', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0); 90 + return $this->belongsTo('\app\admin\model\User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
91 } 91 }
92 92
93 public function shop() 93 public function shop()
94 { 94 {
95 - return $this->belongsTo('\app\admin\model\hotel\hotel', 'shop_id', 'id', [], 'LEFT')->setEagerlyType(0); 95 + return $this->belongsTo('\app\admin\model\hotel\Hotel', 'shop_id', 'id', [], 'LEFT')->setEagerlyType(0);
96 } 96 }
97 97
98 98
@@ -150,19 +150,24 @@ @@ -150,19 +150,24 @@
150 padding: 30px 0; 150 padding: 30px 0;
151 } 151 }
152 </style> 152 </style>
  153 +{if preg_match('/\/admin\/|admin\.php|admin_d75KABNWt\.php/i', url())}
  154 +<!--<div class="alert alert-danger-light">
  155 + {:__('Security tips')}
  156 +</div>-->
  157 +{/if}
153 <div class="panel panel-default panel-intro"> 158 <div class="panel panel-default panel-intro">
154 - <div class="panel-heading"> 159 + <!--<div class="panel-heading">
155 {:build_heading(null, false)} 160 {:build_heading(null, false)}
156 <ul class="nav nav-tabs"> 161 <ul class="nav nav-tabs">
157 <li class="active"><a href="#one" data-toggle="tab">{:__('Dashboard')}</a></li> 162 <li class="active"><a href="#one" data-toggle="tab">{:__('Dashboard')}</a></li>
158 <li><a href="#two" data-toggle="tab">{:__('Custom')}</a></li> 163 <li><a href="#two" data-toggle="tab">{:__('Custom')}</a></li>
159 </ul> 164 </ul>
160 - </div> 165 + </div>-->
161 <div class="panel-body"> 166 <div class="panel-body">
162 <div id="myTabContent" class="tab-content"> 167 <div id="myTabContent" class="tab-content">
163 <div class="tab-pane fade active in" id="one"> 168 <div class="tab-pane fade active in" id="one">
164 169
165 - <div class="row"> 170 + <!--<div class="row">
166 <div class="col-sm-3 col-xs-6"> 171 <div class="col-sm-3 col-xs-6">
167 <div class="sm-st clearfix"> 172 <div class="sm-st clearfix">
168 <span class="sm-st-icon st-red"><i class="fa fa-users"></i></span> 173 <span class="sm-st-icon st-red"><i class="fa fa-users"></i></span>
@@ -199,9 +204,9 @@ @@ -199,9 +204,9 @@
199 </div> 204 </div>
200 </div> 205 </div>
201 </div> 206 </div>
202 - </div> 207 + </div>-->
203 208
204 - <div class="row"> 209 + <!--<div class="row">
205 <div class="col-lg-8"> 210 <div class="col-lg-8">
206 <div id="echart" class="btn-refresh" style="height:200px;width:100%;"></div> 211 <div id="echart" class="btn-refresh" style="height:200px;width:100%;"></div>
207 </div> 212 </div>
@@ -273,9 +278,9 @@ @@ -273,9 +278,9 @@
273 </div> 278 </div>
274 </div> 279 </div>
275 </div> 280 </div>
276 - </div> 281 + </div>-->
277 282
278 - <div class="row" style="margin-top:15px;"> 283 + <!--<div class="row" style="margin-top:15px;">
279 284
280 <div class="col-lg-12"> 285 <div class="col-lg-12">
281 </div> 286 </div>
@@ -364,6 +369,126 @@ @@ -364,6 +369,126 @@
364 </div> 369 </div>
365 </div> 370 </div>
366 </div> 371 </div>
  372 + </div>-->
  373 +
  374 + <!--<div class="row">
  375 + <div class="col-lg-4">
  376 + <div class="box box-danger">
  377 + <div class="box-header with-border">
  378 + <h3 class="box-title">{:__('Recent news')}</h3>
  379 +
  380 + <div class="box-tools pull-right">
  381 + </div>
  382 + </div>
  383 + <div class="box-body">
  384 + <ul class="products-list product-list-in-box">
  385 + {for start="1" end="8"}
  386 + <li class="item">
  387 + <div class="product-img">
  388 + <img src="__CDN__/assets/img/avatar.png" style="height:40px;width:40px;">
  389 + </div>
  390 + <div class="product-info">
  391 + <a href="https://www.fastadmin.net" target="_blank" class="product-title">
  392 + FastAdmin
  393 + <span class="label label-{:$i%3===0?'warning':($i%2===0?'success':'info')} pull-right">开源免费</span>
  394 + </a>
  395 + <span class="product-description">
  396 + 一款基于ThinkPHP5+Bootstrap的极速后台开发框架
  397 + </span>
  398 + </div>
  399 + </li>
  400 + {/for}
  401 + </ul>
  402 + </div>
  403 + </div>
  404 + </div>-->
  405 + <!--<div class="col-lg-4">
  406 + <div class="box box-success">
  407 + <div class="box-header with-border">
  408 + <h3 class="box-title">{:__('Recent discussion')}</h3>
  409 +
  410 + <div class="box-tools pull-right">
  411 + </div>
  412 + </div>
  413 + <div class="box-body">
  414 + <ul class="nav nav-pills nav-stacked">
  415 + <li><a href="https://www.fastadmin.net" target="_blank">一款基于ThinkPHP5+Bootstrap的极速后台开发框架<span class="pull-right text-red"><i class="fa fa-angle-down"></i> 12%</span></a></li>
  416 + <li><a href="https://www.fastadmin.net" target="_blank">一键生成CRUD控制器模型和视图 <span class="pull-right text-green"><i class="fa fa-angle-up"></i> 4%</span></a></li>
  417 + <li><a href="https://www.fastadmin.net" target="_blank">一键压缩打包JS和CSS文件 <span class="pull-right text-red"><i class="fa fa-angle-down"></i> 3%</span></a></li>
  418 + <li><a href="https://www.fastadmin.net" target="_blank">一键生成控制器菜单和规则 <span class="pull-right text-green"><i class="fa fa-angle-up"></i> 8%</span></a></li>
  419 + <li><a href="https://www.fastadmin.net" target="_blank">一键生成API接口文档 <span class="pull-right text-yellow"><i class="fa fa-angle-left"></i> 0%</span></a></li>
  420 + <li><a href="https://www.fastadmin.net" target="_blank">强大的插件扩展功能，在线安装卸载升级插件 <span class="pull-right text-red"><i class="fa fa-angle-down"></i> 10%</span></a></li>
  421 + <li><a href="https://www.fastadmin.net" target="_blank">通用的会员模块和API模块 <span class="pull-right text-green"><i class="fa fa-angle-up"></i> 2%</span></a></li>
  422 + <li><a href="https://www.fastadmin.net" target="_blank">共用同一账号体系的Web端会员中心权限验证和API接口会员权限验证 <span class="pull-right text-red"><i class="fa fa-angle-down"></i> 6%</span></a></li>
  423 + <li><a href="https://www.fastadmin.net" target="_blank">二级域名部署支持，同时域名支持绑定到插件 <span class="pull-right text-yellow"><i class="fa fa-angle-left"></i> 0%</span></a></li>
  424 + <li><a href="https://www.fastadmin.net" target="_blank">多语言支持，服务端及客户端支持 <span class="pull-right text-yellow"><i class="fa fa-angle-left"></i> 0%</span></a></li>
  425 + <li><a href="https://www.fastadmin.net" target="_blank">基于Bootstrap开发，自适应手机、平板、PC <span class="pull-right text-green"><i class="fa fa-angle-up"></i> 4%</span></a></li>
  426 + </ul>
  427 + </div>
  428 + </div>
  429 + </div>-->
  430 + <!--<div class="col-lg-4">
  431 + <div class="box box-info">
  432 + <div class="box-header"><h3 class="box-title">{:__('Server info')}</h3></div>
  433 + <div class="box-body" style="padding-top:0;">
  434 + <table class="table table-striped">
  435 + <tbody>
  436 + &lt;!&ndash;<tr>
  437 + <td width="140">{:__('FastAdmin version')}</td>
  438 + <td>{$Think.config.fastadmin.version} <a href="javascript:;" class="btn btn-xs btn-checkversion">检查最新版</a></td>
  439 + </tr>
  440 + <tr>
  441 + <td>{:__('FastAdmin addon version')}</td>
  442 + <td>{$addonversion}</td>
  443 + </tr>&ndash;&gt;
  444 + <tr>
  445 + <td>{:__('Thinkphp version')}</td>
  446 + <td>{:THINK_VERSION}</td>
  447 + </tr>
  448 + <tr>
  449 + <td>{:__('Sapi name')}</td>
  450 + <td>{:php_sapi_name()}</td>
  451 + </tr>
  452 + <tr>
  453 + <td>{:__('Debug mode')}</td>
  454 + <td>{$Think.config.app_debug?__('Yes'):__('No')}</td>
  455 + </tr>
  456 + <tr>
  457 + <td>{:__('Software')}</td>
  458 + <td>{$Think.server.SERVER_SOFTWARE}</td>
  459 + </tr>
  460 + <tr>
  461 + <td>{:__('Upload mode')}</td>
  462 + <td>{$uploadmode}</td>
  463 + </tr>
  464 + <tr>
  465 + <td>{:__('Upload url')}</td>
  466 + <td>{$config.upload.uploadurl}</td>
  467 + </tr>
  468 + <tr>
  469 + <td>{:__('Upload Cdn url')}</td>
  470 + <td>{$config.upload.cdnurl}</td>
  471 + </tr>
  472 + <tr>
  473 + <td>{:__('Timezone')}</td>
  474 + <td>{:date_default_timezone_get()}</td>
  475 + </tr>
  476 + <tr>
  477 + <td>{:__('Cdn url')}</td>
  478 + <td>__CDN__</td>
  479 + </tr>
  480 + <tr>
  481 + <td>{:__('Language')}</td>
  482 + <td>{$config.language}</td>
  483 + </tr>
  484 + </tbody>
  485 + </table>
  486 + </div>
  487 + </div>
  488 + </div>-->
  489 + <div class="col-lg-12 text-center">
  490 + <div class="box-header"><h3 class="box-title">欢迎使用</h3></div>
  491 + <div class="box-header"><h3 class="box-title">{$site.name|htmlentities}</h3></div>
367 </div> 492 </div>
368 </div> 493 </div>
369 <div class="tab-pane fade" id="two"> 494 <div class="tab-pane fade" id="two">
@@ -379,7 +504,7 @@ @@ -379,7 +504,7 @@
379 <script> 504 <script>
380 var Orderdata = { 505 var Orderdata = {
381 column: {:json_encode(array_keys($paylist))}, 506 column: {:json_encode(array_keys($paylist))},
382 - paydata: {:json_encode(array_values($paylist))},  
383 - createdata: {:json_encode(array_values($createlist))}, 507 + paydata: {:json_encode(array_values($paylist))},
  508 + createdata: {:json_encode(array_values($createlist))},
384 }; 509 };
385 </script> 510 </script>