Merge refs/remotes/origin/master into refs/heads/master

yiming

2024-03-26 09905b43ec2a249ef0e6057d148b8620cfaa1506

 pages/home/home.js

@@ -11,6 +11,7 @@
    backUrl: null,
    userInfo: {},
    tabList: [], //目录
    current: 1,//轮播图参数
    autoplay: true, //轮播图参数
    duration: '500',//轮播图参数
    interval: 5000,//轮播图参数
@@ -28,12 +29,13 @@
    rankingList: [],//排行榜
    shoppingCartGetId: [],
    baseRefresh: {
      value: true
      value: false
    }
  },
  onShow() {
    this.loadHomePage();
    this.getBannerList()

  },

  onLoad(options) {
@@ -63,7 +65,7 @@
  },
  onPullDownRefresh() {
    this.setData({
      isWhite: true
      'baseRefresh.value': true,
    })
    this.init();
  },
@@ -77,10 +79,7 @@

    setTimeout(() => {
      this.setData({
        baseRefresh: {
          value: false,
        },
        isWhite: false,
        'baseRefresh.value': false,
      })
    }, 500);
  },