diff --git a/application/admin/controller/Common.php b/application/admin/controller/Common.php index 0eba895e3..a4ae2dc40 100755 --- a/application/admin/controller/Common.php +++ b/application/admin/controller/Common.php @@ -270,12 +270,10 @@ class Common extends Controller // 站点商店信息 $site_store_info = StoreService::SiteStoreInfo(); - //print_r($site_store_info); if(empty($site_store_info)) { $res = StoreService::SiteStoreAccountsBindHandle(); - - if($res['code'] == 0) + if(!empty($res) && isset($res['code']) && $res['code'] == 0) { $site_store_info = StoreService::SiteStoreInfo(); } diff --git a/application/admin/view/default/agreement/nav.html b/application/admin/view/default/agreement/nav.html index 5b5902624..d0f511a02 100644 --- a/application/admin/view/default/agreement/nav.html +++ b/application/admin/view/default/agreement/nav.html @@ -5,7 +5,7 @@ {{/foreach}} -
+
-

前端访问协议地址增加参数 is_content=0 则仅展示纯协议内容

+

前端访问协议地址增加参数 is_content=1 则仅展示纯协议内容

\ No newline at end of file diff --git a/application/index/controller/Agreement.php b/application/index/controller/Agreement.php index 6996f713a..443892711 100644 --- a/application/index/controller/Agreement.php +++ b/application/index/controller/Agreement.php @@ -63,8 +63,8 @@ class Agreement extends Common $data = $ret['data']; } - // 是否隐藏头尾、默认显示 - $is_content = isset($params['is_content']) ? intval($params['is_content']) : 1; + // 是否仅展示内容 + $is_content = (isset($params['is_content']) && $params['is_content'] == 1) ? 0 : 1; $this->assign('is_header', $is_content); $this->assign('is_footer', $is_content); $this->assign('data', $data);