diff --git a/application/index/view/default/public/footer.html b/application/index/view/default/public/footer.html index 893a78556c6d059e901d3954470378124a92fb81..afa7f784deec6e695e842d33b1d34539bfcc877e 100755 --- a/application/index/view/default/public/footer.html +++ b/application/index/view/default/public/footer.html @@ -66,7 +66,7 @@ {{if !empty($plugins_js_data) and is_array($plugins_js_data) and (!isset($is_header) or $is_header eq 1)}} {{foreach $plugins_js_data as $hook}} {{if is_string($hook)}} - + {{/if}} {{/foreach}} {{/if}} diff --git a/application/plugins/commonrightnavigation/Hook.php b/application/plugins/commonrightnavigation/Hook.php index fa30b833c970cd5b7c65327420d8b92a12f792ee..bfce1dcd60c0758f6ab74d9d89498e6e34842559 100755 --- a/application/plugins/commonrightnavigation/Hook.php +++ b/application/plugins/commonrightnavigation/Hook.php @@ -48,16 +48,16 @@ class Hook { switch($params['hook_name']) { - case 'plugins_view_common_bottom' : - $ret = $this->html($params); + case 'plugins_css' : + $ret = __MY_ROOT_PUBLIC__.'static/plugins/css/commonrightnavigation/style.css'; break; - case 'plugins_view_common_page_bottom' : - $ret = $this->js($params); + case 'plugins_js' : + $ret = __MY_ROOT_PUBLIC__.'static/plugins/js/commonrightnavigation/style.js'; break; - case 'plugins_view_common_header' : - $ret = $this->css($params); + case 'plugins_view_common_bottom' : + $ret = $this->html($params); break; default : @@ -70,68 +70,6 @@ class Hook } } - /** - * css - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @datetime 2019-02-06T16:16:34+0800 - * @param [array] $params [输入参数] - */ - public function css($params = []) - { - return ''; - } - - /** - * js - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @datetime 2019-02-06T16:16:34+0800 - * @param [array] $params [输入参数] - */ - public function js($params = []) - { - return ''; - } - /** * 视图 * @author Devil @@ -171,11 +109,14 @@ class Hook // 购物车总数 $cart_total = BuyService::UserCartTotal(['user'=>$params['user']]); + // 是否需要登录 + $login_event = empty($params['user']) ? 'login-event' : ''; + // 内容 $content .= ' - +
- +
用户中心
◆
@@ -184,7 +125,7 @@ class Hook - +
@@ -195,7 +136,7 @@ class Hook - +
@@ -206,7 +147,7 @@ class Hook - +
@@ -248,9 +189,9 @@ class Hook if(!empty($qrcode)) { $content .= ' -
+
-
+
    '.$qrcode.'
'; diff --git a/application/plugins/commonrightnavigation/config.json b/application/plugins/commonrightnavigation/config.json index 10d351c5f7a5e303dfcaf23740e8cd5586b18ac8..28e57422670aca61a263a76479d2a33358f7e345 100644 --- a/application/plugins/commonrightnavigation/config.json +++ b/application/plugins/commonrightnavigation/config.json @@ -17,13 +17,13 @@ "is_home":false }, "hook":{ - "plugins_view_common_bottom":[ + "plugins_css":[ "app\\plugins\\commonrightnavigation\\Hook" ], - "plugins_view_common_page_bottom":[ + "plugins_js":[ "app\\plugins\\commonrightnavigation\\Hook" ], - "plugins_view_common_header":[ + "plugins_view_common_bottom":[ "app\\plugins\\commonrightnavigation\\Hook" ] } diff --git a/application/plugins/view/commonrightnavigation/admin/index.html b/application/plugins/view/commonrightnavigation/admin/index.html index 152ee318075ad762c93e885ce95bcb0b1c951757..3b269e7565f0a1a1bd32bcde54af07ff73f73f8b 100755 --- a/application/plugins/view/commonrightnavigation/admin/index.html +++ b/application/plugins/view/commonrightnavigation/admin/index.html @@ -4,33 +4,41 @@
- 顶部大图 + 右侧导航 返回
- +
- +
- -
+ +
+ +
- -
- {{if !empty($data['url'])}} - {{$data.url}} - {{else /}} - 无 - {{/if}} + +
+ +
+
+
+ +
+
- + +
+
+
+
{{if isset($data['is_new_window_open']) and $data['is_new_window_open'] eq 1}} 是 @@ -49,20 +57,6 @@ {{/if}}
-
- -
- {{if !empty($data['time_start']) and !empty($data['time_end'])}} - {{$data.time_start}} ~ {{$data.time_end}} - {{elseif !empty($data['time_start']) and empty($data['time_end'])}} - {{$data.time_start}} ~ 长期有效 - {{elseif empty($data['time_start']) and !empty($data['time_end'])}} - 立即生效 ~ {{$data.time_end}} - {{else /}} - 无限制 - {{/if}} -
-
编辑
diff --git a/application/plugins/view/commonrightnavigation/admin/saveinfo.html b/application/plugins/view/commonrightnavigation/admin/saveinfo.html index 3d08d852591501122cbbb97a63dff09bf3c91481..521a26445708bdd68e921b96302e4c02d12f9279 100755 --- a/application/plugins/view/commonrightnavigation/admin/saveinfo.html +++ b/application/plugins/view/commonrightnavigation/admin/saveinfo.html @@ -6,18 +6,20 @@
- 顶部大图 + 右侧导航 返回
    -
  • - - - × -
    • + {{if !empty($data['alipay_mini_qrcode_images'])}} +
  • + + + × +
    • + {{/if}}
+上传图片
@@ -25,11 +27,13 @@
    -
  • - - - × -
    • + {{if !empty($data['alipay_fuwu_qrcode_images'])}} +
  • + + + × +
    • + {{/if}}
+上传图片
@@ -37,11 +41,13 @@
    -
  • - - - × -
    • + {{if !empty($data['weixin_mini_qrcode_images'])}} +
  • + + + × +
    • + {{/if}}
+上传图片
@@ -49,11 +55,13 @@
    -
  • - - - × -
    • + {{if !empty($data['weixin_fuwu_qrcode_images'])}} +
  • + + + × +
    • + {{/if}}
+上传图片
diff --git a/application/tags.php b/application/tags.php index 1fb819bdba473831244df1cfe11b5b10cfa8d413..ea183c76685c329f6e4ff767641ee44c16303b46 100755 --- a/application/tags.php +++ b/application/tags.php @@ -45,15 +45,15 @@ return array ( array ( 0 => 'app\\plugins\\userloginrewardintegral\\Hook', ), - 'plugins_view_common_bottom' => + 'plugins_css' => array ( 0 => 'app\\plugins\\commonrightnavigation\\Hook', ), - 'plugins_view_common_page_bottom' => + 'plugins_js' => array ( 0 => 'app\\plugins\\commonrightnavigation\\Hook', ), - 'plugins_view_common_header' => + 'plugins_view_common_bottom' => array ( 0 => 'app\\plugins\\commonrightnavigation\\Hook', ), diff --git a/public/static/index/default/css/index.css b/public/static/index/default/css/index.css index 5e23c1df2137f68276aca699cb4a6ee1d9afc34d..651c41fc6f71f1e222f605a5a62d54bbd8291e3c 100755 --- a/public/static/index/default/css/index.css +++ b/public/static/index/default/css/index.css @@ -16,7 +16,7 @@ dt + dd {margin-top: 0;} /*手机专享*/ .small-nav {padding:10px 0px; font-size:12px;} .small-nav .am-u-sm-3 { text-align: center; margin: 5px 0; } -.small-nav .nav-icon {max-width: 48px; padding: 8px; margin: 0 auto; border-radius: 50px; background-color: #d2364c; } +.small-nav .nav-icon {max-width: 50px; max-height: 50px; padding: 12px; margin: 0 auto; border-radius: 50px; background-color: #d2364c; } .small-nav .am-u-sm-3:last-child { float: left; } .small-nav .mini-nav-title { margin-top: 5px; } .small-nav .mini-nav-goods-category { background-color: #FB6E52; } @@ -130,7 +130,7 @@ text-align: center;float:none} /*推荐*/ .flood li {width: 50%;float: left;text-align: center;} @media only screen and (min-width: 480px) { - .small-nav img{max-width:60px;} + .small-nav img{max-width: 100%;max-height: 100%;} .small-nav{ font-size:14px;} .flood li{width:33.3%;} diff --git a/public/static/plugins/css/commonrightnavigation/admin.css b/public/static/plugins/css/commonrightnavigation/admin.css index 2bdd937872d735fc2ac5a56ae173ddbd76e15910..ac823bfa9dc33c0990a43895e45070505fb00524 100755 --- a/public/static/plugins/css/commonrightnavigation/admin.css +++ b/public/static/plugins/css/commonrightnavigation/admin.css @@ -9,15 +9,12 @@ .commonrightnavigation-content .items .immages-tag { border: 1px solid #eee; text-align: center; + width: 120px; + height: 120px; } .commonrightnavigation-content .items .immages-tag img { max-width: 100%; } -.commonrightnavigation-content .items .bg-color-tag { - width: 100%; - height: 50px; - border: 1px solid #eee; -} .commonrightnavigation-content .edit-submit { margin-bottom: 20px; } diff --git a/public/static/plugins/css/commonrightnavigation/style.css b/public/static/plugins/css/commonrightnavigation/style.css new file mode 100644 index 0000000000000000000000000000000000000000..ca2d9d174e8532c45c125ec0d68e5c36a43fd570 --- /dev/null +++ b/public/static/plugins/css/commonrightnavigation/style.css @@ -0,0 +1,181 @@ +@media only screen and (min-width:640px) { + .commonrightnavigation-right-nav { + width: 35px; + height: 100vh; + background: #000; + position: fixed; + top: 0; + right: 0; + font-size: 16px; + z-index: 1000; + } + .commonrightnavigation-right-nav .base-nav { + text-align: center; + position: absolute; + width: 100%; + color: #ccc; + cursor: pointer; + } + .commonrightnavigation-right-nav .base-nav [class*="am-icon-"]:before { + line-height: 35px; + } + .commonrightnavigation-right-nav .mui-mbar-tab-tip { + position: absolute; + left: -90px; + top: 0; + width: 90px; + height: 35px; + line-height: 35px; + text-align: center; + color: #fff; + background-color: #494949; + -webkit-box-shadow: 0 0 5px rgba(0,0,0,.2); + -moz-box-shadow: 0 0 5px rgba(0,0,0,.2); + box-shadow: 0 0 5px rgba(0,0,0,.2); + font-size: 12px; + font-weight: 700; + display: none; + } + .mui-mbar-popup { + height: auto; + position: absolute; + right: 36px; + display: none; + box-shadow: -5px 5px 15px 0px rgba(0,0,0,.4); + } + .commonrightnavigation-right-nav .base-nav:hover { + background: #d2364c; + color: #fff; + } + .commonrightnavigation-right-nav .base-nav:hover .mui-mbar-tab-tip, .commonrightnavigation-right-nav .base-nav:hover .mui-mbar-popup { + display: block; + } + .commonrightnavigation-right-nav .mui-mbar-tab-tip-arr { + top: 10px; + right: -8px; + color: #494949; + } + .commonrightnavigation-right-nav .mui-mbar-arr { + position: absolute; + width: 16px; + height: 16px; + line-height: 16px; + text-align: center; + font-size: 16px; + font-family: "\5b8b\4f53"; + } + .commonrightnavigation-right-nav .go-top { + bottom: 0; + left: 0; + height: 35px; + display: none; + } + .commonrightnavigation-right-nav .qrcode-content { + bottom: 35px; + left: 0; + height: 35px; + } + .commonrightnavigation-right-nav .cart { + bottom: 45vh; + left: 0; + height: 140px; + border-top: 1px solid #444; + border-bottom: 1px solid #444; + padding: 10px 0; + } + .commonrightnavigation-right-nav .cart:hover { + border-top: 1px solid #d2364c; + border-bottom: 1px solid #d2364c; + } + .commonrightnavigation-right-nav .favor { + bottom: calc(45vh + 150px); + left: 0; + height: 35px; + } + .commonrightnavigation-right-nav .browse { + bottom: calc(45vh + 185px); + left: 0; + height: 35px; + } + .commonrightnavigation-right-nav .user-center { + bottom: calc(45vh + 220px); + left: 0; + height: 35px; + padding: 5px; + } + .commonrightnavigation-right-nav .user-center img { + border-radius: 50px; + } + .commonrightnavigation-right-nav .cart .cart-text { + width: 12px; + font-size: 12px; + margin-left: 11.5px; + } + .commonrightnavigation-right-nav .cart .cart-text .cart-count { + background: #d2364c; + color: #fff; + padding: 0 3px; + min-width: 14px; + width: 20px; + height: 20px; + line-height: 20px; + border-radius: 10px; + font-size: 12px; + margin-left: -4px; + overflow: hidden; + } + .commonrightnavigation-right-nav .qrcode-items { + bottom: 0; + width: 140px; + } + .commonrightnavigation-right-nav .qrcode-items ul { + padding: 0; + border: 1px solid #eee; + padding: 10px 10px; + background: #f5f5f5; + } + .commonrightnavigation-right-nav .qrcode-items li { + list-style: none; + } + .commonrightnavigation-right-nav .qrcode-items li:not(:first-child) { + margin-top: 10px; + } + .commonrightnavigation-right-nav .qrcode-items p { + font-size: 14px; + font-weight: 700; + color: #666; + padding: 0; + margin: 0; + line-height: 24px; + } + .commonrightnavigation-right-nav .qrcode-items img { + width: 120px; + } +} + +@media only screen and (max-width:640px) { + .commonrightnavigation-right-nav .user-content, + .commonrightnavigation-right-nav .browse-content, + .commonrightnavigation-right-nav .favor-content, + .commonrightnavigation-right-nav .cart-content, + .commonrightnavigation-right-nav .qrcode-content, + .commonrightnavigation-right-nav .go-top .mui-mbar-tab-tip { + display: none; + } + .commonrightnavigation-right-nav .go-top { + position: fixed; + bottom: 130px; + right: 10px; + background: #eee; + width: 45px; + height: 45px; + line-height: 45px; + text-align: center; + color: #666; + font-size: 20px; + cursor: pointer; + border-radius: 50px; + border: 1px solid #e3e3e3; + z-index: 10000; + } +} \ No newline at end of file diff --git a/public/static/plugins/js/commonrightnavigation/style.js b/public/static/plugins/js/commonrightnavigation/style.js new file mode 100644 index 0000000000000000000000000000000000000000..8878bec6f31ff438a27509360adc59bdae5635e4 --- /dev/null +++ b/public/static/plugins/js/commonrightnavigation/style.js @@ -0,0 +1,13 @@ +$(function() +{ + // 回顶部监测 + $(window).scroll(function() + { + if($(window).scrollTop() > 100) + { + $("#plugins-commonrightnavigation").fadeIn(1000); + } else { + $("#plugins-commonrightnavigation").fadeOut(1000); + } + }); +}); \ No newline at end of file diff --git a/public/static/upload/images/plugins_commonrightnavigation/2019/02/15/1550222872753553.png b/public/static/upload/images/plugins_commonrightnavigation/2019/02/15/1550222872753553.png old mode 100644 new mode 100755 diff --git a/public/static/upload/images/plugins_commonrightnavigation/2019/02/17/1550375588899802.jpeg b/public/static/upload/images/plugins_commonrightnavigation/2019/02/17/1550375588899802.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..c114a4b64581140fb8bc92d34e5836a5feb5cada Binary files /dev/null and b/public/static/upload/images/plugins_commonrightnavigation/2019/02/17/1550375588899802.jpeg differ