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

YM

2024-09-10 6afcf851d6f2db0de5cdaca31cad419f60895ede

 pages/cart/index.wxml

@@ -5,38 +5,37 @@
hidden -->
<view hidden="{{hidden}}">
  <scroll-view scroll-y="{{true}}" class="outsideContentBox" bindscrolltolower="onScrollToLower">

    <view>

      <!-- <checkbox-group bindchange="HandelItemChange"> -->
      <view wx:if="{{shoppingCartData.length <= 0}}" class="noDataBox">
        <t-empty icon="folder-open" description="暂无数据" font-size="80" />
        <!-- <t-empty icon="folder-open" description="暂无数据" font-size="80" /> -->
        <empty />
      </view>
      <!-- <button bind:tap="onLogin"> 去登录</button> -->
      <t-swipe-cell wx:for="{{shoppingCartData}}" wx:key="index" wx:for-item="item" wx:for-index="index" opened="{{swipeOpened}}">
        <view class="itemWarp">
          <t-cell bordered="{{false}}">
            <view slot="title" class="titleBox">
              <view wx:if="{{item.type == 'product'}}" style="width: 386rpx;">
              <view style="width: 386rpx">
                <view class="boosName">
                  <text class="eBook">电子书</text>
                  <text class="eBook">{{item.typeTxt}}</text>
                  <text> {{item.name}}</text>
                </view>
              </view>
              <view wx:if="{{item.type == 'item'}}" style="width: 386rpx;">
              <!-- <view wx:if="{{item.type == 'item'}}" style="width: 386rpx">
                <view class="boosName">
                  <text class="cloudLearning">云学习</text>
                  <text> {{item.name}}</text>
                </view>
              </view>
              </view> -->
            </view>
            <view slot="description" class="descriptionBox">
              <view>
                <view class="textBox" wx:if="{{item.type == 'product'}}">图书服务-电子书</view>
                <view class="textBox" wx:if="{{item.type == 'item'}}">图书服务-云学习</view>
              </view>
              <view wx:if="{{item.saleMethod.price != 0}}">
                ￥{{item.saleMethod.price}}
              <view wx:if="{{item.saleMethod.price != 0}}" class="price-box">
                ￥{{item.saleMethod.price }}
              </view>
              <view wx:else class="descriptionBox"> 立即领取</view>
            </view>
@@ -59,8 +58,6 @@
      </view>
    </view>



    <t-toast id="t-toast" />
  </scroll-view>
  <view class="bottomBox">
@@ -72,7 +69,9 @@
    <view class="settlementBox">
      <view class="totalPrice">总价:<text class="totalPriceText">￥{{totalPrice}}</text></view>
      <view class="buttonBox">
        <t-button  class="tButtonBox" size="small" shape="round" bind:tap="goPaymentPage"> <view >去结算({{selectedCount}})</view> </t-button>
        <t-button class="tButtonBox" size="small" shape="round" bind:tap="goPaymentPage">
          <view>去结算({{selectedCount}})</view>
        </t-button>
      </view>
    </view>
  </view>