diff --git a/application/plugins/petscms/Admin.php b/application/plugins/petscms/Admin.php index 5f0b6f31c..a3f08e08a 100755 --- a/application/plugins/petscms/Admin.php +++ b/application/plugins/petscms/Admin.php @@ -32,11 +32,28 @@ class Admin extends Controller */ public function index($params = []) { - $ret = PluginsService::PluginsData('petscms'); + return $this->fetch('../../../plugins/view/petscms/admin/index'); + } + + /** + * 配置管理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-02-07T08:21:54+0800 + * @param [array] $params [输入参数] + */ + public function base($params = []) + { + $ret = PluginsService::PluginsData('petscms', ['logo', 'pets_default_images']); if($ret['code'] == 0) { + if(!empty($ret['data']['not_bind_desc'])) + { + $ret['data']['not_bind_desc'] = str_replace("\n", '
', $ret['data']['not_bind_desc']); + } $this->assign('data', $ret['data']); - return $this->fetch('../../../plugins/view/petscms/admin/index'); + return $this->fetch('../../../plugins/view/petscms/admin/base'); } else { return $ret['msg']; } @@ -52,7 +69,7 @@ class Admin extends Controller */ public function saveinfo($params = []) { - $ret = PluginsService::PluginsData('petscms'); + $ret = PluginsService::PluginsData('petscms', ['logo', 'pets_default_images'], false); if($ret['code'] == 0) { // 是否 diff --git a/application/plugins/petscms/Pets.php b/application/plugins/petscms/Pets.php index b569f251c..cc0939d83 100644 --- a/application/plugins/petscms/Pets.php +++ b/application/plugins/petscms/Pets.php @@ -154,8 +154,16 @@ class Pets extends Controller ); $ret = Service::PetsList($data_params); $data = empty($ret['data'][0]) ? [] : $ret['data'][0]; - $this->assign('data', $data); + + // 基础信息 + $ret = PluginsService::PluginsData('petscms', ['logo', 'pets_default_images']); + if(!empty($ret['data']['not_bind_desc'])) + { + $ret['data']['not_bind_desc'] = str_replace("\n", '
', $ret['data']['not_bind_desc']); + } + $this->assign('plugins_base_data', $ret['data']); + $this->assign('params', $params); return $this->fetch('../../../plugins/view/petscms/pets/detail'); } diff --git a/application/plugins/petscms/Petsadmin.php b/application/plugins/petscms/Petsadmin.php index 8b419b770..778c96a58 100644 --- a/application/plugins/petscms/Petsadmin.php +++ b/application/plugins/petscms/Petsadmin.php @@ -35,7 +35,7 @@ class PetsAdmin extends Controller public function index($params = []) { // 分页 - $number = 10; + $number = MyC('admin_page_number', 10, true); // 条件 $where = Service::PetsListWhere($params); @@ -210,7 +210,7 @@ class PetsAdmin extends Controller } // 分页 - $number = 10; + $number = MyC('admin_page_number', 10, true); // 条件 $where = [ diff --git a/application/plugins/petscms/uninstall.sql b/application/plugins/petscms/uninstall.sql index e69de29bb..e865a6d31 100644 --- a/application/plugins/petscms/uninstall.sql +++ b/application/plugins/petscms/uninstall.sql @@ -0,0 +1,5 @@ +# 宠物管理系统宠物 - 应用 +DROP TABLE `s_plugins_petscms_pets`; + +# 宠物管理系统宠物丢失帮助数据 - 应用 +DROP TABLE `s_plugins_petscms_help`; \ No newline at end of file diff --git a/application/plugins/view/petscms/admin/base.html b/application/plugins/view/petscms/admin/base.html new file mode 100644 index 000000000..81364e5d2 --- /dev/null +++ b/application/plugins/view/petscms/admin/base.html @@ -0,0 +1,65 @@ +{{include file="public/header" /}} + + +
+
+ + 宠物管理系统 + 返回 + + +
+
+ +
+ {{if !empty($data['not_bind_desc'])}} + {{$data.not_bind_desc|raw}} + {{else /}} + 无 + {{/if}} +
+
+
+ +
+ {{if !empty($data['pets_take'])}} + {{$data.pets_take}} + {{else /}} + 我要领取 + {{/if}} +
+
+
+ +
+ {{if !empty($data['lose_provide'])}} + {{$data.lose_provide}} + {{else /}} + 我要提供信息 + {{/if}} +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ + 编辑 +
+
+
+ + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/plugins/view/petscms/admin/index.html b/application/plugins/view/petscms/admin/index.html index 524aae796..d92fef020 100755 --- a/application/plugins/view/petscms/admin/index.html +++ b/application/plugins/view/petscms/admin/index.html @@ -10,10 +10,16 @@
diff --git a/application/plugins/view/petscms/admin/saveinfo.html b/application/plugins/view/petscms/admin/saveinfo.html index 7139a0f72..adcebf94d 100755 --- a/application/plugins/view/petscms/admin/saveinfo.html +++ b/application/plugins/view/petscms/admin/saveinfo.html @@ -4,35 +4,53 @@
-
+ 宠物管理系统 - 返回 + 返回
- - + +
- -
- {{foreach $is_whether_list as $v}} - - {{/foreach}} -
+ +
- -
- - ~ - -
+ + +
+ +
+ +
    + {{if !empty($data['logo'])}} +
  • + + + × +
    • + {{/if}} +
+
+上传图片
+
+ +
+ +
    + {{if !empty($data['pets_default_images'])}} +
  • + + + × +
    • + {{/if}} +
+
+上传图片
diff --git a/application/plugins/view/petscms/pets/detail.html b/application/plugins/view/petscms/pets/detail.html index 1f0b3196c..030335893 100644 --- a/application/plugins/view/petscms/pets/detail.html +++ b/application/plugins/view/petscms/pets/detail.html @@ -17,17 +17,27 @@ {{if isset($data['user_id']) and $data['user_id'] gt 0}}
- {{if !empty($data['photo'])}} -
-
    +
    +
      + {{if !empty($data['photo'])}} {{foreach $data.photo as $photo}}
    • {{$data.title}}
      • {{/foreach}} -
    -
    - {{/if}} + {{else /}} + {{if !empty($plugins_base_data['pets_default_images'])}} +
  • + {{$data.title}} +
    • + {{else /}} +
  • + {{$data.title}} +
    • + {{/if}} + {{/if}} +
+

{{$data.title}}

@@ -75,7 +85,7 @@ {{if isset($data['status']) and $data['status'] eq 1}} - +
@@ -205,11 +215,13 @@ {{/if}} {{else /}}
- -
- 该宠物还没有主人领取，立即领取可爱的宠物宝宝哦！ -
- 我要领取 +

+ {{if !empty($plugins_base_data['not_bind_desc'])}} +
+ {{$plugins_base_data.not_bind_desc|raw}} +
+ {{/if}} + {{if empty($plugins_base_data['pets_take'])}}我要领取{{else /}}{{$plugins_base_data.pets_take}}{{/if}}
{{/if}}
diff --git a/application/service/PluginsService.php b/application/service/PluginsService.php index f2c0d9ad5..ad8e826f7 100755 --- a/application/service/PluginsService.php +++ b/application/service/PluginsService.php @@ -31,12 +31,16 @@ class PluginsService * @desc description * @param [string] $plugins [应用标记] * @param [array] $attachment_field [附件字段] + * @param [boolean] $is_cache [是否缓存读取, 默认true] */ - public static function PluginsData($plugins, $attachment_field = []) + public static function PluginsData($plugins, $attachment_field = [], $is_cache = true) { // 从缓存获取数据 $key = config('shopxo.cache_plugins_data_key').$plugins; - $data = cache($key); + if($is_cache === true) + { + $data = cache($key); + } if(empty($data)) { // 获取数据 diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index b4f1deb88..9e7212ce3 100755 --- a/public/static/admin/default/css/common.css +++ b/public/static/admin/default/css/common.css @@ -32,8 +32,8 @@ legend {padding-bottom:0.2rem !important; margin-bottom: 1rem; } .cr-green { color: #4aaa4a !important; } .cr-blue { color: #4abbf5 !important; } .cr-yellow { color: #e4bfbc !important; } -.am-form select,.am-form textarea,.am-form input[type="text"],.am-form input[type="password"],.am-form input[type="datetime"],.am-form input[type="datetime-local"],.am-form input[type="date"],.am-form input[type="month"],.am-form input[type="time"],.am-form input[type="week"],.am-form input[type="number"],.am-form input[type="email"],.am-form input[type="url"],.am-form input[type="search"],.am-form input[type="tel"],.am-form input[type="color"],.am-form-field {font-size:1.4rem !important;} -select {height:32px !important;} +.am-form select,.am-form textarea,.am-form input[type="text"],.am-form input[type="password"],.am-form input[type="datetime"],.am-form input[type="datetime-local"],.am-form input[type="date"],.am-form input[type="month"],.am-form input[type="time"],.am-form input[type="week"],.am-form input[type="number"],.am-form input[type="email"],.am-form input[type="url"],.am-form input[type="search"],.am-form input[type="tel"],.am-form input[type="color"],.am-form-field {font-size:12px !important;} +select {height:28px !important;} .bk-cr-gray {background:#f3f3f3 !important;} .bk-cr-ffd {background:#ffd !important;} .bk-cr-white {background-color: #fff;} @@ -43,12 +43,13 @@ select {height:32px !important;} .o-h { overflow: hidden; } .submit-state { font-size: 16px; width: 25px; height: 25px; line-height: 25px; } input:hover, select:hover, textarea:hover, .chosen-choices:hover, .chosen-single:hover { border-style:solid; border-width:1px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; border:1px solid #4FACF5 !important; box-shadow:0 0 5px #4FACF5 !important; } -.am-input-group-sm > .am-input-group-btn > .am-btn { height: 32px; } +.am-input-group-sm > .am-input-group-btn > .am-btn { height: 28px; font-size: 12px !important; } .left-menu-more-ico-rotate {-webkit-transform: rotate(-90deg);transform: rotate(-90deg);-webkit-transition: all 300ms;transition: all 300ms;} .am-icon-angle-down {-webkit-transition: all 300ms;transition: all 300ms;} .am-radio-inline input[type="radio"] { margin-left: 0px !important; } .am-alert-tips { background-color: #ffffe9; border-color: #faebd2; color: #888; } .am-alert-tips, .am-alert-tips * { font-size: 12px; } +.am-btn-sm { font-size: 12px; } body {margin:0;color:#797979;} html,body {position:relative;background:#fff;height:100%;width:100%;} diff --git a/public/static/plugins/css/petscms/admin.css b/public/static/plugins/css/petscms/admin.css index ccd37843d..172d0b521 100755 --- a/public/static/plugins/css/petscms/admin.css +++ b/public/static/plugins/css/petscms/admin.css @@ -12,12 +12,33 @@ text-align: center; min-height: 100px; } +.petscms-content .index-list li a:hover { + background: #e3e3e3; +} .petscms-content .index-list li a .title { font-size: 20px; } .petscms-content .index-list li a .desc { color: #999; } + +/** + * 配置管理 + */ +.petscms-content .items { + margin: 10px 0 20px 0; + border-bottom: 1px dashed #f1f1f1; + padding-bottom: 20px; +} +.petscms-content .items .immages-tag { + border: 1px solid #eee; + text-align: center; + max-width: 100px; + padding: 5px; +} +.petscms-content .items .immages-tag img { + max-width: 100%; +} .petscms-content .edit-submit { margin-bottom: 20px; } diff --git a/public/static/plugins/css/petscms/pets.detail.css b/public/static/plugins/css/petscms/pets.detail.css index 2908bbe8d..7e6cc32e5 100644 --- a/public/static/plugins/css/petscms/pets.detail.css +++ b/public/static/plugins/css/petscms/pets.detail.css @@ -102,9 +102,10 @@ padding: 10px 0; float: left; width: 50%; + border-top: 1px solid #f0faff; } -.base ul.basic li:not(:last-child) { - border-bottom: 1px solid #f0faff; +.base ul.basic li:first-child, .base ul.basic li:nth-child(2) { + border-top: 0; } .base ul.basic li span:first-child { font-weight: 500; @@ -142,12 +143,10 @@ } .lose ul.person li { padding: 8px 0; + border-top: 1px solid #ffe4d0; } -.lose ul.person li:not(:last-child) { - border-bottom: 1px solid #ffe4d0; -} -.lose ul.person li:last-child { - padding-bottom: 0; +.lose ul.person li:first-child { + border-top: 0; } .lose ul.person li.tel a { color: #70cfff; @@ -188,9 +187,8 @@ form.form-validation #map { float: left; width: 50%; } - .lose ul.person li:nth-last-child(2) { - border-bottom: 0; - padding-bottom: 0; + .lose ul.person li:nth-child(2) { + border-top: 0; } } @media only screen and (min-width:1025px) { diff --git a/public/static/plugins/images/petscms/default-images.png b/public/static/plugins/images/petscms/default-images.png new file mode 100755 index 000000000..76f08c706 Binary files /dev/null and b/public/static/plugins/images/petscms/default-images.png differ diff --git a/public/static/plugins/images/petscms/index.html b/public/static/plugins/images/petscms/index.html new file mode 100755 index 000000000..0519ecba6 --- /dev/null +++ b/public/static/plugins/images/petscms/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/static/plugins/images/petscms/pets-default-images-s.jpg b/public/static/plugins/images/petscms/pets-default-images-s.jpg new file mode 100644 index 000000000..54ef698ed Binary files /dev/null and b/public/static/plugins/images/petscms/pets-default-images-s.jpg differ diff --git a/public/static/plugins/images/petscms/pets-default-images.jpg b/public/static/plugins/images/petscms/pets-default-images.jpg new file mode 100644 index 000000000..0cdab2a12 Binary files /dev/null and b/public/static/plugins/images/petscms/pets-default-images.jpg differ