From 057199d5c5284a71e5d04e091492873ced412fa5 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 21 三月 2024 09:28:54 +0800
Subject: [PATCH] 代码合并
---
pages/cart/paymentPage/index.wxml | 63 ++++++++-----------------------
1 files changed, 16 insertions(+), 47 deletions(-)
diff --git a/pages/cart/paymentPage/index.wxml b/pages/cart/paymentPage/index.wxml
index 945c7a5..2abb441 100644
--- a/pages/cart/paymentPage/index.wxml
+++ b/pages/cart/paymentPage/index.wxml
@@ -1,6 +1,5 @@
<!-- 澶撮儴 -->
<view class="titleBox">
-
<view style="width: 100%; height: {{barHeight}}px; "></view>
<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
<view>
@@ -10,74 +9,44 @@
</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="aspectFit" />
+ <image src="{{item.paymentIcon }}" mode="aspectFill" />
</view>
-
<view class="cartListContent">
- <view class="cartListDetails">{{item.orderSaleMethod.product.name}}</view>
- <view class="textBox">鍥句功鏈嶅姟-鐢靛瓙涔�</view>
+ <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>
+
+ <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>
-
-
-
-
-
-
-
-
<view class="priceBreakdown">
<view class="priceBreakdownContent">浠锋牸鏄庣粏</view>
<view class="amountMoney">
- <view>鍟嗗搧閲戦</view>
- <view>锟{payPrice}}</view>
+ <view class="commodityBox">鍟嗗搧閲戦</view>
+ <view class="payPriceBox">锟{payPrice}}</view>
</view>
<view class="amount">
- <view>鍚堣锛氾骏{{payPrice}}</view>
+ <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>
--
Gitblit v1.9.1