From 3ec10b0c2654e1243e42a5ad563d088ac89c87fe Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 27 九月 2024 14:06:56 +0800
Subject: [PATCH] zf

---
 pages/cart/paymentPage/index.wxml |   78 +++++++++++++++------------------------
 1 files changed, 30 insertions(+), 48 deletions(-)

diff --git a/pages/cart/paymentPage/index.wxml b/pages/cart/paymentPage/index.wxml
index 09600ee..a221fde 100644
--- a/pages/cart/paymentPage/index.wxml
+++ b/pages/cart/paymentPage/index.wxml
@@ -16,56 +16,52 @@
   <view class="paymentPageBox">
     <view class="content">
       <view class="shoppingCartList">
-        <view
-          class="cartList"
-          wx:for="{{productList}}"
-          wx:key="index"
-          wx:for-item="item"
-          wx:for-index="index"
-        >
+        <view class="cartList" wx:for="{{productList}}" wx:key="index" wx:for-item="item" wx:for-index="index">
           <view class="imageBox">
-            <image
-              wx:if="{{item.paymentIcon}}"
-              src="{{item.paymentIcon }}"
-              mode="aspectFit"
-            />
-            <image
-              wx:else
-              src="/static/images/default-book-img.png"
-              class="imageStyle"
-              mode="aspectFit"
-            />
+            <image wx:if="{{item.paymentIcon}}" src="{{item.paymentIcon }}" mode="aspectFit" />
+            <image wx:else src="/static/images/default-book-img.png" class="imageStyle" mode="aspectFit" />
           </view>
           <view class="cartListContent">
             <view class="cartListDetails">
-              <view wx:if="{{item.type == 'product'}}" style="width: 386rpx">
+              <view style="width: 500rpx">
                 <view class="boosName">
-                  <text class="eBook">鐢靛瓙涔�</text>
+                  <text class="eBook">{{item.typeTxt}}</text>
                   <text> {{item.orderSaleMethod.product.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.orderSaleMethod.product.name}}</text>
                 </view>
-              </view>
+              </view> -->
             </view>
-            <view class="textBox" wx:if="{{item.type == 'product'}}"
-              >鍥句功鏈嶅姟-鐢靛瓙涔�</view
-            >
-            <view class="textBox" wx:if="{{item.type == 'item'}}"
-              >鍥句功鏈嶅姟-浜戝涔�</view
-            >
-            <view class="priceBox">锟{item.payPrice}}</view>
+            <view class="textBox">{{item.productType}}</view>
+            <view class="priceBox">锟{price}}</view>
           </view>
+        </view>
+      </view>
+      <view class="integralBreakdown">
+        <view class="priceBreakdownContent">绉垎鍏戞崲锛�100绉垎鍙厬鎹�1鍏冿級</view>
+        <view class="integral">
+          <view>
+            鎴戠殑绉垎锛歿{integral}}
+          </view>
+          <t-switch defaultValue="{{defaultVal}}" slot="note" bindchange="handleChange" />
         </view>
       </view>
       <view class="priceBreakdown">
         <view class="priceBreakdownContent">浠锋牸鏄庣粏</view>
         <view class="amountMoney">
           <view class="commodityBox">鍟嗗搧閲戦</view>
-          <view class="payPriceBox">锟{payPrice}}</view>
+          <view class="payPriceBox">锟{price}}</view>
+        </view>
+        <view class="integralCon" wx:if="{{showIntegral}}">
+          <view class="label">绉垎鎶垫墸</view>
+          <view class="payBox">
+            <view>{{currentBalance}}</view>
+            <view>锟{deduct}}</view>
+          </view>
         </view>
         <view class="amount">
           <view> <text>鍚堣锛� </text> 锟{payPrice}}</view>
@@ -74,27 +70,13 @@
     </view>
     <!-- <view class="interval"></view> -->
     <view class="paymentBox">
-      <view class="residue"
-        >寰呮敮浠橈細<text class="residueTextBox">锟{payPrice}}</text></view
-      >
+      <view class="residue">寰呮敮浠橈細<text class="residueTextBox">锟{payPrice}}</text></view>
       <view>
-        <t-button
-          wx:if="{{ImmediatelyReceive === 0}}"
-          class="buttonBox"
-          shape="round"
-          catch:tap="onReceive"
-          >绔嬪嵆棰嗗彇</t-button
-        >
-        <t-button
-          wx:else
-          class="buttonBox"
-          shape="round"
-          catch:tap="confirmOrderGet"
-          >寰俊鏀粯</t-button
-        >
+        <t-button wx:if="{{payPrice === '0.00'}}" class="buttonBox" shape="round" catch:tap="onReceive">绔嬪嵆棰嗗彇</t-button>
+        <t-button wx:else class="buttonBox" shape="round" catch:tap="confirmOrderGet">寰俊鏀粯</t-button>
       </view>
     </view>
   </view>
 
   <t-toast id="t-toast" />
-</view>
+</view>
\ No newline at end of file

--
Gitblit v1.9.1