From 4c29b79d485d68d506e798f4fd381232ebc55a86 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期六, 14 九月 2024 11:27:33 +0800
Subject: [PATCH] bug
---
pages/cart/paymentPage/index.wxml | 72 ++++++++++++++---------------------
1 files changed, 29 insertions(+), 43 deletions(-)
diff --git a/pages/cart/paymentPage/index.wxml b/pages/cart/paymentPage/index.wxml
index 4b90cde..b20109e 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,83 +11,70 @@
</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="imageBox">
- <image wx:if="{{item.paymentIcon}}" src="{{item.paymentIcon }}" mode="aspectFill" />
+ <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 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>
- <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>
- <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">锟{item.orderSaleMethod.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>
</view>
</view>
-
</view>
<!-- <view class="interval"></view> -->
<view class="paymentBox">
<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>
--
Gitblit v1.9.1