jufubao-mall 2.0.78-beta3 → 2.0.78-beta5
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
|
|
@@ -440,7 +440,7 @@
|
|
|
440
440
|
watchScroll(scrollTop) {
|
|
441
441
|
this.scrollTop = scrollTop;
|
|
442
442
|
var scrollTopRpx = scrollTop / this.$rpxNum;
|
|
443
|
-
this.navFixed = scrollTopRpx >= this.specialNavTop -
|
|
443
|
+
this.navFixed = scrollTopRpx >= this.specialNavTop - this.layoutInfo['top'];
|
|
444
444
|
},
|
|
445
445
|
onJfbScroll(options) {
|
|
446
446
|
this.watchScroll(options.e.scrollTop);
|
|
@@ -450,6 +450,7 @@
|
|
|
450
450
|
* @param container {object} 业务组件对象自己
|
|
451
451
|
*/
|
|
452
452
|
init(container) {
|
|
453
|
+
console.log(this.layoutInfo,'layoutInfo')
|
|
453
454
|
this.xnamespace = gCPVal(container, 'xnamespace', this.projectAttr.business_code, {});
|
|
454
455
|
let compConfig = getContainerPropsValue(container, "content.compConfig", null);
|
|
455
456
|
let tagsKeys= this.getProductTagsKeys(compConfig,container)
|
|
@@ -497,17 +498,8 @@
|
|
|
497
498
|
//设置业务请求代码
|
|
498
499
|
this.setNameSpace(options);
|
|
499
500
|
this.special_id = options.special_id;
|
|
500
|
-
// this.category_id = options.category_id;
|
|
501
501
|
this.options = options;
|
|
502
|
-
this
|
|
503
|
-
Promise.all([this.getSpecialHomeInfo(), this.getList()])
|
|
504
|
-
.then(res=>{
|
|
505
|
-
this.done = true;
|
|
506
|
-
this.$xdHideLoading();
|
|
507
|
-
})
|
|
508
|
-
.catch(err=>{
|
|
509
|
-
this.$xdHideLoading();
|
|
510
|
-
})
|
|
502
|
+
this.getSpecialHomeInfo()
|
|
511
503
|
},
|
|
512
504
|
|
|
513
505
|
getItemData(cellIndex,data){
|
|
@@ -543,6 +535,7 @@
|
|
|
543
535
|
.then(res => {
|
|
544
536
|
this.loading = false;
|
|
545
537
|
this.$xdHideLoading();
|
|
538
|
+
this.done = true;
|
|
546
539
|
let list = res.list.map((item,index) => {
|
|
547
540
|
item['thumb'] = item.thumb ? getServiceUrl(item.thumb, "size4") : "";
|
|
548
541
|
if(this.productConfig.isPrice==='N'){
|
|
@@ -566,8 +559,8 @@
|
|
|
566
559
|
this.hasNextPage = res.next_page_token !== '';
|
|
567
560
|
this.next_page_token = res.next_page_token;
|
|
568
561
|
this.$nextTick(()=>{
|
|
569
|
-
if(isTabLoading && this.scrollTop >= (this.specialNavTop +
|
|
570
|
-
var targetScrollTop = (this.specialNavTop -
|
|
562
|
+
if(isTabLoading && this.scrollTop >= (this.specialNavTop + this.layoutInfo['top']) * this.$rpxNum) {
|
|
563
|
+
var targetScrollTop = (this.specialNavTop - this.layoutInfo['top']) * this.$rpxNum;
|
|
571
564
|
if(!this.navFixed) {
|
|
572
565
|
targetScrollTop += 106 * this.$rpxNum;
|
|
573
566
|
}
|
|
@@ -689,6 +682,7 @@
|
|
|
689
682
|
banner_img: new_special.banner_img ? getServiceUrl(new_special.banner_img) : "",
|
|
690
683
|
});
|
|
691
684
|
console.log(this.special, 'special')
|
|
685
|
+
this.getList()
|
|
692
686
|
resolve()
|
|
693
687
|
}).catch(err=>{
|
|
694
688
|
reject(err)
|