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

yiming

2024-03-26 09905b43ec2a249ef0e6057d148b8620cfaa1506

 packagePersonal/pages/activateProduct/index.wxml

@@ -1,4 +1,11 @@
<view class="container">
  <scroll-view class="scroll content" bind:scroll="onPageScroll" model:scroll-top="{{setScrollValue}}" scroll-y refresher-enabled="{{true}}" lower-threshold="{{200}}" refresher-threshold="{{80}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindrefresherpulling="{{refresh.onPulling}}" bindrefresherrefresh="onPullDownRefresh" bindscrolltolower="onReachBottom">
    <view slot="refresher" class="refresh-container">
      <view class="loading">
        <t-loading theme="circular" size="40rpx" text="正在刷新..." class="wrapper" />
      </view>
    </view>
    <view class="pageInfo">
  <view class="activation">
    <view class="title">
      <view class="line"></view>
@@ -17,12 +24,7 @@
      <view>已激活商品</view>
    </view>
    <view class="contentBox">
      <scroll-view class="scroll content" bind:scroll="onPageScroll" model:scroll-top="{{setScrollValue}}" scroll-y refresher-enabled="{{true}}" lower-threshold="{{200}}" refresher-threshold="{{80}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindrefresherpulling="{{refresh.onPulling}}" bindrefresherrefresh="onPullDownRefresh" bindscrolltolower="onReachBottom">
        <view slot="refresher" class="refresh-container">
          <view class="loading">
            <t-loading theme="circular" size="40rpx" text="正在刷新..." class="wrapper" />
          </view>
        </view>

        <view class="list" wx:if="{{list.length > 0}}">
          <view class="content-item" wx:for="{{list}}" wx:for-item="items" wx:for-index="index" wx:key="index">
            <view class="codeInfoBox">
@@ -64,8 +66,8 @@
        <view class="bottom-loading" style="color: #ccc;font-size: 28rpx;" wx:if="{{isMoreData}}">
          <text>没有更多了</text>
        </view>
        </view>
      </view>
    </view>
      </scroll-view>
    </view>

  </view>
</view>