소스 검색

聊天页面嵌入

Swdz-WangHaiJun 4 년 전
부모
커밋
a0ae1e0059
32개의 변경된 파일68개의 추가작업 그리고 31개의 파일을 삭제
  1. 14 0
      app/Community/Controllers/ApiController.php
  2. 15 25
      app/Community/Controllers/DocterChatController.php
  3. 2 1
      app/Community/routes.php
  4. 31 5
      app/Http/Controllers/ScheDuleController.php
  5. 0 0
      public/assets/css/app.1ef7a076.css
  6. BIN
      public/assets/img/close001.2835da4d.jpg
  7. BIN
      public/assets/img/close002.e38ad856.jpg
  8. BIN
      public/assets/img/close003.f9dff833.jpg
  9. BIN
      public/assets/img/face002.c9f88acd.jpg
  10. BIN
      public/assets/img/face003.5df92cea.jpg
  11. BIN
      public/assets/img/face004.4a1731fa.jpg
  12. BIN
      public/assets/img/face005.d5784a4b.jpg
  13. 0 0
      public/assets/js/app.a700b62e.js
  14. 0 0
      public/assets/js/app.a700b62e.js.map
  15. 0 0
      public/assets/js/chunk-vendors.95e2f2c7.js
  16. 0 0
      public/assets/js/chunk-vendors.95e2f2c7.js.map
  17. 0 0
      public/cdms/assets/css/app.1ef7a076.css
  18. BIN
      public/cdms/assets/img/close001.2835da4d.jpg
  19. BIN
      public/cdms/assets/img/close002.e38ad856.jpg
  20. BIN
      public/cdms/assets/img/close003.f9dff833.jpg
  21. BIN
      public/cdms/assets/img/face002.c9f88acd.jpg
  22. BIN
      public/cdms/assets/img/face003.5df92cea.jpg
  23. BIN
      public/cdms/assets/img/face004.4a1731fa.jpg
  24. BIN
      public/cdms/assets/img/face005.d5784a4b.jpg
  25. 0 0
      public/cdms/assets/js/app.a700b62e.js
  26. 0 0
      public/cdms/assets/js/app.a700b62e.js.map
  27. 0 0
      public/cdms/assets/js/chunk-vendors.95e2f2c7.js
  28. 0 0
      public/cdms/assets/js/chunk-vendors.95e2f2c7.js.map
  29. BIN
      public/dist/favicon.ico
  30. 1 0
      public/dist/index.html
  31. 1 0
      resources/views/chat.blade.php
  32. 4 0
      routes/web.php

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

xqd
@@ -43,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 );

+ 15 - 25
app/Community/Controllers/DocterChatController.php

xqd
@@ -110,34 +110,24 @@ class DocterChatController extends AdminController
      */
     protected function form()
     {
-        $form = new Form(new Order());
+
         $content = new Content();
-        $form = new \Encore\Admin\Widgets\Form();
-        $params = request()->route()->parameters();
-        $id = $params['docter_chat'];
+        $form = new Form();
         $user = Admin::user();
         $org_id = $user->org_id;
-        if(!empty($org_id)){
-            $user = Order::where('organization_id',$org_id)->distinct()->pluck('user_id');
-        } else {
-            $user = Order::distinct()->pluck('user_id');
-        }
-        $user_info = User::whereIn('id',$user)->pluck('nickname','id');
-
-        $form->number('user_id', __('User id'));
-        $form->number('docter_id', __('Docter id'));
-        $form->number('patient_id', __('Patient id'));
-        $form->number('organization_id', __('Organization id'));
-        $form->text('order_sn', __('Order sn'));
-        $form->switch('payment_type', __('Payment type'))->default(1);
-        $form->switch('product_type', __('Product type'))->default(1);
-        $form->switch('order_status', __('Order status'))->default(1);
-        $form->switch('payment_status', __('Payment status'))->default(1);
-        $form->number('total_amount', __('Total amount'));
-        $form->number('payment_amount', __('Payment amount'));
-        $form->number('discount_amount', __('Discount amount'));
-        $form->number('payment_time', __('Payment time'));
-
+        $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']);
+    }
 }

+ 2 - 1
app/Community/routes.php

xqd
@@ -16,7 +16,8 @@ Route::resource('cdms_roles', PermissionController::class);
 Route::resource('docter_account', DocterAccountController::class);
 Route::resource('notices', NoticeController::class);
 Route::get('send_notices', 'NoticeController@send');
-Route::resource('/docter_wechats', DocterChatController::class);
+Route::resource('/docter_chats', DocterChatController::class);
+Route::get('/chats', 'DocterChatController@chats');
 
 
 //api

+ 31 - 5
app/Http/Controllers/ScheDuleController.php

xqd xqd
@@ -5,7 +5,11 @@ 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
 {
@@ -15,13 +19,35 @@ class ScheDuleController  extends Controller
 
         $time  = TimePeriod::get(['id','start_time_period','end_time_period']);
         $arrays = [1,3,4,12,16,10,20];
-        foreach ($time as $key=>$val){
-            if(!in_array(intval($val->id),$arrays)){
-                $time_info[] = ['id'=>$val->id,'time'=>$val->start_time_period.'-'.$val->end_time_period];
+        $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_info;
-        $data['docter'] = [];
+        $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]));
     }
 

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 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


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
public/assets/js/app.a700b62e.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
public/assets/js/app.a700b62e.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
public/assets/js/chunk-vendors.95e2f2c7.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
public/assets/js/chunk-vendors.95e2f2c7.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 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


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
public/cdms/assets/js/app.a700b62e.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
public/cdms/assets/js/app.a700b62e.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
public/cdms/assets/js/chunk-vendors.95e2f2c7.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 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>

+ 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');
+

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.