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 |   41 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/pages/cart/index.wxml b/pages/cart/index.wxml
index 4219ccc..470f5f0 100644
--- a/pages/cart/index.wxml
+++ b/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>
\ No newline at end of file
+</view>
+
+<t-toast id="t-toast" />
\ No newline at end of file

--
Gitblit v1.9.1