From 5109e97cb566608e443201204d07cbfc1c734e07 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 11 四月 2024 17:56:02 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/cart/paymentPage/index.wxml | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/pages/cart/paymentPage/index.wxml b/pages/cart/paymentPage/index.wxml
index 99f50af..42f130e 100644
--- a/pages/cart/paymentPage/index.wxml
+++ b/pages/cart/paymentPage/index.wxml
@@ -15,7 +15,8 @@
<view class="shoppingCartList">
<view class="cartList" wx:for="{{productList}}" wx:key="index" wx:for-item="item" wx:for-index="index">
<view class="imageBox">
- <image src="{{item.paymentIcon }}" mode="aspectFill" />
+ <image wx:if="{{item.paymentIcon}}" src="{{item.paymentIcon }}" mode="aspectFill" />
+ <image wx:else src="/static/images/default-book-img.png" class="imageStyle" mode="aspectFit" />
</view>
<view class="cartListContent">
<view class="cartListDetails">
@@ -31,16 +32,26 @@
<view wx:if="{{item.type == 'product'}}" style="width: 386rpx;">
- <view>
+ <!-- <view>
<text class="eBook">鐢靛瓙涔�</text> <text class="boosName">{{item.orderSaleMethod.product.name}}</text>
+ </view> -->
+
+ <view class="boosName">
+ <text class="eBook">鐢靛瓙涔�</text>
+ <text> {{item.orderSaleMethod.product.name}}</text>
</view>
+
</view>
<view wx:if="{{item.type == 'item'}}" style="width: 386rpx;">
-
+ <!--
<view>
<text class="cloudLearning">浜戝涔�</text> <text class="boosName">{{item.orderSaleMethod.product.name}}</text>
+ </view> -->
+ <view class="boosName">
+ <text class="cloudLearning">浜戝涔�</text>
+ <text> {{item.orderSaleMethod.product.name}}</text>
</view>
</view>
@@ -75,4 +86,6 @@
<t-button class="buttonBox" shape="round" catch:tap="confirmOrderGet">寰俊鏀粯</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