diff --git a/application/admin/controller/Plugins.php b/application/admin/controller/Plugins.php index 97c2abe28..771c00faa 100644 --- a/application/admin/controller/Plugins.php +++ b/application/admin/controller/Plugins.php @@ -106,29 +106,7 @@ class Plugins extends Common $this->assign('msg', ucfirst($pluginsaction).' 应用方法未定义'); return $this->fetch('public/error'); } - $ret = $obj->$pluginsaction($params); - - // 是否ajax - if(IS_AJAX) - { - return $ret; - } else { - // 调用应用模板 - if(isset($ret['code'])) - { - if($ret['code'] == 0) - { - $this->assign($ret['data']); - return $this->fetch('../../../plugins/view/'.$pluginsname.'/'.$pluginscontrol.'/'.$pluginsaction); - } else { - $this->assign('msg', $ret['msg']); - return $this->fetch('public/error'); - } - } else { - $this->assign('msg', '应用返回数据格式有误'); - return $this->fetch('public/error'); - } - } + return $obj->$pluginsaction($params); } /** diff --git a/application/index/controller/Plugins.php b/application/index/controller/Plugins.php index be75cb43b..7c14c41cb 100644 --- a/application/index/controller/Plugins.php +++ b/application/index/controller/Plugins.php @@ -100,29 +100,7 @@ class Plugins extends Common $this->assign('msg', ucfirst($pluginsaction).' 应用方法未定义'); return $this->fetch('public/error'); } - $ret = $obj->$pluginsaction($params); - - // 是否ajax - if(IS_AJAX) - { - return $ret; - } else { - // 调用应用模板 - if(isset($ret['code'])) - { - if($ret['code'] == 0) - { - $this->assign($ret['data']); - return $this->fetch('../../../plugins/view/'.$pluginsname.'/'.$pluginscontrol.'/'.$pluginsaction); - } else { - $this->assign('msg', $ret['msg']); - return $this->fetch('public/error'); - } - } else { - $this->assign('msg', '应用返回数据格式有误'); - return $this->fetch('public/error'); - } - } + return $obj->$pluginsaction($params); } /** diff --git a/application/plugins/commongobacktop/Admin.php b/application/plugins/commongobacktop/Admin.php index 458e9aef4..76353053a 100644 --- a/application/plugins/commongobacktop/Admin.php +++ b/application/plugins/commongobacktop/Admin.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\plugins\commongobacktop; +use think\Controller; use app\service\PluginsService; /** @@ -19,7 +20,7 @@ use app\service\PluginsService; * @version 0.0.1 * @datetime 2016-12-01T21:51:08+0800 */ -class Admin +class Admin extends Controller { /** * 首页 @@ -34,13 +35,10 @@ class Admin $ret = PluginsService::PluginsData('commongobacktop', ['images']); if($ret['code'] == 0) { - // 数组组装 - $data = [ - 'data' => $ret['data'], - ]; - return DataReturn('处理成功', 0, $data); + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/commongobacktop/admin/index'); } else { - return $ret; + return $ret['msg']; } } @@ -63,14 +61,11 @@ class Admin 1 => array('id' => 1, 'name' => '是', 'checked' => true), ]; - // 数组组装 - $data = [ - 'is_whether_list' => $is_whether_list, - 'data' => $ret['data'], - ]; - return DataReturn('处理成功', 0, $data); + $this->assign('is_whether_list', $is_whether_list); + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/commongobacktop/admin/saveinfo'); } else { - return $ret; + return $ret['msg']; } } diff --git a/application/plugins/commongobacktop/Hook.php b/application/plugins/commongobacktop/Hook.php index 8360bf193..16b794acb 100644 --- a/application/plugins/commongobacktop/Hook.php +++ b/application/plugins/commongobacktop/Hook.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\plugins\commongobacktop; +use think\Controller; use app\service\PluginsService; /** @@ -19,7 +20,7 @@ use app\service\PluginsService; * @version 0.0.1 * @datetime 2016-12-01T21:51:08+0800 */ -class Hook +class Hook extends Controller { /** * 应用响应入口 @@ -132,10 +133,6 @@ class Hook // 获取应用数据 $ret = PluginsService::PluginsData('commongobacktop', ['images']); - - // html拼接 - $html = '
'; - $content = ''; if($ret['code'] == 0) { // 图片是否为空 @@ -154,16 +151,11 @@ class Hook } } - $content = '
'; - $content .= ''; - $content .= '
'; + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/commongobacktop/index/content'); } else { - $content = $ret['msg']; + return $ret['msg']; } - $html .= $content; - $html .= '
'; - - return $html; } } ?> \ No newline at end of file diff --git a/application/plugins/commononlineservice/Admin.php b/application/plugins/commononlineservice/Admin.php index 8154ebfc2..9297e98fe 100644 --- a/application/plugins/commononlineservice/Admin.php +++ b/application/plugins/commononlineservice/Admin.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\plugins\commononlineservice; +use think\Controller; use app\service\PluginsService; /** @@ -19,7 +20,7 @@ use app\service\PluginsService; * @version 0.0.1 * @datetime 2016-12-01T21:51:08+0800 */ -class Admin +class Admin extends Controller { /** * 首页 @@ -37,13 +38,10 @@ class Admin // 数据处理 $ret['data']['online_service'] = str_replace("\n", '
', $ret['data']['online_service']); - // 数组组装 - $data = [ - 'data' => $ret['data'], - ]; - return DataReturn('处理成功', 0, $data); + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/commononlineservice/admin/index'); } else { - return $ret; + return $ret['msg']; } } @@ -66,14 +64,11 @@ class Admin 1 => array('id' => 1, 'name' => '是', 'checked' => true), ]; - // 数组组装 - $data = [ - 'is_whether_list' => $is_whether_list, - 'data' => $ret['data'], - ]; - return DataReturn('处理成功', 0, $data); + $this->assign('is_whether_list', $is_whether_list); + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/commononlineservice/admin/saveinfo'); } else { - return $ret; + return $ret['msg']; } } diff --git a/application/plugins/commononlineservice/Hook.php b/application/plugins/commononlineservice/Hook.php index c8802a9f1..f43b6863f 100644 --- a/application/plugins/commononlineservice/Hook.php +++ b/application/plugins/commononlineservice/Hook.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\plugins\commononlineservice; +use think\Controller; use app\service\PluginsService; /** @@ -19,7 +20,7 @@ use app\service\PluginsService; * @version 0.0.1 * @datetime 2016-12-01T21:51:08+0800 */ -class Hook +class Hook extends Controller { /** * 应用响应入口 @@ -86,10 +87,6 @@ class Hook // 获取应用数据 $ret = PluginsService::PluginsData('commononlineservice', ['images']); - - // html拼接 - $html = '
- 点击这里给我发消息 - '; + $online_service_data[] = $items; $online_service_li_count++; } } } + $ret['data']['online_service'] = $online_service_data; // 电话 - $tel_html = ''; if(!empty($ret['data']['tel'])) { - $tel_html .= '
  • - 电话:'.$ret['data']['tel'].' -
  • '; $online_service_li_count++; } - // 背景色 - $bg_color = empty($ret['data']['bg_color']) ? '' : 'background:'.$ret['data']['bg_color'].';'; + // li数量 + $ret['data']['online_service_li_count'] = $online_service_li_count; - // 内容css - $content_css = $bg_color; - if($online_service_li_count <= 2) - { - $content_css .= 'border-radius:0;'; - } - // 组装 - $content = '
    - 展开 - 收缩 -
    -
    -
    -

    '.$ret['data']['title'].'

    -
      '.$online_service_html.$tel_html.' -
    -
    -
    '; + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/commononlineservice/index/content'); } else { - $content = $ret['msg']; + return $ret['msg']; } - $html .= '>'; - $html .= $content; - $html .= '
    '; - - return $html; } } ?> \ No newline at end of file diff --git a/application/plugins/commonrightnavigation/Admin.php b/application/plugins/commonrightnavigation/Admin.php index b8ca84755..aafcd0183 100755 --- a/application/plugins/commonrightnavigation/Admin.php +++ b/application/plugins/commonrightnavigation/Admin.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\plugins\commonrightnavigation; +use think\Controller; use app\service\PluginsService; /** @@ -19,7 +20,7 @@ use app\service\PluginsService; * @version 0.0.1 * @datetime 2016-12-01T21:51:08+0800 */ -class Admin +class Admin extends Controller { /** * 首页 @@ -34,13 +35,10 @@ class Admin $ret = PluginsService::PluginsData('commonrightnavigation', ['alipay_mini_qrcode_images', 'alipay_fuwu_qrcode_images', 'weixin_mini_qrcode_images', 'weixin_fuwu_qrcode_images']); if($ret['code'] == 0) { - // 数组组装 - $data = [ - 'data' => $ret['data'], - ]; - return DataReturn('处理成功', 0, $data); + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/commonrightnavigation/admin/index'); } else { - return $ret; + return $ret['msg']; } } @@ -63,14 +61,11 @@ class Admin 1 => array('id' => 1, 'name' => '是', 'checked' => true), ]; - // 数组组装 - $data = [ - 'is_whether_list' => $is_whether_list, - 'data' => $ret['data'], - ]; - return DataReturn('处理成功', 0, $data); + $this->assign('is_whether_list', $is_whether_list); + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/commonrightnavigation/admin/saveinfo'); } else { - return $ret; + return $ret['msg']; } } diff --git a/application/plugins/commonrightnavigation/Hook.php b/application/plugins/commonrightnavigation/Hook.php index a012bb6de..da0005230 100755 --- a/application/plugins/commonrightnavigation/Hook.php +++ b/application/plugins/commonrightnavigation/Hook.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\plugins\commonrightnavigation; +use think\Controller; use app\service\PluginsService; use app\service\BuyService; @@ -20,7 +21,7 @@ use app\service\BuyService; * @version 0.0.1 * @datetime 2016-12-01T21:51:08+0800 */ -class Hook +class Hook extends Controller { /** * 应用响应入口 @@ -103,116 +104,29 @@ class Hook } } + // 当前模块/控制器/方法 + $this->assign('module_controller_action', $module_name.$controller_name.$action_name); + // 是否新窗口打开 - $is_new_window_open = (isset($ret['data']['is_new_window_open']) && $ret['data']['is_new_window_open'] == 1) ? 'target="_blank"' : ''; + $is_new_window_open_html = (isset($ret['data']['is_new_window_open']) && $ret['data']['is_new_window_open'] == 1) ? 'target="_blank"' : ''; + $this->assign('is_new_window_open_html', $is_new_window_open_html); // 购物车总数 $cart_total = BuyService::UserCartTotal(['user'=>$params['user']]); + $this->assign('cart_total', $cart_total); // 是否需要登录 - $login_event = empty($params['user']) ? 'login-event' : ''; + $login_event_class = empty($params['user']) ? 'login-event' : ''; + $this->assign('login_event_class', $login_event_class); - // 内容 - $content .= ' - -
    - -
    - 用户中心 -
    -
    -
    -
    - - - -
    - -
    - 我的足迹 -
    -
    -
    -
    - - - -
    - -
    - 我的收藏 -
    -
    -
    -
    - - - -
    - -
    - 购物车 -
    '.($cart_total > 9 ? '9+' : $cart_total).'
    -
    -
    -
    '; - - $qrcode = ''; - if(!empty($ret['data']['alipay_mini_qrcode_images'])) - { - $qrcode .= '
  • -

    支付宝小程序

    - 支付宝小程序 -
  • '; - } - if(!empty($ret['data']['alipay_fuwu_qrcode_images'])) - { - $qrcode .= '
  • -

    支付宝生活号

    - 支付宝生活号 -
  • '; - } - if(!empty($ret['data']['weixin_mini_qrcode_images'])) - { - $qrcode .= '
  • -

    微信小程序

    - 微信小程序 -
  • '; - } - if(!empty($ret['data']['weixin_fuwu_qrcode_images'])) - { - $qrcode .= '
  • -

    微信公众号

    - 微信公众号 -
  • '; - } - if(!empty($qrcode)) - { - $content .= ' -
    - -
    - -
    -
    '; - } - - $content .= ' -
    - -
    - 返回顶部 -
    -
    -
    '; + // 用户信息 + $this->assign('user', $params['user']); + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/commonrightnavigation/index/content'); } else { - $content = $ret['msg']; + return $ret['msg']; } - $html .= $content; - $html .= ''; - - return $html; } } ?> \ No newline at end of file diff --git a/application/plugins/commontopmaxpicture/Admin.php b/application/plugins/commontopmaxpicture/Admin.php index 298449ecb..a760d4fdc 100755 --- a/application/plugins/commontopmaxpicture/Admin.php +++ b/application/plugins/commontopmaxpicture/Admin.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\plugins\commontopmaxpicture; +use think\Controller; use app\service\PluginsService; /** @@ -19,7 +20,7 @@ use app\service\PluginsService; * @version 0.0.1 * @datetime 2016-12-01T21:51:08+0800 */ -class Admin +class Admin extends Controller { /** * 首页 @@ -34,13 +35,10 @@ class Admin $ret = PluginsService::PluginsData('commontopmaxpicture', ['images']); if($ret['code'] == 0) { - // 数组组装 - $data = [ - 'data' => $ret['data'], - ]; - return DataReturn('处理成功', 0, $data); + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/commontopmaxpicture/admin/index'); } else { - return $ret; + return $ret['msg']; } } @@ -63,14 +61,11 @@ class Admin 1 => array('id' => 1, 'name' => '是'), ]; - // 数组组装 - $data = [ - 'is_whether_list' => $is_whether_list, - 'data' => $ret['data'], - ]; - return DataReturn('处理成功', 0, $data); + $this->assign('is_whether_list', $is_whether_list); + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/commontopmaxpicture/admin/saveinfo'); } else { - return $ret; + return $ret['msg']; } } diff --git a/application/plugins/commontopmaxpicture/Hook.php b/application/plugins/commontopmaxpicture/Hook.php index 978d96d37..1d94c36ce 100755 --- a/application/plugins/commontopmaxpicture/Hook.php +++ b/application/plugins/commontopmaxpicture/Hook.php @@ -10,8 +10,8 @@ // +---------------------------------------------------------------------- namespace app\plugins\commontopmaxpicture; +use think\Controller; use app\service\PluginsService; - /** * 顶部大图广告插件 - 钩子入口 * @author Devil @@ -19,7 +19,7 @@ use app\service\PluginsService; * @version 0.0.1 * @datetime 2016-12-01T21:51:08+0800 */ -class Hook +class Hook extends Controller { /** * 应用响应入口 @@ -59,10 +59,6 @@ class Hook // 获取应用数据 $ret = PluginsService::PluginsData('commontopmaxpicture', ['images']); - - // html拼接 - $html = '
    '; - $content .= ''; - $content .= ''; + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/commontopmaxpicture/index/content'); } else { - $content = $ret['msg']; + return $ret['msg']; } - $html .= '">'; - $html .= $content; - $html .= '
    '; - - return $html; } } ?> \ No newline at end of file diff --git a/application/plugins/commontopnotice/Admin.php b/application/plugins/commontopnotice/Admin.php index 34c3c7986..c3a7aaf49 100755 --- a/application/plugins/commontopnotice/Admin.php +++ b/application/plugins/commontopnotice/Admin.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\plugins\commontopnotice; +use think\Controller; use app\service\PluginsService; /** @@ -19,7 +20,7 @@ use app\service\PluginsService; * @version 0.0.1 * @datetime 2016-12-01T21:51:08+0800 */ -class Admin +class Admin extends Controller { /** * 首页 @@ -34,13 +35,10 @@ class Admin $ret = PluginsService::PluginsData('commontopnotice'); if($ret['code'] == 0) { - // 数组组装 - $data = [ - 'data' => $ret['data'], - ]; - return DataReturn('处理成功', 0, $data); + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/commontopnotice/admin/index'); } else { - return $ret; + return $ret['msg']; } } @@ -63,14 +61,11 @@ class Admin 1 => array('id' => 1, 'name' => '是'), ]; - // 数组组装 - $data = [ - 'is_whether_list' => $is_whether_list, - 'data' => $ret['data'], - ]; - return DataReturn('处理成功', 0, $data); + $this->assign('is_whether_list', $is_whether_list); + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/commontopnotice/admin/saveinfo'); } else { - return $ret; + return $ret['msg']; } } diff --git a/application/plugins/commontopnotice/Hook.php b/application/plugins/commontopnotice/Hook.php index fb933f5c8..450cab1e9 100755 --- a/application/plugins/commontopnotice/Hook.php +++ b/application/plugins/commontopnotice/Hook.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\plugins\commontopnotice; +use think\Controller; use app\service\PluginsService; /** @@ -19,7 +20,7 @@ use app\service\PluginsService; * @version 0.0.1 * @datetime 2016-12-01T21:51:08+0800 */ -class Hook +class Hook extends Controller { /** * 应用响应入口 @@ -59,10 +60,6 @@ class Hook // 获取应用数据 $ret = PluginsService::PluginsData('commontopnotice'); - - // html拼接 - $html = '
    '; - $content = ''; if($ret['code'] == 0) { // 内容是否为空 @@ -99,14 +96,11 @@ class Hook } } - $content .= '
    '.$ret['data']['content'].'
    '; + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/commontopnotice/index/content'); } else { - $content = $ret['msg']; + return $ret['msg']; } - $html .= $content; - $html .= '
    '; - - return $html; } } ?> \ No newline at end of file diff --git a/application/plugins/usercentertopnotice/Admin.php b/application/plugins/usercentertopnotice/Admin.php index 5d0560436..a91f6915c 100755 --- a/application/plugins/usercentertopnotice/Admin.php +++ b/application/plugins/usercentertopnotice/Admin.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\plugins\usercentertopnotice; +use think\Controller; use app\service\PluginsService; /** @@ -19,7 +20,7 @@ use app\service\PluginsService; * @version 0.0.1 * @datetime 2016-12-01T21:51:08+0800 */ -class Admin +class Admin extends Controller { /** * 首页 @@ -34,13 +35,10 @@ class Admin $ret = PluginsService::PluginsData('usercentertopnotice'); if($ret['code'] == 0) { - // 数组组装 - $data = [ - 'data' => $ret['data'], - ]; - return DataReturn('处理成功', 0, $data); + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/usercentertopnotice/admin/index'); } else { - return $ret; + return $ret['msg']; } } @@ -57,13 +55,10 @@ class Admin $ret = PluginsService::PluginsData('usercentertopnotice'); if($ret['code'] == 0) { - // 数组组装 - $data = [ - 'data' => $ret['data'], - ]; - return DataReturn('处理成功', 0, $data); + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/usercentertopnotice/admin/saveinfo'); } else { - return $ret; + return $ret['msg']; } } diff --git a/application/plugins/usercentertopnotice/Hook.php b/application/plugins/usercentertopnotice/Hook.php index c87a8288c..307177c39 100755 --- a/application/plugins/usercentertopnotice/Hook.php +++ b/application/plugins/usercentertopnotice/Hook.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\plugins\usercentertopnotice; +use think\Controller; use app\service\PluginsService; /** @@ -19,7 +20,7 @@ use app\service\PluginsService; * @version 0.0.1 * @datetime 2016-12-01T21:51:08+0800 */ -class Hook +class Hook extends Controller { /** * 应用响应入口 @@ -52,17 +53,8 @@ class Hook */ public function html($params = []) { - // 当前模块/控制器/方法 - $module_name = strtolower(request()->module()); - $controller_name = strtolower(request()->controller()); - $action_name = strtolower(request()->action()); - // 获取应用数据 $ret = PluginsService::PluginsData('usercentertopnotice'); - - // html拼接 - $html = '
    '; - $content = ''; if($ret['code'] == 0) { // 内容是否为空 @@ -89,14 +81,11 @@ class Hook } } - $content .= '
    '.$ret['data']['content'].'
    '; + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/usercentertopnotice/index/content'); } else { - $content = $ret['msg']; + return $ret['msg']; } - $html .= $content; - $html .= '
    '; - - return $html; } } ?> \ No newline at end of file diff --git a/application/plugins/userloginrewardintegral/Admin.php b/application/plugins/userloginrewardintegral/Admin.php index 5479e62d3..369897f62 100644 --- a/application/plugins/userloginrewardintegral/Admin.php +++ b/application/plugins/userloginrewardintegral/Admin.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\plugins\userloginrewardintegral; +use think\Controller; use app\service\PluginsService; /** @@ -19,7 +20,7 @@ use app\service\PluginsService; * @version 0.0.1 * @datetime 2016-12-01T21:51:08+0800 */ -class Admin +class Admin extends Controller { /** * 首页 @@ -34,13 +35,10 @@ class Admin $ret = PluginsService::PluginsData('userloginrewardintegral'); if($ret['code'] == 0) { - // 数组组装 - $data = [ - 'data' => $ret['data'], - ]; - return DataReturn('处理成功', 0, $data); + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/userloginrewardintegral/admin/index'); } else { - return $ret; + return $ret['msg']; } } @@ -63,14 +61,11 @@ class Admin 1 => array('id' => 1, 'name' => '是', 'checked' => true), ]; - // 数组组装 - $data = [ - 'is_whether_list' => $is_whether_list, - 'data' => $ret['data'], - ]; - return DataReturn('处理成功', 0, $data); + $this->assign('is_whether_list', $is_whether_list); + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/userloginrewardintegral/admin/saveinfo'); } else { - return $ret; + return $ret['msg']; } } diff --git a/application/plugins/view/commongobacktop/index/content.html b/application/plugins/view/commongobacktop/index/content.html new file mode 100644 index 000000000..0c2536867 --- /dev/null +++ b/application/plugins/view/commongobacktop/index/content.html @@ -0,0 +1,5 @@ +
    +
    + +
    +
    \ No newline at end of file diff --git a/application/plugins/view/commononlineservice/index/content.html b/application/plugins/view/commononlineservice/index/content.html new file mode 100644 index 000000000..e1bda9954 --- /dev/null +++ b/application/plugins/view/commononlineservice/index/content.html @@ -0,0 +1,30 @@ +
    +
    + 展开 + 收缩 +
    +
    +
    + {{if !empty($data['title'])}} +

    {{$data.title}}

    + {{/if}} + {{if !empty($data['online_service'])}} +
      + {{foreach name=$data.online_service as $v}} +
    • + {{$v[0]}} + + 点击这里给我发消息 + +
    • + {{/foreach}} + {{if !empty($data['title'])}} +
    • + 电话:{{$data.tel}} +
    • + {{/if}} +
    + {{/if}} +
    +
    +
    \ No newline at end of file diff --git a/application/plugins/view/commonrightnavigation/index/content.html b/application/plugins/view/commonrightnavigation/index/content.html new file mode 100644 index 000000000..666a2da41 --- /dev/null +++ b/application/plugins/view/commonrightnavigation/index/content.html @@ -0,0 +1,87 @@ +
    + + +
    + +
    + 用户中心 +
    +
    +
    +
    + + + +
    + +
    + 我的足迹 +
    +
    +
    +
    + + + +
    + +
    + 我的收藏 +
    +
    +
    +
    + + + +
    + +
    + 购物车 +
    {{if $cart_total > 9}}9+{{else /}}{{$cart_total}}{{/if}}
    +
    +
    +
    + + +
    + +
    +
      + {{if !empty($data['alipay_mini_qrcode_images'])}} +
    • +

      支付宝小程序

      + 支付宝小程序 +
    • + {{/if}} + {{if !empty($data['alipay_fuwu_qrcode_images'])}} +
    • +

      支付宝生活号

      + 支付宝生活号 +
    • + {{/if}} + {{if !empty($data['weixin_mini_qrcode_images'])}} +
    • +

      微信小程序

      + 微信小程序 +
    • + {{/if}} + {{if !empty($data['weixin_fuwu_qrcode_images'])}} +
    • +

      微信公众号

      + 微信公众号 +
    • + {{/if}} +
    +
    +
    + + +
    + +
    + 返回顶部 +
    +
    +
    +
    \ No newline at end of file diff --git a/application/plugins/view/commontopmaxpicture/index/content.html b/application/plugins/view/commontopmaxpicture/index/content.html new file mode 100644 index 000000000..ce7d531fd --- /dev/null +++ b/application/plugins/view/commontopmaxpicture/index/content.html @@ -0,0 +1,5 @@ +
    + + + +
    \ No newline at end of file diff --git a/application/plugins/view/commontopnotice/index/content.html b/application/plugins/view/commontopnotice/index/content.html new file mode 100644 index 000000000..d2f141836 --- /dev/null +++ b/application/plugins/view/commontopnotice/index/content.html @@ -0,0 +1,3 @@ +
    +
    {{$data.content}}
    +
    \ No newline at end of file diff --git a/application/plugins/view/usercentertopnotice/index/content.html b/application/plugins/view/usercentertopnotice/index/content.html new file mode 100644 index 000000000..d2f141836 --- /dev/null +++ b/application/plugins/view/usercentertopnotice/index/content.html @@ -0,0 +1,3 @@ +
    +
    {{$data.content}}
    +
    \ No newline at end of file diff --git a/application/service/PluginsAdminService.php b/application/service/PluginsAdminService.php index be47a4c63..dda80f262 100644 --- a/application/service/PluginsAdminService.php +++ b/application/service/PluginsAdminService.php @@ -486,7 +486,7 @@ class PluginsAdminService $admin=<< ['hello', 'world!'], - 'msg' => 'hello world! admin', - ]; - return DataReturn('处理成功', 0, \$data); + \$this->assign('data', ['hello', 'world!']); + \$this->assign('msg', 'hello world! admin'); + return \$this->fetch('../../../plugins/view/$plugins/admin/index'); } } ?> @@ -513,7 +511,7 @@ php; $hook=<< ['hello', 'world!'], - 'msg' => 'hello world! index', - ]; - return DataReturn('处理成功', 0, \$data); + \$this->assign('data', ['hello', 'world!']); + \$this->assign('msg', 'hello world! index'); + return \$this->fetch('../../../plugins/view/$plugins/index/index'); } } ?> diff --git a/application/tags.php b/application/tags.php index 6201d3052..109265b7d 100755 --- a/application/tags.php +++ b/application/tags.php @@ -45,6 +45,20 @@ return array ( array ( 0 => 'app\\plugins\\userloginrewardintegral\\Hook', ), + 'plugins_view_common_bottom' => + array ( + 0 => 'app\\plugins\\commongobacktop\\Hook', + 1 => 'app\\plugins\\commonrightnavigation\\Hook', + 2 => 'app\\plugins\\commononlineservice\\Hook', + ), + 'plugins_common_page_bottom' => + array ( + 0 => 'app\\plugins\\commongobacktop\\Hook', + ), + 'plugins_common_header' => + array ( + 0 => 'app\\plugins\\commongobacktop\\Hook', + ), 'plugins_css' => array ( 0 => 'app\\plugins\\commonrightnavigation\\Hook', @@ -55,10 +69,5 @@ return array ( 0 => 'app\\plugins\\commonrightnavigation\\Hook', 1 => 'app\\plugins\\commononlineservice\\Hook', ), - 'plugins_view_common_bottom' => - array ( - 0 => 'app\\plugins\\commonrightnavigation\\Hook', - 1 => 'app\\plugins\\commononlineservice\\Hook', - ), ); ?> \ No newline at end of file diff --git a/config/shopxo.php b/config/shopxo.php index d37e4d1da..715cf1062 100644 --- a/config/shopxo.php +++ b/config/shopxo.php @@ -15,7 +15,7 @@ return [ // 开发模式 - 'is_develop' => false, + 'is_develop' => true, // 默认编码 'default_charset' => 'utf-8',