wuhui_zzw
/
wyyl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复 一行四图pro 模块建议尺寸错误等

This commit is contained in:
pushuo 2023-01-16 11:41:27 +08:00 committed by Edward Yang
parent 9579ae8c08
commit f643c76632
8 changed files with 52 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/vendor/scrolltofixed/jquery-scrolltofixed-min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

6
resources/beike/admin/views/pages/design/module/image401.blade.php
View File

@ -15,7 +15,11 @@
<div :class="'pb-images-list ' + (item.show ? 'active' : '')">
<div class="pb-images-top">
<pb-image-selector v-model="item.image"></pb-image-selector>
<div class="tag">{{ __('admin/builder.text_suggested_size') }}: 1060 x 380</div>
<div class="tag">{{ __('admin/builder.text_suggested_size') }}:
<span v-if="index == 0">780 x 614</span>
<span v-if="index == 1 || index == 2">372 x 292</span>
<span v-if="index == 3">780 x 292</span>
</div>
</div>
<link-selector v-model="item.link"></link-selector>
</div>

14
resources/beike/shop/default/js/app.js vendored
View File

@ -3,7 +3,7 @@
* @link https://beikeshop.com
* @Author pu shuo <pushuo@guangda.work>
* @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();
bk.getCarts(); // 页面初始加载购物车数据

35
resources/beike/shop/default/js/common.js vendored
View File

@ -3,7 +3,7 @@
* @link https://beikeshop.com
* @Author pu shuo <pushuo@guangda.work>
* @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);

5
themes/default/cart/cart.blade.php
View File

@ -5,6 +5,7 @@
@push('header')
<script src="{{ asset('vendor/vue/2.7/vue' . (!config('app.debug') ? '.min' : '') . '.js') }}"></script>
<script src="{{ asset('vendor/element-ui/2.15.6/js.js') }}"></script>
<script src="{{ asset('vendor/scrolltofixed/jquery-scrolltofixed-min.js') }}"></script>
<link rel="stylesheet" href="{{ asset('vendor/element-ui/2.15.6/css.css') }}">
@endpush
@ -23,7 +24,7 @@
<div class="row mt-5" v-if="products.length">
<div class="col-12 col-md-9 left-column">
<div class="card shadow-sm fixed-top-left">
<div class="card shadow-sm">
<div class="card-body p-lg-4">
<div class="p-lg-0"><h4 class="mb-3">{{ __('shop/carts.commodity') }}</h4></div>
<div class="cart-products-wrap table-responsive">
@ -78,7 +79,7 @@
</div>
</div>
<div class="col-12 col-md-3 right-column">
<div class="card shadow-sm fixed-top-line">
<div class="card shadow-sm x-fixed-top">
<div class="card-body p-lg-4">
<div class="card total-wrap">
<div class="p-lg-0"><h4 class="mb-3">{{ __('shop/carts.product_total') }}</h4></div>

6
themes/default/category.blade.php
View File

@ -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')
<script src="{{ asset('vendor/scrolltofixed/jquery-scrolltofixed-min.js') }}"></script>
@endpush
@section('content')
<div class="container">
@ -11,7 +15,7 @@
<div class="row">
<div class="col-12 col-lg-3 pe-lg-4 left-column d-none d-lg-block">
@include('shared.filter_sidebar_block')
<div class="x-fixed-top">@include('shared.filter_sidebar_block')</div>
</div>
<div class="col-12 col-lg-9 right-column">

5
themes/default/checkout.blade.php
View File

@ -4,6 +4,7 @@
@push('header')
<script src="{{ asset('vendor/vue/2.7/vue' . (!config('app.debug') ? '.min' : '') . '.js') }}"></script>
<script src="{{ asset('vendor/scrolltofixed/jquery-scrolltofixed-min.js') }}"></script>
<script src="{{ asset('vendor/element-ui/2.15.6/js.js') }}"></script>
<link rel="stylesheet" href="{{ asset('vendor/element-ui/2.15.6/css.css') }}">
@endpush
@ -19,7 +20,7 @@
<div class="row mt-5">
<div class="col-12 col-md-8 left-column">
<div class="card shadow-sm fixed-top-left">
<div class="card shadow-sm">
<div class="card-body p-lg-4">
@include('checkout._address')
@ -66,7 +67,7 @@
</div>
<div class="col-12 col-md-4 right-column">
<div class="fixed-top-line">
<div class="x-fixed-top">
@if (!current_customer())
<div class="card total-wrap mb-4 p-lg-4 shadow-sm">
<div class="card-header">

41
themes/default/shared/filter_sidebar_block.blade.php
View File

@ -71,24 +71,29 @@
@push('add-scripts')
<script>
const currencyRate = {{ current_currency_rate() }};
$("#price-slider").slider({
range: true,
step: 0.01,
min: {{ $filter_data['price']['min'] ?? 0 }},
max: {{ $filter_data['price']['max'] ?? 0 }},
values: [{{ $filter_data['price']['select_min'] }}, {{ $filter_data['price']['select_max'] }}],
change: function(event, ui) {
$('input.price-select-min').val(ui.values[0])
$('input.price-select-max').val(ui.values[1])
filterProductData();
},
slide: function(event, ui) {
let min = $('.price-range .min').html();
let max = $('.price-range .max').html();
$('.price-range .min').html(min.replace(min.replace(/[^0-9.,]/g, ''), (ui.values[0] * currencyRate).toFixed(2)));
$('.price-range .max').html(max.replace(max.replace(/[^0-9.,]/g, ''), (ui.values[1] * currencyRate).toFixed(2)));
$(document).ready(function() {
if (!$('#price-slider').length) {
return;
}
});
$("#price-slider").slider({
range: true,
step: 0.01,
min: {{ $filter_data['price']['min'] ?? 0 }},
max: {{ $filter_data['price']['max'] ?? 0 }},
values: [{{ $filter_data['price']['select_min'] }}, {{ $filter_data['price']['select_max'] }}],
change: function(event, ui) {
$('input.price-select-min').val(ui.values[0])
$('input.price-select-max').val(ui.values[1])
filterProductData();
},
slide: function(event, ui) {
let min = $('.price-range .min').html();
let max = $('.price-range .max').html();
$('.price-range .min').html(min.replace(min.replace(/[^0-9.,]/g, ''), (ui.values[0] * currencyRate).toFixed(2)));
$('.price-range .max').html(max.replace(max.replace(/[^0-9.,]/g, ''), (ui.values[1] * currencyRate).toFixed(2)));
}
});
})
</script>
@endpush