From 9f916f98c6cc6827c84da18fbc9a5e2cacbefc0a Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 02 四月 2024 16:20:08 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/cart/index.wxml | 40 ++++++++++++++++++----------------------
1 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/pages/cart/index.wxml b/pages/cart/index.wxml
index 0da4120..2dc5e3a 100644
--- a/pages/cart/index.wxml
+++ b/pages/cart/index.wxml
@@ -1,10 +1,4 @@
-<scroll-view scroll-y="{{true}}" class="outsideContentBox">
-
-
-
-
-
-
+<scroll-view scroll-y="{{true}}" class="outsideContentBox" bindscrolltolower="onScrollToLower">
<view>
@@ -71,7 +65,8 @@
<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="aspectFit" />
+ <image wx:if="{{item.imgUrl}}" src="{{item.imgUrl}}" class="imageStyle" mode="aspectFit" />
+ <image src="/static/images/default-book-img.png" class="imageStyle" mode="aspectFit" />
</view>
</view>
</t-cell>
@@ -84,19 +79,20 @@
</view>
</view>
- <view class="bottomBox">
- <view class="checkGroupBox">
- <checkbox-group bindchange="bottomChange">
- <checkbox disabled="{{onDisabled}}" value="鍏ㄩ��" checked="{{checkAll}}">鍏ㄩ��</checkbox>
- </checkbox-group>
- </view>
- <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">鍘荤粨绠�({{selectedCount}})</t-button>
- </view>
- </view>
- </view>
+
<t-toast id="t-toast" />
-</scroll-view>
\ No newline at end of file
+</scroll-view>
+<view class="bottomBox">
+ <view class="checkGroupBox">
+ <checkbox-group bindchange="bottomChange">
+ <checkbox disabled="{{onDisabled}}" value="鍏ㄩ��" checked="{{checkAll}}">鍏ㄩ��</checkbox>
+ </checkbox-group>
+ </view>
+ <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">鍘荤粨绠�({{selectedCount}})</t-button>
+ </view>
+ </view>
+</view>
\ No newline at end of file
--
Gitblit v1.9.1