A

Merge branch 'master' of http://gitea.enheng.asia/risin9/course

app/api/controller/StudentFeedbackController.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace app\api\controller;
+
+use app\BaseController;
+use app\common\service\StudentFeedbackService;
+use support\Request;
+
+class StudentFeedbackController extends BaseController
+{
+
+    /**
+     * @desc 反馈
+     * @param Request $request
+     * @return \support\Response
+     */
+    public function feedback(Request $request)
+    {
+        $service = new StudentFeedbackService();
+        $result = $service->feedback($request);
+        return $this->json($result);
+    }
+
+}

app/api/controller/TeacherController.php

@@ -31,5 +31,17 @@ class TeacherController extends BaseController
         return $this->json($res);
     }
 
+    /**
+     * @desc 教师信息
+     * @param Request $request
+     * @return \support\Response
+     */
+    public function teacherInfo(Request $request)
+    {
+        $service = new TeacherService();
+        $res = $service->teacherInfo($request);
+        return $this->json($res);
+    }
+
 
 }

app/api/controller/WechatSubscriptController.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace app\api\controller;
+
+use app\BaseController;
+use app\constant\ResponseCode;
+use support\Request;
+
+class WechatSubscriptController extends BaseController
+{
+    protected $noNeedLogin = ['*'];
+
+
+    public function getCode(Request $request)
+    {
+        $appid = getenv('WECHAT_APPID');
+        $redirect_uri = urlencode(getenv('SERVER_DOMAIN') . "/index.html#/pages/login/login ");//重定向地址
+        $url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=$appid&redirect_uri=$redirect_uri&response_type=code&scope=snsapi_userinfo&state=STATE&connect_redirect=1#wechat_redirect";
+        return $this->json([
+            'code' => ResponseCode::SUCCESS,
+            'data' => $url
+        ]);
+    }
+
+}

app/common/model/StudentFeedback.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace app\common\model;
+
+use app\BaseModel;
+use support\Model;
+
+/**
+ * wa_student_feedback 学成课程反馈
+ * @property integer $id (主键)
+ * @property integer $student_id 学生
+ * @property integer $teacher_schedule_time_id 课程
+ * @property integer $teacher_id 老师
+ * @property integer $subject_id 课程
+ * @property string $date 日期
+ * @property string $time 时间
+ * @property string $start_time 
+ * @property string $end_time 
+ * @property mixed $created_at 创建时间
+ * @property string $updated_at 更新时间
+ * @property string $deleted_at
+ */
+class StudentFeedback extends BaseModel
+{
+
+    public function student()
+    {
+        return $this->hasOne(Student::class, 'id', 'student_id')->bind(['student_name', 'student_account'=>'account']);
+    }
+
+    public function teacher()
+    {
+        return $this->hasOne(Teacher::class, 'id', 'teacher_id')->bind(['teacher_name', 'teacher_account'=>'account']);
+    }
+
+    public function subject()
+    {
+        return $this->hasOne(Subject::class, 'id', 'subject_id')->bind(['subject_name', 'english_name']);
+    }
+    
+}

app/common/service/StudentFeedbackService.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace app\common\service;
+
+use app\common\model\Student;
+use app\common\model\StudentFeedback;
+use app\common\model\TeacherScheduleTime;
+use app\constant\ResponseCode;
+use think\Exception;
+
+class StudentFeedbackService
+{
+
+    /**
+     * @desc 课程反馈
+     * @param $request
+     * @return array
+     */
+    public function feedback($request)
+    {
+        try {
+            if (empty($request->student)) {
+                throw new Exception('请登陆学生端后再试~');
+            }
+            $student = Student::where(['id' => $request->student->id])->findOrEmpty();
+            if ($student->isEmpty()) {
+                throw new Exception('未找到用户信息');
+            }
+            $data = $request->post();
+
+            $teacher_schedule_time = TeacherScheduleTime::where(['id' => $data['teacher_schedule_time_id']])->findOrEmpty();
+            if ($teacher_schedule_time->isEmpty()) {
+                throw new Exception('未找到教师排课信息');
+            }
+
+            StudentFeedback::create([
+                'student_id' => $student->id,
+                'feedback' => $data['feedback'],
+                'teacher_schedule_time_id' => $data['teacher_schedule_time_id'],
+                'teacher_id' => $teacher_schedule_time->teacher_id,
+                'subject_id' => $teacher_schedule_time->subject_id,
+                'date' => $teacher_schedule_time->date,
+                'time' => $teacher_schedule_time->time,
+                'start_time' => $teacher_schedule_time->start_time,
+                'end_time' => $teacher_schedule_time->end_time,
+            ]);
+
+            return [
+                'code' => ResponseCode::SUCCESS,
+                'msg' => '反馈成功'
+            ];
+        } catch (Exception $e) {
+            return [
+                'code' => ResponseCode::FAIL,
+                'msg' => $e->getMessage()
+            ];
+        }
+    }
+
+}

app/common/service/TeacherFreeTimeService.php

@@ -33,6 +33,7 @@ class TeacherFreeTimeService
 
             $free_time = json_decode($data['free_time'], true);
 
+
             if (empty($free_time)) {
                 throw new Exception('请选择时间段之后再提交');
             }

app/common/service/TeacherService.php

@@ -92,4 +92,27 @@ class TeacherService
         }
     }
 
+
+    /**
+     * @desc 教师信息
+     * @param $request
+     * @return array
+     */
+    public function teacherInfo($request)
+    {
+        try {
+            $teacher = Teacher::where(['id' => $request->teacher->id])->field('id,account,teacher_name,time_zone_offset,time_zone_id,time_zone_name')->findOrEmpty();
+
+            return [
+                'code' => ResponseCode::SUCCESS,
+                'data' => $teacher,
+            ];
+        }catch (Exception $e){
+            return [
+                'code' => ResponseCode::FAIL,
+                'msg' => $e->getMessage()
+            ];
+        }
+    }
+
 }

plugin/admin/app/controller/StudentFeedbackController.php

@@ -0,0 +1,133 @@
+<?php
+
+namespace plugin\admin\app\controller;
+
+use app\common\model\Student;
+use app\common\model\Subject;
+use app\common\model\Teacher;
+use app\constant\ResponseCode;
+use support\Request;
+use support\Response;
+use plugin\admin\app\model\StudentFeedback;
+use plugin\admin\app\controller\Crud;
+use support\exception\BusinessException;
+use think\Exception;
+
+/**
+ * 学生反馈 
+ */
+class StudentFeedbackController extends Crud
+{
+    
+    /**
+     * @var StudentFeedback
+     */
+    protected $model = null;
+
+    /**
+     * 构造函数
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->model = new StudentFeedback;
+    }
+
+
+    public function select(Request $request): Response
+    {
+        try {
+            $feedback = \app\common\model\StudentFeedback::order('id asc');
+            $data = $request->all();
+
+            if(isset($data['student_name']) && !empty($data['student_name'])){
+                $feedback->where('student_name','like','%'.$data['student_name'].'%');
+            }
+            if(isset($data['feedback']) && !empty($data['feedback'])){
+                $feedback->where('feedback','like','%'.$data['feedback'].'%');
+            }
+            if(isset($data['student_id']) && !empty($data['student_id'])){
+                $feedback->where('student_id',$data['student_id']);
+            }
+            if(isset($data['teacher_id']) && !empty($data['teacher_id'])){
+                $feedback->where('teacher_id',$data['teacher_id']);
+            }
+            if(isset($data['subject_id']) && !empty($data['subject_id'])){
+                $feedback->where('subject_id',$data['subject_id']);
+            }
+            if(isset($data['date']) && !empty($data['date'])){
+                if($data['date'][0] && $data['date'][1]){
+                    $feedback->whereBetweenTime('create_time',$data['date'][0], $data[1] . ' 23:59:59');
+                }
+            }
+
+
+            $limit = (int)$request->get('limit', 10);
+            $limit = $limit <= 0 ? 10 : $limit;
+            $page = (int)$request->get('page');
+            $page = $page > 0 ? $page : 1;
+
+            $total = $feedback->count();
+            $list = $feedback->with(['student', 'teacher', 'subject'])->page($page, $limit)->select();
+
+
+            return json([
+                'code' => ResponseCode::WEB_API_SUCCESS,
+                'data' => $list,
+                'count' => $total,
+                'msg' => 'success'
+            ]);
+        }catch (Exception $e){
+
+            return json([
+                'code' => ResponseCode::WEB_API_FAIL,
+                'data' => [],
+                'msg' => 'success'
+            ]);
+        }
+    }
+
+    /**
+     * 浏览
+     * @return Response
+     */
+    public function index(): Response
+    {
+        //获取所有老师
+        $teacher = Teacher::order('id asc')->field('id,teacher_name,account')->select()->toArray();
+        //所有课程
+        $subject = Subject::order('sort desc,id asc')->field('id,subject_name,english_name')->select()->toArray();
+        //学生
+        $student = Student::order('id asc')->field('id,student_name,account')->select()->toArray();
+        return view('student-feedback/index', compact('teacher', 'subject', 'student'));
+    }
+
+    /**
+     * 插入
+     * @param Request $request
+     * @return Response
+     * @throws BusinessException
+     */
+    public function insert(Request $request): Response
+    {
+        if ($request->method() === 'POST') {
+            return parent::insert($request);
+        }
+        return view('student-feedback/insert');
+    }
+
+    /**
+     * 更新
+     * @param Request $request
+     * @return Response
+     * @throws BusinessException
+    */
+    public function update(Request $request): Response
+    {
+
+        $feedback = \app\common\model\StudentFeedback::where(['id'=>$request->get('id')])->with(['teacher', 'student', 'subject'])->findOrEmpty()->toArray();
+
+        return view('student-feedback/update', ['feedback' => $feedback]);
+    }
+
+}

plugin/admin/app/controller/TeacherController.php

@@ -6,6 +6,7 @@ use app\common\model\Student;
 use app\common\model\StudentSchedule;
 use app\common\model\Subject;
 use app\common\model\TeacherScheduleTime;
+use app\common\model\TimeZone;
 use app\constant\ResponseCode;
 use support\Request;
 use support\Response;
@@ -107,12 +108,15 @@ class TeacherController extends Crud
                 $request_data = $request->post();
                 $teacher = \app\common\model\Teacher::where(['id' => $request_data['id']])->findOrEmpty();
 
+                $time_zone = TimeZone::where(['id' => $request_data['time_zone_id']])->findOrEmpty();
                 if (empty($request_data['password'])) {
                     $update = [
                         'account' => $request_data['account'],
                         'teacher_name' => $request_data['teacher_name'],
-                        'time_zone_name' => $request_data['time_zone_name'],
-                        'time_zone' => $request_data['time_zone'],
+                        'openid' => $request_data['openid'],
+                        'time_zone_id' => $time_zone->id,
+                        'time_zone_name' => $time_zone->name,
+                        'time_zone_offset' => $time_zone->offset,
                     ];
                 } else {
                     $salt = random_str(16);
@@ -122,8 +126,10 @@ class TeacherController extends Crud
                         'password' => $password,
                         'salt' => $salt,
                         'teacher_name' => $request_data['teacher_name'],
-                        'time_zone_name' => $request_data['time_zone_name'],
-                        'time_zone' => $request_data['time_zone'],
+                        'openid' => $request_data['openid'],
+                        'time_zone_id' => $time_zone->id,
+                        'time_zone_name' => $time_zone->name,
+                        'time_zone_offset' => $time_zone->offset,
                     ];
                 }
 
@@ -148,7 +154,12 @@ class TeacherController extends Crud
 
             return parent::update($request);
         }
-        return view('teacher/update');
+
+        $data = $request->get();
+        $teacher = \app\common\model\Teacher::where(['id' => $data['id']])->findOrEmpty();
+        //时区
+        $time_zone = TimeZone::order('sort desc,id asc')->field('id,name,offset')->select()->toArray();
+        return view('teacher/update', ['time_zone' => $time_zone, 'teacher' => $teacher]);
     }
 
 
@@ -241,7 +252,7 @@ class TeacherController extends Crud
         $data = $request->get();
         $teacher_id = $data['teacher_id'];
         $month = $data['month'];
-        $teacher = \app\common\model\Teacher::where(['id'=>$teacher_id])->findOrEmpty();
+        $teacher = \app\common\model\Teacher::where(['id' => $teacher_id])->findOrEmpty();
         //获取该老师当前分配学生
 //        $student_schedule = StudentSchedule::where([''])
 

plugin/admin/app/model/StudentFeedback.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace plugin\admin\app\model;
+
+use plugin\admin\app\model\Base;
+
+/**
+ * @property integer $id (主键)
+ * @property integer $student_id 学生
+ * @property string $feedback 反馈内容
+ * @property integer $teacher_schedule_time_id 课程
+ * @property integer $teacher_id 老师
+ * @property integer $subject_id 课程
+ * @property string $date 日期
+ * @property string $time 时间
+ * @property string $start_time 
+ * @property string $end_time 
+ * @property mixed $created_at 创建时间
+ * @property string $updated_at 更新时间
+ * @property string $deleted_at
+ */
+class StudentFeedback extends Base
+{
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'wa_student_feedback';
+
+    /**
+     * The primary key associated with the table.
+     *
+     * @var string
+     */
+    protected $primaryKey = 'id';
+    
+    
+    
+}

plugin/admin/app/view/student-feedback/index.html

@@ -0,0 +1,372 @@
+
+<!DOCTYPE html>
+<html lang="zh-cn">
+    <head>
+        <meta charset="utf-8">
+        <title>浏览页面</title>
+        <link rel="stylesheet" href="/app/admin/component/pear/css/pear.css" />
+        <link rel="stylesheet" href="/app/admin/admin/css/reset.css" />
+    </head>
+    <body class="pear-container">
+
+        <!-- 顶部查询表单 -->
+        <div class="layui-card">
+            <div class="layui-card-body">
+                <form class="layui-form top-search-from">
+
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">学生</label>
+                        <div class="layui-input-block">
+<!--                            <input type="text" name="student_name" value="" class="layui-input">-->
+                            <select lay-search name="student_id">
+                                <option value="0">请选择</option>
+                                {foreach $student as $item}
+                                <option value="{$item['id']}">{$item['student_name']}</option>
+                                {/foreach}
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">反馈内容</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="feedback" value="" class="layui-input">
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">老师</label>
+                        <div class="layui-input-block">
+<!--                            <input type="text" name="teacher_name" value="" class="layui-input">-->
+                            <select lay-search name="teacher_id">
+                                <option value="0">请选择</option>
+                                {foreach $teacher as $item}
+                                <option value="{$item['id']}">{$item['teacher_name']}</option>
+                                {/foreach}
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">课程</label>
+                        <div class="layui-input-block">
+<!--                            <input type="text" name="subject_id" value="" class="layui-input">-->
+                            <select lay-search name="subject_id">
+                                <option value="0">请选择</option>
+                                {foreach $subject as $item}
+                                <option value="{$item['id']}">{$item['subject_name']}</option>
+                                {/foreach}
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">日期</label>
+                        <div class="layui-input-block">
+                            <div class="layui-input-block" id="date">
+                                <input type="text" autocomplete="off" name="date[]" id="date-date-start" class="layui-input inline-block" placeholder="开始时间">
+                                -
+                                <input type="text" autocomplete="off" name="date[]" id="date-date-end" class="layui-input inline-block" placeholder="结束时间">
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item layui-inline">
+                        <label class="layui-form-label"></label>
+                        <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="table-query">
+                            <i class="layui-icon layui-icon-search"></i>查询
+                        </button>
+                        <button type="reset" class="pear-btn pear-btn-md" lay-submit lay-filter="table-reset">
+                            <i class="layui-icon layui-icon-refresh"></i>重置
+                        </button>
+                    </div>
+                    <div class="toggle-btn">
+                        <a class="layui-hide">展开<i class="layui-icon layui-icon-down"></i></a>
+                        <a class="layui-hide">收起<i class="layui-icon layui-icon-up"></i></a>
+                    </div>
+                </form>
+            </div>
+        </div>
+
+        <!-- 数据表格 -->
+        <div class="layui-card">
+            <div class="layui-card-body">
+                <table id="data-table" lay-filter="data-table"></table>
+            </div>
+        </div>
+
+        <!-- 表格顶部工具栏 -->
+        <script type="text/html" id="table-toolbar">
+<!--            <button class="pear-btn pear-btn-primary pear-btn-md" lay-event="add" permission="app.admin.studentfeedback.insert">-->
+<!--                <i class="layui-icon layui-icon-add-1"></i>新增-->
+<!--            </button>-->
+            <button class="pear-btn pear-btn-danger pear-btn-md" lay-event="batchRemove" permission="app.admin.studentfeedback.delete">
+                <i class="layui-icon layui-icon-delete"></i>删除
+            </button>
+        </script>
+
+        <!-- 表格行工具栏 -->
+        <script type="text/html" id="table-bar">
+            <button class="pear-btn pear-btn-xs tool-btn" lay-event="edit" permission="app.admin.studentfeedback.update">详情</button>
+            <button class="pear-btn pear-btn-xs tool-btn" lay-event="remove" permission="app.admin.studentfeedback.delete">删除</button>
+        </script>
+
+        <script src="/app/admin/component/layui/layui.js?v=2.8.12"></script>
+        <script src="/app/admin/component/pear/pear.js"></script>
+        <script src="/app/admin/admin/js/permission.js"></script>
+        <script src="/app/admin/admin/js/common.js"></script>
+
+        <script>
+
+            // 相关常量
+            const PRIMARY_KEY = "id";
+            const SELECT_API = "/app/admin/student-feedback/select";
+            const UPDATE_API = "/app/admin/student-feedback/update";
+            const DELETE_API = "/app/admin/student-feedback/delete";
+            const INSERT_URL = "/app/admin/student-feedback/insert";
+            const UPDATE_URL = "/app/admin/student-feedback/update";
+
+            // 字段 日期 date
+            layui.use(["laydate"], function() {
+                layui.laydate.render({
+                    elem: "#date",
+                    range: ["#date-date-start", "#date-date-end"],
+                    type: "date",
+                    rangeLinked: true
+                });
+            })
+
+            // 表格渲染
+            layui.use(["table", "form", "common", "popup", "util"], function() {
+                let table = layui.table;
+                let form = layui.form;
+                let $ = layui.$;
+                let common = layui.common;
+                let util = layui.util;
+
+				// 表头参数
+				let cols = [
+					{
+						type: "checkbox",
+						align: "center"
+					},{
+						title: "id",align: "center",
+						field: "id",
+					},{
+						title: "学生",align: "center",
+						field: "student_name",
+					},{
+						title: "课程",align: "center",
+						field: "teacher_schedule_time_id",
+                        hide: true
+					},{
+						title: "老师",align: "center",
+						field: "teacher_name",
+					},{
+						title: "课程",align: "center",
+						field: "subject_name",
+					},{
+						title: "日期",align: "center",
+						field: "date",
+					},{
+						title: "时间",align: "center",
+						field: "time",
+					},{
+                        title: "反馈内容",align: "center",
+                        field: "feedback",
+                    },{
+						title: "start_time",align: "center",
+						field: "start_time",
+                        hide: true,
+					},{
+						title: "end_time",align: "center",
+						field: "end_time",
+                        hide: true,
+					},{
+						title: "创建时间",align: "center",
+						field: "created_at",
+					},{
+						title: "更新时间",align: "center",
+						field: "updated_at",
+						hide: true,
+					},{
+						title: "deleted_at",align: "center",
+						field: "deleted_at",
+						hide: true,
+					},{
+						title: "操作",
+						toolbar: "#table-bar",
+						align: "center",
+						fixed: "right",
+						width: 120,
+					}
+				];
+
+				// 渲染表格
+				table.render({
+				    elem: "#data-table",
+				    url: SELECT_API,
+				    page: true,
+				    cols: [cols],
+				    skin: "line",
+				    size: "lg",
+				    toolbar: "#table-toolbar",
+				    autoSort: false,
+				    defaultToolbar: [{
+				        title: "刷新",
+				        layEvent: "refresh",
+				        icon: "layui-icon-refresh",
+				    }, "filter", "print", "exports"],
+				    done: function () {
+				        layer.photos({photos: 'div[lay-id="data-table"]', anim: 5});
+				    }
+				});
+
+
+                // 编辑或删除行事件
+                table.on("tool(data-table)", function(obj) {
+                    if (obj.event === "remove") {
+                        remove(obj);
+                    } else if (obj.event === "edit") {
+                        edit(obj);
+                    }
+                });
+
+                // 表格顶部工具栏事件
+                table.on("toolbar(data-table)", function(obj) {
+                    if (obj.event === "add") {
+                        add();
+                    } else if (obj.event === "refresh") {
+                        refreshTable();
+                    } else if (obj.event === "batchRemove") {
+                        batchRemove(obj);
+                    }
+                });
+
+                // 表格顶部搜索事件
+                form.on("submit(table-query)", function(data) {
+                    table.reload("data-table", {
+                        page: {
+                            curr: 1
+                        },
+                        where: data.field
+                    })
+                    return false;
+                });
+
+                // 表格顶部搜索重置事件
+                form.on("submit(table-reset)", function(data) {
+                    table.reload("data-table", {
+                        where: []
+                    })
+                });
+
+                // 字段允许为空
+                form.verify({
+                    phone: [/(^$)|^1\d{10}$/, "请输入正确的手机号"],
+                    email: [/(^$)|^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/, "邮箱格式不正确"],
+                    url: [/(^$)|(^#)|(^http(s*):\/\/[^\s]+\.[^\s]+)/, "链接格式不正确"],
+                    number: [/(^$)|^\d+$/,'只能填写数字'],
+                    date: [/(^$)|^(\d{4})[-\/](\d{1}|0\d{1}|1[0-2])([-\/](\d{1}|0\d{1}|[1-2][0-9]|3[0-1]))*$/, "日期格式不正确"],
+                    identity: [/(^$)|(^\d{15}$)|(^\d{17}(x|X|\d)$)/, "请输入正确的身份证号"]
+                });
+
+                // 表格排序事件
+                table.on("sort(data-table)", function(obj){
+                    table.reload("data-table", {
+                        initSort: obj,
+                        scrollPos: "fixed",
+                        where: {
+                            field: obj.field,
+                            order: obj.type
+                        }
+                    });
+                });
+
+                // 表格新增数据
+                let add = function() {
+                    layer.open({
+                        type: 2,
+                        title: "新增",
+                        shade: 0.1,
+                        maxmin: true,
+                        area: [common.isModile()?"100%":"500px", common.isModile()?"100%":"450px"],
+                        content: INSERT_URL
+                    });
+                }
+
+                // 表格编辑数据
+                let edit = function(obj) {
+                    let value = obj.data[PRIMARY_KEY];
+                    layer.open({
+                        type: 2,
+                        title: "修改",
+                        shade: 0.1,
+                        maxmin: true,
+                        area: [common.isModile()?"100%":"500px", common.isModile()?"100%":"450px"],
+                        content: UPDATE_URL + "?" + PRIMARY_KEY + "=" + value
+                    });
+                }
+
+                // 删除一行
+                let remove = function(obj) {
+                    return doRemove(obj.data[PRIMARY_KEY]);
+                }
+
+                // 删除多行
+                let batchRemove = function(obj) {
+                    let checkIds = common.checkField(obj, PRIMARY_KEY);
+                    if (checkIds === "") {
+                        layui.popup.warning("未选中数据");
+                        return false;
+                    }
+                    doRemove(checkIds.split(","));
+                }
+
+                // 执行删除
+                let doRemove = function (ids) {
+                    let data = {};
+                    data[PRIMARY_KEY] = ids;
+                    layer.confirm("确定删除?", {
+                        icon: 3,
+                        title: "提示"
+                    }, function(index) {
+                        layer.close(index);
+                        let loading = layer.load();
+                        $.ajax({
+                            url: DELETE_API,
+                            data: data,
+                            dataType: "json",
+                            type: "post",
+                            success: function(res) {
+                                layer.close(loading);
+                                if (res.code) {
+                                    return layui.popup.failure(res.msg);
+                                }
+                                return layui.popup.success("操作成功", refreshTable);
+                            }
+                        })
+                    });
+                }
+
+                // 刷新表格数据
+                window.refreshTable = function() {
+                    table.reloadData("data-table", {
+                        scrollPos: "fixed",
+                        done: function (res, curr) {
+                            if (curr > 1 && res.data && !res.data.length) {
+                                curr = curr - 1;
+                                table.reloadData("data-table", {
+                                    page: {
+                                        curr: curr
+                                    },
+                                })
+                            }
+                        }
+                    });
+                }
+            })
+
+        </script>
+    </body>
+</html>

plugin/admin/app/view/student-feedback/insert.html

@@ -0,0 +1,165 @@
+<!DOCTYPE html>
+<html lang="zh-cn">
+    <head>
+        <meta charset="UTF-8">
+        <title>新增页面</title>
+        <link rel="stylesheet" href="/app/admin/component/pear/css/pear.css" />
+        <link rel="stylesheet" href="/app/admin/component/jsoneditor/css/jsoneditor.css" />
+        <link rel="stylesheet" href="/app/admin/admin/css/reset.css" />
+    </head>
+    <body>
+
+        <form class="layui-form" action="">
+
+            <div class="mainBox">
+                <div class="main-container mr-5">
+                    
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">学生</label>
+                        <div class="layui-input-block">
+                            <input type="number" name="student_id" value="0" class="layui-input">
+                        </div>
+                    </div>
+                    
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">反馈内容</label>
+                        <div class="layui-input-block">
+                            <textarea name="feedback" class="layui-textarea"></textarea>
+                        </div>
+                    </div>
+                    
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">课程</label>
+                        <div class="layui-input-block">
+                            <input type="number" name="teacher_schedule_time_id" value="0" class="layui-input">
+                        </div>
+                    </div>
+                    
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">老师</label>
+                        <div class="layui-input-block">
+                            <input type="number" name="teacher_id" value="0" class="layui-input">
+                        </div>
+                    </div>
+                    
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">课程</label>
+                        <div class="layui-input-block">
+                            <input type="number" name="subject_id" value="0" class="layui-input">
+                        </div>
+                    </div>
+                    
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">日期</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="date" id="date" autocomplete="off" class="layui-input">
+                        </div>
+                    </div>
+                    
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">时间</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="time" value="" class="layui-input">
+                        </div>
+                    </div>
+                    
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">start_time</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="start_time" id="start_time" autocomplete="off" class="layui-input">
+                        </div>
+                    </div>
+                    
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">end_time</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="end_time" id="end_time" autocomplete="off" class="layui-input">
+                        </div>
+                    </div>
+                    
+                </div>
+            </div>
+
+            <div class="bottom">
+                <div class="button-container">
+                    <button type="submit" class="pear-btn pear-btn-primary pear-btn-md" lay-submit=""
+                        lay-filter="save">
+                        提交
+                    </button>
+                    <button type="reset" class="pear-btn pear-btn-md">
+                        重置
+                    </button>
+                </div>
+            </div>
+            
+        </form>
+
+        <script src="/app/admin/component/layui/layui.js?v=2.8.12"></script>
+        <script src="/app/admin/component/pear/pear.js"></script>
+        <script src="/app/admin/component/jsoneditor/jsoneditor.js"></script>
+        <script src="/app/admin/admin/js/permission.js"></script>
+        
+        <script>
+
+            // 相关接口
+            const INSERT_API = "/app/admin/student-feedback/insert";
+            
+            // 字段 日期 date
+            layui.use(["laydate"], function() {
+                layui.laydate.render({
+                    elem: "#date",
+                    type: "datetime",
+                });
+            })
+            
+            // 字段 start_time start_time
+            layui.use(["laydate"], function() {
+                layui.laydate.render({
+                    elem: "#start_time",
+                    type: "datetime",
+                });
+            })
+            
+            // 字段 end_time end_time
+            layui.use(["laydate"], function() {
+                layui.laydate.render({
+                    elem: "#end_time",
+                    type: "datetime",
+                });
+            })
+            
+            //提交事件
+            layui.use(["form", "popup"], function () {
+                // 字段验证允许为空
+                layui.form.verify({
+                    phone: [/(^$)|^1\d{10}$/, "请输入正确的手机号"],
+                    email: [/(^$)|^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/, "邮箱格式不正确"],
+                    url: [/(^$)|(^#)|(^http(s*):\/\/[^\s]+\.[^\s]+)/, "链接格式不正确"],
+                    number: [/(^$)|^\d+$/,'只能填写数字'],
+                    date: [/(^$)|^(\d{4})[-\/](\d{1}|0\d{1}|1[0-2])([-\/](\d{1}|0\d{1}|[1-2][0-9]|3[0-1]))*$/, "日期格式不正确"],
+                    identity: [/(^$)|(^\d{15}$)|(^\d{17}(x|X|\d)$)/, "请输入正确的身份证号"]
+                });
+                layui.form.on("submit(save)", function (data) {
+                    layui.$.ajax({
+                        url: INSERT_API,
+                        type: "POST",
+                        dateType: "json",
+                        data: data.field,
+                        success: function (res) {
+                            if (res.code) {
+                                return layui.popup.failure(res.msg);
+                            }
+                            return layui.popup.success("操作成功", function () {
+                                parent.refreshTable();
+                                parent.layer.close(parent.layer.getFrameIndex(window.name));
+                            });
+                        }
+                    });
+                    return false;
+                });
+            });
+
+        </script>
+
+    </body>
+</html>

plugin/admin/app/view/student-feedback/update.html

@@ -0,0 +1,188 @@
+<!DOCTYPE html>
+<html lang="zh-cn">
+<head>
+    <meta charset="UTF-8">
+    <title>更新页面</title>
+    <link rel="stylesheet" href="/app/admin/component/pear/css/pear.css"/>
+    <link rel="stylesheet" href="/app/admin/component/jsoneditor/css/jsoneditor.css"/>
+    <link rel="stylesheet" href="/app/admin/admin/css/reset.css"/>
+
+</head>
+<body>
+
+<form class="layui-form">
+
+    <div class="mainBox">
+        <div class="main-container mr-5">
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">学生</label>
+                <div class="layui-input-block">
+                    <input type="text" name="student_name" value="{$feedback['student_name']}" class="layui-input">
+                    <input type="hidden" name="student_id" value="{$feedback['student_id']}" class="layui-input">
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">课程</label>
+                <div class="layui-input-block">
+                    <input type="text" name="subject_name" value="{$feedback['subject_name']}" class="layui-input">
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">老师</label>
+                <div class="layui-input-block">
+<!--                    <input type="number" name="teacher_id" value="" class="layui-input">-->
+                    <input type="text" name="teacher_name" value="{$feedback['teacher_name']}" class="layui-input">
+                </div>
+            </div>
+
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">日期</label>
+                <div class="layui-input-block">
+                    <input type="text" name="date" value="{$feedback['date']}" class="layui-input">
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">时间</label>
+                <div class="layui-input-block">
+                    <input type="text" name="time" value="{$feedback['time']}" class="layui-input">
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">反馈内容</label>
+                <div class="layui-input-block">
+                    <textarea name="feedback" class="layui-textarea">{$feedback['feedback']}</textarea>
+                </div>
+            </div>
+
+
+        </div>
+    </div>
+
+    <div class="bottom">
+        <div class="button-container">
+            <button type="submit" class="pear-btn pear-btn-primary pear-btn-md" lay-submit="" lay-filter="save">
+                关闭
+            </button>
+<!--            <button type="reset" class="pear-btn pear-btn-md">-->
+<!--                重置-->
+<!--            </button>-->
+        </div>
+    </div>
+
+</form>
+
+<script src="/app/admin/component/layui/layui.js?v=2.8.12"></script>
+<script src="/app/admin/component/pear/pear.js"></script>
+<script src="/app/admin/component/jsoneditor/jsoneditor.js"></script>
+<script src="/app/admin/admin/js/permission.js"></script>
+
+<script>
+
+    // 相关接口
+    const PRIMARY_KEY = "id";
+    const SELECT_API = "/app/admin/student-feedback/select" + location.search;
+    const UPDATE_API = "/app/admin/student-feedback/update";
+
+    // 获取数据库记录
+    layui.use(["form", "util", "popup"], function () {
+        let $ = layui.$;
+        $.ajax({
+            url: SELECT_API,
+            dataType: "json",
+            success: function (res) {
+
+                // 给表单初始化数据
+                // layui.each(res.data[0], function (key, value) {
+                //     let obj = $('*[name="' + key + '"]');
+                //     if (key === "password") {
+                //         obj.attr("placeholder", "不更新密码请留空");
+                //         return;
+                //     }
+                //     if (typeof obj[0] === "undefined" || !obj[0].nodeName) return;
+                //     if (obj[0].nodeName.toLowerCase() === "textarea") {
+                //         obj.val(value);
+                //     } else {
+                //         obj.attr("value", value);
+                //         obj[0].value = value;
+                //     }
+                // });
+
+                // 字段 日期 date
+                layui.use(["laydate"], function () {
+                    layui.laydate.render({
+                        elem: "#date",
+                        type: "datetime",
+                    });
+                })
+
+                // 字段 start_time start_time
+                layui.use(["laydate"], function () {
+                    layui.laydate.render({
+                        elem: "#start_time",
+                        type: "datetime",
+                    });
+                })
+
+                // 字段 end_time end_time
+                layui.use(["laydate"], function () {
+                    layui.laydate.render({
+                        elem: "#end_time",
+                        type: "datetime",
+                    });
+                })
+
+
+                // ajax返回失败
+                if (res.code) {
+                    layui.popup.failure(res.msg);
+                }
+
+            }
+        });
+    });
+
+    //提交事件
+    layui.use(["form", "popup"], function () {
+        // 字段验证允许为空
+        layui.form.verify({
+            phone: [/(^$)|^1\d{10}$/, "请输入正确的手机号"],
+            email: [/(^$)|^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/, "邮箱格式不正确"],
+            url: [/(^$)|(^#)|(^http(s*):\/\/[^\s]+\.[^\s]+)/, "链接格式不正确"],
+            number: [/(^$)|^\d+$/, '只能填写数字'],
+            date: [/(^$)|^(\d{4})[-\/](\d{1}|0\d{1}|1[0-2])([-\/](\d{1}|0\d{1}|[1-2][0-9]|3[0-1]))*$/, "日期格式不正确"],
+            identity: [/(^$)|(^\d{15}$)|(^\d{17}(x|X|\d)$)/, "请输入正确的身份证号"]
+        });
+        layui.form.on("submit(save)", function (data) {
+            // parent.refreshTable();
+            parent.layer.close(parent.layer.getFrameIndex(window.name));
+            // data.field[PRIMARY_KEY] = layui.url().search[PRIMARY_KEY];
+            // layui.$.ajax({
+            //     url: UPDATE_API,
+            //     type: "POST",
+            //     dateType: "json",
+            //     data: data.field,
+            //     success: function (res) {
+            //         if (res.code) {
+            //             return layui.popup.failure(res.msg);
+            //         }
+            //         return layui.popup.success("操作成功", function () {
+            //             parent.refreshTable();
+            //             parent.layer.close(parent.layer.getFrameIndex(window.name));
+            //         });
+            //     }
+            // });
+            return false;
+        });
+    });
+
+</script>
+
+</body>
+
+</html>

plugin/admin/app/view/teacher/index.html

@@ -270,7 +270,7 @@
                         title: "修改",
                         shade: 0.1,
                         maxmin: true,
-                        area: [common.isModile()?"100%":"500px", common.isModile()?"100%":"450px"],
+                        area: [common.isModile()?"100%":"650px", common.isModile()?"100%":"600px"],
                         content: UPDATE_URL + "?" + PRIMARY_KEY + "=" + value
                     });
                 }

plugin/admin/app/view/teacher/update.html

@@ -18,7 +18,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label required">账号</label>
                 <div class="layui-input-block">
-                    <input type="text" name="account" value="" required lay-verify="required" class="layui-input">
+                    <input type="text" name="account" value="{$teacher['account']}" required lay-verify="required" class="layui-input">
                 </div>
             </div>
 
@@ -39,35 +39,35 @@
             <div class="layui-form-item">
                 <label class="layui-form-label required">教师姓名</label>
                 <div class="layui-input-block">
-                    <input type="text" name="teacher_name" value="" required lay-verify="required" class="layui-input">
+                    <input type="text" name="teacher_name" value="{$teacher['teacher_name']}" required lay-verify="required" class="layui-input">
                 </div>
             </div>
 
-<!--            <div class="layui-form-item">-->
-<!--                <label class="layui-form-label">年龄</label>-->
-<!--                <div class="layui-input-block">-->
-<!--                    <input type="number" name="age" value="" class="layui-input">-->
-<!--                </div>-->
-<!--            </div>-->
 
             <div class="layui-form-item">
                 <label class="layui-form-label">Openid</label>
                 <div class="layui-input-block">
-                    <input type="text" name="openid" value="" class="layui-input">
+                    <input type="text" name="openid" value="{$teacher['openid']}" class="layui-input">
                 </div>
             </div>
 
-            <div class="layui-form-item">
-                <label class="layui-form-label">时区名称</label>
-                <div class="layui-input-block">
-                    <input type="text" name="time_zone_name" value="" class="layui-input">
-                </div>
-            </div>
+<!--            <div class="layui-form-item">-->
+<!--                <label class="layui-form-label">时区名称</label>-->
+<!--                <div class="layui-input-block">-->
+<!--                    <input type="text" name="time_zone_name" value="" class="layui-input">-->
+<!--                </div>-->
+<!--            </div>-->
 
             <div class="layui-form-item">
                 <label class="layui-form-label required">时差</label>
                 <div class="layui-input-block">
-                    <input type="text" name="time_zone" value="" required lay-verify="required" class="layui-input">
+<!--                    <input type="text" name="time_zone" value="" required lay-verify="required" class="layui-input">-->
+                    <select lay-search="" name="time_zone_id" required lay-verify="required">
+                        <option value="">请选择或搜索时区</option>
+                        {foreach $time_zone as $item}
+                        <option value="{$item['id']}" {if $teacher['time_zone_id'] == $item['id']}selected{/if}>{$item['name']}</option>
+                        {/foreach}
+                    </select>
                 </div>
             </div>
 
@@ -108,20 +108,20 @@
             success: function (res) {
 
                 // 给表单初始化数据
-                layui.each(res.data[0], function (key, value) {
-                    let obj = $('*[name="' + key + '"]');
-                    if (key === "password") {
-                        obj.attr("placeholder", "不更新密码请留空");
-                        return;
-                    }
-                    if (typeof obj[0] === "undefined" || !obj[0].nodeName) return;
-                    if (obj[0].nodeName.toLowerCase() === "textarea") {
-                        obj.val(value);
-                    } else {
-                        obj.attr("value", value);
-                        obj[0].value = value;
-                    }
-                });
+                // layui.each(res.data[0], function (key, value) {
+                //     let obj = $('*[name="' + key + '"]');
+                //     if (key === "password") {
+                //         obj.attr("placeholder", "不更新密码请留空");
+                //         return;
+                //     }
+                //     if (typeof obj[0] === "undefined" || !obj[0].nodeName) return;
+                //     if (obj[0].nodeName.toLowerCase() === "textarea") {
+                //         obj.val(value);
+                //     } else {
+                //         obj.attr("value", value);
+                //         obj[0].value = value;
+                //     }
+                // });
 
 
                 // ajax返回失败