From e2038f628055b4e161f0457c70bd899450b4fdb7 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Thu, 18 Apr 2019 10:50:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/plugins/petscms/Petsadmin.php | 46 +++++++++- application/plugins/petscms/Service.php | 88 ++++++++++++++++--- .../plugins/view/petscms/pets/index.html | 9 +- .../plugins/view/petscms/pets/saveinfo.html | 2 +- .../plugins/view/petscms/petsadmin/help.html | 2 +- .../plugins/view/petscms/petsadmin/index.html | 19 ++-- .../view/petscms/petsadmin/saveinfo.html | 2 +- public/static/common/css/common.css | 3 + public/static/plugins/css/petscms/pets.css | 10 +-- .../static/plugins/css/petscms/petsadmin.css | 9 +- 10 files changed, 152 insertions(+), 38 deletions(-) diff --git a/application/plugins/petscms/Petsadmin.php b/application/plugins/petscms/Petsadmin.php index 55e5a4f8c..8b419b770 100644 --- a/application/plugins/petscms/Petsadmin.php +++ b/application/plugins/petscms/Petsadmin.php @@ -49,7 +49,7 @@ class PetsAdmin extends Controller 'total' => $total, 'where' => $params, 'page' => isset($params['page']) ? intval($params['page']) : 1, - 'url' => PluginsHomeUrl('petscms', 'pets', 'index'), + 'url' => PluginsAdminUrl('petscms', 'petsadmin', 'index'), ); $page = new \base\Page($page_params); $this->assign('page_html', $page->GetPageHtml()); @@ -152,7 +152,45 @@ class PetsAdmin extends Controller } // 用户 - return Service::PestSave($params); + return Service::PetsSave($params); + } + + /** + * 宠物解绑 + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-15T11:03:30+0800 + */ + public function untying($params = []) + { + // 是否ajax + if(!IS_AJAX) + { + return $this->error('非法访问'); + } + + // 开始操作 + return Service::PetsUntying($params); + } + + /** + * 宠物删除 + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-15T11:03:30+0800 + */ + public function delete($params = []) + { + // 是否ajax + if(!IS_AJAX) + { + return $this->error('非法访问'); + } + + // 开始操作 + return Service::PetsDelete($params); } /** @@ -188,7 +226,7 @@ class PetsAdmin extends Controller 'total' => $total, 'where' => $params, 'page' => isset($params['page']) ? intval($params['page']) : 1, - 'url' => PluginsHomeUrl('petscms', 'pets', 'index'), + 'url' => PluginsAdminUrl('petscms', 'petsadmin', 'index'), ); $page = new \base\Page($page_params); $this->assign('page_html', $page->GetPageHtml()); @@ -200,7 +238,9 @@ class PetsAdmin extends Controller 'where' => $where, ); $data = Service::HelpList($data_params); + unset($params['pets_id']); $this->assign('data_list', $data['data']); + $this->assign('params', $params); return $this->fetch('../../../plugins/view/petscms/petsadmin/help'); } diff --git a/application/plugins/petscms/Service.php b/application/plugins/petscms/Service.php index bab7de3f2..a4607e320 100644 --- a/application/plugins/petscms/Service.php +++ b/application/plugins/petscms/Service.php @@ -64,7 +64,7 @@ class Service $where = empty($params['where']) ? [] : $params['where']; $m = isset($params['m']) ? intval($params['m']) : 0; $n = isset($params['n']) ? intval($params['n']) : 10; - $order_by = empty($params['order_by']) ? 'id desc' : $params['order_by']; + $order_by = empty($params['order_by']) ? 'status asc, id desc' : $params['order_by']; // 获取数据列表 $data = Db::name('PluginsPetscmsPets')->where($where)->limit($m, $n)->order($order_by)->select(); @@ -76,13 +76,13 @@ class Service $v['type_name'] = empty($v['type']) ? '' : self::$pets_attribute_type_list[$v['type']]['name']; // 性别 - $v['gender_name'] = self::$pets_attribute_gender_list[$v['gender']]['name']; + $v['gender_name'] = ($v['gender'] == -1) ? '' : self::$pets_attribute_gender_list[$v['gender']]['name']; // 是否绝育 - $v['sterilization_name'] = self::$pets_attribute_is_text_list[$v['sterilization']]['name']; + $v['sterilization_name'] = ($v['sterilization'] == -1) ? '' : self::$pets_attribute_is_text_list[$v['sterilization']]['name']; // 是否疫苗 - $v['vaccine_name'] = self::$pets_attribute_is_text_list[$v['vaccine']]['name']; + $v['vaccine_name'] = ($v['vaccine'] == -1) ? '' : self::$pets_attribute_is_text_list[$v['vaccine']]['name']; // 状态 $v['status_name'] = self::$pets_attribute_status_list[$v['status']]['name']; @@ -102,7 +102,7 @@ class Service $v['content'] = ResourcesService::ContentStaticReplace($v['content'], 'get'); // 相册 - $v['photo'] = empty($v['photo']) ? null : self::GetPestPhotoHandle($v['photo']); + $v['photo'] = empty($v['photo']) ? null : self::GetPetsPhotoHandle($v['photo']); // 丢失时间 $v['lose_time_name'] = empty($v['lose_time']) ? '' : date('Y-m-d', $v['lose_time']); @@ -138,7 +138,7 @@ class Service * @datetime 2019-04-11T22:56:49+0800 * @param [array] $photo [相册数据] */ - private static function GetPestPhotoHandle($photo) + private static function GetPetsPhotoHandle($photo) { $result = []; if(!empty($photo)) @@ -241,7 +241,7 @@ class Service * @desc description * @param [array] $params [输入参数] */ - public static function PestSave($params = []) + public static function PetsSave($params = []) { // 请求参数 $p = [ @@ -359,9 +359,9 @@ class Service 'birthday' => empty($params['birthday']) ? 0 : strtotime($params['birthday']), 'type' => isset($params['type']) ? $params['type'] : '', 'varieties' => isset($params['varieties']) ? $params['varieties'] : '', - 'gender' => isset($params['gender']) ? intval($params['gender']) : 0, - 'sterilization' => isset($params['sterilization']) ? intval($params['sterilization']) : 0, - 'vaccine' => isset($params['vaccine']) ? intval($params['vaccine']) : 0, + 'gender' => isset($params['gender']) ? $params['gender'] : -1, + 'sterilization' => isset($params['sterilization']) ? $params['sterilization'] : -1, + 'vaccine' => isset($params['vaccine']) ? $params['vaccine'] : -1, 'photo' => empty($photo['data']) ? '' : json_encode($photo['data']), 'content' => $content, 'person_name' => isset($params['person_name']) ? $params['person_name'] : '', @@ -586,5 +586,73 @@ class Service { return (int) Db::name('PluginsPetscmsHelp')->where($where)->count(); } + + /** + * 宠物解绑 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-12-18 + * @desc description + * @param [array] $params [输入参数] + */ + public static function PetsUntying($params = []) + { + // 请求参数 + $p = [ + [ + 'checked_type' => 'empty', + 'key_name' => 'id', + 'error_msg' => '操作id有误', + ], + ]; + $ret = ParamsChecked($params, $p); + if($ret !== true) + { + return DataReturn($ret, -1); + } + + // 解绑操作 + if(Db::name('PluginsPetscmsPets')->where(['id'=>$params['id']])->update(['user_id'=>0, 'upd_time'=>time()])) + { + return DataReturn('解绑成功'); + } + + return DataReturn('解绑失败或资源不存在', -100); + } + + /** + * 宠物删除 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-12-18 + * @desc description + * @param [array] $params [输入参数] + */ + public static function PetsDelete($params = []) + { + // 请求参数 + $p = [ + [ + 'checked_type' => 'empty', + 'key_name' => 'id', + 'error_msg' => '操作id有误', + ], + ]; + $ret = ParamsChecked($params, $p); + if($ret !== true) + { + return DataReturn($ret, -1); + } + + // 删除操作 + if(Db::name('PluginsPetscmsPets')->where(['id'=>$params['id']])->delete()) + { + return DataReturn('删除成功'); + } + + return DataReturn('删除失败或资源不存在', -100); + } } ?> \ No newline at end of file diff --git a/application/plugins/view/petscms/pets/index.html b/application/plugins/view/petscms/pets/index.html index 0894a9567..0a70dffb4 100644 --- a/application/plugins/view/petscms/pets/index.html +++ b/application/plugins/view/petscms/pets/index.html @@ -114,7 +114,7 @@ 二维码 状态 操作时间 - 操作 + 操作 @@ -142,7 +142,7 @@ 类型：{{if empty($v['type_name'])}}未填写{{else /}}{{$v.type_name}}{{/if}}
- 性别：{{if empty($v['gender_name'])}}未填写{{else /}}{{$v.gender_name}}{{/if}}
+ 性别：{{if empty($v['gender_name'])}}未设置{{else /}}{{$v.gender_name}}{{/if}}
生日：{{if empty($v['birthday_name'])}}未填写{{else /}}{{$v.birthday_name}}{{/if}}
@@ -150,8 +150,9 @@ 品种：{{if empty($v['varieties'])}}未填写{{else /}}{{$v.varieties}}{{/if}}
- 绝育：{{$v.sterilization_name}}
- 疫苗：{{$v.vaccine_name}}
+ 绝育：{{if empty($v['sterilization_name'])}}未设置{{else /}}{{$v.sterilization_name}}{{/if}}
+ + 疫苗：{{if empty($v['sterilization_name'])}}未设置{{else /}}{{$v.sterilization_name}}{{/if}}
姓名：{{if empty($v['person_name'])}}未填写{{else /}}{{$v.person_name}}{{/if}}
diff --git a/application/plugins/view/petscms/pets/saveinfo.html b/application/plugins/view/petscms/pets/saveinfo.html index 4af320233..bf44ad91e 100644 --- a/application/plugins/view/petscms/pets/saveinfo.html +++ b/application/plugins/view/petscms/pets/saveinfo.html @@ -177,8 +177,8 @@ +
-
diff --git a/application/plugins/view/petscms/petsadmin/help.html b/application/plugins/view/petscms/petsadmin/help.html index cf7487879..d77653f1a 100644 --- a/application/plugins/view/petscms/petsadmin/help.html +++ b/application/plugins/view/petscms/petsadmin/help.html @@ -5,7 +5,7 @@
宠物管理系统 - 返回 + 返回
diff --git a/application/plugins/view/petscms/petsadmin/index.html b/application/plugins/view/petscms/petsadmin/index.html index 39501bd47..d503c1ac7 100644 --- a/application/plugins/view/petscms/petsadmin/index.html +++ b/application/plugins/view/petscms/petsadmin/index.html @@ -101,13 +101,13 @@ 二维码 状态 操作时间 - 操作 + 操作 {{if !empty($data_list)}} {{foreach $data_list as $v}} - +

{{$v.title}}

{{if !empty($v['photo'])}} @@ -129,7 +129,7 @@ 类型：{{if empty($v['type_name'])}}未填写{{else /}}{{$v.type_name}}{{/if}}
- 性别：{{if empty($v['gender_name'])}}未填写{{else /}}{{$v.gender_name}}{{/if}}
+ 性别：{{if empty($v['gender_name'])}}未设置{{else /}}{{$v.gender_name}}{{/if}}
生日：{{if empty($v['birthday_name'])}}未填写{{else /}}{{$v.birthday_name}}{{/if}}
@@ -137,8 +137,9 @@ 品种：{{if empty($v['varieties'])}}未填写{{else /}}{{$v.varieties}}{{/if}}
- 绝育：{{$v.sterilization_name}}
- 疫苗：{{$v.vaccine_name}}
+ 绝育：{{if empty($v['sterilization_name'])}}未设置{{else /}}{{$v.sterilization_name}}{{/if}}
+ + 疫苗：{{if empty($v['sterilization_name'])}}未设置{{else /}}{{$v.sterilization_name}}{{/if}}
姓名：{{if empty($v['person_name'])}}未填写{{else /}}{{$v.person_name}}{{/if}}
@@ -161,11 +162,15 @@ {{/if}} - 编辑 + 编辑 {{if $v['status'] neq 3}} 详情 {{/if}} - 帮助 + 帮助 + {{if $v['user_id'] gt 0}} + + {{/if}} + {{/foreach}} diff --git a/application/plugins/view/petscms/petsadmin/saveinfo.html b/application/plugins/view/petscms/petsadmin/saveinfo.html index 2fb0d13f2..c49d7e8a9 100644 --- a/application/plugins/view/petscms/petsadmin/saveinfo.html +++ b/application/plugins/view/petscms/petsadmin/saveinfo.html @@ -151,8 +151,8 @@
+
-
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css index ea13fdaf4..958755450 100755 --- a/public/static/common/css/common.css +++ b/public/static/common/css/common.css @@ -77,6 +77,9 @@ iframe { width: 100%; height: 100%; border: 0; } */ @media only screen and (min-width: 641px) { /* 表单 */ + form.am-form { + overflow: hidden; + } form.am-form .am-form-group:hover, .plug-file-upload-view:hover { background: #f6f9fc; } diff --git a/public/static/plugins/css/petscms/pets.css b/public/static/plugins/css/petscms/pets.css index 3df5ea7bb..1837cb485 100644 --- a/public/static/plugins/css/petscms/pets.css +++ b/public/static/plugins/css/petscms/pets.css @@ -38,6 +38,9 @@ .chosen-container-single .chosen-search input[type="text"] { width: 100% !important; } .so-list select { width: calc(100% - 44px); display: -webkit-inline-box; } } +.th-operation { + width: 120px; +} /** * 添加/编辑页面 @@ -49,15 +52,9 @@ form.form-validation .am-divider { margin: 10px auto; } form.form-validation .am-alert-secondary { background-color: #f8f8f8; } form.form-validation .am-alert-warning { background-color: #fffbf7; } - /** * 地图、联动地址 */ -form.form-validation .map-address { - border-bottom: 0; - padding-bottom: 0; - margin-bottom: 10px; -} form.form-validation .region-linkage .chosen-select { display: -webkit-inline-box; width: calc(33.3% - 3px) !important; @@ -68,6 +65,7 @@ form.form-validation .region-linkage .chosen-select .chosen-single { form.form-validation #map { width: 100%; height: 350px; + margin-top: 5px; } /** diff --git a/public/static/plugins/css/petscms/petsadmin.css b/public/static/plugins/css/petscms/petsadmin.css index 2da9f830e..29a7490e9 100644 --- a/public/static/plugins/css/petscms/petsadmin.css +++ b/public/static/plugins/css/petscms/petsadmin.css @@ -38,6 +38,9 @@ .chosen-container-single .chosen-search input[type="text"] { width: 100% !important; } .so-list select { width: calc(100% - 44px); display: -webkit-inline-box; } } +.th-operation { + width: 120px; +} /** * 添加/编辑页面 @@ -53,11 +56,6 @@ form.form-validation .am-alert-warning { background-color: #fffbf7; } /** * 地图、联动地址 */ -form.form-validation .map-address { - border-bottom: 0; - padding-bottom: 0; - margin-bottom: 10px; -} form.form-validation .region-linkage .chosen-select { display: -webkit-inline-box; width: calc(33.3% - 3px) !important; @@ -68,6 +66,7 @@ form.form-validation .region-linkage .chosen-select .chosen-single { form.form-validation #map { width: 100%; height: 350px; + margin-top: 5px; } /** -- GitLab