Merge branch 'dev-yxl' into dev-yxl1231

master
于肖磊 2025-01-08 15:27:22 +08:00
commit c5fb66c963
1 changed files with 9 additions and 3 deletions

View File

@ -1,7 +1,7 @@
<template> <template>
<view :style="page_style"> <view :style="page_style">
<view :style="page_img_style"> <view :style="page_img_style">
<scroll-view :scroll-y="true" class="ht scroll-view" @scroll="on_scroll_event" @scrolltolower="on_scroll_lower_event" lower-threshold="60" scroll-with-animation> <scroll-view :scroll-y="true" class="ht" @scroll="on_scroll_event" @scrolltolower="on_scroll_lower_event" @scrolltoupper="on_scroll_upper_event" lower-threshold="60" scroll-with-animation="true">
<!-- 头部小程序兼容 --> <!-- 头部小程序兼容 -->
<view class="pr header"> <view class="pr header">
<componentDiyHeader :propKey="header_data.id" :propValue="header_data.com_data" :propScrollTop="head_scroll_top" @onImmersionModelCallBack="immersion_model_call_back" @onLocationBack="choice_location_back"></componentDiyHeader> <componentDiyHeader :propKey="header_data.id" :propValue="header_data.com_data" :propScrollTop="head_scroll_top" @onImmersionModelCallBack="immersion_model_call_back" @onLocationBack="choice_location_back"></componentDiyHeader>
@ -462,6 +462,12 @@
this.get_goods_list(); this.get_goods_list();
} }
}, },
//
on_scroll_upper_event() {
setTimeout(() => {
this.head_scroll_top = 0;
});
},
// //
get_goods_list(is_mandatory) { get_goods_list(is_mandatory) {
@ -567,7 +573,7 @@
// //
on_scroll_event(e) { on_scroll_event(e) {
const scroll_num = e.detail.scrollTop; const scroll_num = parseInt(e.detail.scrollTop);
if (scroll_num <= 20) { if (scroll_num <= 20) {
this.head_scroll_top = 0; this.head_scroll_top = 0;
} else { } else {
@ -578,7 +584,6 @@
this.head_scroll_top = this.sticky_top + 100; this.head_scroll_top = this.sticky_top + 100;
} }
} }
this.scroll_timer_compute(scroll_num);
// //
// #ifdef H5 || MP-TOUTIAO // #ifdef H5 || MP-TOUTIAO
@ -594,6 +599,7 @@
} }
} }
// #endif // #endif
this.scroll_timer_compute(scroll_num);
}, },
scroll_timer_compute(scroll_num) { scroll_timer_compute(scroll_num) {