sileya-ai
/
vr-shopxo-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-sws' into dev

master
gongfuxiang 2024-09-27 19:14:47 +08:00
parent 21c66208f3 ee9c62d321
commit d6ac75e1c8
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/diy/diy.vue
View File

@ -11,7 +11,7 @@
</view> </view>
<template v-if="is_tabs_type"> <template v-if="is_tabs_type">
<template v-if="diy_data.length > 0"> <template v-if="diy_data.length > 0">
<view v-for="(item, index) in diy_data" :key="index" :style="['margin-top:' + (['float-window'].includes(item.key) ? '0rpx' : -(item.com_data.style.common_style.floating_up * 2 || 0) + 'rpx;z-index:1;')]"> <view v-for="(item, index) in diy_data" :key="index" :style="'margin-top:' + (['float-window'].includes(item.key) ? '0rpx' : -(item.com_data.style.common_style.floating_up * 2 || 0) + 'rpx;z-index:1;')">
<!-- 基础组件 --> <!-- 基础组件 -->
<componentDiySearch v-if="item.key == 'search'" :propValue="item.com_data"></componentDiySearch> <componentDiySearch v-if="item.key == 'search'" :propValue="item.com_data"></componentDiySearch>
<componentDiyCarousel v-else-if="item.key == 'carousel'" :propValue="item.com_data"></componentDiyCarousel> <componentDiyCarousel v-else-if="item.key == 'carousel'" :propValue="item.com_data"></componentDiyCarousel>
@ -412,25 +412,23 @@
scroll_top: e.detail.scrollTop, scroll_top: e.detail.scrollTop,
}); });
// 判断顶部导航是否置顶 // 判断顶部导航是否置顶
// #ifdef H5 || MP-TOUTIAO
if (!this.is_header_top) { if (!this.is_header_top) {
if (e.detail.scrollTop >= this.sticky_top + 33) { if (e.detail.scrollTop >= this.sticky_top + 33) {
// #ifdef H5 || MP-TOUTIAO
this.setData({ this.setData({
temp_sticky_top: 0, temp_sticky_top: 0,
temp_header_top: this.tabs_height + 'px', temp_header_top: this.tabs_height + 'px',
temp_is_header_top: true, temp_is_header_top: true,
}); });
// #endif
} else { } else {
// #ifdef H5 || MP-TOUTIAO,
this.setData({ this.setData({
temp_header_top: this.header_top, temp_header_top: this.header_top,
temp_sticky_top: this.sticky_top, temp_sticky_top: this.sticky_top,
temp_is_header_top: false, temp_is_header_top: false,
}); });
// #endif
} }
} }
// #endif
}, },
}, },
}; };

2
uni_modules/uv-sticky/components/uv-sticky/uv-sticky.vue
View File

@ -185,7 +185,7 @@
}); });
}); });
// #endif // #endif
}, },
// H5通过创建元素的形式嗅探是否支持css sticky // H5通过创建元素的形式嗅探是否支持css sticky
// 判断浏览器是否支持sticky属性 // 判断浏览器是否支持sticky属性
checkCssStickyForH5() { checkCssStickyForH5() {