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/paymentPage/index.wxml |  102 ++++++++++++++++++++++++---------------------------
 1 files changed, 48 insertions(+), 54 deletions(-)

diff --git a/pages/cart/paymentPage/index.wxml b/pages/cart/paymentPage/index.wxml
index 6ba3df7..fbaed31 100644
--- a/pages/cart/paymentPage/index.wxml
+++ b/pages/cart/paymentPage/index.wxml
@@ -1,74 +1,68 @@
-<!--pages/cart/paymentPage/index.wxml-->
-<view style="width: 100%; height: {{barHeight}}px; "></view>
-<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
-  <view>
-    <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
+<!-- 澶撮儴 -->
+<view class="titleBox">
+  <view style="width: 100%; height: {{barHeight}}px; "></view>
+  <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
+    <view>
+      <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
+    </view>
+    <view class="navbar-title">鎻愪氦璁㈠崟</view>
   </view>
-  <view class="navbar-title">鎻愪氦璁㈠崟</view>
 </view>
 
+<view class="paymentPageBox">
+  <view class="content">
+    <t-dialog visible="{{showCloseBtn}}" close-btn bind:confirm="closeDialog" bind:cancel="closeDialog">
+      <view slot="content" class="slotContent">
+        <view class="myQrcodeBox">
+          <canvas style="width: 200px; height: 200px;margin:0 auto" canvas-id="myQrcode"></canvas>
+          <view class="myQrcodeTextBox">寰俊鎵爜鏀粯</view>
+        </view>
+      </view>
+    </t-dialog>
+
+    <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" />
+        </view>
+
+        <view class="cartListContent">
 
 
+          <view class="cartListDetails">
+            <view class="labelBox">
+              <view class="eBook" wx:if="{{type == 'product'}}">鐢靛瓙涔�</view>
+              <view wx:if="{{type == 'item'}}" class="cloudLearning">浜戝涔�</view>
+            </view>
 
+            <view class="boosName">
+              {{item.orderSaleMethod.product.name}}
+            </view>
 
-<view class="content">
-
-
-
-
-
-  <!-- 
-  <t-button t-class="wrapper" theme="primary" size="large" variant="outline" data-key="showCloseBtn" bind:tap="showDialog" block>
-    甯﹀叧闂寜閽�
-  </t-button> -->
-  <t-dialog visible="{{showCloseBtn}}" close-btn bind:confirm="closeDialog" bind:cancel="closeDialog">
-    <view slot="content" class="slotContent">
-      <view class="myQrcodeBox">
-        <canvas style="width: 200px; height: 200px;margin:0 auto" canvas-id="myQrcode"></canvas>
-        <view class="myQrcodeTextBox">寰俊鎵爜鏀粯</view>
+          </view>
+          <view class="textBox" wx:if="{{type == 'product'}}">鍥句功鏈嶅姟-鐢靛瓙涔�</view>
+          <view class="textBox" wx:if="{{type == 'item'}}">鍥句功鏈嶅姟-浜戝涔�</view>
+          <view class="priceBox">锟{item.payPrice}}</view>
+        </view>
       </view>
     </view>
-  </t-dialog>
-
-
-
-
-
-  <view class="shoppingCartList">
-    <view class="cartList" wx:for="{{productList}}" wx:key="index" wx:for-item="item" wx:for-index="index">
-      <image src="{{item.paymentIcon }}" mode="" />
-      <view class="cartListContent">
-        <view class="cartListDetails">{{item.orderSaleMethod.product.name}}</view>
-        <view class="textBox">鍥句功鏈嶅姟-鐢靛瓙涔�</view>
-        <view class="priceBox">锟{item.payPrice}}</view>
-
+    <view class="priceBreakdown">
+      <view class="priceBreakdownContent">浠锋牸鏄庣粏</view>
+      <view class="amountMoney">
+        <view>鍟嗗搧閲戦</view>
+        <view>锟{payPrice}}</view>
       </view>
-
+      <view class="amount">
+        <view>鍚堣锛氾骏{{payPrice}}</view>
+      </view>
     </view>
-
 
   </view>
-
-  <view class="priceBreakdown">
-    <view class="priceBreakdownContent">浠锋牸鏄庣粏</view>
-    <view class="amountMoney">
-      <view>鍟嗗搧閲戦</view>
-      <view>锟{payPrice}}</view>
-    </view>
-    <view class="amount">
-      <view>鍚堣锛氾骏{{payPrice}}</view>
-    </view>
-  </view>
-
-
-
-  <view class="interval"></view>
-
+  <!-- <view class="interval"></view> -->
   <view class="paymentBox">
     <view class="residue">寰呮敮浠橈細<text class="residueTextBox">锟{payPrice}}</text></view>
     <view>
       <t-button class="buttonBox" shape="round" bind:tap="confirmOrderGet">寰俊鏀粯</t-button>
     </view>
   </view>
-
 </view>
\ No newline at end of file

--
Gitblit v1.9.1