From 6305460f707e6e49137f101403de06f92da1042b Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 13 十一月 2024 15:18:05 +0800
Subject: [PATCH] 支付价格，ziy
---
pages/cart/paymentPage/index.js | 3 ++-
pages/cart/paymentPage/index.wxml | 3 ++-
pages/cart/paymentPage/index.wxss | 5 +++--
packageBookService/pages/bookServices/detail/index.wxml | 10 +++-------
packageBookService/pages/bookServices/detail/index.js | 3 ++-
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 68ed718..e66a428 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -978,12 +978,13 @@
},
}
app.MG.store.getProductDetailNoChildren(query).then((res) => {
- if (!res.datas.cmsDatas[0].datas.length) {
+ if (!res.datas.cmsDatas[0].datas.length || res.datas.cmsDatas[0].datas.length == 0) {
return this.setData({
noResources: true,
loading: false,
});
}
+
let list = []
// 鍒ゆ柇浜戝涔犳湁鏃犻攢鍞柟寮忓拰鏈夋晥鏈�
const cloundSaleMethod =
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index b1c9889..6cb3280 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -225,12 +225,6 @@
bind:updateCloudLearning="updateCloudLearning"
></tree>
</view>
- <!-- <t-loading
- theme="circular"
- size="60rpx"
- class="loading"
- loading="{{loading }}"
- /> -->
<view wx:if="{{loading}}" style="width: 100%; height: min-content">
<t-skeleton
row-col="{{rowCol}}"
@@ -238,6 +232,9 @@
animation="gradient"
loading="{{loading}}"
></t-skeleton>
+ </view>
+ <view wx:if="{{noResources && !loading}}" class="noData">
+ <empty />
</view>
</t-tab-panel>
<t-tab-panel
@@ -280,7 +277,6 @@
></tree>
</view>
<view wx:if="{{noResources && !loading}}" class="noData">
- <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
<empty />
</view>
</t-tab-panel>
diff --git a/pages/cart/paymentPage/index.js b/pages/cart/paymentPage/index.js
index 14d62f8..21f05fd 100644
--- a/pages/cart/paymentPage/index.js
+++ b/pages/cart/paymentPage/index.js
@@ -158,10 +158,12 @@
if (Number(this.data.payPrice) < Number(this.data.price)) {
this.handleChange()
}
+ console.log(res, "res")
res.saleMethodLinks.forEach(item => {
const type = item.orderSaleMethod.type == 'createProductItemSaleMethod' ? 'item' : 'product';
item.type = type; // 灏唗ype璁剧疆涓篿tem瀵硅薄鐨勫睘鎬э紝鑰屼笉鏄娇鐢╯etData
item.paymentIcon = getPublicImage(item.orderSaleMethod.product.icon)
+ item.price = item.orderSaleMethod.price.toFixed(2)
if (item.orderSaleMethod.product.cmsTypeRefCode == 'jsek_digitalTextbooks') {
item.typeTxt = '鏁板瓧鏁欐潗'
item.productType = "鏁板瓧鏁欐潗"
@@ -171,7 +173,6 @@
} else {
item.typeTxt = '鐢靛瓙涔�'
item.productType = "鍥句功鏈嶅姟-鐢靛瓙涔�"
-
if (item.orderSaleMethod.type == 'createProductItemSaleMethod') {
item.typeTxt = '浜戝涔�'
item.productType = "鍥句功鏈嶅姟-浜戝涔�"
diff --git a/pages/cart/paymentPage/index.wxml b/pages/cart/paymentPage/index.wxml
index a221fde..19910a3 100644
--- a/pages/cart/paymentPage/index.wxml
+++ b/pages/cart/paymentPage/index.wxml
@@ -29,6 +29,7 @@
<text> {{item.orderSaleMethod.product.name}}</text>
</view>
</view>
+ <view wx:if="{{item.typeTxt == '浜戝涔�'}}" class="cmsItemName"> {{item.orderSaleMethod.cmsItemList[0].name}}</view>
<!-- <view wx:if="{{item.type == 'item'}}" style="width: 386rpx">
<view class="boosName">
<text class="cloudLearning">浜戝涔�</text>
@@ -37,7 +38,7 @@
</view> -->
</view>
<view class="textBox">{{item.productType}}</view>
- <view class="priceBox">锟{price}}</view>
+ <view class="priceBox">锟{item.price}}</view>
</view>
</view>
</view>
diff --git a/pages/cart/paymentPage/index.wxss b/pages/cart/paymentPage/index.wxss
index 02da90f..e975340 100644
--- a/pages/cart/paymentPage/index.wxss
+++ b/pages/cart/paymentPage/index.wxss
@@ -66,12 +66,12 @@
flex-direction: row;
padding: 0 10rpx; */
/* margin-right: 500rpx; */
- margin-bottom: 50rpx;
+ margin-bottom: 30rpx;
font-family: PingFang SC, PingFang SC;
font-weight: bold;
font-size: 29rpx;
color: #333333;
- display: flex;
+ /* display: flex; */
flex-direction: row;
}
@@ -273,6 +273,7 @@
}
.boosName {
+ margin-bottom: 20rpx;
font-family: PingFang SC, PingFang SC;
font-weight: bold;
font-size: 29rpx;
--
Gitblit v1.9.1