From 3963ae3ae3ebc2908905bb1409799d7b883a802f Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期三, 27 三月 2024 10:59:54 +0800
Subject: [PATCH] 书目bug
---
pages/bibliographyList/index.wxml | 31 ++++++++-------
pages/bookExhibitionList/index.wxss | 18 ++++++++
static/images/bibliographyList/email-click.png | 0
pages/bibliographyList/index.wxss | 16 ++++++++
pages/bookExhibitionList/index.js | 1
static/images/bibliographyList/email.png | 0
pages/bibliographyList/index.js | 13 ++++++
pages/cart/index.wxss | 8 ++--
8 files changed, 66 insertions(+), 21 deletions(-)
diff --git a/pages/bibliographyList/index.js b/pages/bibliographyList/index.js
index 2ec369e..c02f54b 100644
--- a/pages/bibliographyList/index.js
+++ b/pages/bibliographyList/index.js
@@ -7,6 +7,7 @@
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
+ downloadLoadin: false,
isMore: null,
higherList: [],
vocationalList: [],
@@ -253,6 +254,9 @@
},
downloadData(event) {
+ this.setData({
+ downloadLoadin: true
+ })
console.log(111);
const item = event.currentTarget.dataset.item;
// console.log(item.datas.freeFile.Value);
@@ -282,6 +286,13 @@
console.log('涓嬭浇鏂囦欢澶辫触', res);
}
});
+
+ setTimeout(() => {
+ this.setData({
+ downloadLoadin: false
+ });
+ }, 2000);
+
},
onSearchSubmit: function (e) {
const keyword = e.detail.value;
@@ -371,7 +382,7 @@
this.setData({
start: 1,
-
+
})
this.higherGet(keyword)
diff --git a/pages/bibliographyList/index.wxml b/pages/bibliographyList/index.wxml
index 02c8e0d..8355c4b 100644
--- a/pages/bibliographyList/index.wxml
+++ b/pages/bibliographyList/index.wxml
@@ -1,4 +1,8 @@
<!--pages/bibliographyList/index.wxml-->
+<view wx:if="{{downloadLoadin}}" class="loadinBox">
+ <t-loading class="colors" theme="circular" size="70rpx" class="wrapper" />
+
+</view>
<view class="bibliographyListBox">
<view class="titleBox">
<view style="width: 100%; height: {{barHeight}}px; "></view>
@@ -19,13 +23,13 @@
<t-tabs class="contentBox" defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel">
<t-tab-panel label="楂樼瓑鏁欒偛({{higherTotal}})" value="0">
<view class="outsideHigherBox">
- <view class="higherBox" wx:for="{{higherList}}" wx:key="index" wx:for-item="item" wx:for-index="index">
+ <view class="higherBox" wx:for="{{higherList}}" wx:key="index" wx:for-item="item" wx:for-index="index" bind:tap="downloadData" data-item="{{item}}">
<view class="outsideHigherImageBox">
<image class="higherImageBox" src="{{item.icon}}" mode="" />
- <view class="downloadIcon" bind:tap="downloadData" data-item="{{item}}">
+ <view class="downloadIcon" data-item="{{item}}">
- <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/downloadshiftin.png" mode="" />
- <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/download.png" mode="" />
+ <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/email-click.png" mode="" />
+ <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/email.png" mode="" />
</view>
</view>
@@ -40,13 +44,12 @@
</t-tab-panel>
<t-tab-panel label="鑱屼笟鏁欒偛({{vocationalTotal}})" value="1">
<view class="outsideHigherBox">
- <view class="higherBox" wx:for="{{vocationalList}}" wx:key="index" wx:for-item="item" wx:for-index="index">
+ <view class="higherBox" wx:for="{{vocationalList}}" wx:key="index" wx:for-item="item" wx:for-index="index" bind:tap="downloadData" data-item="{{item}}">
<view class="outsideHigherImageBox">
<image class="higherImageBox" src="{{item.icon}}" mode="" />
- <view class="downloadIcon" bind:tap="downloadData" data-item="{{item}}">
-
- <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/downloadshiftin.png" mode="" />
- <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/download.png" mode="" />
+ <view class="downloadIcon">
+ <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/email-click.png" mode="" />
+ <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/email.png" mode="" />
</view>
</view>
@@ -62,13 +65,12 @@
</t-tab-panel>
<t-tab-panel label="鏁欏笀鏁欒偛({{teacherTotal}})" value="2">
<view class="outsideHigherBox">
- <view class="higherBox" wx:for="{{teacherList}}" wx:key="index" wx:for-item="item" wx:for-index="index">
+ <view class="higherBox" wx:for="{{teacherList}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="downloadData">
<view class="outsideHigherImageBox">
<image class="higherImageBox" src="{{item.icon}}" mode="" />
- <view class="downloadIcon" bind:tap="downloadData" data-item="{{item}}">
-
- <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/downloadshiftin.png" mode="" />
- <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/download.png" mode="" />
+ <view class="downloadIcon">
+ <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/email-click.png" mode="" />
+ <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/email.png" mode="" />
</view>
</view>
@@ -80,6 +82,7 @@
<t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
+
</t-tab-panel>
</t-tabs>
diff --git a/pages/bibliographyList/index.wxss b/pages/bibliographyList/index.wxss
index 8133f8a..bcbc718 100644
--- a/pages/bibliographyList/index.wxss
+++ b/pages/bibliographyList/index.wxss
@@ -128,4 +128,20 @@
height: 80rpx;
font-size: 28rpx;
--td-loading-color: #ff6c00
+}
+
+.loadinBox {
+ position: fixed;
+ top: 50%;
+ left: 50%;
+ z-index: 999;
+ color: #FF6C00;
+}
+
+.loadinBox .colors {
+ color: #FF6C00;
+}
+
+.t-loading__spinner {
+ color: #FF6C00 !important;
}
\ No newline at end of file
diff --git a/pages/bookExhibitionList/index.js b/pages/bookExhibitionList/index.js
index de23628..babb3d4 100644
--- a/pages/bookExhibitionList/index.js
+++ b/pages/bookExhibitionList/index.js
@@ -26,7 +26,6 @@
},
product: {
value: '*',
-
options: [
{
value: '*',
diff --git a/pages/bookExhibitionList/index.wxss b/pages/bookExhibitionList/index.wxss
index 5269cb6..b7dcccc 100644
--- a/pages/bookExhibitionList/index.wxss
+++ b/pages/bookExhibitionList/index.wxss
@@ -189,12 +189,28 @@
height: 0 !important;
}
-.t-button--primary {
+/* .t-button--primary {
color: #fff !important;
background-color: #FF6C00 !important;
border: 1rpx #fff solid !important;
+} */
+
+.t-button--primary {
+ color: var(--td-button-primary-color, var(--td-font-white-1, #ffffff)) !important;
+ background-color: var(--td-button-primary-bg-color, var(--td-brand-color, var(--td-primary-color-7, #FF6C00))) !important;
}
+.t-button--primary::after {
+ border-width: var(--td-button-border-width, 4rpx);
+ border-color: var(--td-button-primary-border-color, var(--td-brand-color, var(--td-primary-color-7, #FF6C00))) !important;
+}
+
+.t-button--primary.t-button--hover::after {
+ background-color: var(--td-button-primary-active-bg-color, var(--td-brand-color-active, var(--td-primary-color-8, #FF6C00))) !important;
+ border-color: var(--td-button-primary-active-border-color, var(--td-brand-color-active, var(--td-primary-color-8, #FF6C00))) !important;
+}
+
+
.t-button--light {
color: #000 !important;
background-color: #fff !important;
diff --git a/pages/cart/index.wxss b/pages/cart/index.wxss
index 88ecf3a..03f362b 100644
--- a/pages/cart/index.wxss
+++ b/pages/cart/index.wxss
@@ -43,12 +43,12 @@
display: flex;
align-items: center;
position: fixed;
- bottom: 0;
+ bottom: calc(env(safe-area-inset-bottom) + 100rpx);
left: 0;
right: 0;
- height: 44px;
- padding-bottom: 80px;
- padding-top: 10rpx;
+ /* height: 44px; */
+ /* padding-bottom: 90px; */
+ /* padding-top: 10rpx; */
}
.checkGroupBox {
diff --git a/static/images/bibliographyList/email-click.png b/static/images/bibliographyList/email-click.png
new file mode 100644
index 0000000..dc4bfeb
--- /dev/null
+++ b/static/images/bibliographyList/email-click.png
Binary files differ
diff --git a/static/images/bibliographyList/email.png b/static/images/bibliographyList/email.png
new file mode 100644
index 0000000..2bc3625
--- /dev/null
+++ b/static/images/bibliographyList/email.png
Binary files differ
--
Gitblit v1.9.1