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

闫增涛

2024-04-03 5e649be819c7297c79c21c6dc120b4b6b362db9e

 pages/cart/index.wxml

@@ -7,34 +7,21 @@
      <t-empty icon="folder-open" description="暂无数据" font-size="80" />
    </view>
    <!-- <button bind:tap="onLogin"> 去登录</button> -->
    <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> -->
    <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 class="labelBox">
            <view class="eBook" wx:if="{{item.type == 'product'}}">电子书</view>
            <view wx:if="{{item.type == 'item'}}" class="cloudLearning">云学习</view>
          </view>
          <view class="boosName">
            {{item.productMonWithLinkDto.product.name}}
          </view> -->

            <view wx:if="{{item.type == 'product'}}" style="width: 386rpx;">
              <!-- <view>
                <text class="eBook">电子书</text> <text class="boosName">{{item.name}}</text>
              </view> -->

              <view class="boosName">
                <text class="eBook">云学习</text>
                <text class="eBook">电子书</text>
                <text> {{item.name}}</text>
              </view>
            </view>
            <view wx:if="{{item.type == 'item'}}" style="width: 386rpx;">
              <!-- <view>
                <text class="cloudLearning">云学习</text> <text class="boosName">   {{item.name}}</text>
              </view> -->

              <view class="boosName">
                <text class="cloudLearning">云学习</text>
                <text> {{item.name}}</text>
@@ -55,7 +42,7 @@
            <view class="contentCheckbox">
              <t-checkbox icon="rectangle" value=" {{item.id}}" data-item="{{item}}" checked="{{item.checked}}" bindchange="HandelItemChange" />
            </view>
            <view class="left-image">
            <view class="left-image" data-item="{{item}}" bind:tap="onBook">
              <image wx:if="{{item.imgUrl}}" src="{{item.imgUrl}}" class="imageStyle" mode="aspectFit" />
              <image wx:else src="/static/images/default-book-img.png" class="imageStyle" mode="aspectFit" />
            </view>