From e8ec903206cb82e4dbb4687291d5f7788e7ff046 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 06 五月 2024 18:17:47 +0800
Subject: [PATCH] bug修改

---
 pages/cart/paymentPage/index.wxml |   89 +++++++++++++++++++++++---------------------
 1 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/pages/cart/paymentPage/index.wxml b/pages/cart/paymentPage/index.wxml
index 4b90cde..09600ee 100644
--- a/pages/cart/paymentPage/index.wxml
+++ b/pages/cart/paymentPage/index.wxml
@@ -3,8 +3,7 @@
 <template is="skeleton" wx:if="{{loading}}" />
 
 <view hidden="{{hidden}}">
-
-  <view class="titleBox">
+  <!-- <view class="titleBox">
     <view style="width: 100%; height: {{barHeight}}px; "></view>
     <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
       <view>
@@ -12,62 +11,52 @@
       </view>
       <view class="navbar-title">鎻愪氦璁㈠崟</view>
     </view>
-  </view>
+  </view> -->
 
   <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="aspectFill" />
-            <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 class="labelBox">
-              <view class="eBook" wx:if="{{item.type == 'product'}}">鐢靛瓙涔�</view>
-              <view wx:if="{{item.type == 'item'}}" class="cloudLearning">浜戝涔�</view>
-            </view> -->
-
-
-              <!-- <view class="boosName">
-              {{item.orderSaleMethod.product.name}}
-            </view> -->
-
-              <view wx:if="{{item.type == 'product'}}" style="width: 386rpx;">
-
-                <!-- <view>
-                <text class="eBook">鐢靛瓙涔�</text> <text class="boosName">{{item.orderSaleMethod.product.name}}</text>
-              </view> -->
-
+              <view wx:if="{{item.type == 'product'}}" style="width: 386rpx">
                 <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 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 class="textBox" wx:if="{{item.type == 'product'}}">鍥句功鏈嶅姟-鐢靛瓙涔�</view>
-            <view class="textBox" wx:if="{{item.type == 'item'}}">鍥句功鏈嶅姟-浜戝涔�</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>
         </view>
@@ -82,16 +71,30 @@
           <view> <text>鍚堣锛� </text> 锟{payPrice}}</view>
         </view>
       </view>
-
     </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 class="buttonBox" shape="round" catch:tap="confirmOrderGet">寰俊鏀粯</t-button>
+        <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
+        >
       </view>
     </view>
   </view>
 
   <t-toast id="t-toast" />
-</view>
\ No newline at end of file
+</view>

--
Gitblit v1.9.1