处理中...
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 @@
}}{{$data.images_url}}{{else /}}{{$attachment_host}}/static/admin/default/images/default-images.png{{/if}})
+ }}{{$data.images_url}}{{else /}}{{$attachment_host}}/static/admin/default/images/default-images.jpg{{/if}})
+ 
×
}}{{$data.logo}}{{else /}}{{$attachment_host}}/static/admin/default/images/default-images.png{{/if}})
+ }}{{$data.logo}}{{else /}}{{$attachment_host}}/static/admin/default/images/default-images.jpg{{/if}})
}}{{$data.images_url}}{{else /}}{{$attachment_host}}/static/plugins/images/answers/default-images.png{{/if}})
+ }}{{$data.images_url}}{{else /}}{{$attachment_host}}/static/plugins/images/answers/default-images.jpg{{/if}})
}}{{$data.images}}{{else /}}{{$attachment_host}}/static/plugins/images/commongobacktop/default-images.png{{/if}})
+ }}{{$data.images}}{{else /}}{{$attachment_host}}/static/plugins/images/commongobacktop/default-images.jpg{{/if}})
}}{{$data.weixin_fuwu_qrcode_images}}{{else /}}{{$attachment_host}}/static/plugins/images/commonrightnavigation/default-images.png{{/if}})
+ }}{{$data.weixin_fuwu_qrcode_images}}{{else /}}{{$attachment_host}}/static/plugins/images/commonrightnavigation/default-images.jpg{{/if}})
}}{{$data.alipay_fuwu_qrcode_images}}{{else /}}{{$attachment_host}}/static/plugins/images/commonrightnavigation/default-images.png{{/if}})
+ }}{{$data.alipay_fuwu_qrcode_images}}{{else /}}{{$attachment_host}}/static/plugins/images/commonrightnavigation/default-images.jpg{{/if}})
}}{{$data.weixin_mini_qrcode_images}}{{else /}}{{$attachment_host}}/static/plugins/images/commonrightnavigation/default-images.png{{/if}})
+ }}{{$data.weixin_mini_qrcode_images}}{{else /}}{{$attachment_host}}/static/plugins/images/commonrightnavigation/default-images.jpg{{/if}})
}}{{$data.images}}{{else /}}{{$attachment_host}}/static/plugins/images/commontopmaxpicture/default-images.png{{/if}})
+ }}{{$data.images}}{{else /}}{{$attachment_host}}/static/plugins/images/commontopmaxpicture/default-images.jpg{{/if}})
}}{{$data.logo}}{{else /}}{{$attachment_host}}/static/plugins/images/petscms/default-images.png{{/if}})
+ }}{{$data.logo}}{{else /}}{{$attachment_host}}/static/plugins/images/petscms/default-images.jpg{{/if}})
}}{{$data.alipay_qrcode_images}}{{else /}}{{$attachment_host}}/static/plugins/images/petscms/default-images.jpg{{/if}})
+ }}{{$data.weixin_qrcode_images}}{{else /}}{{$attachment_host}}/static/plugins/images/petscms/default-images.jpg{{/if}})
+ 
';
+ html += '
';
html += '×';
html += '}}{{$data.images}}{{else /}}{{$attachment_host}}/static/plugins/images/answers/default-images.png{{/if}})
+ }}{{$data.images}}{{else /}}{{$attachment_host}}/static/plugins/images/answers/default-images.jpg{{/if}})
}}{{$data.images_bottom}}{{else /}}{{$attachment_host}}/static/plugins/images/answers/default-images.png{{/if}})
+ }}{{$data.images_bottom}}{{else /}}{{$attachment_host}}/static/plugins/images/answers/default-images.jpg{{/if}})