Browse Source

后台,答主,咨询记录,旁听记录

lizhen_gitee 2 weeks ago
parent
commit
cee99cebc7

+ 46 - 11
app/Admin/Controllers/Ask/AskOrderController.php

@@ -9,6 +9,7 @@ use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use Dcat\Admin\Show;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
+use Dcat\Admin\Widgets\Metrics\Card;
 
 
 class AskOrderController extends AdminController
 class AskOrderController extends AdminController
 {
 {
@@ -32,8 +33,15 @@ class AskOrderController extends AdminController
             $grid->column('id');
             $grid->column('id');
             $grid->column('user_id');
             $grid->column('user_id');
             $grid->column('blogger_user_id');
             $grid->column('blogger_user_id');
-//            $grid->column('question');
-            $grid->column('images')->image('',50);
+            $grid->column('question','咨询内容')->display('更多')->expand(function ($a) {
+                $question = $this->question;
+                $images = explode(',',$this->images);
+                $card = Card::make(view('admin/ask/askorder', compact('question', 'images')));
+                return $card;
+            });
+            $grid->column('images')->display(function($images){
+                return explode(',',$images);
+            })->image('',50);
 
 
             $grid->column('ask_price');
             $grid->column('ask_price');
             $grid->column('sit_price');
             $grid->column('sit_price');
@@ -41,19 +49,34 @@ class AskOrderController extends AdminController
             $grid->column('is_hidden')->using([
             $grid->column('is_hidden')->using([
                 0=>'非匿名',
                 0=>'非匿名',
                 1=>'匿名',
                 1=>'匿名',
-            ]);
+            ])->label([
+                    'default' => 'primary', // 设置默认颜色,不设置则默认为 default
+                    0 => 'danger',
+                    1 => 'primary',
+                ]);
             $grid->column('is_public')->using([
             $grid->column('is_public')->using([
                 0=>'不公开',
                 0=>'不公开',
                 1=>'公开',
                 1=>'公开',
-            ]);
+            ])->label([
+                    'default' => 'primary', // 设置默认颜色,不设置则默认为 default
+                    0 => 'primary',
+                    1 => 'danger',
+                ]);
             $grid->column('eva_score');
             $grid->column('eva_score');
             $grid->column('sit_number');
             $grid->column('sit_number');
             $grid->column('status')->using([
             $grid->column('status')->using([
                 0 =>'待支付',
                 0 =>'待支付',
                 10=>'已支付',
                 10=>'已支付',
                 20=>'已结束',
                 20=>'已结束',
-            ]);
-            $grid->column('createtime');
+            ])->label([
+                    'default' => 'info', // 设置默认颜色,不设置则默认为 default
+                    0 => 'info',
+                    10 => 'danger',
+                    20 => 'success',
+                ]);
+            $grid->column('createtime')->display(function($createtime){
+                return empty($createtime) ? '' : date('Y-m-d H:i:s',$createtime);
+            });
 
 
             $grid->filter(function (Grid\Filter $filter) {
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->like('question');
                 $filter->like('question');
@@ -84,19 +107,31 @@ class AskOrderController extends AdminController
             $show->field('user_id');
             $show->field('user_id');
             $show->field('blogger_user_id');
             $show->field('blogger_user_id');
             $show->field('question');
             $show->field('question');
-//            $show->field('images');
+            $show->field('images')->image();
             $show->field('ask_price');
             $show->field('ask_price');
             $show->field('sit_price');
             $show->field('sit_price');
             $show->field('ask_minute');
             $show->field('ask_minute');
-//            $show->field('is_hidden');
-//            $show->field('is_public');
+            $show->field('is_hidden')->using([
+                0=>'非匿名',
+                1=>'匿名',
+            ]);
+            $show->field('is_public')->using([
+                0=>'不公开',
+                1=>'公开',
+            ]);
             $show->field('good_number');
             $show->field('good_number');
             $show->field('eva_score');
             $show->field('eva_score');
             $show->field('eva_content');
             $show->field('eva_content');
 //            $show->field('eva_time');
 //            $show->field('eva_time');
             $show->field('sit_number');
             $show->field('sit_number');
-//            $show->field('status');
-//            $show->field('createtime');
+            $show->field('status')->using([
+                0 =>'待支付',
+                10=>'已支付',
+                20=>'已结束',
+            ]);
+            $show->field('createtime')->as(function(){
+                return empty($this->createtime) ? '' : date('Y-m-d H:i:s',$this->createtime);
+            });
 //            $show->field('paytime');
 //            $show->field('paytime');
 //            $show->field('finish_time');
 //            $show->field('finish_time');
 //            $show->field('countdown_time');
 //            $show->field('countdown_time');

+ 11 - 3
app/Admin/Controllers/Ask/AskSitOrderController.php

@@ -31,13 +31,21 @@ class AskSitOrderController extends AdminController
 //            $grid->column('user_id');
 //            $grid->column('user_id');
             $grid->column('order_id');
             $grid->column('order_id');
             $grid->column('sit_user_id');
             $grid->column('sit_user_id');
-            $grid->column('createtime');
+            $grid->column('createtime')->display(function($createtime){
+                return empty($createtime) ? '' : date('Y-m-d H:i:s',$createtime);
+            });
             $grid->column('sit_price');
             $grid->column('sit_price');
             $grid->column('status')->using([
             $grid->column('status')->using([
                 0 =>'待支付',
                 0 =>'待支付',
                 10=>'已支付',
                 10=>'已支付',
-            ]);
-            $grid->column('paytime');
+            ])->label([
+                    'default' => 'danger', // 设置默认颜色,不设置则默认为 default
+                    0 => 'danger',
+                    1 => 'success',
+                ]);
+            $grid->column('paytime')->display(function($paytime){
+                return empty($paytime) ? '' : date('Y-m-d H:i:s',$paytime);
+            });
             $grid->column('user_rate');
             $grid->column('user_rate');
             $grid->column('user_price');
             $grid->column('user_price');
 
 

+ 15 - 5
app/Admin/Controllers/Ask/BloggerController.php

@@ -37,15 +37,23 @@ class BloggerController extends AdminController
             $grid->column('ask_status')->using([
             $grid->column('ask_status')->using([
                 0=>'暂停咨询',
                 0=>'暂停咨询',
                 1=>'接受咨询',
                 1=>'接受咨询',
-            ]);
+            ])->label([
+                    'default' => 'danger', // 设置默认颜色,不设置则默认为 default
+                    0 => 'danger',
+                    1 => 'success',
+                ]);
             $grid->column('status')->using([
             $grid->column('status')->using([
                 0=>'未认证',
                 0=>'未认证',
                 1=>'已认证',
                 1=>'已认证',
-            ]);
+            ])->label([
+                    'default' => 'danger', // 设置默认颜色,不设置则默认为 default
+                    0 => 'danger',
+                    1 => 'success',
+                ]);
             $grid->column('order_number');
             $grid->column('order_number');
             $grid->column('order_eva_score');
             $grid->column('order_eva_score');
 
 
-            $types = DB::table('blogger_type')->get();
+            $types = DB::table('blogger_type')->orderBy('sort','desc')->get();
             $types = json_decode(json_encode($types),true);
             $types = json_decode(json_encode($types),true);
 
 
             $grid->column('type_ids')->display(function($type_ids)use($types){
             $grid->column('type_ids')->display(function($type_ids)use($types){
@@ -136,8 +144,10 @@ class BloggerController extends AdminController
                 0=>'未认证',
                 0=>'未认证',
                 1=>'已认证',
                 1=>'已认证',
             ]);
             ]);
-//            $form->multipleSelect('type_ids')->options(BloggerType::pluck('title', 'id'));
-            $form->select('type_ids')->options(BloggerType::pluck('title', 'id'));
+            $form->multipleSelect('type_ids')->options(BloggerType::orderBy('sort','desc')->pluck('title', 'id'))->saving(function($array){
+                return implode(',',$array);
+            });
+//            $form->select('type_ids')->options(BloggerType::pluck('title', 'id'));
             $form->text('info');
             $form->text('info');
 
 
             $form->deleting(function (Form $form){
             $form->deleting(function (Form $form){

File diff suppressed because it is too large
+ 13 - 0
resources/views/admin/ask/askorder.blade.php


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