Browse Source

fix:
- sql备份
- 去掉框架自带信息
- 专家关联模块
- 去掉服务价格

zzb 1 năm trước cách đây
mục cha
commit
3cc8b0e1ec

+ 14 - 12
app/admin/controller/Main.php

@@ -54,18 +54,20 @@ class Main extends Permissions
 
         //==============网站数据=============================
 
-        //会员
+        //用户
         $web['user_num'] = Db::name('user')->where('status', \app\common\model\User::STATUS_PASS)->count();
-        $web['user_num_wait'] = Db::name('user')->where('status', \app\common\model\User::STATUS_WAIT)->count();
-        //文章
-        $web['article_num'] = Db::name('article')->count();
-        $web['status_article'] = Db::name('article')->where('status', 0)->count();
-        //附件
-        $web['file_num'] = Db::name('attachment')->count();
-        $web['status_file'] = Db::name('attachment')->where('status', 0)->count();
-        //消息
-        $web['message_num'] = Db::name('messages')->count();
-        $web['look_message'] = Db::name('messages')->where('is_look', 0)->count();
+        //预约
+        $web['application_num'] = Db::name('appointment_application')->count();
+        //反馈
+        $web['feedback_num'] = Db::name('feedback')->count();
+        //公告
+        $web['announcement_num'] = Db::name('announcement')->count();
+
+        //
+        $web['user_num_today'] = Db::name('user')->where('status', \app\common\model\User::STATUS_PASS)->whereTime('create_time', 'today')->count();
+        $web['application_num_today'] = Db::name('appointment_application')->whereTime('create_time', 'today')->count();
+        $web['feedback_num_today'] = Db::name('feedback')->whereTime('create_time', 'today')->count();
+        $web['announcement_num_today'] = Db::name('announcement')->whereTime('create_time', 'today')->count();
 
         //==============管理员操作记录===========================
 
@@ -86,7 +88,7 @@ class Main extends Permissions
             $min_time = strtotime($val);
             $max_time = $min_time + 60 * 60 * 24;
             $where['create_time'] = [['>=', $min_time], ['<=', $max_time]];
-            $login_sum .= Db::name('admin_log')->where('params', '<>', '')->where($where)->count() . ',';
+            $login_sum .= Db::name('appointment_application')->where($where)->count() . ',';
         }
         $web['login_sum'] = $login_sum;
         $this->assign('web', $web);

+ 10 - 0
app/admin/controller/Specialist.php

@@ -41,20 +41,28 @@ class Specialist extends Permissions
             if (isset($post["address_id"]) and "" != $post["address_id"]) {
                 $where["address_id"] = $post["address_id"];
             }
+            if (isset($post["module"]) and "" != $post["module"]) {
+                $where["module"] = $post["module"];
+            }
 
             $model = $this->getModel();
             $count = $model->where($where)->count();
             $data = $model->where($where)->page($post['page']??0, $post['limit']??15)->order('id desc')->select();
 
+            $boxsIdAndName = (new \app\common\model\ConfigOption())->where(['pid' => 2])->column('name', 'id');
+
             foreach ($data as $key => $value) {
                 $value['head_pic_url'] = geturl($value['head_pic']);
                 $value['sex_text'] = $value->sex_text;
                 $value['address_name'] = $value->address ? $value->address->title : '';
+                $value['module_name'] = $boxsIdAndName[$value->module]??'';
                 $data[$key] = $value;
             }
             return array('code' => 0, 'count' => $count, 'data' => $data);
         } else {
             $this->assign('addresslist', \app\common\model\Address::all());
+            $boxs = (new \app\common\model\ConfigOption())->where(['pid' => 2, 'status' => \app\common\model\ConfigOption::STATUS_OPEN])->order('sort desc')->select();
+            $this->assign('modules', $boxs);
             return $this->fetch();
         }
     }
@@ -82,6 +90,8 @@ class Specialist extends Permissions
             }
         } else {
             $this->assign('addresslist', \app\common\model\Address::all());
+            $boxs = (new \app\common\model\ConfigOption())->where(['pid' => 2, 'status' => \app\common\model\ConfigOption::STATUS_OPEN])->order('sort desc')->select();
+            $this->assign('modules', $boxs);
         }
 
         if ($id > 0) {

+ 8 - 8
app/admin/view/appointment/publish.html

@@ -121,14 +121,14 @@
             </div>
         </div>
 
-        <div class="layui-form-item">
-            <label class="layui-form-label">服务价格</label>
-            <div class="layui-input-inline" style="max-width:300px;">
-                <input name="price" lay-verify="required" autocomplete="off" placeholder="请输入" class="layui-input"
-                type="text" value="">
-            </div>
-            <div class="layui-form-mid layui-word-aux">必填</div>
-        </div>
+        <!--<div class="layui-form-item">-->
+            <!--<label class="layui-form-label">服务价格</label>-->
+            <!--<div class="layui-input-inline" style="max-width:300px;">-->
+                <!--<input name="price" lay-verify="required" autocomplete="off" placeholder="请输入" class="layui-input"-->
+                <!--type="text" value="">-->
+            <!--</div>-->
+            <!--<div class="layui-form-mid layui-word-aux">必填</div>-->
+        <!--</div>-->
 
 
         <input type="hidden" name="pid" value="{$Request.param.pid}">

+ 17 - 73
app/admin/view/main/index.html

@@ -28,26 +28,26 @@
                     <ul class="layui-row layui-col-space10 layui-this">
                       <li class="layui-col-xs6">
                         <a lay-href="" class="layadmin-backlog-body">
-                          <h3>会员</h3>
+                          <h3>用户</h3>
                           <p><cite>{$web.user_num}</cite></p>
                         </a>
                       </li>
                       <li class="layui-col-xs6">
                         <a lay-href="" class="layadmin-backlog-body">
-                          <h3>文章</h3>
-                          <p><cite>{$web.article_num}</cite></p>
+                          <h3>预约</h3>
+                          <p><cite>{$web.application_num}</cite></p>
                         </a>
                       </li>
                       <li class="layui-col-xs6">
                         <a lay-href="" class="layadmin-backlog-body">
-                          <h3>文件</h3>
-                          <p><cite>{$web.file_num}</cite></p>
+                          <h3>反馈</h3>
+                          <p><cite>{$web.feedback_num}</cite></p>
                         </a>
                       </li>
                       <li class="layui-col-xs6">
                         <a lay-href="" class="layadmin-backlog-body">
-                          <h3>消息</h3>
-                          <p><cite>{$web.message_num}</cite></p>
+                          <h3>公告</h3>
+                          <p><cite>{$web.announcement_num}</cite></p>
                         </a>
                       </li>
                     </ul>
@@ -60,7 +60,7 @@
           </div>
           <div class="layui-col-md6">
             <div class="layui-card">
-              <div class="layui-card-header">待办事项</div>
+              <div class="layui-card-header">今日数据</div>
               <div class="layui-card-body">
 
                 <div class="layui-carousel layadmin-carousel layadmin-backlog" lay-anim=""
@@ -69,26 +69,26 @@
                     <ul class="layui-row layui-col-space10 layui-this">
                       <li class="layui-col-xs6">
                         <a lay-href="" class="layadmin-backlog-body">
-                          <h3>会员</h3>
-                          <p><cite>{$web.user_num_wait}</cite></p>
+                          <h3>用户</h3>
+                          <p><cite>{$web.user_num_today}</cite></p>
                         </a>
                       </li>
                       <li class="layui-col-xs6">
                         <a lay-href="" class="layadmin-backlog-body">
-                          <h3>文章</h3>
-                          <p><cite>{$web.status_article}</cite></p>
+                          <h3>预约</h3>
+                          <p><cite>{$web.application_num_today}</cite></p>
                         </a>
                       </li>
                       <li class="layui-col-xs6">
                         <a lay-href="" class="layadmin-backlog-body">
-                          <h3>文件</h3>
-                          <p><cite>{$web.status_file}</cite></p>
+                          <h3>反馈</h3>
+                          <p><cite>{$web.feedback_num_today}</cite></p>
                         </a>
                       </li>
                       <li class="layui-col-xs6">
                         <a lay-href="" class="layadmin-backlog-body">
-                          <h3>消息</h3>
-                          <p><cite>{$web.look_message}</cite></p>
+                          <h3>公告</h3>
+                          <p><cite>{$web.announcement_num_today}</cite></p>
                         </a>
                       </li>
                     </ul>
@@ -101,7 +101,7 @@
           </div>
           <div class="layui-col-md12">
             <div class="layui-card">
-              <div class="layui-card-header">管理员操作记录</div>
+              <div class="layui-card-header">预约记录</div>
               <div class="layui-card-body" id="main" style="height: 450px;">
 
               </div>
@@ -166,62 +166,6 @@
         </script>
         {/if}
 
-        <div class="layui-card">
-          <div class="layui-card-header">
-            公告
-          </div>
-          <div class="layui-card-body layui-text layadmin-text">
-            <p>
-              Tplay后台管理框架搭载的是国内最受欢迎的两大框架Layui和ThinkPHP,ThinkPHP的大道至简和Layui的简而全在理念上可谓是不谋而合,两大框架结合所产生的结果就是将WEB开发精简到了极致。
-              QQ交流群:<a href="https://jq.qq.com/?_wv=1027&k=AUVg7vSC" target="_blank">609048497</a>
-            </p>
-          </div>
-        </div>
-
-        <div class="layui-card">
-          <div class="layui-card-header">版本信息</div>
-          <div class="layui-card-body layui-text">
-            <table class="layui-table">
-              <colgroup>
-                <col width="100">
-                <col>
-              </colgroup>
-              <tbody>
-              <tr>
-                <td>当前版本</td>
-                <td>
-                  {$Think.const.PRODUCT_NAME}-{$Think.const.PRODUCT_VERSION}
-                  <a href="{$Think.const.PRODUCT_URL}" target="_blank"
-                     class="layui-btn layui-btn-sm">源码</a>
-                </td>
-              </tr>
-              <tr>
-                <td>下载交流</td>
-                <td style="padding-bottom: 0;">
-                  layui-2.5.6
-                  <a href="https://gitee.com/layui" target="_blank"
-                     class="layui-btn layui-btn-sm">文档</a>
-                  <a href="https://dev.layuion.com/extend/" target="_blank"
-                     class="layui-btn layui-btn-sm">插件</a>
-                </td>
-              </tr>
-              <tr>
-                <td>基于框架</td>
-                <td>
-                  thinkphp-{$info.tp}
-                  <a href="https://www.kancloud.cn/manual/thinkphp5/118003" target="_blank"
-                     class="layui-btn layui-btn-sm">文档</a>
-                </td>
-              </tr>
-              <tr>
-                <td>主要特色</td>
-                <td>适配强 / 高颜值 / 清爽 / 简洁</td>
-              </tr>
-
-              </tbody>
-            </table>
-          </div>
-        </div>
 
         <div class="layui-card">
           <div class="layui-card-header">系统信息</div>

+ 9 - 0
app/admin/view/specialist/index.html

@@ -77,6 +77,14 @@
                     {/volist}
                 </select>
             </div>
+            <div class="layui-input-inline" style="width: 100px">
+                <select name="module" lay-search="">
+                    <option value="">模块</option>
+                    {volist name="$modules" id="vo"}
+                    <option value="{$vo.id}">{$vo.name}</option>
+                    {/volist}
+                </select>
+            </div>
             <button class="layui-btn layui-btn-sm" lay-submit="" lay-filter="serch">立即提交</button>
         </div>
     </form>
@@ -125,6 +133,7 @@
                     {field: "desc", title: '简介'},
                     {field: "consultation_direction", title: '咨询方向'},
                     {field: "address_name", title: '地址'},
+                    {field: "module_name", title: '模块'},
                     {field: 'action', title: '操作', toolbar: '#barDemo', fixed: 'right'}
                 ]],
                 done: function () {

+ 17 - 1
app/admin/view/specialist/publish.html

@@ -92,7 +92,23 @@
                     {/volist}
                 </select>
             </div>
-            <div class="layui-form-mid layui-word-aux">必填,可搜索地址</div>
+            <div class="layui-form-mid layui-word-aux">必填</div>
+        </div>
+
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">模块</label>
+            <div class="layui-input-inline" style="max-width:300px;">
+                <select name="module" lay-filter="" lay-search="" lay-verify="required">
+                    <option value="">请选择</option>
+                    {volist name="$modules" id="vo"}
+                    <option value="{$vo.id}"
+                            {notempty name="$data.module" }
+                            {eq name="$data.module" value="$vo.id" } selected="" {/eq}{/notempty}>{$vo.name}</option>
+                    {/volist}
+                </select>
+            </div>
+            <div class="layui-form-mid layui-word-aux">必填</div>
         </div>
 
         <!-- 输入框 -->

+ 4 - 0
app/api/controller/Specialist.php

@@ -16,6 +16,7 @@ class Specialist extends Base
         $post = $this->request->param();
         $validate = new \think\Validate([
             ['id', 'number'],
+            ['module', 'number'],
             ['page', 'number'],
             ['pagenum', 'number|<=:1000']
         ]);
@@ -27,6 +28,9 @@ class Specialist extends Base
         if (isset($post['id'])) {
             $where['id'] = $post['id'];
         }
+        if (isset($post['module'])) {
+            $where['module'] = $post['module'];
+        }
 
         if (isset($post['id'])) {
             $datalist = ($this->getModel())->where($where)->find();

+ 4 - 0
app/api/controller/接口文档.md

@@ -244,12 +244,16 @@
 
 接口地址:/api/specialist/index
 
+更新时间: 2023-05-06
+
 请求方式:get / post
 
 请求数据:
 
 | 参数名 | 说明  | 备注  |
 | ---   | ---   | ---  |
+| id  | 用ID查询专家 | int |
+| module | 按模块ID查专家列表 | int |
 |  page    | 第几页,默认1           |  int   |
 |  pagenum | 每页几条,默认20        |  int,<=:1000 |
 

+ 0 - 18
app/index/config.php

@@ -1,18 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: 中闽 < 1464674022@qq.com >
- * Date: 2020/2/4
- * Time: 12:47
- */
-
-//配置文件
-return [
-    //全局替换
-    'view_replace_str' => [
-        '__PUBLIC__' => '/static/public',
-        '__CSS__' => '/static/index/css',
-        '__JS__' => '/static/index/js',
-        '__IMG__' => '/static/index/images'
-    ],
-];

+ 0 - 92
app/index/view/index/default.html

@@ -1,92 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="format-detection" content="telephone=no">
-    <title>欢迎使用{$Think.const.PRODUCT_NAME}</title>
-    <meta name="keywords" content="欢迎使用{$Think.const.PRODUCT_NAME}"/>
-    <meta name="description" content="{$Think.const.PRODUCT_NAME}集成了一般应用所必须的基础性功能,为开发者减少重复性的工作,提升开发速度,规范团队开发模式。"/>
-    <link rel="stylesheet" href="__PUBLIC__/layui/css/layui.css">
-    <link rel="stylesheet" href="__PUBLIC__/global.css" media="all">
-</head>
-<body class="site-home" id="LAY_home" style="background-color: #eee;" data-date="10-12">
-<div class="layui-header header header-index">
-    <div class="layui-container"><a class="logo" href="/"><img src="__PUBLIC__/images/logo.png" alt="layui"> </a>
-        <div class="layui-hide-xs site-notice"></div>
-        <ul class="layui-nav" id="LAY_NAV_TOP">
-            <li class="layui-nav-item "><a href="https://gitee.com/pps/tplay/wikis/pages?sort_id=4562054&doc_id=480370"
-                                           target="_blank">文档</a></li>
-            <li class="layui-nav-item "><a href="https://gitee.com/pps/tplay" target="_blank">下载</a></li>
-            <li class="layui-nav-item layui-hide-xs"><a href="https://jq.qq.com/?_wv=1027&k=AUVg7vSC" target="_blank"
-                                                        rel="nofollow">反馈</a></li>
-            <span class="layui-nav-bar" style="left: 20px; top: 55px; width: 0px; opacity: 0;"></span></ul>
-    </div>
-</div>
-<!-- 让IE8/9支持媒体查询,从而兼容栅格 --> <!--[if lt IE 9]>
-<script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
-<script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
-<![endif]-->
-<div class="site-banner">
-    <div class="site-banner-bg">
-    </div>
-    <div class="site-banner-main">
-        <div class="site-zfj site-zfj-anim"><i class="layui-icon"
-                                               style="color: #fff; color: rgba(255,255,255,.6);"></i>
-        </div>
-        <div class="layui-anim site-desc site-desc-anim">
-            <p class="web-font-desc">欢迎使用 {$Think.const.PRODUCT_NAME} !</p> <cite>{$Think.const.PRODUCT_NAME}为快速开发量身定制的后台管理框架,本页面为{$Think.const.PRODUCT_NAME}系统默认页。</cite>
-        </div>
-        <div class="site-download"><a href="{:url('admin/common/login')}" class="layui-inline site-down"> <cite
-                class="layui-icon">&#xe60c;</cite> 访问后台 </a>
-        </div>
-        <div class="site-version"><span>当前版本:<cite class="site-showv">{$Think.const.PRODUCT_VERSION}</cite></span>
-            <span><a href="https://gitee.com/pps/tplay/releases" rel="nofollow" target="_blank">更新日志</a></span>
-        </div>
-    </div>
-</div>
-<div class="layui-container">
-    <ul class="layui-row layui-col-space30 site-idea">
-        <li class="layui-col-md4">
-            <div>
-                <fieldset class="layui-elem-field layui-field-title">
-                    <legend>返璞归真</legend>
-                    <p>身处在前端社区的繁荣之下,我们都在有意或无意地追逐。而 {$Think.const.PRODUCT_NAME}
-                        偏偏回望当初,奔赴在返璞归真的漫漫征途,自信并勇敢着,追寻于原生态的书写指令,试图以最简单的方式诠释高效。</p>
-                </fieldset>
-            </div>
-        </li>
-        <li class="layui-col-md4">
-            <div>
-                <fieldset class="layui-elem-field layui-field-title">
-                    <legend>双面体验</legend>
-                    <p>拥有双面的不仅是人生,还有
-                        {$Think.const.PRODUCT_NAME}。一面极简,一面丰盈。极简是视觉所见的外在,是开发所念的简易。丰盈是倾情雕琢的内在,是信手拈来的承诺。一切本应如此,简而全,双重体验。</p>
-                </fieldset>
-            </div>
-        </li>
-        <li class="layui-col-md4">
-            <div>
-                <fieldset class="layui-elem-field layui-field-title">
-                    <legend>星辰大海</legend>
-                    <p>如果眼下还是一团零星之火,那运筹帷幄之后,迎面东风,就是一场烈焰燎原吧,那必定会是一番尽情的燃烧。待,秋风萧瑟时,散作满天星辰,你看那四季轮回<!--海天相接-->,正是
-                        {$Think.const.PRODUCT_NAME} 不灭的执念。</p>
-                </fieldset>
-            </div>
-        </li>
-    </ul>
-</div>
-<div class="layui-footer footer footer-index">
-    <p> Copyright © 2021 <a href="https://gitee.com/pps/tplay.git">tplay.com</a> MIT Licensed</p>
-    <p></p>
-</div>
-<div class="site-tree-mobile layui-hide"><i class="layui-icon layui-icon-spread-left"></i>
-</div>
-<div class="site-mobile-shade"></div>
-<script src="__PUBLIC__/layui/layui.js" charset="utf-8"></script>
-</body>
-</html>

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 121 - 182
app/install/data/db.sql


Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác