diff --git a/application/plugins/petscms/Pets.php b/application/plugins/petscms/Pets.php index 6ee0359ddd9063843e42608dce4f5f7d6fd686c8..f320555d68ff945365dc559fd1357cf985b601fa 100644 --- a/application/plugins/petscms/Pets.php +++ b/application/plugins/petscms/Pets.php @@ -52,7 +52,6 @@ class Pets extends Controller public function index($params = []) { // 参数 - $params = input(); $params['user'] = $this->user; // 分页 @@ -82,8 +81,9 @@ class Pets extends Controller 'where' => $where, ); $data = Service::PetsList($data_params); + unset($params['user']); + $this->assign('params', $params); $this->assign('data_list', $data['data']); - $this->assign('pets_attribute_status_list', Service::$pets_attribute_status_list); $this->assign('pets_attribute_is_text_list', Service::$pets_attribute_is_text_list); $this->assign('pets_attribute_gender_list', Service::$pets_attribute_gender_list); @@ -173,7 +173,7 @@ class Pets extends Controller } // 用户 - $params['user'] = $this->user; + $params['user_id'] = $this->user['id']; return Service::PestSave($params); } @@ -194,7 +194,7 @@ class Pets extends Controller } // 用户 - $params['user'] = $this->user; + $params['user_id'] = $this->user['id']; return Service::HelpSave($params); } diff --git a/application/plugins/petscms/Petsadmin.php b/application/plugins/petscms/Petsadmin.php index 540b8f5d343c071592b689bc3a3ee8e1355c2bb2..55e5a4f8cd8806002968fc8c831ad2345b76c4d7 100644 --- a/application/plugins/petscms/Petsadmin.php +++ b/application/plugins/petscms/Petsadmin.php @@ -13,6 +13,7 @@ namespace app\plugins\petscms; use think\Controller; use app\plugins\petscms\Service; use app\service\PluginsService; +use app\service\UserService; /** * 宠物管理系统 - 宠物管理 @@ -31,8 +32,41 @@ class PetsAdmin extends Controller * @datetime 2019-03-15T23:51:50+0800 * @param [array] $params [输入参数] */ - public function Index($params = []) + public function index($params = []) { + // 分页 + $number = 10; + + // 条件 + $where = Service::PetsListWhere($params); + + // 获取总数 + $total = Service::PetsTotal($where); + + // 分页 + $page_params = array( + 'number' => $number, + 'total' => $total, + 'where' => $params, + 'page' => isset($params['page']) ? intval($params['page']) : 1, + 'url' => PluginsHomeUrl('petscms', 'pets', 'index'), + ); + $page = new \base\Page($page_params); + $this->assign('page_html', $page->GetPageHtml()); + + // 获取列表 + $data_params = array( + 'm' => $page->GetPageStarNumber(), + 'n' => $number, + 'where' => $where, + ); + $data = Service::PetsList($data_params); + $this->assign('data_list', $data['data']); + $this->assign('params', $params); + $this->assign('pets_attribute_status_list', Service::$pets_attribute_status_list); + $this->assign('pets_attribute_is_text_list', Service::$pets_attribute_is_text_list); + $this->assign('pets_attribute_gender_list', Service::$pets_attribute_gender_list); + $this->assign('pets_attribute_type_list', Service::$pets_attribute_type_list); return $this->fetch('../../../plugins/view/petscms/petsadmin/index'); } @@ -44,9 +78,158 @@ class PetsAdmin extends Controller * @datetime 2019-03-15T23:51:50+0800 * @param [array] $params [输入参数] */ - public function SaveInfo($params = []) + public function saveinfo($params = []) { + // 获取数据 + $data = []; + if(!empty($params['id'])) + { + $data_params = array( + 'm' => 0, + 'n' => 1, + 'where' => ['id' => intval($params['id'])], + ); + $ret = Service::PetsList($data_params); + if(!empty($ret['data'][0])) + { + $ret['data'][0]['lose_features'] = str_replace('
', "\n", $ret['data'][0]['lose_features']); + $data = $ret['data'][0]; + } + unset($params['id']); + } + $this->assign('params', $params); + $this->assign('data', $data); + $this->assign('pets_attribute_status_list', Service::$pets_attribute_status_list); + $this->assign('pets_attribute_is_text_list', Service::$pets_attribute_is_text_list); + $this->assign('pets_attribute_gender_list', Service::$pets_attribute_gender_list); + $this->assign('pets_attribute_type_list', Service::$pets_attribute_type_list); return $this->fetch('../../../plugins/view/petscms/petsadmin/saveinfo'); } + + /** + * 宠物详情 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-03-15T23:51:50+0800 + * @param [array] $params [输入参数] + */ + public function detail($params = []) + { + // 获取数据 + $data = []; + if(empty($params['id'])) + { + return '宠物id有误'; + } + $data_params = array( + 'm' => 0, + 'n' => 1, + 'where' => ['id' => intval($params['id']), 'status'=>[0,1,2]], + ); + $ret = Service::PetsList($data_params); + $data = empty($ret['data'][0]) ? [] : $ret['data'][0]; + + $this->assign('data', $data); + $this->assign('params', $params); + return $this->fetch('../../../plugins/view/petscms/petsadmin/detail'); + } + + /** + * 宠物添加/编辑 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-03-15T23:51:50+0800 + * @param [array] $params [输入参数] + */ + public function save($params = []) + { + // 是否ajax请求 + if(!IS_AJAX) + { + return $this->error('非法访问'); + } + + // 用户 + return Service::PestSave($params); + } + + /** + * 宠物帮助数据列表 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-03-15T23:51:50+0800 + * @param [array] $params [输入参数] + */ + public function help($params = []) + { + // 参数 + if(empty($params['pets_id'])) + { + return '参数有误'; + } + + // 分页 + $number = 10; + + // 条件 + $where = [ + 'pets_id' => intval($params['pets_id']), + ]; + + // 获取总数 + $total = Service::HelpTotal($where); + + // 分页 + $page_params = array( + 'number' => $number, + 'total' => $total, + 'where' => $params, + 'page' => isset($params['page']) ? intval($params['page']) : 1, + 'url' => PluginsHomeUrl('petscms', 'pets', 'index'), + ); + $page = new \base\Page($page_params); + $this->assign('page_html', $page->GetPageHtml()); + + // 获取列表 + $data_params = array( + 'm' => $page->GetPageStarNumber(), + 'n' => $number, + 'where' => $where, + ); + $data = Service::HelpList($data_params); + $this->assign('data_list', $data['data']); + return $this->fetch('../../../plugins/view/petscms/petsadmin/help'); + } + + /** + * 宠物帮助数据地图展示 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-03-15T23:51:50+0800 + * @param [array] $params [输入参数] + */ + public function helpmap($params = []) + { + // 隐藏头尾 + $this->assign('is_header', 0); + $this->assign('is_footer', 0); + + // 参数 + $params = input(); + if(!empty($params['lng'])) + { + $params['lng'] = base64_decode($params['lng']); + } + if(!empty($params['lat'])) + { + $params['lat'] = base64_decode($params['lat']); + } + $this->assign('params', $params); + return $this->fetch('../../../plugins/view/petscms/petsadmin/helpmap'); + } } ?> \ No newline at end of file diff --git a/application/plugins/petscms/Service.php b/application/plugins/petscms/Service.php index abd9fee7d26339838a1806930ab402f502021f44..f8d4dfec131e1e37a3d8cfc427c0f370cd694394 100644 --- a/application/plugins/petscms/Service.php +++ b/application/plugins/petscms/Service.php @@ -353,7 +353,7 @@ class Service // 宠物数据 $data = [ - 'user_id' => isset($params['user']['id']) ? intval($params['user']['id']) : 0, + 'user_id' => isset($params['user_id']) ? intval($params['user_id']) : 0, 'title' => isset($params['title']) ? $params['title'] : '', 'name' => isset($params['name']) ? $params['name'] : '', 'birthday' => empty($params['birthday']) ? 0 : strtotime($params['birthday']), @@ -504,7 +504,7 @@ class Service // 宠物数据 $data = [ - 'user_id' => isset($params['user']['id']) ? intval($params['user']['id']) : 0, + 'user_id' => isset($params['user_id']) ? intval($params['user_id']) : 0, 'pets_id' => intval($params['pets_id']), 'contacts_name' => $params['contacts_name'], 'contacts_tel' => isset($params['contacts_tel']) ? $params['contacts_tel'] : '', diff --git a/application/plugins/view/petscms/petsadmin/help.html b/application/plugins/view/petscms/petsadmin/help.html new file mode 100644 index 0000000000000000000000000000000000000000..cf74878798c393ebb4089c1749b74f9fdf004f1c --- /dev/null +++ b/application/plugins/view/petscms/petsadmin/help.html @@ -0,0 +1,79 @@ +{{include file="public/header" /}} + + +
+
+ + 宠物管理系统 + 返回 + + +
+ +
+ + + + + + + + + + + + {{if !empty($data_list)}} + {{foreach $data_list as $v}} + + + + + + + + {{/foreach}} + {{/if}} + {{if empty($data_list)}} + + + + {{/if}} + +
联系人信息省市区/县详细地址操作时间操作
+ 姓名：{{if empty($v['contacts_name'])}}未填写{{else /}}{{$v.contacts_name}}{{/if}}
+ + 电话：{{if empty($v['contacts_tel'])}}未填写{{else /}}{{$v.contacts_tel}}{{/if}}
+ + 微信：{{if empty($v['contacts_weixin'])}}未填写{{else /}}{{$v.contacts_weixin}}{{/if}} + 		+ 所在省：{{if empty($v['province_name'])}}未填写{{else /}}{{$v.province_name}}{{/if}}
+ + 所在市：{{if empty($v['city_name'])}}未填写{{else /}}{{$v.city_name}}{{/if}}
+ + 所在区/县：{{if empty($v['county_name'])}}未填写{{else /}}{{$v.county_name}}{{/if}}
+ 		{{$v.address}} + 添加：{{$v.add_time_time}} + {{if !empty($v['upd_time_time'])}} +
更新：{{$v.upd_time_time}} + {{/if}} + 		+ {{if !empty($v['lng']) and !empty($v['lat']) and $v['lng'] gt 0 and $v['lat'] gt 0}} + + {{/if}} +
+
没有相关数据
+
+
+ + + {{if !empty($data_list)}} + {{$page_html|raw}} + {{/if}} +
+
+
+ + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/plugins/view/petscms/petsadmin/helpmap.html b/application/plugins/view/petscms/petsadmin/helpmap.html new file mode 100644 index 0000000000000000000000000000000000000000..e9e03d97649657e9317b735644d0a8c059e198c6 --- /dev/null +++ b/application/plugins/view/petscms/petsadmin/helpmap.html @@ -0,0 +1,39 @@ +{{include file="public/header" /}} + +{{if !empty($params['lng']) and !empty($params['lat']) and $params['lng'] gt 0 and $params['lat'] gt 0}} +
+{{else /}} +
参数有误
+{{/if}} + +{{include file="public/footer" /}} + +{{if !empty($params['lng']) and !empty($params['lat']) and $params['lng'] gt 0 and $params['lat'] gt 0}} + + + + +{{/if}} \ No newline at end of file diff --git a/application/plugins/view/petscms/petsadmin/index.html b/application/plugins/view/petscms/petsadmin/index.html index bd93112f21fbfcac18c68962785a0aa68494ce12..17187978ee76c650b4ae24f559a9a82f9b1d5436 100644 --- a/application/plugins/view/petscms/petsadmin/index.html +++ b/application/plugins/view/petscms/petsadmin/index.html @@ -1,3 +1,195 @@ -petsadmin - index +{{include file="public/header" /}} -新增 \ No newline at end of file + +
+
+ + 宠物管理系统 + 返回 + + +
+
+
+
+ + + + +
+ +
+ + + + + + + + + + + + + + + +
+ 类型： + + + 状态： + +
+ 绝育： + + + 性别： + +
+ + 清除条件 +
+
+ + +
+ 新增 / 绑定 +
+ + + +
+ + + + + + + + + + + + + + {{if !empty($data_list)}} + {{foreach $data_list as $v}} + + + + + + + + + + {{/foreach}} + {{/if}} + {{if empty($data_list)}} + + + + {{/if}} + +
标题/相册宠物信息主人信息二维码状态操作时间操作
+

{{$v.title}}

+ {{if !empty($v['photo'])}} +
+
    + {{foreach $v.photo as $photo}} +
  • + {{$v.title}} +
    • + {{/foreach}} +
+
+ {{/if}} + 		+ 编号：{{if empty($v['pest_no'])}}未填写{{else /}}{{$v.pest_no}}{{/if}}
+ + 名字：{{if empty($v['name'])}}未填写{{else /}}{{$v.name}}{{/if}}
+ + 类型：{{if empty($v['type_name'])}}未填写{{else /}}{{$v.type_name}}{{/if}}
+ + 性别：{{if empty($v['gender_name'])}}未填写{{else /}}{{$v.gender_name}}{{/if}}
+ + 生日：{{if empty($v['birthday_name'])}}未填写{{else /}}{{$v.birthday_name}}{{/if}}
+ + 年龄：{{if empty($v['age'])}}未填写{{else /}}{{$v.age}}{{/if}}
+ + 品种：{{if empty($v['varieties'])}}未填写{{else /}}{{$v.varieties}}{{/if}}
+ + 绝育：{{$v.sterilization_name}}
+ 疫苗：{{$v.vaccine_name}}
+ 		+ 姓名：{{if empty($v['person_name'])}}未填写{{else /}}{{$v.person_name}}{{/if}}
+ + 电话：{{if empty($v['person_tel'])}}未填写{{else /}}{{$v.person_tel}}{{/if}}
+ + 微信：{{if empty($v['person_weixin'])}}未填写{{else /}}{{$v.person_weixin}}{{/if}}
+ 		+ {{$v.title}} + +

下载二维码

+ + 		{{$v.status_name}} + 添加：{{$v.add_time_time}} + {{if !empty($v['upd_time_time'])}} +
更新：{{$v.upd_time_time}} + {{/if}} + 		+ 编辑 + {{if $v['status'] neq 3}} + 详情 + {{/if}} + 帮助 +
+
没有相关数据
+
+
+ + + {{if !empty($data_list)}} + {{$page_html|raw}} + {{/if}} +
+
+
+ + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/plugins/view/petscms/petsadmin/saveinfo.html b/application/plugins/view/petscms/petsadmin/saveinfo.html index 581f529a9fddc6f675b8d742c26289bcf2ead9c9..303a01846ff2e7197a39719286b5eee70b369dad 100644 --- a/application/plugins/view/petscms/petsadmin/saveinfo.html +++ b/application/plugins/view/petscms/petsadmin/saveinfo.html @@ -1 +1,227 @@ -saveinfo \ No newline at end of file +{{include file="public/header" /}} + + +
+
+ + 宠物管理系统 + 返回 + +
+
+ +
+ {{if empty($data['id'])}} +
+ + +
+ {{/if}} + +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ + +
+ +
    + {{if !empty($data['photo'])}} + {{foreach $data.photo as $v}} +
  • + + + × +
    • + {{/foreach}} + {{/if}} +
+
+上传相册
+
+ + +
+ + +
+
+ + +
+

主人信息

+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+

丢失信息（丢失状态下有效）

+
+
+ + +
+
+ + +
+
+ + +
+
+ + + + +
+
+ +
+ + + + + + +
+
+
+
+ +
+ + +
+ +
+ + + +
+
+
+
+
+ + + +{{include file="public/footer" /}} + + + + + + \ No newline at end of file diff --git a/config/app.php b/config/app.php index f84fa55bdf1921e593e9819fdc62d1ba5c9903a6..fec2e442cd586708782fe5a1a3a76bae37d2b713 100755 --- a/config/app.php +++ b/config/app.php @@ -19,7 +19,7 @@ return [ // 应用地址 'app_host' => '', // 应用调试模式 - 'app_debug' => false, + 'app_debug' => true, // 应用Trace 'app_trace' => false, // 是否支持多模块 diff --git a/public/static/plugins/css/petscms/petsadmin.css b/public/static/plugins/css/petscms/petsadmin.css new file mode 100644 index 0000000000000000000000000000000000000000..2da9f830e9dc9f5cbb2acd518189ac9af61a6f93 --- /dev/null +++ b/public/static/plugins/css/petscms/petsadmin.css @@ -0,0 +1,87 @@ +/* 筛选 */ +.thin, .pay-list { overflow:hidden; } +.thin .so { width:66%; } +.thin_sub { font-weight:100; margin:10px 0px 0px 10px; cursor: pointer; } +.so-list { width:100%; margin-top: 20px; } +.so-list * { font-size:1.2rem !important; } +.so-list input { height:28px; display:inline !important; } +.time input, .so-list .chosen-container { background:#FFF !important; } +.time input { width:100px !important; } +.time i { position:absolute; margin:4px 0px 0px -15px; } +.price input { width:101px !important; } +.time, .time { width:50%; } +.so-list tr+tr>td { padding-top:10px; } +.so-list .chosen-container { border-radius:2px; } +.text-grey { color: #999; } +.chosen-container-single .chosen-single, .so-list select { height: 28px; line-height: 28px; width: 100%; } +.reset-submit { margin-left: 20px; } +.so-list select { padding: 0 0 0 8px; } +.operation-nav { margin: 15px 0 10px 0; } +.row-qucode img { max-width: 100px; } +.row-qucode p { margin-top: 5px; } +.row-qucode a:hover, .row-qucode a:focus { text-decoration: none; } +.row-first { width: 20%; } +.row-first p { font-weight: 500; max-width: 240px; } +.row-first .am-slider { max-height: 130px; } +.row-first .am-slider .am-slides img { width: auto; max-height: 100%; margin: 0 auto; } +@media only screen and (min-width: 641px){ + .so-list .chosen-container, .so-list select { width:217px !important; display: -webkit-inline-box; } + .thin_sub:hover { color:#F60; } +} +@media only screen and (max-width: 641px){ + .so-list input { width:40% !important; } + .so-list td { width:100%; display:block; } + .so-list tr td:last-child { margin-top:10px; } + .so-list .chosen-container { width:85%; } + .so-list .chosen-container { width:100%; } + .so-list tr td:last-child { padding-top:0px !important; } + .chosen-container-single .chosen-search input[type="text"] { width: 100% !important; } + .so-list select { width: calc(100% - 44px); display: -webkit-inline-box; } +} + +/** + * 添加/编辑页面 + */ +.base-view .am-form-group:last-child, .person-view .am-form-group:last-child, .lose-view .am-form-group:last-child {border-bottom: 0; } +form.form-validation h2 { font-weight: 700; font-size: 14px; } +form.form-validation .am-divider { margin: 10px auto; } +.lose-view { margin-top: 30px; } +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; +} +form.form-validation .region-linkage .chosen-select .chosen-single { + width: 100%; +} +form.form-validation #map { + width: 100%; + height: 350px; +} + +/** + * 帮助页面 + */ +#help-map { + width: 100%; + height: 100vh; +} + +/** + * 公共 + */ +.am-slider-a1 { + -webkit-box-shadow: none; + box-shadow: none; +} diff --git a/public/static/plugins/js/petscms/petsadmin.js b/public/static/plugins/js/petscms/petsadmin.js new file mode 100644 index 0000000000000000000000000000000000000000..dede4f04932c36887dca8d3b8050a73fefb88140 --- /dev/null +++ b/public/static/plugins/js/petscms/petsadmin.js @@ -0,0 +1,15 @@ +$(function() +{ + // 帮助-地图查看 + $('.pets-help .map-submit').on('click', function() + { + var lng = parseFloat($(this).data('lng')); + var lat = parseFloat($(this).data('lat')); + if(lng > 0 && lat > 0) + { + // 数据base64避免特殊字符 + var url = UrlFieldReplace('lat', window.btoa(lat), UrlFieldReplace('lng', window.btoa(lng), $('.pets-help').data('url'))); + ModalLoad(url, '地图', 'plugins-petscms-popup-modal-help'); + } + }); +}); \ No newline at end of file