diff --git a/public/vendor/scrolltofixed/jquery-scrolltofixed-min.js b/public/vendor/scrolltofixed/jquery-scrolltofixed-min.js new file mode 100644 index 00000000..6b6fa8d5 --- /dev/null +++ b/public/vendor/scrolltofixed/jquery-scrolltofixed-min.js @@ -0,0 +1 @@ +(function(a){a.isScrollToFixed=function(b){return !!a(b).data("ScrollToFixed")};a.ScrollToFixed=function(d,i){var m=this;m.$el=a(d);m.el=d;m.$el.data("ScrollToFixed",m);var c=false;var H=m.$el;var I;var F;var k;var e;var z;var E=0;var r=0;var j=-1;var f=-1;var u=null;var A;var g;function v(){H.trigger("preUnfixed.ScrollToFixed");l();H.trigger("unfixed.ScrollToFixed");f=-1;E=H.offset().top;r=H.offset().left;if(m.options.offsets){r+=(H.offset().left-H.position().left)}if(j==-1){j=r}I=H.css("position");c=true;if(m.options.bottom!=-1){H.trigger("preFixed.ScrollToFixed");x();H.trigger("fixed.ScrollToFixed")}}function o(){var J=m.options.limit;if(!J){return 0}if(typeof(J)==="function"){return J.apply(H)}return J}function q(){return I==="fixed"}function y(){return I==="absolute"}function h(){return !(q()||y())}function x(){if(!q()){var J=H[0].getBoundingClientRect();u.css({display:H.css("display"),width:J.width,height:J.height,"float":H.css("float")});cssOptions={"z-index":m.options.zIndex,position:"fixed",top:m.options.bottom==-1?t():"",bottom:m.options.bottom==-1?"":m.options.bottom,"margin-left":"0px"};if(!m.options.dontSetWidth){cssOptions.width=H.css("width")}H.css(cssOptions);H.addClass(m.options.baseClassName);if(m.options.className){H.addClass(m.options.className)}I="fixed"}}function b(){var K=o();var J=r;if(m.options.removeOffsets){J="";K=K-E}cssOptions={position:"absolute",top:K,left:J,"margin-left":"0px",bottom:""};if(!m.options.dontSetWidth){cssOptions.width=H.css("width")}H.css(cssOptions);I="absolute"}function l(){if(!h()){f=-1;u.css("display","none");H.css({"z-index":z,width:"",position:F,left:"",top:e,"margin-left":""});H.removeClass("scroll-to-fixed-fixed");if(m.options.className){H.removeClass(m.options.className)}I=null}}function w(J){if(J!=f){H.css("left",r-J);f=J}}function t(){var J=m.options.marginTop;if(!J){return 0}if(typeof(J)==="function"){return J.apply(H)}return J}function B(){if(!a.isScrollToFixed(H)||H.is(":hidden")){return}var M=c;var L=h();if(!c){v()}else{if(h()){E=H.offset().top;r=H.offset().left}}var J=a(window).scrollLeft();var N=a(window).scrollTop();var K=o();if(m.options.minWidth&&a(window).width()m.options.maxWidth){if(!h()||!M){p();H.trigger("preUnfixed.ScrollToFixed");l();H.trigger("unfixed.ScrollToFixed")}}else{if(m.options.bottom==-1){if(K>0&&N>=K-t()){if(!L&&(!y()||!M)){p();H.trigger("preAbsolute.ScrollToFixed");b();H.trigger("unfixed.ScrollToFixed")}}else{if(N>=E-t()){if(!q()||!M){p();H.trigger("preFixed.ScrollToFixed");x();f=-1;H.trigger("fixed.ScrollToFixed")}w(J)}else{if(!h()||!M){p();H.trigger("preUnfixed.ScrollToFixed");l();H.trigger("unfixed.ScrollToFixed")}}}}else{if(K>0){if(N+a(window).height()-H.outerHeight(true)>=K-(t()||-n())){if(q()){p();H.trigger("preUnfixed.ScrollToFixed");if(F==="absolute"){b()}else{l()}H.trigger("unfixed.ScrollToFixed")}}else{if(!q()){p();H.trigger("preFixed.ScrollToFixed");x()}w(J);H.trigger("fixed.ScrollToFixed")}}else{w(J)}}}}}function n(){if(!m.options.bottom){return 0}return m.options.bottom}function p(){var J=H.css("position");if(J=="absolute"){H.trigger("postAbsolute.ScrollToFixed")}else{if(J=="fixed"){H.trigger("postFixed.ScrollToFixed")}else{H.trigger("postUnfixed.ScrollToFixed")}}}var D=function(J){if(H.is(":visible")){c=false;B()}else{l()}};var G=function(J){(!!window.requestAnimationFrame)?requestAnimationFrame(B):B()};var C=function(){var K=document.body;if(document.createElement&&K&&K.appendChild&&K.removeChild){var M=document.createElement("div");if(!M.getBoundingClientRect){return null}M.innerHTML="x";M.style.cssText="position:fixed;top:100px;";K.appendChild(M);var N=K.style.height,O=K.scrollTop;K.style.height="3000px";K.scrollTop=500;var J=M.getBoundingClientRect().top;K.style.height=N;var L=(J===100);K.removeChild(M);K.scrollTop=O;return L}return null};var s=function(J){J=J||window.event;if(J.preventDefault){J.preventDefault()}J.returnValue=false};m.init=function(){m.options=a.extend({},a.ScrollToFixed.defaultOptions,i);z=H.css("z-index");m.$el.css("z-index",m.options.zIndex);u=a("
");I=H.css("position");F=H.css("position");k=H.css("float");e=H.css("top");if(h()){m.$el.after(u)}a(window).bind("resize.ScrollToFixed",D);a(window).bind("scroll.ScrollToFixed",G);if("ontouchmove" in window){a(window).bind("touchmove.ScrollToFixed",B)}if(m.options.preFixed){H.bind("preFixed.ScrollToFixed",m.options.preFixed)}if(m.options.postFixed){H.bind("postFixed.ScrollToFixed",m.options.postFixed)}if(m.options.preUnfixed){H.bind("preUnfixed.ScrollToFixed",m.options.preUnfixed)}if(m.options.postUnfixed){H.bind("postUnfixed.ScrollToFixed",m.options.postUnfixed)}if(m.options.preAbsolute){H.bind("preAbsolute.ScrollToFixed",m.options.preAbsolute)}if(m.options.postAbsolute){H.bind("postAbsolute.ScrollToFixed",m.options.postAbsolute)}if(m.options.fixed){H.bind("fixed.ScrollToFixed",m.options.fixed)}if(m.options.unfixed){H.bind("unfixed.ScrollToFixed",m.options.unfixed)}if(m.options.spacerClass){u.addClass(m.options.spacerClass)}H.bind("resize.ScrollToFixed",function(){u.height(H.height())});H.bind("scroll.ScrollToFixed",function(){H.trigger("preUnfixed.ScrollToFixed");l();H.trigger("unfixed.ScrollToFixed");B()});H.bind("detach.ScrollToFixed",function(J){s(J);H.trigger("preUnfixed.ScrollToFixed");l();H.trigger("unfixed.ScrollToFixed");a(window).unbind("resize.ScrollToFixed",D);a(window).unbind("scroll.ScrollToFixed",G);H.unbind(".ScrollToFixed");u.remove();m.$el.removeData("ScrollToFixed")});D()};m.init()};a.ScrollToFixed.defaultOptions={marginTop:0,limit:0,bottom:-1,zIndex:1000,baseClassName:"scroll-to-fixed-fixed"};a.fn.scrollToFixed=function(b){return this.each(function(){(new a.ScrollToFixed(this,b))})}})(jQuery); \ No newline at end of file diff --git a/resources/beike/admin/views/pages/design/module/image401.blade.php b/resources/beike/admin/views/pages/design/module/image401.blade.php index 3201131a..55cb08a0 100644 --- a/resources/beike/admin/views/pages/design/module/image401.blade.php +++ b/resources/beike/admin/views/pages/design/module/image401.blade.php @@ -15,7 +15,11 @@
-
{{ __('admin/builder.text_suggested_size') }}: 1060 x 380
+
{{ __('admin/builder.text_suggested_size') }}: + 780 x 614 + 372 x 292 + 780 x 292 +
diff --git a/resources/beike/shop/default/js/app.js b/resources/beike/shop/default/js/app.js index 24089a7c..0733573f 100644 --- a/resources/beike/shop/default/js/app.js +++ b/resources/beike/shop/default/js/app.js @@ -3,7 +3,7 @@ * @link https://beikeshop.com * @Author pu shuo * @Date 2022-08-29 17:32:51 - * @LastEditTime 2022-09-16 20:56:37 + * @LastEditTime 2023-01-16 11:28:28 */ import http from "../../../../js/http"; @@ -35,9 +35,17 @@ $(document).ready(function ($) { }) }) + if ($(window).width() > 992 && $('.x-fixed-top').length) { + $('.x-fixed-top').scrollToFixed({ + limit: function () { + var limit = $('footer').offset().top - 84 - $('.x-fixed-top').outerHeight(true); + return limit + } + }); + } + const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]') const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl)) }); -bk.getCarts(); // 页面初始加载购物车数据 -bk.slidingFixed(); \ No newline at end of file +bk.getCarts(); // 页面初始加载购物车数据 \ No newline at end of file diff --git a/resources/beike/shop/default/js/common.js b/resources/beike/shop/default/js/common.js index 02cf36a2..37389250 100644 --- a/resources/beike/shop/default/js/common.js +++ b/resources/beike/shop/default/js/common.js @@ -3,7 +3,7 @@ * @link https://beikeshop.com * @Author pu shuo * @Date 2022-09-09 19:16:39 - * @LastEditTime 2023-01-13 11:29:27 + * @LastEditTime 2023-01-16 10:42:11 */ export default { @@ -84,31 +84,6 @@ export default { } }, - /** - * @description: 滑动固定顶部 - * @return {*} - */ - slidingFixed() { - $(document).ready(() => { - if (!$('.fixed-top-line').length) return; - if ($(window).width() < 768) return; - const [fTop, tLeft] = [$('.fixed-top-line'), $('.fixed-top-left')] - const fTopTop = fTop.offset().top; - const fTopWidth = fTop.outerWidth(); - const fTopHeight = fTop.outerHeight(); - - $(window).scroll(function () { - const topLeftHeight = tLeft.outerHeight(); - - if ($(this).scrollTop() > fTopTop && topLeftHeight > fTopHeight) { - fTop.css({position: 'fixed', top: 0, bottom: 'auto', 'width': fTopWidth}) - } else { - fTop.removeAttr('style') - } - }) - }) - }, - openLogin() { layer.open({ type: 2, @@ -121,14 +96,6 @@ export default { }); }, - openWin(url, name = '', iWidth = 700, iHeight = 500) { - var iTop = (window.screen.height - 30 - iHeight) / 2;; - var iLeft = (window.screen.width - 10 - iWidth) / 2;; - window.open(url, name, 'height=' + iHeight + ',innerHeight=' + iHeight -　　　　+ ',width=' + iWidth + ',innerWidth=' + iWidth + ',top=' + iTop + ',left=' + iLeft -　　　　+ ',toolbar=no,menubar=no,scrollbars=auto,resizeable=no,location=no,status=no'); - }, - getQueryString(name, defaultValue) { const reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)'); const r = window.location.search.substr(1).match(reg); diff --git a/themes/default/cart/cart.blade.php b/themes/default/cart/cart.blade.php index b9d86d7c..0b352a37 100644 --- a/themes/default/cart/cart.blade.php +++ b/themes/default/cart/cart.blade.php @@ -5,6 +5,7 @@ @push('header') + @endpush @@ -23,7 +24,7 @@
-
+

{{ __('shop/carts.commodity') }}

@@ -78,7 +79,7 @@
-
+

{{ __('shop/carts.product_total') }}

diff --git a/themes/default/category.blade.php b/themes/default/category.blade.php index cf6cd745..eade083d 100644 --- a/themes/default/category.blade.php +++ b/themes/default/category.blade.php @@ -4,6 +4,10 @@ @section('keywords', $category->description->meta_keywords ?: system_setting('base.meta_keyword')) @section('description', $category->description->meta_description ?: system_setting('base.meta_description')) +@push('header') + +@endpush + @section('content')
@@ -11,7 +15,7 @@
- @include('shared.filter_sidebar_block') +
@include('shared.filter_sidebar_block')
diff --git a/themes/default/checkout.blade.php b/themes/default/checkout.blade.php index ed3d9513..89f1f689 100644 --- a/themes/default/checkout.blade.php +++ b/themes/default/checkout.blade.php @@ -4,6 +4,7 @@ @push('header') + @endpush @@ -19,7 +20,7 @@
-
+
@include('checkout._address') @@ -66,7 +67,7 @@
-
+
@if (!current_customer())
diff --git a/themes/default/shared/filter_sidebar_block.blade.php b/themes/default/shared/filter_sidebar_block.blade.php index f2808d11..3107851e 100644 --- a/themes/default/shared/filter_sidebar_block.blade.php +++ b/themes/default/shared/filter_sidebar_block.blade.php @@ -71,24 +71,29 @@ @push('add-scripts') @endpush \ No newline at end of file