Merge remote-tracking branch 'origin/master'

k94314517

2024-07-29 282ae8b61eed9a9eb81ac85a9c7f6899eb3652fd

 wechat_jiaxuan/pages/discover/discover.js

@@ -7,10 +7,10 @@
  data: {
    menuButtonInfo: {},
    catalogCode: "product_intro",
    activeCate: '',

    activeCate: '', 
    height: 0,
    top: 0,
    isLoading:false
  },
  onLoad(options) {
    let menuButtonInfo = wx.getMenuButtonBoundingClientRect();