diff --git a/application/admin/view/default/apphomenav/save_info.html b/application/admin/view/default/apphomenav/save_info.html index 6a3bb6c50..3f7568452 100755 --- a/application/admin/view/default/apphomenav/save_info.html +++ b/application/admin/view/default/apphomenav/save_info.html @@ -57,7 +57,7 @@
+上传图片
diff --git a/application/admin/view/default/express/index.html b/application/admin/view/default/express/index.html index b7245a2ba..50c637b27 100755 --- a/application/admin/view/default/express/index.html +++ b/application/admin/view/default/express/index.html @@ -24,7 +24,7 @@ @@ -51,7 +51,7 @@ -
+

处理中...

diff --git a/application/admin/view/default/goodscategory/index.html b/application/admin/view/default/goodscategory/index.html index 9e6508a7b..22b1ab0c5 100755 --- a/application/admin/view/default/goodscategory/index.html +++ b/application/admin/view/default/goodscategory/index.html @@ -46,7 +46,7 @@
  • - + ×
@@ -57,7 +57,7 @@
  • - + ×
@@ -109,7 +109,7 @@ -
+

处理中...

diff --git a/application/admin/view/default/pluginsadmin/save_info.html b/application/admin/view/default/pluginsadmin/save_info.html index d218eff20..2c343296c 100755 --- a/application/admin/view/default/pluginsadmin/save_info.html +++ b/application/admin/view/default/pluginsadmin/save_info.html @@ -26,7 +26,7 @@
  • - +
+上传图片
diff --git a/application/admin/view/default/slide/save_info.html b/application/admin/view/default/slide/save_info.html index 2cb5b55f1..8060d09fa 100755 --- a/application/admin/view/default/slide/save_info.html +++ b/application/admin/view/default/slide/save_info.html @@ -53,7 +53,7 @@
  • - +
+上传图片
diff --git a/application/plugins/petscms/Admin.php b/application/plugins/petscms/Admin.php index a3f08e08a..056ea9e46 100755 --- a/application/plugins/petscms/Admin.php +++ b/application/plugins/petscms/Admin.php @@ -45,7 +45,7 @@ class Admin extends Controller */ public function base($params = []) { - $ret = PluginsService::PluginsData('petscms', ['logo', 'pets_default_images']); + $ret = PluginsService::PluginsData('petscms', ['logo', 'pets_default_images', 'alipay_qrcode_images', 'weixin_qrcode_images']); if($ret['code'] == 0) { if(!empty($ret['data']['not_bind_desc'])) @@ -69,7 +69,7 @@ class Admin extends Controller */ public function saveinfo($params = []) { - $ret = PluginsService::PluginsData('petscms', ['logo', 'pets_default_images'], false); + $ret = PluginsService::PluginsData('petscms', ['logo', 'pets_default_images', 'alipay_qrcode_images', 'weixin_qrcode_images'], false); if($ret['code'] == 0) { // 是否 diff --git a/application/plugins/petscms/Hook.php b/application/plugins/petscms/Hook.php index 2dfeba553..a7fbcbb02 100755 --- a/application/plugins/petscms/Hook.php +++ b/application/plugins/petscms/Hook.php @@ -41,6 +41,11 @@ class Hook extends Controller $ret = $this->UserCenterLeftMenuHandle($params); break; + // 顶部小导航右侧-我的业务 + case 'plugins_service_header_navigation_top_right_handle' : + $ret = $this->CommonTopNavRightMenuHandle($params); + break; + default : $ret = ''; } @@ -75,5 +80,23 @@ class Hook extends Controller ]]; array_splice($params['data'], 2, 0, $menu); } + + /** + * 顶部小导航右侧-我的业务 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-04-11 + * @desc description + * @param array $params [description] + */ + public function CommonTopNavRightMenuHandle($params = []) + { + $menu = [ + 'name' => '我的宠物', + 'url' => PluginsHomeUrl('petscms', 'pets', 'index'), + ]; + array_push($params['data'][1]['items'], $menu); + } } ?> \ No newline at end of file diff --git a/application/plugins/petscms/Pets.php b/application/plugins/petscms/Pets.php index a2cd4d67d..00361f3d1 100644 --- a/application/plugins/petscms/Pets.php +++ b/application/plugins/petscms/Pets.php @@ -39,7 +39,22 @@ class Pets extends Controller { parent::__construct(); + // 用户信息 $this->user = UserService::LoginUserInfo(); + + // 需要登录校验的方法 + $is_login_all = ['index', 'saveinfo', 'save', 'untying', 'helpsave', 'help', 'helpmap']; + + // 登录校验 + if(in_array(input('pluginsaction'), $is_login_all) && empty($this->user)) + { + if(IS_AJAX) + { + exit(json_encode(DataReturn('登录失效，请重新登录', -400))); + } else { + return $this->redirect('index/user/logininfo'); + } + } } /** @@ -102,6 +117,24 @@ class Pets extends Controller */ public function saveinfo($params = []) { + // 是否绑定 + if(!empty($params['pest_no'])) + { + $data_params = array( + 'm' => 0, + 'n' => 1, + 'where' => ['pest_no' => $params['pest_no']], + ); + $ret = Service::PetsList($data_params); + if(!empty($ret['data'][0]['user_id'])) + { + $this->assign('msg', '该宠物已被绑定'); + return $this->fetch('public/tips_error'); + } + $this->assign('pest_no', $params['pest_no']); + unset($params['pest_no']); + } + // 获取数据 $data = []; if(!empty($params['id'])) @@ -119,10 +152,7 @@ class Pets extends Controller } unset($params['id']); } - - // 是否绑定 - $this->assign('pest_no', empty($params['pest_no']) ? '' : $params['pest_no']); - unset($params['pest_no']); + $this->assign('params', $params); $this->assign('data', $data); $this->assign('pets_attribute_status_list', Service::$pets_attribute_status_list); @@ -158,7 +188,7 @@ class Pets extends Controller $this->assign('data', $data); // 基础信息 - $ret = PluginsService::PluginsData('petscms', ['logo', 'pets_default_images']); + $ret = PluginsService::PluginsData('petscms', ['logo', 'pets_default_images', 'alipay_qrcode_images', 'weixin_qrcode_images']); if(!empty($ret['data']['not_bind_desc'])) { $ret['data']['not_bind_desc'] = str_replace("\n", '
', $ret['data']['not_bind_desc']); @@ -196,6 +226,26 @@ class Pets extends Controller 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('非法访问'); + } + + // 用户 + $params['user_id'] = $this->user['id']; + return Service::PetsUntying($params); + } + /** * 丢失提供信息添加/编辑 * @author Devil diff --git a/application/plugins/petscms/Service.php b/application/plugins/petscms/Service.php index d236c9796..71d2da08c 100644 --- a/application/plugins/petscms/Service.php +++ b/application/plugins/petscms/Service.php @@ -382,7 +382,7 @@ class Service // 绑定编号 $edit_msg_title = '编辑'; - if(empty($params['id']) && !empty($params['pest_no'])) + if(!empty($params['pest_no'])) { $pets = Db::name('PluginsPetscmsPets')->where(['pest_no'=>$params['pest_no']])->field('id,pest_no,user_id')->find(); if(empty($pets)) @@ -612,8 +612,15 @@ class Service return DataReturn($ret, -1); } + // 条件 + $where = ['id'=>intval($params['id'])]; + if(!empty($params['user_id'])) + { + $where['user_id'] = intval($params['user_id']); + } + // 解绑操作 - if(Db::name('PluginsPetscmsPets')->where(['id'=>$params['id']])->update(['user_id'=>0, 'upd_time'=>time()])) + if(Db::name('PluginsPetscmsPets')->where($where)->update(['user_id'=>0, 'upd_time'=>time()])) { return DataReturn('解绑成功'); } @@ -647,7 +654,7 @@ class Service } // 删除操作 - if(Db::name('PluginsPetscmsPets')->where(['id'=>$params['id']])->delete()) + if(Db::name('PluginsPetscmsPets')->where(['id'=>intval($params['id'])])->delete()) { return DataReturn('删除成功'); } diff --git a/application/plugins/petscms/config.json b/application/plugins/petscms/config.json index 997ad9ce1..4f4d08639 100755 --- a/application/plugins/petscms/config.json +++ b/application/plugins/petscms/config.json @@ -19,6 +19,9 @@ "hook":{ "plugins_service_users_center_left_menu_handle":[ "app\\plugins\\petscms\\Hook" + ], + "plugins_service_header_navigation_top_right_handle":[ + "app\\plugins\\petscms\\Hook" ] } } \ No newline at end of file diff --git a/application/plugins/view/answers/admin/index.html b/application/plugins/view/answers/admin/index.html index 951a025cc..5e367becd 100644 --- a/application/plugins/view/answers/admin/index.html +++ b/application/plugins/view/answers/admin/index.html @@ -97,7 +97,7 @@
- +
@@ -106,7 +106,7 @@
- +
diff --git a/application/plugins/view/answers/admin/sliderinfo.html b/application/plugins/view/answers/admin/sliderinfo.html index ffd6e6802..1b8dad9e3 100644 --- a/application/plugins/view/answers/admin/sliderinfo.html +++ b/application/plugins/view/answers/admin/sliderinfo.html @@ -32,7 +32,7 @@
  • - +
+上传图片
diff --git a/application/plugins/view/commongobacktop/admin/index.html b/application/plugins/view/commongobacktop/admin/index.html index d359840e8..7750d5d52 100755 --- a/application/plugins/view/commongobacktop/admin/index.html +++ b/application/plugins/view/commongobacktop/admin/index.html @@ -12,7 +12,7 @@
- +
diff --git a/application/plugins/view/commongobacktop/admin/saveinfo.html b/application/plugins/view/commongobacktop/admin/saveinfo.html index aff6f342d..ada3d5aaa 100755 --- a/application/plugins/view/commongobacktop/admin/saveinfo.html +++ b/application/plugins/view/commongobacktop/admin/saveinfo.html @@ -15,7 +15,7 @@
  • - +
+上传图片
diff --git a/application/plugins/view/commonrightnavigation/admin/index.html b/application/plugins/view/commonrightnavigation/admin/index.html index 98a32b5a7..be11fa2ef 100755 --- a/application/plugins/view/commonrightnavigation/admin/index.html +++ b/application/plugins/view/commonrightnavigation/admin/index.html @@ -12,25 +12,25 @@
- +
- +
- +
- +
diff --git a/application/plugins/view/commontopmaxpicture/admin/index.html b/application/plugins/view/commontopmaxpicture/admin/index.html index 679cee556..ac8e7f1c7 100755 --- a/application/plugins/view/commontopmaxpicture/admin/index.html +++ b/application/plugins/view/commontopmaxpicture/admin/index.html @@ -12,7 +12,7 @@
- +
diff --git a/application/plugins/view/commontopmaxpicture/admin/saveinfo.html b/application/plugins/view/commontopmaxpicture/admin/saveinfo.html index 138a2b091..b507e74fb 100755 --- a/application/plugins/view/commontopmaxpicture/admin/saveinfo.html +++ b/application/plugins/view/commontopmaxpicture/admin/saveinfo.html @@ -15,7 +15,7 @@
  • - +
+上传图片
diff --git a/application/plugins/view/petscms/admin/base.html b/application/plugins/view/petscms/admin/base.html index 81364e5d2..bfc95f396 100644 --- a/application/plugins/view/petscms/admin/base.html +++ b/application/plugins/view/petscms/admin/base.html @@ -43,7 +43,7 @@
- +
@@ -54,6 +54,40 @@
+
+ +
+ +
+
+
+ +
+ {{if !empty($data['alipay_qrcode_name'])}} + {{$data.alipay_qrcode_name}} + {{else /}} + 空 + {{/if}} +
+
+ +
+ +
+ +
+
+
+ +
+ {{if !empty($data['weixin_qrcode_name'])}} + {{$data.weixin_qrcode_name}} + {{else /}} + 空 + {{/if}} +
+
+ 编辑
diff --git a/application/plugins/view/petscms/admin/saveinfo.html b/application/plugins/view/petscms/admin/saveinfo.html index adcebf94d..458ba09c9 100755 --- a/application/plugins/view/petscms/admin/saveinfo.html +++ b/application/plugins/view/petscms/admin/saveinfo.html @@ -53,6 +53,42 @@
+上传图片
+
+ +
    + {{if !empty($data['alipay_qrcode_images'])}} +
  • + + + × +
    • + {{/if}} +
+
+上传图片
+
+
+ + +
+ +
+ +
    + {{if !empty($data['weixin_qrcode_images'])}} +
  • + + + × +
    • + {{/if}} +
+
+上传图片
+
+
+ + +
+
diff --git a/application/plugins/view/petscms/pets/detail.html b/application/plugins/view/petscms/pets/detail.html index 030335893..55a902eb9 100644 --- a/application/plugins/view/petscms/pets/detail.html +++ b/application/plugins/view/petscms/pets/detail.html @@ -222,6 +222,27 @@
{{/if}} {{if empty($plugins_base_data['pets_take'])}}我要领取{{else /}}{{$plugins_base_data.pets_take}}{{/if}} + + {{if !empty($plugins_base_data['alipay_qrcode_images']) or !empty($plugins_base_data['weixin_qrcode_images'])}} + + {{/if}}
{{/if}} diff --git a/application/plugins/view/petscms/pets/index.html b/application/plugins/view/petscms/pets/index.html index 0a70dffb4..81d295a49 100644 --- a/application/plugins/view/petscms/pets/index.html +++ b/application/plugins/view/petscms/pets/index.html @@ -176,6 +176,7 @@ 编辑 + {{if $v['status'] neq 3}} 详情 {{/if}} diff --git a/application/plugins/view/petscms/pets/saveinfo.html b/application/plugins/view/petscms/pets/saveinfo.html index 618de13ee..9a7feafeb 100644 --- a/application/plugins/view/petscms/pets/saveinfo.html +++ b/application/plugins/view/petscms/pets/saveinfo.html @@ -30,7 +30,7 @@
- {{if empty($data['id']) and !empty($pest_no)}} + {{if !empty($pest_no)}}
@@ -120,7 +120,9 @@
diff --git a/application/plugins/view/petscms/petsadmin/index.html b/application/plugins/view/petscms/petsadmin/index.html index d503c1ac7..9f0ad30e2 100644 --- a/application/plugins/view/petscms/petsadmin/index.html +++ b/application/plugins/view/petscms/petsadmin/index.html @@ -168,9 +168,9 @@ {{/if}} 帮助 {{if $v['user_id'] gt 0}} - + {{/if}} - + {{/foreach}} diff --git a/application/service/NavigationService.php b/application/service/NavigationService.php index c51f5d855..aa4b74034 100755 --- a/application/service/NavigationService.php +++ b/application/service/NavigationService.php @@ -515,7 +515,7 @@ class NavigationService 'items' => [], ], [ - 'name' => '我的交易', + 'name' => '我的业务', 'is_login' => 1, 'badge' => null, 'icon' => 'am-icon-cube', diff --git a/application/tags.php b/application/tags.php index 68c231a0b..1bec6c623 100755 --- a/application/tags.php +++ b/application/tags.php @@ -121,5 +121,9 @@ return array ( array ( 0 => 'app\\plugins\\petscms\\Hook', ), + 'plugins_service_header_navigation_top_right_handle' => + array ( + 0 => 'app\\plugins\\petscms\\Hook', + ), ); ?> \ No newline at end of file diff --git a/public/static/admin/default/images/default-images.jpg b/public/static/admin/default/images/default-images.jpg new file mode 100644 index 000000000..c3eb8295d Binary files /dev/null and b/public/static/admin/default/images/default-images.jpg differ diff --git a/public/static/admin/default/images/default-images.png b/public/static/admin/default/images/default-images.png deleted file mode 100755 index 76f08c706..000000000 Binary files a/public/static/admin/default/images/default-images.png and /dev/null differ diff --git a/public/static/admin/default/js/goods.js b/public/static/admin/default/js/goods.js index ad4a3fc6e..0da1942fb 100755 --- a/public/static/admin/default/js/goods.js +++ b/public/static/admin/default/js/goods.js @@ -110,7 +110,7 @@ $(function() html += ''; diff --git a/public/static/plugins/css/petscms/pets.detail.css b/public/static/plugins/css/petscms/pets.detail.css index 7e6cc32e5..266928391 100644 --- a/public/static/plugins/css/petscms/pets.detail.css +++ b/public/static/plugins/css/petscms/pets.detail.css @@ -64,14 +64,44 @@ } .pets-not-bind i { font-size: 60px; - color: #00b0ff; + color: #f0f0f0; } .pets-not-bind .am-alert-secondary { margin-top: 0; + background: #fcfcfc; + border: 1px solid #f8f8f8; } .pets-not-bind .am-btn { margin-top: 10px; } +.pets-not-bind ul.qrcode { + overflow: hidden; + margin-top: 30px; + border: 1px solid; + border-top: 5px solid; + border-color: #eee; +} +.pets-not-bind ul.qrcode li { + width: 50%; + float: left; + text-align: center; + padding: 20px; +} +.pets-not-bind ul.qrcode li:first-child { + border-right: 1px solid #eee; +} +.pets-not-bind ul.qrcode li:last-child { + border-left: 1px solid #fff; +} +.pets-not-bind ul.qrcode li img { + max-width: 150px; +} +.pets-not-bind ul.qrcode li p { + font-size: 14px; + font-weight: 500; + color: #666; + margin-top: 5px; +} /** * 左侧 diff --git a/public/static/plugins/images/answers/default-images.jpg b/public/static/plugins/images/answers/default-images.jpg new file mode 100644 index 000000000..c3eb8295d Binary files /dev/null and b/public/static/plugins/images/answers/default-images.jpg differ diff --git a/public/static/plugins/images/answers/default-images.png b/public/static/plugins/images/answers/default-images.png deleted file mode 100755 index 76f08c706..000000000 Binary files a/public/static/plugins/images/answers/default-images.png and /dev/null differ diff --git a/public/static/plugins/images/commongobacktop/default-images.jpg b/public/static/plugins/images/commongobacktop/default-images.jpg new file mode 100644 index 000000000..c3eb8295d Binary files /dev/null and b/public/static/plugins/images/commongobacktop/default-images.jpg differ diff --git a/public/static/plugins/images/commongobacktop/default-images.png b/public/static/plugins/images/commongobacktop/default-images.png deleted file mode 100755 index 76f08c706..000000000 Binary files a/public/static/plugins/images/commongobacktop/default-images.png and /dev/null differ diff --git a/public/static/plugins/images/commonrightnavigation/default-images.jpg b/public/static/plugins/images/commonrightnavigation/default-images.jpg new file mode 100644 index 000000000..c3eb8295d Binary files /dev/null and b/public/static/plugins/images/commonrightnavigation/default-images.jpg differ diff --git a/public/static/plugins/images/commonrightnavigation/default-images.png b/public/static/plugins/images/commonrightnavigation/default-images.png deleted file mode 100755 index 76f08c706..000000000 Binary files a/public/static/plugins/images/commonrightnavigation/default-images.png and /dev/null differ diff --git a/public/static/plugins/images/commontopmaxpicture/default-images.jpg b/public/static/plugins/images/commontopmaxpicture/default-images.jpg new file mode 100644 index 000000000..c3eb8295d Binary files /dev/null and b/public/static/plugins/images/commontopmaxpicture/default-images.jpg differ diff --git a/public/static/plugins/images/commontopmaxpicture/default-images.png b/public/static/plugins/images/commontopmaxpicture/default-images.png deleted file mode 100755 index 76f08c706..000000000 Binary files a/public/static/plugins/images/commontopmaxpicture/default-images.png and /dev/null differ diff --git a/public/static/plugins/images/petscms/default-images.jpg b/public/static/plugins/images/petscms/default-images.jpg new file mode 100644 index 000000000..c3eb8295d Binary files /dev/null and b/public/static/plugins/images/petscms/default-images.jpg differ diff --git a/public/static/plugins/images/petscms/default-images.png b/public/static/plugins/images/petscms/default-images.png deleted file mode 100755 index 76f08c706..000000000 Binary files a/public/static/plugins/images/petscms/default-images.png and /dev/null differ