后台调整

application/admin/lang/zh-cn/order.php

@@ -17,7 +17,7 @@ return [
     'Pay_out_trade_no'  => '支付订单号',
     'Active.name'       => '活动标题',
     'User.username'     => '用户名',
-    'User.nickname'     => '昵称',
+    'User.nickname'     => '用户昵称',
     'Student.realname'  => '姓名',
     'School.schoolname' => '学校名',
     'Classes.classname' => '班级名'

application/admin/model/Order.php

@@ -71,18 +71,18 @@ class Order extends Model
 
     public function student()
     {
-        return $this->belongsTo('app\admin\model\user\Student', 'student_id', 'id', [], 'LEFT')->setEagerlyType(0);
+        return $this->belongsTo('Userstudent', 'student_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
 
 
     public function school()
     {
-        return $this->belongsTo('School', 'student_id', 'id', [], 'LEFT')->setEagerlyType(0);
+        return $this->belongsTo('School', 'student.school_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
 
 
     public function classes()
     {
-        return $this->belongsTo('Classes', 'student_id', 'id', [], 'LEFT')->setEagerlyType(0);
+        return $this->belongsTo('Classes', 'student.classes_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
 }

application/admin/view/active/index.html

@@ -12,13 +12,13 @@
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('active/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
 
-                        <div class="dropdown btn-group {:$auth->check('active/multi')?'':'hide'}">
+                        <!--<div class="dropdown btn-group {:$auth->check('active/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
                             </ul>
-                        </div>
+                        </div>-->
 
                         
                     </div>

application/admin/view/banner/index.html

@@ -12,13 +12,13 @@
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('banner/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
 
-                        <div class="dropdown btn-group {:$auth->check('banner/multi')?'':'hide'}">
+                        <!--<div class="dropdown btn-group {:$auth->check('banner/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
                             </ul>
-                        </div>
+                        </div>-->
 
                         
                     </div>

application/admin/view/order/index.html

@@ -17,7 +17,7 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('order/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                       <!-- <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('order/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('order/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('order/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
@@ -28,7 +28,7 @@
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
                             </ul>
-                        </div>
+                        </div>-->
 
                         
                     </div>

application/admin/view/userstudent/index.html

@@ -7,7 +7,7 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('userstudent/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('userstudent/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('userstudent/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('userstudent/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
@@ -18,7 +18,7 @@
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
                             </ul>
-                        </div>
+                        </div>-->
 
                         
                     </div>

public/assets/js/backend/order.js

@@ -28,24 +28,25 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'order_no', title: __('Order_no'), operate: 'LIKE'},
+//                        {field: 'order_no', title: __('Order_no'), operate: 'LIKE'},
                         {field: 'active_id', title: __('Active_id')},
+                        {field: 'active.name', title: __('Active.name'), operate: 'LIKE'},
                         {field: 'user_id', title: __('User_id')},
+                        {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
+                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
                         {field: 'student_id', title: __('Student_id')},
+                        {field: 'student.realname', title: __('Student.realname'), operate: 'LIKE'},
+                        {field: 'school.schoolname', title: __('School.schoolname'), operate: 'LIKE'},
+                        {field: 'classes.classname', title: __('Classes.classname'), operate: 'LIKE'},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'pay_fee', title: __('Pay_fee'), operate:'BETWEEN'},
                         {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1')}, formatter: Table.api.formatter.status},
                         {field: 'remark', title: __('Remark'), operate: 'LIKE'},
                         {field: 'paytime', title: __('Paytime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'pay_type', title: __('Pay_type'), operate: 'LIKE'},
-                        {field: 'pay_out_trade_no', title: __('Pay_out_trade_no'), operate: 'LIKE'},
-                        {field: 'active.name', title: __('Active.name'), operate: 'LIKE'},
-                        {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
-                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
-                        {field: 'student.realname', title: __('Student.realname'), operate: 'LIKE'},
-                        {field: 'school.schoolname', title: __('School.schoolname'), operate: 'LIKE'},
-                        {field: 'classes.classname', title: __('Classes.classname'), operate: 'LIKE'},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+//                        {field: 'pay_type', title: __('Pay_type'), operate: 'LIKE'},
+//                        {field: 'pay_out_trade_no', title: __('Pay_out_trade_no'), operate: 'LIKE'},
+
+//                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });

public/assets/js/backend/userstudent.js

@@ -43,7 +43,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'idcard', title: __('Idcard'), operate: 'LIKE'},
                         {field: 'mobile', title: __('Mobile'), operate: 'LIKE'},
                         {field: 'is_default', title: __('Is_default'), searchList: {"1":__('Is_default 1'),"0":__('Is_default 0')}, formatter: Table.api.formatter.normal},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+//                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });

thinkphp/library/think/model/relation/OneToOne.php

@@ -91,7 +91,7 @@ abstract class OneToOne extends Relation
             $query->join([$joinTable => $joinAlias], $name . '.' . $this->localKey . '=' . $joinAlias . '.' . $this->foreignKey, $this->joinType);
         }
         //lizhen
-        
+
 
         if ($closure) {
             // 执行闭包查询