ChenWuJie 4 anni fa
parent
commit
73658b91de
47 ha cambiato i file con 622 aggiunte e 24 eliminazioni
  1. 11 11
      app/Admin/Actions/Community/Docter/Pass.php
  2. 30 0
      app/Admin/Actions/Community/Notice/sendNotice.php
  3. 34 0
      app/Community/Controllers/ApiController.php
  4. 133 0
      app/Community/Controllers/DocterChatController.php
  5. 100 0
      app/Community/Controllers/NoticeController.php
  6. 5 2
      app/Community/Controllers/StatController.php
  7. 1 1
      app/Helpers/functions.php
  8. 6 3
      app/Http/Controllers/Api/V1/CommonController.php
  9. 59 0
      app/Http/Controllers/ScheDuleController.php
  10. 10 0
      app/Models/Notice.php
  11. 9 0
      app/Models/ServiceApply.php
  12. 3 2
      composer.json
  13. 62 1
      composer.lock
  14. 4 4
      config/config.php
  15. 40 0
      database/migrations/2020_11_17_033808_alert_cmds_user.php
  16. 37 0
      database/migrations/2020_11_19_064648_bm_banner.php
  17. 37 0
      database/migrations/2020_11_19_094540_bm_servebanners.php
  18. 35 0
      database/migrations/2020_11_24_065951_add_table_bm_service_apply.php
  19. 0 0
      public/assets/css/app.1ef7a076.css
  20. BIN
      public/assets/img/close001.2835da4d.jpg
  21. BIN
      public/assets/img/close002.e38ad856.jpg
  22. BIN
      public/assets/img/close003.f9dff833.jpg
  23. BIN
      public/assets/img/face002.c9f88acd.jpg
  24. BIN
      public/assets/img/face003.5df92cea.jpg
  25. BIN
      public/assets/img/face004.4a1731fa.jpg
  26. BIN
      public/assets/img/face005.d5784a4b.jpg
  27. 0 0
      public/assets/js/app.a700b62e.js
  28. 0 0
      public/assets/js/app.a700b62e.js.map
  29. 0 0
      public/assets/js/chunk-vendors.95e2f2c7.js
  30. 0 0
      public/assets/js/chunk-vendors.95e2f2c7.js.map
  31. 0 0
      public/cdms/assets/css/app.1ef7a076.css
  32. BIN
      public/cdms/assets/img/close001.2835da4d.jpg
  33. BIN
      public/cdms/assets/img/close002.e38ad856.jpg
  34. BIN
      public/cdms/assets/img/close003.f9dff833.jpg
  35. BIN
      public/cdms/assets/img/face002.c9f88acd.jpg
  36. BIN
      public/cdms/assets/img/face003.5df92cea.jpg
  37. BIN
      public/cdms/assets/img/face004.4a1731fa.jpg
  38. BIN
      public/cdms/assets/img/face005.d5784a4b.jpg
  39. 0 0
      public/cdms/assets/js/app.a700b62e.js
  40. 0 0
      public/cdms/assets/js/app.a700b62e.js.map
  41. 0 0
      public/cdms/assets/js/chunk-vendors.95e2f2c7.js
  42. 0 0
      public/cdms/assets/js/chunk-vendors.95e2f2c7.js.map
  43. BIN
      public/dist/favicon.ico
  44. 1 0
      public/dist/index.html
  45. BIN
      public/img/01.jpg
  46. 1 0
      resources/views/chat.blade.php
  47. 4 0
      routes/web.php

+ 11 - 11
app/Admin/Actions/Community/Docter/Pass.php

xqd
@@ -22,17 +22,17 @@ class Pass extends RowAction
         try{
             $DocOrg = new DocterOrganization();
             $DocOrg->where('id',$id)->update(['state'=>1]);
-            $count = $DocOrg->where('state','!=',1)->where('docter_id',$docter_id)->count();
-            if($count == 0){
-                Docter::where(['id'=>$docter_id])->update(['is_then'=>1]);
-                $user_name = $this->randomkeys(8);
-                $data['username'] = $user_name;
-                $data['name'] = $name;
-                $data['password'] = bcrypt('123456');
-                $data['org_id'] = $org_id;
-                $data['docter_id'] = $docter_id;
-                CdmsUsers::insert($data);
-            }
+//            $count = $DocOrg->where('state','!=',1)->where('docter_id',$docter_id)->count();
+//            if($count == 0){
+//                Docter::where(['id'=>$docter_id])->update(['is_then'=>1]);
+//                $user_name = $this->randomkeys(8);
+//                $data['username'] = $user_name;
+//                $data['name'] = $name;
+//                $data['password'] = bcrypt('123456');
+//                $data['org_id'] = $org_id;
+//                $data['docter_id'] = $docter_id;
+//                CdmsUsers::insert($data);
+//            }
 
         } catch (\Exception $e){
             return $this->response()->error('更新失败!');

+ 30 - 0
app/Admin/Actions/Community/Notice/sendNotice.php

xqd
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Admin\Actions\Community\Notice;
+
+use App\User;
+use Encore\Admin\Actions\BatchAction;
+use Illuminate\Database\Eloquent\Collection;
+
+class sendNotice extends BatchAction
+{
+    public $name = '群发通知';
+
+    public function handle(Collection $collection)
+    {
+        foreach ($collection as $model) {
+            $openid = User::where('id',$model->id)->value('openid');
+            if(empty($openid)) continue;
+        }
+
+        return $this->response()->success('Success message...')->refresh();
+    }
+
+    public function form()
+    {
+        $this->text('title','标题')->value('社区通州')->disable();
+        $this->textarea('content','内容')->value('社区通州')->rows(4);
+        $this->textarea('remark','备注')->value('社区通州')->rows(3);
+    }
+
+}

+ 34 - 0
app/Community/Controllers/ApiController.php

xqd xqd xqd
@@ -7,6 +7,8 @@ namespace App\Community\Controllers;
 use App\Http\Controllers\Controller;
 use App\Models\Docter;
 use App\Models\PatientRemark;
+use App\Models\Schedule;
+use App\Models\TimePeriod;
 use EasyWeChat\Factory;
 
 class ApiController extends Controller
@@ -41,6 +43,20 @@ class ApiController extends Controller
 //            oVxTzvgYlGktIDZXwfLMLQ01Tr5s
         ];
 
+        //3LUhWGlyiljxrT3Jh8orwQZ2LSHjfRs9SIHaB40O6q0
+        //开发者调用模版消息接口时需提供模版ID
+        //标题
+        //offer进度提醒
+        //行业
+        //IT科技 - 互联网|电子商务
+        //详细内容
+        //{{first.DATA}}
+        //人才姓名:{{keyword1.DATA}}
+        //联系方式:{{keyword2.DATA}}
+        //入职职位:{{keyword3.DATA}}
+        //入职公司:{{keyword4.DATA}}
+        //报到时间:{{keyword5.DATA}}
+        //{{remark.DATA}}
         $renyuan = ['oVxTzvhu4gs4RyCt4kJDRWOgsUXw','oVxTzvgYlGktIDZXwfLMLQ01Tr5s']; //周璐
         $renyuan = ['oVxTzvvTnnbjEE9jsalOYj4mtp6U','oVxTzvgu4XnI5F2aF7DcrbJIp5fI']; //简行
         $app = Factory::officialAccount($config );
@@ -49,4 +65,22 @@ class ApiController extends Controller
         dd($res);
     }
 
+
+
+    public function getComSchedule()
+    {
+
+        $time  = TimePeriod::get(['id','start_time_period','end_time_period']);
+        dd($time);
+        $data['community'] = [];
+        $data['docter'] = [];
+
+    }
+
+
+    public function setDocChedule()
+    {
+
+    }
+
 }

+ 133 - 0
app/Community/Controllers/DocterChatController.php

xqd
@@ -0,0 +1,133 @@
+<?php
+
+namespace App\Community\Controllers;
+
+use App\Admin\Actions\Community\Docter\Chat;
+use App\Admin\Actions\Community\Notice\sendNotice;
+use App\Models\Docter;
+use App\Models\Order;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Facades\Admin;
+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+use Encore\Admin\Layout\Content;
+use Encore\Admin\Show;
+use App\Models\User;
+
+class DocterChatController extends AdminController
+{
+    /**
+     * Title for current resource.
+     *
+     * @var string
+     */
+    protected $title = '咨询订单';
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $grid = new Grid(new Order());
+
+        $user = Admin::user();
+        $is_admin = Admin::user()->inRoles(['administrator','devloper']);
+        $grid->batchActions(function ($batch) {
+            $batch->add(new sendNotice());
+        });
+        if(!$is_admin){
+            $org_id = $user->org_id;
+            $docter_id = $user->docter_id;
+
+
+            $grid->model()->whereHas('orders',function ($query) use ($org_id,$docter_id) {
+                $where['organization_id']=$org_id;
+                if($docter_id){
+                    $where['docter_id'] = $docter_id;
+                }
+                $query->where($where);
+            });
+        }
+
+        $grid->column('order_sn', __('订单号'));
+        $grid->column('orderUser.nickname', __('咨询用户'));
+        $grid->column('orderPatient.name', __('咨询患者'));
+        $grid->column('orderPatient.birthday', __('患者年龄'))->display(function ($w){
+            return birthday_to_age($w);
+        });
+        $grid->actions(function ($actions){
+           $actions->add( new Chat());
+           $actions->disableDelete();
+           $actions->disableView();
+           $actions->disableEdit();
+        });
+        $grid->filter(function ($filter){
+            $filter->disableIdFilter();
+            $filter->equal('order_status','订单状态')->select(Order::$_order_status);
+        });
+        $grid->column('order_status', __('订单状态'))->using(Order::$_order_status);
+        $grid->column('created_at', __('下单时间'));
+
+        return $grid;
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        $show = new Show(Order::findOrFail($id));
+
+        $show->field('id', __('Id'));
+        $show->field('user_id', __('User id'));
+        $show->field('docter_id', __('Docter id'));
+        $show->field('patient_id', __('Patient id'));
+        $show->field('organization_id', __('Organization id'));
+        $show->field('order_sn', __('Order sn'));
+        $show->field('payment_type', __('Payment type'));
+        $show->field('product_type', __('Product type'));
+        $show->field('order_status', __('Order status'));
+        $show->field('payment_status', __('Payment status'));
+        $show->field('total_amount', __('Total amount'));
+        $show->field('payment_amount', __('Payment amount'));
+        $show->field('discount_amount', __('Discount amount'));
+        $show->field('payment_time', __('Payment time'));
+        $show->field('created_at', __('Created at'));
+        $show->field('updated_at', __('Updated at'));
+
+        return $show;
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+
+        $content = new Content();
+        $form = new Form();
+        $user = Admin::user();
+        $org_id = $user->org_id;
+        $docter_id = $user->docter_id;
+        $form->setView('chat');
+        return $form;
+    }
+
+    function chats(Content $content){
+        $content->title('儿保排班');
+        $content->description('医生用户可以接受接受预约');
+        $user = Admin::user();
+        $org_id = $user->org_id;
+        $docter_id = $user->docter_id;
+        $content->view('chat',['docter_id'=>$docter_id]);
+        return $content;
+        return view('chat', ['data' =>'foo']);
+    }
+}

+ 100 - 0
app/Community/Controllers/NoticeController.php

xqd
@@ -0,0 +1,100 @@
+<?php
+
+namespace App\Community\Controllers;
+
+use App\Models\Notice;
+use App\Models\User;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+use Encore\Admin\Layout\Content;
+use Encore\Admin\Show;
+
+class NoticeController extends AdminController
+{
+    /**
+     * Title for current resource.
+     *
+     * @var string
+     */
+    protected $title = '通告列表';
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $grid = new Grid(new Notice());
+
+        $grid->column('id', __('Id'));
+        $grid->column('org_id', __('Org id'));
+        $grid->column('title', __('Title'));
+        $grid->column('content', __('Content'));
+        $grid->column('remark', __('Remark'));
+        $grid->column('created_at', __('Created at'));
+        $grid->column('updated_at', __('Updated at'));
+
+        return $grid;
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        $show = new Show(Notice::findOrFail($id));
+
+        $show->field('id', __('Id'));
+        $show->field('org_id', __('Org id'));
+        $show->field('title', __('Title'));
+        $show->field('content', __('Content'));
+        $show->field('remark', __('Remark'));
+        $show->field('created_at', __('Created at'));
+        $show->field('updated_at', __('Updated at'));
+
+        return $show;
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        $form = new Form(new Notice());
+
+        $form->number('org_id', __('Org id'));
+        $form->text('title', __('Title'));
+        $form->text('content', __('Content'));
+        $form->text('remark', __('Remark'));
+
+        return $form;
+    }
+
+    public function send(Content $content)
+    {
+
+        $content->title('fasong');
+        $content->header('群发邮件');
+        $form = new \Encore\Admin\Widgets\Form();
+        $form->action('send');
+        $form->method('post');
+        $user = User::distinct()->pluck('nickname','id');
+        $form->multipleSelect('user_ids','用户')->options($user);
+        $form->text('title','标题')->rules('required',['requried'=>'请输入标题'])->placeholder('请输入标题,最多50个字');
+        $form->textarea('content','内容')->rules('required')->placeholder('请输入标题,最多200个字');
+        $form->textarea('remark','备注')->placeholder('请输入标题,最多200个字');;
+
+        $content->row($form);
+        $dibu = '<div>这是底部</div>';
+        $content->row($dibu);
+        return $content;
+
+    }
+}

+ 5 - 2
app/Community/Controllers/StatController.php

xqd
@@ -14,16 +14,19 @@ class StatController extends  Controller
     //疫苗统计
     public function vaccine()
     {
-
       $data ['count'] = Vaccine::count();
-      $data['success'] = Order::where('order_status',1)->count();
+      $data['have'] = Vaccine::sum('state');
+      $data['today_spend'] = Order::where(['']);
       return $data;
 
     }
 
+
+
     //实时数据
     public function service()
     {
+        $data['success'] = Order::where(['order_status'=>1])->whereIn('product_type',[3,4,5])->where('created_at','>',date('Y-m-d H:i:s',time()))->count();
 
     }
 

+ 1 - 1
app/Helpers/functions.php

xqd
@@ -249,7 +249,7 @@ if (!function_exists('aly_sm_request')) {
 
         try {
             $content = aly_sms_fetch_content($url, $method, "Signature={$signature}{$sortedQueryStringTmp}");
-            return json_decode($content);
+            return json_decode($content, true);
         } catch (Exception $e) {
             return false;
         }

+ 6 - 3
app/Http/Controllers/Api/V1/CommonController.php

xqd xqd xqd xqd
@@ -57,7 +57,8 @@ class CommonController extends Controller
                 'latitude' => $req['latitude'] ?? 0,
                 'longitude' => $req['longitude'] ?? 0,
                 'phone' => $req['phone'] ?? '',
-                'session_key' => $session_key
+                'session_key' => $session_key,
+                'last_login_time' => time(),
             ];
             $add['nickname'] = $req['nickname'] ?? '';
             $add['avatar'] = $req['avatar'] ?? request()->getScheme().'://'.request()->getHost().'/img/default-head.png';
@@ -78,7 +79,8 @@ class CommonController extends Controller
                 'latitude' => $req['latitude'] ?? 0,
                 'longitude' => $req['longitude'] ?? 0,
                 'phone' => $req['phone'] ?? '',
-                'session_key' => $session_key
+                'session_key' => $session_key,
+                'last_login_time' => time(),
             ];
             $update = array_filter($update);
 
@@ -127,6 +129,7 @@ class CommonController extends Controller
                     'phone' => $decryptedData['phoneNumber'],
                     'session_key' => $data['session_key'],
                     'avatar' => request()->getScheme().'://'.request()->getHost().'/img/default-head.png',
+                    'last_login_time' => time(),
                 ]);
                 $nickname = '用户'.base_convert($user['id'], 10, 16);
                 User::where('id', $user['id'])->update(['nickname' => $nickname]);
@@ -235,7 +238,7 @@ class CommonController extends Controller
 
         $verify_code = generate_code();
         $result = send_sms($req['phone'], 'verify_template_code', ['code' => $verify_code]);
-        if (!$result){
+        if (empty($result['Code']) || $result['Code'] != 'OK'){
             return out(null, 30010, '验证码发送失败,请稍后重试');
         }
 

+ 59 - 0
app/Http/Controllers/ScheDuleController.php

xqd
@@ -0,0 +1,59 @@
+<?php
+
+
+namespace App\Http\Controllers;
+
+
+
+use App\Models\CommunitySchedule;
+use App\Models\Schedule;
+use App\Models\SchedulePeriod;
+use App\Models\TimePeriod;
+use Illuminate\Support\Facades\DB;
+
+class ScheDuleController  extends Controller
+{
+
+    public function getComSchedule()
+    {
+
+        $time  = TimePeriod::get(['id','start_time_period','end_time_period']);
+        $arrays = [1,3,4,12,16,10,20];
+        $org_id = 1;
+        $docter_id = 1;
+        $community = CommunitySchedule::where('org_id',$org_id)->orderBy('day_type')->pluck('times_id','day_type');
+        $time_array = [[],[],[],[],[],[],[]];
+        foreach ($community as $key => $ids){
+            $time = TimePeriod::whereIn('id',$ids)->get(['id','start_time_period','end_time_period']);
+            $time_info = [];
+            foreach ($time as $val){
+                if(!in_array(intval($val->id),$arrays)){
+                    $time_info[] = ['id'=>$val->id,'time'=>$val->start_time_period.'-'.$val->end_time_period];
+                }
+            }
+            $time_array[$key-1] = $time_info;
+        }
+        $data['community'] = $time_array;
+        $firstday = date('Y-m-d', strtotime("this week"));
+        $scd_id = Schedule::where(['schedule_date'=>$firstday,'docter_id'=>$docter_id,'organization_id'=>$org_id])->value('id');
+        $docter_schedule = $time_array;
+        if(!empty($scd_id)){
+            $sche_dule = SchedulePeriod::where('schedule_id',$scd_id)->get(['time_period_id','schedule_date'])->GroupBy('schedule_date')->toArray();
+            foreach ($sche_dule as $val){
+                if($val){
+                    $i = 0;
+                    $new_sche_dule[$i] = array_column($val,'time_period_id');
+                    $i++;
+                }
+            }
+        }
+        $data['docter'] = $docter_schedule;
+        return  (json_encode(['code'=>200,'msg'=>'ok','data'=>$data]));
+    }
+
+
+    public function setDocChedule()
+    {
+
+    }
+}

+ 10 - 0
app/Models/Notice.php

xqd
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Notice extends Model
+{
+    //
+}

+ 9 - 0
app/Models/ServiceApply.php

xqd
@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ServiceApply extends Model
+{
+}

+ 3 - 2
composer.json

xqd
@@ -14,8 +14,9 @@
         "laravel-admin-ext/multitenancy": "^2.1",
         "laravel/framework": "^6.0",
         "laravel/tinker": "^1.0",
-        "maatwebsite/excel": "^3.1",
-        "overtrue/wechat": "^4.0"
+        "overtrue/wechat": "^4.0",
+        "sven/artisan-view": "^3.3",
+        "maatwebsite/excel": "^3.1"
     },
     "require-dev": {
         "filp/whoops": "^2.0",

+ 62 - 1
composer.lock

xqd xqd
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ba59c15c3b2309c40638946694b9bf00",
+    "content-hash": "418bc0dda52cb02116262b36b99e5be4",
     "packages": [
         {
             "name": "dnoegel/php-xdg-base-dir",
@@ -3302,6 +3302,67 @@
             ],
             "time": "2020-02-21T04:36:14+00:00"
         },
+        {
+            "name": "sven/artisan-view",
+            "version": "v3.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/svenluijten/artisan-view.git",
+                "reference": "2c2cdbebf033ef068ae9bb719ba66e103c81e53c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/svenluijten/artisan-view/zipball/2c2cdbebf033ef068ae9bb719ba66e103c81e53c",
+                "reference": "2c2cdbebf033ef068ae9bb719ba66e103c81e53c",
+                "shasum": ""
+            },
+            "require": {
+                "laravel/framework": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "graham-campbell/testbench": "^4.0 || ^5.0",
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Sven\\ArtisanView\\ServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Sven\\ArtisanView\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Sven Luijten",
+                    "email": "svenluijten1995@gmail.com",
+                    "homepage": "https://svenluijten.com"
+                }
+            ],
+            "description": "Manage your views in Laravel projects through artisan",
+            "keywords": [
+                "artisan",
+                "blade",
+                "laravel",
+                "templates",
+                "views"
+            ],
+            "support": {
+                "issues": "https://github.com/svenluijten/artisan-view/issues",
+                "source": "https://github.com/svenluijten/artisan-view/tree/3.0"
+            },
+            "time": "2020-09-07T07:19:03+00:00"
+        },
         {
             "name": "swiftmailer/swiftmailer",
             "version": "v6.2.3",

+ 4 - 4
config/config.php

xqd
@@ -26,10 +26,10 @@ return [
     'product_type_map' => [1 => '电话咨询', 2 => '图文咨询', 3 => '门诊预约', 4 => '疫苗接种预约', 5 => '儿保预约', 6 => '服务包', 7 => '充值'],
 
     'aly_sms' => [
-        'access_key' => 'LTAI4FgJdnfwsj5Bb6ioWSD9',
-        'access_secret' => 'S4Tp2eNVKHROuNOLjTvAICTnjqXFFR',
-        'sign_name' => '思维定制',
-        'verify_template_code' => 'SMS_185242509',
+        'access_key' => 'LTAI4GGMyBKstgVLLckoPxtf',
+        'access_secret' => 'goLufn8Qe0Mfip5PBR8R0DfbYYYkDF',
+        'sign_name' => '熙宝HMO',
+        'verify_template_code' => 'SMS_205875481',
         'sms_verify_code_expire' => 360,
     ],
 

+ 40 - 0
database/migrations/2020_11_17_033808_alert_cmds_user.php

xqd
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AlertCmdsUser extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('cdms_users',function (Blueprint $table){
+            $table->addColumn('integer','docter_id')->comment('医生id')->nullable(true)->after('org_id');
+        });
+
+        Schema::table('cdms_roles',function (Blueprint $table){
+            $table->addColumn('integer','org_id')->comment('医生id')->after('id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('cdms_users',function (Blueprint $table){
+            $table->dropColumn('docter_id');
+        });
+
+        Schema::table('cdms_roles',function (Blueprint $table){
+            $table->dropColumn('org_id');
+        });
+    }
+}

+ 37 - 0
database/migrations/2020_11_19_064648_bm_banner.php

xqd
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class BmBanner extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        //
+        Schema::create('banner', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('type')->comment('分类 1.用户 2.医生');
+            $table->string('image')->comment('图片地址');
+            $table->string('url')->comment('链接')->nullable();
+            $table->integer('status')->comment('状态');
+            $table->dateTime('created_at')->comment('创建时间');
+            $table->dateTime('updated_at')->comment('更新时间');
+        });
+    }
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+        Schema::drop('banner');
+    }
+}

+ 37 - 0
database/migrations/2020_11_19_094540_bm_servebanners.php

xqd
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class BmServebanners extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        //
+        Schema::create('servebanners', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('image')->comment('图片地址');
+            $table->string('url')->comment('链接')->nullable();
+            $table->integer('status')->comment('状态');
+            $table->dateTime('created_at')->comment('创建时间');
+            $table->dateTime('updated_at')->comment('更新时间');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+        Schema::drop('servebanners');
+    }
+}

+ 35 - 0
database/migrations/2020_11_24_065951_add_table_bm_service_apply.php

xqd
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddTableBmServiceApply extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('service_applys', function (Blueprint $table) {
+           $table->increments('id')->comment('自增id');
+           $table->integer('docter_id')->comment('医生id')->nullable(false)->unsigned();
+           $table->integer('service_type')->comment('服务类别 1 图文 2 电话 3 门诊')->nullable(false)->unsigned();
+           $table->integer('status')->comment('审核状态 1 审核 2 已通过 3 已拒绝')->nullable(false)->unsigned();
+           $table->dateTime('created_at')->comment('创建时间');
+           $table->dateTime('updated_at')->comment('更新时间');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('service_apply');
+    }
+}

File diff suppressed because it is too large
+ 0 - 0
public/assets/css/app.1ef7a076.css


BIN
public/assets/img/close001.2835da4d.jpg


BIN
public/assets/img/close002.e38ad856.jpg


BIN
public/assets/img/close003.f9dff833.jpg


BIN
public/assets/img/face002.c9f88acd.jpg


BIN
public/assets/img/face003.5df92cea.jpg


BIN
public/assets/img/face004.4a1731fa.jpg


BIN
public/assets/img/face005.d5784a4b.jpg


File diff suppressed because it is too large
+ 0 - 0
public/assets/js/app.a700b62e.js


File diff suppressed because it is too large
+ 0 - 0
public/assets/js/app.a700b62e.js.map


File diff suppressed because it is too large
+ 0 - 0
public/assets/js/chunk-vendors.95e2f2c7.js


File diff suppressed because it is too large
+ 0 - 0
public/assets/js/chunk-vendors.95e2f2c7.js.map


File diff suppressed because it is too large
+ 0 - 0
public/cdms/assets/css/app.1ef7a076.css


BIN
public/cdms/assets/img/close001.2835da4d.jpg


BIN
public/cdms/assets/img/close002.e38ad856.jpg


BIN
public/cdms/assets/img/close003.f9dff833.jpg


BIN
public/cdms/assets/img/face002.c9f88acd.jpg


BIN
public/cdms/assets/img/face003.5df92cea.jpg


BIN
public/cdms/assets/img/face004.4a1731fa.jpg


BIN
public/cdms/assets/img/face005.d5784a4b.jpg


File diff suppressed because it is too large
+ 0 - 0
public/cdms/assets/js/app.a700b62e.js


File diff suppressed because it is too large
+ 0 - 0
public/cdms/assets/js/app.a700b62e.js.map


File diff suppressed because it is too large
+ 0 - 0
public/cdms/assets/js/chunk-vendors.95e2f2c7.js


File diff suppressed because it is too large
+ 0 - 0
public/cdms/assets/js/chunk-vendors.95e2f2c7.js.map


BIN
public/dist/favicon.ico


+ 1 - 0
public/dist/index.html

xqd
@@ -0,0 +1 @@
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>mabaochat</title><link href="assets/css/app.1ef7a076.css" rel="preload" as="style"><link href="assets/js/app.a700b62e.js" rel="preload" as="script"><link href="assets/js/chunk-vendors.95e2f2c7.js" rel="preload" as="script"><link href="assets/css/app.1ef7a076.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but mabaochat doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="assets/js/chunk-vendors.95e2f2c7.js"></script><script src="assets/js/app.a700b62e.js"></script></body></html>

BIN
public/img/01.jpg


+ 1 - 0
resources/views/chat.blade.php

xqd
@@ -0,0 +1 @@
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>mabaochat</title><link href="/assets/css/app.1ef7a076.css" rel="preload" as="style"><link href="/assets/js/app.a700b62e.js" rel="preload" as="script"><link href="/assets/js/chunk-vendors.95e2f2c7.js" rel="preload" as="script"><link href="/assets/css/app.1ef7a076.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but mabaochat doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/assets/js/chunk-vendors.95e2f2c7.js"></script><script src="/assets/js/app.a700b62e.js"></script></body></html>

+ 4 - 0
routes/web.php

xqd
@@ -14,3 +14,7 @@
 Route::get('/', function () {
     return redirect('/admin');
 });
+
+
+Route::get('/api/getComSchedule', 'ScheDuleController@getComSchedule');
+

Some files were not shown because too many files changed in this diff