后台管理描述

app/Admin/Controllers/CourseController.php

@@ -28,8 +28,8 @@ class CourseController extends AdminController
 
         $grid->column('id', __('Id'));
         $grid->column('name', __('科目名'));
-        $grid->column('created_at', __('Created at'));
-        $grid->column('updated_at', __('Updated at'));
+        $grid->column('created_at', __('添加时间'));
+        $grid->column('updated_at', __('更新时间'));
 //        $grid->column('deleted_at', __('Deleted at'));
 
         return $grid;
@@ -47,9 +47,9 @@ class CourseController extends AdminController
 
         $show->field('id', __('Id'));
         $show->field('name', __('科目名'));
-        $show->field('created_at', __('Created at'));
-        $show->field('updated_at', __('Updated at'));
-        $show->field('deleted_at', __('Deleted at'));
+        $show->field('created_at', __('添加时间'));
+        $show->field('updated_at', __('更新时间'));
+//        $show->field('deleted_at', __('Deleted at'));
 
         return $show;
     }

app/Admin/Controllers/EquipmentsController.php

@@ -53,7 +53,7 @@ class EquipmentsController extends AdminController
                 return "<span class='label bg-warning'>闲置</span>";
             }
         })->sortable();
-        $grid->column('created_at', __('Created at'))->sortable();
+        $grid->column('created_at', __('添加时间'))->sortable();
 //        $grid->column('updated_at', __('Updated at'));
 
         return $grid;

app/Admin/Controllers/ExperiencesController.php

@@ -36,7 +36,7 @@ class ExperiencesController extends AdminController
                 return "<span class='label bg-yellow'>不可用</span>";
             }
         })->sortable();
-        $grid->column('created_at', __('Created at'));
+        $grid->column('created_at', __('添加时间'));
 //        $grid->column('updated_at', __('Updated at'));
 
         return $grid;
@@ -53,10 +53,10 @@ class ExperiencesController extends AdminController
         $show = new Show(Experience::findOrFail($id));
 
         $show->field('id', __('Id'));
-        $show->field('name', __('Name'));
-        $show->field('des', __('Des'));
-        $show->field('status', __('Status'));
-        $show->field('created_at', __('Created at'));
+        $show->field('name', __('姓名'));
+        $show->field('des', __('详情'));
+        $show->field('status', __('状态'));
+        $show->field('created_at', __('添加时间'));
         $show->field('updated_at', __('Updated at'));
 
         return $show;

app/Admin/Controllers/IntroductionController.php

@@ -36,7 +36,7 @@ class IntroductionController extends AdminController
                 return "<span class='label bg-yellow'>不可用</span>";
             }
         })->sortable();
-        $grid->column('created_at', __('Created at'))->sortable();
+        $grid->column('created_at', __('添加时间'))->sortable();
 //        $grid->column('updated_at', __('Updated at'));
 
         return $grid;

app/Admin/Controllers/MakeJobsController.php

@@ -31,10 +31,10 @@ class MakeJobsController extends AdminController
             $grid->model()->where(['websites_id' => Admin::user()->website_id]);
         }
         $grid->model()->orderBy('id', 'desc');
-        $grid->column('id', __('Id'));
-        $grid->column('user_id', __('用户id'));
+        $grid->column('id', __('ID'));
+        $grid->column('user.nick_name', __('用户名'));
         $grid->column('website.name', __('门店名称'));
-        $grid->column('equipment_id', __('机器id'));
+        $grid->column('equipment.name', __('机器id'));
         $grid->column('appointmentConfig.name', __('已选时间段'));
         $grid->column('make_time_start', __('预约开始时间'));
         $grid->column('make_time_end', __('预约结束时间'));

app/Admin/Controllers/MessageTypesController.php

@@ -29,7 +29,7 @@ class MessageTypesController extends AdminController
         $grid->column('id', __('Id'))->sortable();
         $grid->column('name', __('类名'))->sortable();
         $grid->column('des', __('描述'));
-        $grid->column('created_at', __('Created at'))->sortable();
+        $grid->column('created_at', __('添加时间'))->sortable();
 //        $grid->column('updated_at', __('Updated at'));
 
         return $grid;

app/Admin/Controllers/SmsLogsController.php

@@ -27,16 +27,16 @@ class SmsLogsController extends AdminController
         $grid = new Grid(new SmsLog());
 
         $grid->column('id', __('Id'));
-        $grid->column('phone', __('Phone'));
-        $grid->column('type', __('Type'));
-        $grid->column('code', __('Code'));
-        $grid->column('status', __('Status'));
-        $grid->column('content', __('Content'));
-        $grid->column('ip_count', __('Ip count'));
-        $grid->column('err_msg', __('Err msg'));
-        $grid->column('created_at', __('Created at'));
-        $grid->column('updated_at', __('Updated at'));
-        $grid->column('deleted_at', __('Deleted at'));
+        $grid->column('phone', __('手机号码'));
+//        $grid->column('type', __('Type'));
+        $grid->column('code', __('短信验证码'));
+        $grid->column('status', __('状态'));
+        $grid->column('content', __('内容'));
+        $grid->column('ip_count', __('Ip'));
+        $grid->column('err_msg', __('错误描述'));
+        $grid->column('created_at', __('添加时间'));
+//        $grid->column('updated_at', __('Updated at'));
+//        $grid->column('deleted_at', __('Deleted at'));
 
         return $grid;
     }
@@ -52,16 +52,16 @@ class SmsLogsController extends AdminController
         $show = new Show(SmsLog::findOrFail($id));
 
         $show->field('id', __('Id'));
-        $show->field('phone', __('Phone'));
-        $show->field('type', __('Type'));
-        $show->field('code', __('Code'));
-        $show->field('status', __('Status'));
-        $show->field('content', __('Content'));
-        $show->field('ip_count', __('Ip count'));
-        $show->field('err_msg', __('Err msg'));
-        $show->field('created_at', __('Created at'));
-        $show->field('updated_at', __('Updated at'));
-        $show->field('deleted_at', __('Deleted at'));
+        $show->field('phone', __('手机号码'));
+        $show->field('type', __('类型'));
+        $show->field('code', __('验证码'));
+        $show->field('status', __('是否使用'));
+        $show->field('content', __('内用'));
+        $show->field('ip_count', __('Ip'));
+        $show->field('err_msg', __('错误描述'));
+        $show->field('created_at', __('添加时间'));
+        $show->field('updated_at', __('更新时间'));
+//        $show->field('deleted_at', __('Deleted at'));
 
         return $show;
     }

app/Admin/Controllers/UserMessageController.php

@@ -27,13 +27,13 @@ class UserMessageController extends AdminController
         $grid = new Grid(new UserMessage());
 
         $grid->column('id', __('Id'))->sortable();
-        $grid->column('user_id', __('用户id'))->sortable();
+//        $grid->column('user_id', __('用户id'))->sortable();
         $grid->column('message_type', __('消息类型'))->sortable();
         $grid->column('title', __('标题'));
         $grid->column('introduction', __('简介'));
-        $grid->column('content', __('内容'));
+//        $grid->column('content', __('内容'));
         $grid->column('status', __('状态'));
-        $grid->column('created_at', __('Created at'));
+        $grid->column('created_at', __('添加时间'));
 //        $grid->column('updated_at', __('Updated at'));
         # 禁用创建按钮
         $grid->disableCreateButton();

app/Admin/Controllers/VouchersController.php

@@ -36,7 +36,7 @@ class VouchersController extends AdminController
                 return "<span class='label bg-yellow'>不可用</span>";
             }
         })->sortable();
-        $grid->column('created_at', __('Created at'))->sortable();
+        $grid->column('created_at', __('添加时间'))->sortable();
 //        $grid->column('updated_at', __('Updated at'));
 
         return $grid;

app/Http/Requests/Api/ZbSettingRequest.php

@@ -1,65 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Api;
-
-use App\Exceptions\ApiException;
-use Dingo\Api\Http\Request;
-use Illuminate\Foundation\Http\FormRequest;
-
-class ZbSettingRequest extends FormRequest
-{
-
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * @param Request $request
-     * @return array
-     */
-    public function rules(Request $request)
-    {
-        switch ($request->type) {
-            case 1:
-                return [
-                    'name' => 'required|between:6,20|regex:/^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,20}$/|unique:vr_users,name',
-                ];
-                break;
-            case 2:
-                return [
-                    'birth_place' => 'required|between:8,60',
-                ];
-                break;
-            case 3:
-                return [
-                    'verification_key' => 'required|string',
-                    'verification_code' => 'required|string',
-                    'pay_password' => 'required|string|min:6|max:20|regex:/^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,20}$/',
-                ];
-                break;
-            default:
-                throw new ApiException('参数错误！');
-        }
-
-    }
-
-    public function messages()
-    {
-        return [
-            'name.unique' => '用户名已被占用，请重新填写',
-            'name.regex' => '用户名只支持英文、数字、横杆和下划线。',
-            'name.between' => '用户名必须介于 1 - 25 个字符之间。',
-            'name.required' => '用户名不能为空。',
-            'birth_place.required' => '地址不能为空。',
-            'birth_place.between' => '地址长度最少为8个字符。',
-            'verification_key.required' => '验证秘钥不能为空',
-            'verification_key.string' => '验证秘钥为字符串。',
-            'verification_code.required' => '验证码不能为空。',
-            'pay_password.required' => '密码不能为空。',
-            'pay_password.min' => '密码最小6位。',
-            'pay_password.max' => '密码最大20位。',
-            'pay_password.regex' => '密码要包含数字字母。',
-        ];
-    }
-}

app/Models/MakeJob.php

@@ -25,4 +25,9 @@ class MakeJob extends BaseModel
     {
         return $this->hasOne(Equipment::class, 'id', 'equipment_id');
     }
+    // 关联设备详情表
+    public function user()
+    {
+        return $this->hasOne(User::class, 'id', 'user_id');
+    }
 }