jufubao-mall 2.0.78-beta4 → 2.0.78-beta6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
<view
|
|
48
48
|
class="special_nav"
|
|
49
49
|
v-if="categories.length > 1"
|
|
50
|
-
:style="[navFixed ? {position: 'fixed', top: '
|
|
50
|
+
:style="[navFixed ? {position: 'fixed', top: this.layoutInfo['top'] + 'rpx', zIndex: 9999} : {position: 'relative', zIndex: 9999}]"
|
|
51
51
|
>
|
|
52
52
|
<xd-tab
|
|
53
53
|
class="tab"
|
|
@@ -73,13 +73,13 @@
|
|
|
73
73
|
@scrolltolower="handleProdScroll"
|
|
74
74
|
> -->
|
|
75
75
|
<view class="product_section" :style="[productListPaddingTop]">
|
|
76
|
-
<view
|
|
76
|
+
<!-- <view
|
|
77
77
|
v-if="curCate.category_img && curCate['imgStatus'] === 'ok'"
|
|
78
78
|
class="product_category"
|
|
79
79
|
:style="{height: curCate.imgHeight + 'px'}"
|
|
80
80
|
>
|
|
81
81
|
<image :src="curCate.category_img" mode="widthFix"></image>
|
|
82
|
-
</view>
|
|
82
|
+
</view> -->
|
|
83
83
|
<view class="product_list" :style="[contWrapStyle]">
|
|
84
84
|
<!--骨架-->
|
|
85
85
|
<view
|
|
@@ -272,6 +272,7 @@
|
|
|
272
272
|
scrollIntoView: "",
|
|
273
273
|
navFixed: false,
|
|
274
274
|
footerColor:'#ddd',
|
|
275
|
+
itemPadding: {},
|
|
275
276
|
}
|
|
276
277
|
},
|
|
277
278
|
computed: {
|
|
@@ -440,7 +441,7 @@
|
|
|
440
441
|
watchScroll(scrollTop) {
|
|
441
442
|
this.scrollTop = scrollTop;
|
|
442
443
|
var scrollTopRpx = scrollTop / this.$rpxNum;
|
|
443
|
-
this.navFixed = scrollTopRpx >= this.specialNavTop -
|
|
444
|
+
this.navFixed = scrollTopRpx >= this.specialNavTop - this.layoutInfo['top'];
|
|
444
445
|
},
|
|
445
446
|
onJfbScroll(options) {
|
|
446
447
|
this.watchScroll(options.e.scrollTop);
|
|
@@ -450,6 +451,7 @@
|
|
|
450
451
|
* @param container {object} 业务组件对象自己
|
|
451
452
|
*/
|
|
452
453
|
init(container) {
|
|
454
|
+
console.log(this.layoutInfo,'layoutInfo')
|
|
453
455
|
this.xnamespace = gCPVal(container, 'xnamespace', this.projectAttr.business_code, {});
|
|
454
456
|
let compConfig = getContainerPropsValue(container, "content.compConfig", null);
|
|
455
457
|
let tagsKeys= this.getProductTagsKeys(compConfig,container)
|
|
@@ -558,8 +560,8 @@
|
|
|
558
560
|
this.hasNextPage = res.next_page_token !== '';
|
|
559
561
|
this.next_page_token = res.next_page_token;
|
|
560
562
|
this.$nextTick(()=>{
|
|
561
|
-
if(isTabLoading && this.scrollTop >= (this.specialNavTop +
|
|
562
|
-
var targetScrollTop = (this.specialNavTop -
|
|
563
|
+
if(isTabLoading && this.scrollTop >= (this.specialNavTop + this.layoutInfo['top']) * this.$rpxNum) {
|
|
564
|
+
var targetScrollTop = (this.specialNavTop - this.layoutInfo['top']) * this.$rpxNum;
|
|
563
565
|
if(!this.navFixed) {
|
|
564
566
|
targetScrollTop += 106 * this.$rpxNum;
|
|
565
567
|
}
|