Merge branch 'master' into develop

app/Admin/Controllers/ArticleManagement/ArticleController.php

@@ -44,7 +44,7 @@ class ArticleController extends AdminController
             // Add a column filter
             $type = [''=>'全部'];
             $type = array_merge($type,Article::$_post_type);
-            $filter->equal('type', '类别')->select(Article::$_post_type);
+            $filter->equal('type', '分类')->select(Article::$_post_type);
 
         });
 

app/Admin/Controllers/DocterTypeController.php

@@ -25,7 +25,10 @@ class DocterTypeController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new DocterType());
-
+        $grid->filter(function ($filter){
+            $filter->disableIdFilter();
+            $filter->like('name','名称');
+        });
         $grid->column('id', __('ID'));
         $grid->column('name', __('名称'));
         $states = [

app/Admin/Controllers/HelpInfoController.php

@@ -25,7 +25,10 @@ class HelpInfoController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new HelpInfo());
-
+        $grid->filter(function ($filter){
+           $filter->disableIdFilter();
+           $filter->like('title','标题');
+        });
         $grid->column('id', __('Id'));
         $grid->column('title', __('标题'));
         $grid->column('content', __('内容'))->limit(50,'...');

app/Admin/Controllers/OrdersManagement/RechargeOrderController.php

@@ -36,7 +36,6 @@ class RechargeOrderController extends AdminController
             $filter->disableIdFilter();
 
             $filter->like('user.nickname','用户姓名');
-            $filter->equal('user_id', '用户id');
             $filter->equal('order_status','订单状态')->radio(
                 [
                     ''=>'不限',

app/Admin/Controllers/ServiceManagement/ServiceController.php

@@ -75,7 +75,7 @@ class ServiceController extends AdminController
 
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->equal('service_type','服务类别')->select([1 => '图文', 2 => '电话', 3 => '问诊']);
+            $filter->equal('service_type','服务类别')->select([1 => '图文咨询', 2 => '电话咨询', 3 => '门诊预约']);
             $filter->equal('status','状态')->select([1=>'待审核',2 =>'已通过 ',3=>'未开通']);
             $filter->equal('docterorganization.organization_id','机构')->select(Organization::pluck('intro','id'));
         });

app/Admin/Controllers/ServicePacksManagment/InsuranceAgreementController.php

@@ -29,6 +29,10 @@ class InsuranceAgreementController extends AdminController
         $grid->actions(function ($actions){
            $actions->disableView();
         });
+        $grid->filter(function ($filter){
+           $filter->disableIdFilter();
+           $filter->like('name','协议名称');
+        });
         $grid->column('id', __('Id'));
         $grid->column('name', __('协议名称'));
         $grid->column('content', __('协议内容'))->limit(20,'...');

app/Admin/Controllers/UserManagement/BmUser/FeedBacksController.php

@@ -30,6 +30,7 @@ class FeedBacksController extends AdminController
            $actions->disableEdit();
         });
         $grid->filter(function ($filter){
+            $filter->disableIdFilter();
            $filter->like('docter.nickname','名字');
            $filter->equal('docter.phone','电话');
            $filter->between('created_at', '创建时间')->datetime();

app/Admin/Controllers/UserManagement/BmUser/UserListController.php

@@ -54,7 +54,7 @@ class UserListController extends AdminController
         $grid->filter(function ($filter){
             $filter->column(1/2, function ($filter) {
                 $filter->disableIdFilter();
-                $filter->equal('phone','手机')->mobile()->placeholder("请输入手机");
+                $filter->equal('phone','手机号码')->mobile()->placeholder("请输入手机");
                 $filter->like('nickname','用户名');
                 $filter->equal('status','用户状态')->radio([
                     ''   => '不限',
@@ -73,7 +73,7 @@ class UserListController extends AdminController
             $grid->column('avatar', __('头像'))->lightbox(['width' =>'', 'height' => 30]);
             $grid->column('nickname', __('用户名'));
             $grid->column('phone', __('手机号码'));
-            $grid->column('status', __('状态'))->using([0=>'黑名单',1=>'正常',]);
+            $grid->column('status', __('用户状态'))->using([0=>'黑名单',1=>'正常',]);
             $grid->column('balance', __('当前余额'))->display(function ($price){
                 return $price/100;
             });

app/Admin/Controllers/UserManagement/DocterManagement/ApproveController.php

@@ -36,6 +36,7 @@ class ApproveController extends AdminController
             $filter->like('docter.name','医生姓名');
             $filter->like('organization.name','机构名');
             $filter->equal('state', '认证状态')->select([1=>'已认证',2=>'审核驳回',3=>'待审核']);
+            $filter->equal('docter.phone', '医生电话');
             $filter->between('authentication_time', '签约时间')->datetime();
             $filter->between('authentication_end_time', '签约到期时间')->datetime();
         });

app/Admin/Controllers/UserManagement/DocterManagement/DoctorManagementController.php

@@ -39,13 +39,13 @@ class DoctorManagementController extends AdminController
         $grid->disableCreateButton();
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->like('name','昵称');
+            $filter->like('name','姓名');
             $filter->equal('phone','电话');
             $filter->where(function ($query) {
                 $query->whereHas('organization',function ($query){
                     $query->where('intro','like',"%{$this->input}%");
                 });
-            },'机构名');
+            },'所属机构');
             $filter->equal('status','工作状态')->select([
                 0    => '禁用',
                 1    => '启用',

app/Admin/Controllers/UserManagement/DocterManagement/UserEvaluatesController.php

@@ -49,8 +49,8 @@ class UserEvaluatesController extends AdminController
 
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->like('user.nickname','用户名字');
-            $filter->like('docter.name','医生名字');
+            $filter->like('user.nickname','用户姓名');
+            $filter->like('docter.name','医生名称');
             $filter->equal('status','审核状态')->select([
                 1   => '待审核',
                 2    => '审核通过',
@@ -71,7 +71,7 @@ class UserEvaluatesController extends AdminController
         $grid->column('docter.name', __('医生名称'));
         $grid->column('content', __('评价内容'));
         $grid->column('score', __('评分'));
-        $grid->column('status', __('状态'))->using([1=>'待审核',2=>'审核通过',3=>'忽略']);
+        $grid->column('status', __('审核状态'))->using([1=>'待审核',2=>'审核通过',3=>'忽略']);
         $grid->column('audit_time', __('审核时间'))->display(function ($time){
             if($time == 0)
                 return '';

app/Admin/Controllers/WeChatProgram/UserManagement/BannerController.php

@@ -45,7 +45,7 @@ class BannerController extends AdminController
             // Add a column filter
             $type = [''=>'全部'];
             $type = array_merge($type,Banner::$_post_type);
-            $filter->equal('type', '类别')->select(Banner::$_post_type);
+            $filter->equal('type', '类型')->select(Banner::$_post_type);
 
         });
 

app/Admin/Controllers/WeChatProgram/UserManagement/IconsUserController.php

@@ -26,6 +26,10 @@ class IconsUserController extends AdminController
     {
         $grid = new Grid(new Icons());
         $grid->model()->where('type_cl','1')->orderBy('id','desc');
+        $grid->filter(function ($filter){
+           $filter->disableIdFilter();
+           $filter->like('name','功能图标名称');
+        });
         $grid->column('id', __('Id'));
         $grid->column('name', __('功能图标名称'));
         $grid->column('image', __('图片'))->lightbox(['width' =>'', 'height' => 30]);

app/Http/Controllers/Api/V1/DocterController.php

@@ -178,7 +178,11 @@ class DocterController extends AuthController
 
         $distance_field = get_user_distance_field($user);
 
-        $data = Docter::with(['office', 'qualification', 'evaluate.user'])->select(['id', 'type', 'name', 'phone', 'sex', 'birthday', 'avatar', 'status', 'label', 'sign', 'intro', 'office_id', 'qualification_id', 'score', 'service_persons', 'eva_num', 'service_days', 'phone_minutes', 'chat_price', 'phone_price', 'appoint_price', 'is_chat', 'is_phone', 'is_appoint', 'latitude', 'longitude', DB::raw($distance_field)])->where('id', $req['docter_id'])->where('status', 1)->first()->toArray();
+        $data = Docter::with(['office', 'qualification', 'evaluate.user'])->select(['id', 'type', 'name', 'phone', 'sex', 'birthday', 'avatar', 'status', 'label', 'sign', 'intro', 'office_id', 'qualification_id', 'score', 'service_persons', 'eva_num', 'service_days', 'phone_minutes', 'chat_price', 'phone_price', 'appoint_price', 'is_chat', 'is_phone', 'is_appoint', 'latitude', 'longitude', DB::raw($distance_field)])->where('id', $req['docter_id'])->where('status', 1)->first();
+        if (empty($data)) {
+            return out(null, 10001, '医生不存在');
+        }
+        $data = $data->toArray();
 
         $organization_ids = SchedulePeriod::where('docter_id', $req['docter_id'])->groupBy('organization_id')->pluck('organization_id')->toArray();
         $data['organization'] = [];

app/Http/Controllers/Api/V1/OrderController.php

@@ -64,6 +64,10 @@ class OrderController extends AuthController
         $payment_amount = $req['total_amount'] - $discount_amount;
         $payment_amount = $payment_amount < 0 ? 0 : $payment_amount;
 
+        if (Order::where('docter_id', $req['docter_id'])->where('product_type', $req['product_type'])->where('user_id', $user['id'])->where('order_status', 1)->exists()) {
+            return out(null, 10013, '您有一笔该医生的未支付订单，请先去支付');
+        }
+
         //图文咨询订单未结束时不能针对同一医生再次下图文订单
         if ($req['product_type'] == 2 && Order::where('docter_id', $req['docter_id'])->where('product_type', 2)->where('user_id', $user['id'])->whereIn('order_status', [2,3])->exists()) {
             return out(null, 10012, '您已经下过该医生的图文订单了，并且订单还未完成');