From cf3c07d5bed07fa1e60255a8820c1926d712bd56 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 18 三月 2024 15:04:45 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/cart/index.js | 7 ---
pages/cart/paymentPage/index.wxml | 13 ++----
pages/cart/paymentPage/index.wxss | 45 ++++++++++++++++++----
packageDomain/pages/resourceDetails/myAudio/index.js | 4 +-
packageDomain/pages/resourceDetails/myAudio/index.wxss | 6 ++
packageDomain/pages/resourceDetails/myAudio/index.wxml | 19 ++++-----
pages/cart/index.wxss | 5 ++
pages/cart/index.wxml | 12 ------
8 files changed, 60 insertions(+), 51 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 544125b..4a6103d 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -34,8 +34,8 @@
style: 'height: 248rpx',
submitType: "new", // 鏂板缓 or 缂栬緫
noteId: '',
- myAudioDuration: '', // 瑙嗛鏃堕棿
- myAudioCurrent: '', // 褰撳墠鎾斁杩涘害
+ myAudioDuration: '00:00', // 瑙嗛鏃堕棿
+ myAudioCurrent: '00:00', // 褰撳墠鎾斁杩涘害
isplay: false, //鏄惁榛樿鎾斁,
selectId: '',
speed: 1.0,
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxml b/packageDomain/pages/resourceDetails/myAudio/index.wxml
index daf0f65..4fe7b87 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxml
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxml
@@ -16,19 +16,16 @@
</view>
<!-- 瑙嗛鎾斁鐨勬寜閽� -->
<view class="bigFunctionBox">
- <slider activeColor='#FF6C00' class="mp-slider-bar" block-size="16" value="{{myAudioPos}}" bindchange="hanle_slider_change"></slider>
+
<view class="functionBox">
-
-
-
<!-- 宸﹀垏鎹� -->
- <view class="leftSwitchBox color" bind:tap="onLeftSwitch">
+ <!-- <view class="leftSwitchBox color" bind:tap="onLeftSwitch">
<t-icon name="previous" size="24" />
- </view>
+ </view> -->
<!-- 鏆傚仠鎾斁 -->
- <view class="audioIconBox color">
+ <view class="audioIconBox color" style="margin-left: 30rpx; margin-right: 10rpx;">
<view wx:if="{{!isplay}}" bind:tap='play'>
<t-icon name="play-circle-stroke" size="24" />
</view>
@@ -36,18 +33,18 @@
<t-icon name="pause-circle-stroke" size="24" />
</view>
</view>
-
+ <slider style="width: 300rpx;" activeColor='#FF6C00' class="mp-slider-bar" block-size="16" value="{{myAudioPos}}" bindchange="hanle_slider_change"></slider>
<!-- 鍙冲垏鎹� -->
- <view class="rightSwitchBox color" bind:tap="onRightSwitch">
+ <!-- <view class="rightSwitchBox color" bind:tap="onRightSwitch">
<t-icon name="next" size="24" />
- </view>
+ </view> -->
<!-- 鏃堕棿 -->
<view class="current-time color">{{myAudioCurrent}} </view>
<view class="color" style="margin: 0 10rpx;">/</view>
<view class="duration-time color"> {{myAudioDuration}} </view>
- <view class="publicBtn color" style="margin-left:100rpx ;" bind:tap="onSpeed">
+ <view class="publicBtn color" style="margin-left:40rpx ; width: 80rpx;" bind:tap="onSpeed">
<text class="publicText">{{"x "+speed}}</text>
</view>
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxss b/packageDomain/pages/resourceDetails/myAudio/index.wxss
index 4d891e6..888d2cf 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxss
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxss
@@ -306,7 +306,7 @@
.mp-slider-bar {
margin: 0 18rpx;
- margin-top: 10rpx;
+ /* margin-top: 10rpx; */
}
.t-tabs__item--active {
@@ -316,4 +316,8 @@
.t-tabs__track {
background-color: #FF6C00 !important;
+}
+
+.audioIconBox {
+ /* margin-top: 10rpx; */
}
\ No newline at end of file
diff --git a/pages/cart/index.js b/pages/cart/index.js
index e567fdc..98123d1 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -77,12 +77,9 @@
if (eitem.id == item.id) {
eitem.checked = e.detail.checked
}
-
-
})
const data = items.filter(item => item.checked)
const checkAll = data.length == this.data.shoppingCartData.length
-
this.setData({
shoppingCartData: items,
checkAll
@@ -120,7 +117,6 @@
});
})
} else {
-
Toast({
context: this,
selector: '#t-toast',
@@ -129,8 +125,5 @@
direction: 'column',
});
}
-
-
-
}
});
diff --git a/pages/cart/index.wxml b/pages/cart/index.wxml
index 470f5f0..ef02555 100644
--- a/pages/cart/index.wxml
+++ b/pages/cart/index.wxml
@@ -15,31 +15,21 @@
<view class="labelBox">
<view class="eBook" wx:if="{{type == 'product'}}">鐢靛瓙涔�</view>
<view wx:if="{{type == 'item'}}" class="cloudLearning">浜戝涔�</view>
-
</view>
-
<view class="boosName">
{{item.productMonWithLinkDto.product.name}}
</view>
-
-
</view>
-
<view slot="description" class="descriptionBox">
-
<view>
<view class="textBox" wx:if="{{type == 'product'}}">鍥句功鏈嶅姟-鐢靛瓙涔�</view>
<view class="textBox" wx:if="{{type == 'item'}}">鍥句功鏈嶅姟-浜戝涔�</view>
</view>
-
<view wx:if="{{item.saleMethod.price != 0}}">
锟{item.saleMethod.price}}
</view>
-
-
<view wx:else class="descriptionBox"> 绔嬪嵆棰嗗彇</view>
</view>
-
<view slot="left-icon" class="left-icon">
<view class="contentCheckbox">
<t-checkbox icon="rectangle" value=" {{item.id}}" data-item="{{item}}" checked="{{item.checked}}" bindchange="HandelItemChange" />
@@ -50,10 +40,8 @@
</view>
</t-cell>
</view>
- <!-- </view> -->
<view slot="right" class="btn delete-btn" bind:tap="onDelete" data-item="{{item}}">鍒犻櫎</view>
</t-swipe-cell>
- <!-- </checkbox-group> -->
</view>
<view class="bottomBox">
diff --git a/pages/cart/index.wxss b/pages/cart/index.wxss
index 6323f54..d83487e 100644
--- a/pages/cart/index.wxss
+++ b/pages/cart/index.wxss
@@ -228,6 +228,7 @@
background: #5F92FD;
text-align: center;
line-height: 38rpx;
+ border-radius: 9rpx;
}
.boosName {
@@ -237,6 +238,10 @@
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
+ font-family: PingFang SC, PingFang SC;
+ font-weight: bold;
+ font-size: 29rpx;
+ color: #333333;
}
.textBox {
diff --git a/pages/cart/paymentPage/index.wxml b/pages/cart/paymentPage/index.wxml
index fbaed31..f92e232 100644
--- a/pages/cart/paymentPage/index.wxml
+++ b/pages/cart/paymentPage/index.wxml
@@ -19,27 +19,22 @@
</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>
+
<view class="textBox" wx:if="{{type == 'product'}}">鍥句功鏈嶅姟-鐢靛瓙涔�</view>
<view class="textBox" wx:if="{{type == 'item'}}">鍥句功鏈嶅姟-浜戝涔�</view>
<view class="priceBox">锟{item.payPrice}}</view>
@@ -49,11 +44,11 @@
<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>
diff --git a/pages/cart/paymentPage/index.wxss b/pages/cart/paymentPage/index.wxss
index 14285dc..ab15ca0 100644
--- a/pages/cart/paymentPage/index.wxss
+++ b/pages/cart/paymentPage/index.wxss
@@ -82,10 +82,6 @@
font-size: 31rpx;
color: #0F1214;
font-family: DIN, DIN;
-
-
-
-
}
.priceBreakdown {
@@ -97,17 +93,16 @@
.priceBreakdownContent {
font-weight: bold;
- font-size: 32rpx;
+ font-size: 29rpx;
color: #0F1214;
margin-bottom: 50rpx;
+ font-family: PingFang SC, PingFang SC;
+
}
.amountMoney {
display: flex;
justify-content: space-between;
- font-weight: 500;
- font-size: 33rpx;
- color: #0F1214;
border-bottom: 2rpx solid #EDEDED;
padding-bottom: 38rpx;
}
@@ -116,6 +111,17 @@
display: flex;
justify-content: flex-end;
margin: 30rpx 0;
+ font-family: DIN, DIN;
+ font-weight: 500;
+ font-size: 33rpx;
+ color: #0F1214;
+}
+
+.amount text {
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 400;
+ font-size: 25rpx;
+ color: #949494
}
@@ -140,12 +146,17 @@
.residue {
color: #949494;
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 400;
+ font-size: 25rpx;
+ color: #949494;
}
.residueTextBox {
font-weight: bold;
font-size: 38rpx;
color: #FF6C00;
+ font-family: DIN, DIN;
}
.buttonBox {
@@ -202,8 +213,10 @@
font-size: 22rpx;
color: #FFFFFF;
font-family: PingFang SC, PingFang SC;
+}
-
+.labelBox text {
+ color: #000;
}
.boosName {
@@ -213,4 +226,18 @@
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
+}
+
+.commodityBox {
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 400;
+ font-size: 27rpx;
+ color: #0F1214;
+}
+
+.payPriceBox {
+ font-family: DIN, DIN;
+ font-weight: 500;
+ font-size: 33rpx;
+ color: #0F1214;
}
\ No newline at end of file
--
Gitblit v1.9.1