From 6afcf851d6f2db0de5cdaca31cad419f60895ede Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期二, 10 九月 2024 16:52:58 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/cart/index.wxml | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/pages/cart/index.wxml b/pages/cart/index.wxml
index 8d664f4..978a60f 100644
--- a/pages/cart/index.wxml
+++ b/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>
--
Gitblit v1.9.1