From 3f1ea0a8e4bb02bf7544df8660b15cfa69d6b84a Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 15 三月 2024 18:54:04 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/cart/index.wxml | 102 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 72 insertions(+), 30 deletions(-)
diff --git a/pages/cart/index.wxml b/pages/cart/index.wxml
index 8828092..470f5f0 100644
--- a/pages/cart/index.wxml
+++ b/pages/cart/index.wxml
@@ -1,31 +1,73 @@
-<!-- 鍒嗗眰璐墿杞� -->
-<block wx:if="{{cartGroupData.isNotEmpty}}">
- <cart-group
- store-goods="{{ cartGroupData.storeGoods }}"
- invalid-good-items="{{ cartGroupData.invalidGoodItems }}"
- bindselectgoods="onGoodsSelect"
- bindselectstore="onStoreSelect"
- bindchangequantity="onQuantityChange"
- bindgocollect="goCollect"
- bindgoodsclick="goGoodsDetail"
- bindclearinvalidgoods="clearInvalidGoods"
- binddelete="onGoodsDelete"
- />
+<view class="outsideContentBox">
+ <!-- <checkbox-group bindchange="HandelItemChange"> -->
+ <view wx:if="{{!shoppingCartData}}" class="noDataBox">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" />
- <view class="gap" />
- <!-- 鍟嗗搧灏忚浠ュ強缁撶畻鎸夐挳 -->
- <cart-bar
- is-all-selected="{{cartGroupData.isAllSelected}}"
- total-amount="{{cartGroupData.totalAmount}}"
- total-goods-num="{{cartGroupData.selectedGoodsCount}}"
- total-discount-amount="{{cartGroupData.totalDiscountAmount}}"
- fixed="{{true}}"
- bottomHeight="{{112}}"
- bindhandleSelectAll="onSelectAll"
- bindhandleToSettle="onToSettle"
- />
-</block>
-<!-- 璐墿杞︾┖鎬� -->
-<cart-empty wx:else bind:handleClick="onGotoHome" />
-<t-toast id="t-toast" />
-<t-dialog id="t-dialog" />
+ </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}}">
+ <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="aspectFit" />
+ </view>
+ </view>
+ </t-cell>
+ </view>
+ <!-- </view> -->
+ <view slot="right" class="btn delete-btn" bind:tap="onDelete" data-item="{{item}}">鍒犻櫎</view>
+ </t-swipe-cell>
+ <!-- </checkbox-group> -->
+</view>
+
+<view class="bottomBox">
+ <view class="checkGroupBox">
+ <checkbox-group bindchange="bottomChange">
+ <checkbox 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" />
\ No newline at end of file
--
Gitblit v1.9.1