diff --git a/app/admin/controller/ContactUs/ConsultingHotline.php b/app/admin/controller/ContactUs/ConsultingHotline.php index 259cd79..f7fc1ce 100644 --- a/app/admin/controller/ContactUs/ConsultingHotline.php +++ b/app/admin/controller/ContactUs/ConsultingHotline.php @@ -25,16 +25,17 @@ class ConsultingHotline extends BaseController $params = $request->param(); $con = []; - $con = Tool::getOptionalQuery(['consulting_hotline_user', 'LIKE'], ['consulting_hotline_phone', 'LIKE'],); + $con = Tool::getOptionalQuery(['consulting_hotline_user', 'LIKE'], ['consulting_hotline_phone', 'LIKE'],['consulting_hotline_order','='],); $query = ModelConsultingHotline::where($con) ->field([ 'consulting_hotline_id', 'consulting_hotline_guid', 'consulting_hotline_user', - 'consulting_hotline_phone' + 'consulting_hotline_phone', + 'consulting_hotline_order' ]) - ->order('consulting_hotline_update_time', 'desc'); + ->order('consulting_hotline_order', 'asc'); return msg("获取咨询热线列表成功!", $query); } @@ -47,14 +48,16 @@ class ConsultingHotline extends BaseController $params = $request->param(); $this->validate($params, [ 'consulting_hotline_user|资讯留言人' => 'require', - 'consulting_hotline_phone|资讯热线方式' => 'require' + 'consulting_hotline_phone|资讯热线方式' => 'require', + 'consulting_hotline_order|资讯热线排序'=>'require' ]); $model = ModelConsultingHotline::where('consulting_hotline_guid', $params['consulting_hotline_guid'])->find(); if (!$model) throwErrorMsg("该咨询热线不存在", 1); $model->allowField([ 'consulting_hotline_update_user_guid', 'consulting_hotline_user', - 'consulting_hotline_phone' + 'consulting_hotline_phone', + 'consulting_hotline_order' ])->save($params); return msg('编辑成功!'); } @@ -67,14 +70,16 @@ class ConsultingHotline extends BaseController $params = $request->param(); $this->validate($params, [ 'consulting_hotline_user|资讯留言人' => 'require', - 'consulting_hotline_phone|资讯热线方式' => 'require' + 'consulting_hotline_phone|资讯热线方式' => 'require', + 'consulting_hotline_order|资讯热线排序'=>'require' ]); $model = ModelConsultingHotline::create($params, [ 'consulting_hotline_guid', 'consulting_hotline_create_user_guid', 'consulting_hotline_update_user_guid', 'consulting_hotline_user', - 'consulting_hotline_phone' + 'consulting_hotline_phone', + 'consulting_hotline_order' ]); return msg('添加成功!'); } diff --git a/app/admin/controller/ContactUs/ContactInfo.php b/app/admin/controller/ContactUs/ContactInfo.php index 5edffc1..2f93abb 100644 --- a/app/admin/controller/ContactUs/ContactInfo.php +++ b/app/admin/controller/ContactUs/ContactInfo.php @@ -23,15 +23,10 @@ class ContactInfo extends BaseController $query = ModelContactInfo::field([ 'contact_info_id', 'contact_info_guid', - 'contact_info_phone', 'contact_info_location', 'longitude', 'latitude', 'contact_info_content', - 'customer_service_wx_img', - 'wx_office_accounts_img', - 'weibo_img', - 'qq_img' ])->where(1)->find(); return [ @@ -48,25 +43,16 @@ class ContactInfo extends BaseController { $params = $request->param(); $this->validate($params, [ - 'contact_info_phone|咨询热线' => 'require', + 'contact_info_content|联系我们简介' => 'require', - 'customer_service_wx_img|客服微信图片' => 'require', - 'wx_office_accounts_img|微信公众号图片' => 'require', - 'weibo_img|官方微博图片' => 'require', - 'qq_img|官方qq图片' => 'require' ]); $model = ModelContactInfo::where(1)->find(); $model->allowField([ 'contact_info_update_user_guid', - 'contact_info_phone', 'contact_info_location', 'longitude', 'latitude', 'contact_info_content', - 'customer_service_wx_img', - 'wx_office_accounts_img', - 'weibo_img', - 'qq_img' ])->save($params); return msg('编辑成功!'); } diff --git a/app/admin/controller/ContactUs/ContactScancode.php b/app/admin/controller/ContactUs/ContactScancode.php index ed86301..5ddcd7f 100644 --- a/app/admin/controller/ContactUs/ContactScancode.php +++ b/app/admin/controller/ContactUs/ContactScancode.php @@ -29,13 +29,15 @@ class ContactScancode extends BaseController $query = ModelContactScancode::where($con) ->field([ -'contact_scancode_id', -'contact_scancode_guid', -'contact_scancode_img' -]) + 'contact_scancode_id', + 'contact_scancode_guid', + 'contact_scancode_title', + 'contact_scancode_img', + 'contact_scancode_order' + ]) ->order('contact_scancode_update_time', 'desc'); - return msg("获取联系扫码列表成功!",$query); + return msg("获取联系扫码列表成功!", $query); } /** @@ -45,14 +47,17 @@ class ContactScancode extends BaseController { $params = $request->param(); $this->validate($params, [ -'contact_scancode_img|联系扫码图片'=>'require' -]); - $model = ModelContactScancode::where('contact_scancode_guid',$params['contact_scancode_guid'])->find(); + 'contact_scancode_title|联系扫码标题'=>'require' + + ]); + $model = ModelContactScancode::where('contact_scancode_guid', $params['contact_scancode_guid'])->find(); if (!$model) throwErrorMsg("该联系扫码不存在", 1); $model->allowField([ -'contact_scancode_update_user_guid', -'contact_scancode_img' -])->save($params); + 'contact_scancode_update_user_guid', + 'contact_scancode_title', + 'contact_scancode_img', + 'contact_scancode_order' + ])->save($params); return msg('编辑成功!'); } @@ -63,14 +68,17 @@ class ContactScancode extends BaseController { $params = $request->param(); $this->validate($params, [ -'contact_scancode_img|联系扫码图片'=>'require' -]); - $model = ModelContactScancode::create($params,[ -'contact_scancode_guid', -'contact_scancode_create_user_guid', -'contact_scancode_update_user_guid', -'contact_scancode_img' -]); + 'contact_scancode_title|联系扫码标题'=>'require', + 'contact_scancode_order|联系扫码排序'=>'require' + ]); + $model = ModelContactScancode::create($params, [ + 'contact_scancode_guid', + 'contact_scancode_create_user_guid', + 'contact_scancode_update_user_guid', + 'contact_scancode_title', + 'contact_scancode_img', + 'contact_scancode_order' + ]); return msg('添加成功!'); } @@ -89,11 +97,4 @@ class ContactScancode extends BaseController $contact_scancode->delete(); return msg('删除成功!'); } - - - - - - - } diff --git a/app/api/controller/ContactUs/ConsultingHotline.php b/app/api/controller/ContactUs/ConsultingHotline.php index fa49d23..9e221d6 100644 --- a/app/api/controller/ContactUs/ConsultingHotline.php +++ b/app/api/controller/ContactUs/ConsultingHotline.php @@ -25,19 +25,20 @@ class ConsultingHotline extends BaseController $params = $request->param(); $con = []; - $con = Tool::getOptionalQuery(['consulting_hotline_user','LIKE'],['consulting_hotline_phone','LIKE'],); + $con = Tool::getOptionalQuery(['consulting_hotline_user', 'LIKE'], ['consulting_hotline_phone', 'LIKE'],); $query = ModelConsultingHotline::where($con) ->field([ -'consulting_hotline_id', -'consulting_hotline_guid', -'consulting_hotline_user', -'consulting_hotline_phone' -]) - ->order('consulting_hotline_update_time', 'desc') + 'consulting_hotline_id', + 'consulting_hotline_guid', + 'consulting_hotline_user', + 'consulting_hotline_phone', + 'consulting_hotline_order' + ]) + ->order('consulting_hotline_order', 'asc') ->select(); - + return msg(0, "获取咨询热线列表成功!", [ 'data' => $query, @@ -55,15 +56,15 @@ class ConsultingHotline extends BaseController $this->validate($params, ['consulting_hotline_guid' => 'require']); $find = ModelConsultingHotline::field([ -'consulting_hotline_id', -'consulting_hotline_guid', -'consulting_hotline_user', -'consulting_hotline_phone' -]) - ->where('consulting_hotline_guid',$params['consulting_hotline_guid']) - ->find(); + 'consulting_hotline_id', + 'consulting_hotline_guid', + 'consulting_hotline_user', + 'consulting_hotline_phone', + 'consulting_hotline_order' + ]) + ->where('consulting_hotline_guid', $params['consulting_hotline_guid']) + ->find(); - return msg(0,'获取咨询热线详情成功!',['data' => $find]); + return msg(0, '获取咨询热线详情成功!', ['data' => $find]); } - } diff --git a/app/api/controller/ContactUs/ContactInfo.php b/app/api/controller/ContactUs/ContactInfo.php index 09f6ec0..77687a5 100644 --- a/app/api/controller/ContactUs/ContactInfo.php +++ b/app/api/controller/ContactUs/ContactInfo.php @@ -21,15 +21,11 @@ class ContactInfo extends BaseController $params = $request->param(); $query = ModelContactInfo::field([ - 'contact_info_phone', 'contact_info_location', 'longitude', 'latitude', 'contact_info_content', - 'customer_service_wx_img', - 'wx_office_accounts_img', - 'weibo_img', - 'qq_img' + ])->where(1)->find(); return [ diff --git a/app/api/controller/ContactUs/ContactScancode.php b/app/api/controller/ContactUs/ContactScancode.php index a9d86f7..680ed42 100644 --- a/app/api/controller/ContactUs/ContactScancode.php +++ b/app/api/controller/ContactUs/ContactScancode.php @@ -25,18 +25,22 @@ class ContactScancode extends BaseController $params = $request->param(); $con = []; + + $con = Tool::getOptionalQuery(); $query = ModelContactScancode::where($con) ->field([ -'contact_scancode_id', -'contact_scancode_guid', -'contact_scancode_img' -]) + 'contact_scancode_id', + 'contact_scancode_guid', + 'contact_scancode_title', + 'contact_scancode_img', + 'contact_scancode_order' + ]) ->order('contact_scancode_update_time', 'desc') ->select(); - + return msg(0, "获取联系扫码列表成功!", [ 'data' => $query, @@ -54,14 +58,15 @@ class ContactScancode extends BaseController $this->validate($params, ['contact_scancode_guid' => 'require']); $find = ModelContactScancode::field([ -'contact_scancode_id', -'contact_scancode_guid', -'contact_scancode_img' -]) - ->where('contact_scancode_guid',$params['contact_scancode_guid']) - ->find(); + 'contact_scancode_id', + 'contact_scancode_guid', + 'contact_scancode_title', + 'contact_scancode_img', + 'contact_scancode_order' + ]) + ->where('contact_scancode_guid', $params['contact_scancode_guid']) + ->find(); - return msg(0,'获取联系扫码详情成功!',['data' => $find]); + return msg(0, '获取联系扫码详情成功!', ['data' => $find]); } - } diff --git a/app/common/model/ContactUs/ConsultingHotline.php b/app/common/model/ContactUs/ConsultingHotline.php index 27f0ddd..8d56f20 100644 --- a/app/common/model/ContactUs/ConsultingHotline.php +++ b/app/common/model/ContactUs/ConsultingHotline.php @@ -29,6 +29,8 @@ class ConsultingHotline extends BaseModel "consulting_hotline_user" => "string", "consulting_hotline_phone" => "string", + + "consulting_hotline_order" =>"int", "consulting_hotline_create_time" => "datetime", @@ -53,13 +55,18 @@ class ConsultingHotline extends BaseModel protected $updateTime = 'consulting_hotline_update_time'; - + //排序字段 + public $order_field = 'consulting_hotline_order'; /** * 新增前 */ public static function onBeforeInsert(self $model): void { + Tool::sortInsertProc( + self::class, + $model->consulting_hotline_order, + ); // self::checkRepeatData($model); $model->completeCreateField(); } @@ -69,6 +76,11 @@ class ConsultingHotline extends BaseModel */ public static function onBeforeUpdate(self $model): void { + Tool::sortEditProc( + self::class, + $model->consulting_hotline_guid, + $model->consulting_hotline_order, + ); // self::checkRepeatData($model); $model->completeUpdateField(); } @@ -78,6 +90,7 @@ class ConsultingHotline extends BaseModel */ public static function onBeforeDelete(self $model): void { + Tool::sortDeleteProc(self::class, $model->consulting_hotline_guid); $model->completeDeleteField(); } diff --git a/app/common/model/ContactUs/ContactScancode.php b/app/common/model/ContactUs/ContactScancode.php index b7778f3..333c206 100644 --- a/app/common/model/ContactUs/ContactScancode.php +++ b/app/common/model/ContactUs/ContactScancode.php @@ -26,7 +26,11 @@ class ContactScancode extends BaseModel "contact_scancode_guid" => "string", + "contact_scancode_title"=>"string", + "contact_scancode_img" => "string", + + "contact_scancode_order"=>'int', "contact_scancode_create_time" => "datetime", @@ -52,12 +56,19 @@ class ContactScancode extends BaseModel + + //排序字段 + public $order_field = 'contact_scancode_order'; /** * 新增前 */ public static function onBeforeInsert(self $model): void { + Tool::sortInsertProc( + self::class, + $model->contact_scancode_order, + ); // self::checkRepeatData($model); $model->completeCreateField(); } @@ -67,6 +78,11 @@ class ContactScancode extends BaseModel */ public static function onBeforeUpdate(self $model): void { + Tool::sortEditProc( + self::class, + $model->contact_scancode_guid, + $model->contact_scancode_order, + ); // self::checkRepeatData($model); $model->completeUpdateField(); } @@ -76,6 +92,7 @@ class ContactScancode extends BaseModel */ public static function onBeforeDelete(self $model): void { + Tool::sortDeleteProc(self::class, $model->contact_scancode_guid); $model->completeDeleteField(); }