Merge remote-tracking branch 'origin/master'

jiangping

2024-07-29 a3d2fe9dff3b6cd9fa8fdd91e87aac843f694c0f

 wechat_jiaxuan/pages/discover/discover.js

@@ -7,7 +7,10 @@
  data: {
    menuButtonInfo: {},
    catalogCode: "product_intro",
    activeCate: ''
    activeCate: '', 
    height: 0,
    top: 0,
    isLoading:false
  },
  onLoad(options) {
    let menuButtonInfo = wx.getMenuButtonBoundingClientRect();