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

litian

2024-03-15 3f1ea0a8e4bb02bf7544df8660b15cfa69d6b84a

 pages/cart/index.wxml

@@ -1,18 +1,51 @@
<view class="outsideContentBox">
  <!-- <checkbox-group bindchange="HandelItemChange"> -->
  <view wx:if="{{!shoppingCartData}}" class="noDataBox">
    <t-empty icon="folder-open" description="暂无数据" font-size="80" />

  </view>
  <t-swipe-cell wx:for="{{shoppingCartData}}" wx:key="index" wx:for-item="item" wx:for-index="index">
    <!-- <view class="contentBox"> -->
    <!-- <view class="contentCheckbox">
          <checkbox value="{{item.id}}" checked="{{item.checked}}"></checkbox>
        </view> -->
    <view class="itemWarp">
      <t-cell bordered="{{false}}" title="{{item.productMonWithLinkDto.product.name}}" description="￥{{item.saleMethod.price}}">
      <t-cell bordered="{{false}}">
        <view slot="title" class="titleBox">
          <view class="labelBox">
            <view class="eBook" wx:if="{{type == 'product'}}">电子书</view>
            <view wx:if="{{type == 'item'}}" class="cloudLearning">云学习</view>

          </view>

          <view class="boosName">
            {{item.productMonWithLinkDto.product.name}}
          </view>


        </view>

        <view slot="description" class="descriptionBox">

          <view>
            <view class="textBox" wx:if="{{type == 'product'}}">图书服务-电子书</view>
            <view class="textBox" wx:if="{{type == 'item'}}">图书服务-云学习</view>
          </view>

          <view wx:if="{{item.saleMethod.price != 0}}">
            ￥{{item.saleMethod.price}}
          </view>


          <view wx:else class="descriptionBox"> 立即领取</view>
        </view>

        <view slot="left-icon" class="left-icon">
          <view class="contentCheckbox">
            <t-checkbox icon="rectangle" value=" {{item.id}}" data-item="{{item}}" checked="{{item.checked}}" bindchange="HandelItemChange" />
          </view>
          <view class="left-image">
            <image src="{{item.imgUrl}}" class="imageStyle" mode="" />
            <image src="{{item.imgUrl}}" class="imageStyle" mode="aspectFit" />
          </view>
        </view>
      </t-cell>
@@ -35,4 +68,6 @@
      <t-button class="tButtonBox" size="small" shape="round" bind:tap="goPaymentPage">去结算({{selectedCount}})</t-button>
    </view>
  </view>
</view>
</view>

<t-toast id="t-toast" />