From 4a9955330070cf8abd78d95aaa2067d9a06a88c3 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 07 五月 2024 10:05:59 +0800
Subject: [PATCH] 各页面bug修改
---
packageDomain/pages/resourceDetails/document/index.wxss | 40 +++++++++-
packageDomain/pages/resourceDetails/document/index.js | 61 ++++++++++++++-
packageDomain/pages/resourceDetails/document/index.wxml | 3
packageDomain/pages/sampleBookList/index.wxml | 2
pages/bibliographyList/index.wxml | 37 +++++----
pages/bibliographyList/index.wxss | 14 +++
pages/bookExhibitionList/index.js | 2
pages/home/home.wxml | 1
pages/retrievalPage/index.js | 25 ------
pages/retrievalPage/index.wxss | 8 -
pages/bibliographyList/index.js | 24 +----
11 files changed, 140 insertions(+), 77 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/document/index.js b/packageDomain/pages/resourceDetails/document/index.js
index 2276497..0ca3e50 100644
--- a/packageDomain/pages/resourceDetails/document/index.js
+++ b/packageDomain/pages/resourceDetails/document/index.js
@@ -33,6 +33,10 @@
pauseTime: 0, //鏆傚仠鏃堕棿
applyState: '',
deadline: '',
+ lzoomFlag: false, //瀹氫箟 缂╂斁浜嬩欢 鑺傛祦闃�,闃叉涓�娆＄缉鏀捐Е鍙戜袱娆＄缉鏀句簨浠�
+ distance: 0, //璁板綍鎵嬫寚绉诲姩璺濈
+ scale: 1, //瀹氫箟鍒濆鍖栫殑椤甸潰缂╂斁澶у皬
+ newScale: 1, //璁板綍鏂扮殑椤甸潰缂╂斁澶у皬
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
@@ -342,12 +346,61 @@
},
//棰勮鍥剧墖锛屾斁澶ч瑙�
preview(event) {
- console.log(event.currentTarget.dataset.src)
- let currentUrl = event.currentTarget.dataset.src
+ let urls = [event.currentTarget.dataset.src]
wx.previewImage({
- current: currentUrl, // 褰撳墠鏄剧ず鍥剧墖鐨刪ttp閾炬帴
- // urls: this.data.showData // 闇�瑕侀瑙堢殑鍥剧墖http閾炬帴鍒楄〃
+ urls: urls // 闇�瑕侀瑙堢殑鍥剧墖http閾炬帴鍒楄〃
})
},
+ // myTouchStart(e) {
+ // //---------------------璁板綍缂╂斁浜嬩欢淇℃伅---------------------
+ // // 褰撲袱鏍规墜鎸囨斁涓婂幓鐨勬椂鍊欙紝灏嗚窛绂�(distance)鍒濆鍖栥��
+ // let xMove = e.touches[1].clientX - e.touches[0].clientX;
+ // let yMove = e.touches[1].clientY - e.touches[0].clientY;
+ // //璁＄畻寮�濮嬭Е鍙戜袱涓墜鎸囧潗鏍囩殑璺濈
+ // const distance = Math.sqrt(xMove * xMove + yMove * yMove);
+ // this.setData({
+ // distance: distance
+ // })
+ // //---------------------璁板綍缂╂斁浜嬩欢淇℃伅end---------------------
+ // },
+ // myTouchMove(e) {
+ // // ----------------鐩戝惉鎵嬪娍缂╁皬鏀惧ぇ浜嬩欢----------------
+ // // 鍗曟墜鎸囩缉鏀句笉鍋氫换浣曟搷浣�
+ // if (e.touches.length != 1) {
+ // //鍙屾墜鎸囪繍鍔� x绉诲姩鍚庣殑鍧愭爣鍜寉绉诲姩鍚庣殑鍧愭爣
+ // let xMove = e.touches[1].clientX - e.touches[0].clientX;
+ // let yMove = e.touches[1].clientY - e.touches[0].clientY;
+ // //鍙屾墜鎸囪繍鍔ㄦ柊鐨� ditance
+ // let newDistance = Math.sqrt(xMove * xMove + yMove * yMove);
+ // //璁＄畻绉诲姩鐨勮繃绋嬩腑瀹為檯绉诲姩浜嗗灏戠殑璺濈
+ // let distanceDiff = newDistance - this.data.distance;
+ // // newScale = scale + 0.005 * distanceDiff
+ // console.log('绉诲姩璺濈', distanceDiff);
+ // this.setData({
+ // newScale: this.data.newScale + 0.005 * distanceDiff
+ // })
+ // // 鎵撳紑缂╂斁鐩戝惉
+ // // zoomFlag = true
+ // this.setData({
+ // lzoomFlag: true
+ // })
+ // return
+ // }
+ // // ----------------鐩戝惉鎵嬪娍缂╁皬鏀惧ぇ浜嬩欢end----------------
+ // },
+ // myTouchEnd() {
+ // if (this.data.lzoomFlag) {
+ // if (this.data.newScale > 1.3) {
+ // console.log("鏀惧ぇ浜�", this.data.newScale);
+ // } else if (this.data.newScale < 0.7, this.data.newScale) {
+ // console.log("缂╁皬浜�");
+ // }
+ // // 鍏抽棴缂╂斁鐩戝惉
+ // // zoomFlag = false
+ // this.setData({
+ // lzoomFlag: false
+ // })
+ // }
+ // },
})
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/document/index.wxml b/packageDomain/pages/resourceDetails/document/index.wxml
index 05fd5cf..a16d7be 100644
--- a/packageDomain/pages/resourceDetails/document/index.wxml
+++ b/packageDomain/pages/resourceDetails/document/index.wxml
@@ -13,9 +13,10 @@
</view>
<!-- bind:tap="onClick" -->
<view class="pictureBox" wx:if="{{selectType == 'picture'}}">
+ <!-- style="width: {{(newScale <= 5 ? newScale: 5) * 100}}%;" -->
<image
src="{{showData}}"
- mode="aspectFit"
+ mode="widthFix"
data-src="{{showData}}"
bindtap="preview"
/>
diff --git a/packageDomain/pages/resourceDetails/document/index.wxss b/packageDomain/pages/resourceDetails/document/index.wxss
index 5d36a62..4e92ab4 100644
--- a/packageDomain/pages/resourceDetails/document/index.wxss
+++ b/packageDomain/pages/resourceDetails/document/index.wxss
@@ -49,7 +49,6 @@
background: #FFFFFF;
box-shadow: 0rpx 9rpx 9rpx 2rpx rgba(0, 0, 0, 0.06);
padding: 20rpx 50rpx;
- margin-bottom: 100rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 400;
font-size: 29rpx;
@@ -59,16 +58,49 @@
.pictureBox {
display: flex;
justify-content: center;
- margin-top: 160rpx;
+ margin-top: 20rpx;
width: 100%;
height: 100%;
}
.pictureBox image {
- width: 100%;
- height: 100%;
+ /* width: 100%;
+ height: auto; */
}
.download-btn {
width: 100%;
+}
+
+.heart {
+ animation-name: scaleDraw;
+ /*鍏抽敭甯у悕绉�*/
+ animation-timing-function: ease-in-out;
+ /*鍔ㄧ敾鐨勯�熷害鏇茬嚎*/
+ animation-iteration-count: infinite;
+ /*鍔ㄧ敾鎾斁鐨勬鏁�*/
+ animation-duration: 2s;
+ /*鍔ㄧ敾鎵�鑺辫垂鐨勬椂闂�*/
+}
+
+@keyframes scaleDraw {
+
+ /*瀹氫箟鍏抽敭甯с�乻caleDrew鏄渶瑕佺粦瀹氬埌閫夋嫨鍣ㄧ殑鍏抽敭甯у悕绉�*/
+ 0% {
+ transform: scale(1);
+ /*寮�濮嬩负鍘熷澶у皬*/
+ }
+
+ 25% {
+ transform: scale(1.5);
+ /*鏀惧ぇ1.1鍊�*/
+ }
+
+ 50% {
+ transform: scale(1.75);
+ }
+
+ 75% {
+ transform: scale(2.0);
+ }
}
\ No newline at end of file
diff --git a/packageDomain/pages/sampleBookList/index.wxml b/packageDomain/pages/sampleBookList/index.wxml
index 371d69b..f10148f 100644
--- a/packageDomain/pages/sampleBookList/index.wxml
+++ b/packageDomain/pages/sampleBookList/index.wxml
@@ -70,10 +70,10 @@
<view class="bookServices-list" wx:if="{{!skeletonLoding}}">
<view class="list-body">
<movable-area class="movable-area">
+ <!-- model:scroll-top="{{setScrollValue}}" -->
<scroll-view
class="scroll content"
bind:scroll="onPageScroll"
- model:scroll-top="{{setScrollValue}}"
scroll-y
refresher-enabled="{{true}}"
lower-threshold="{{200}}"
diff --git a/pages/bibliographyList/index.js b/pages/bibliographyList/index.js
index 2a851c7..9043fb8 100644
--- a/pages/bibliographyList/index.js
+++ b/pages/bibliographyList/index.js
@@ -420,23 +420,9 @@
Md5: item.datas.freeFile.FileList[0].Md5,
dialogBox: true
})
- // wx.showModal({
- // title: '璇疯緭鍏ラ偖绠�',
- // content: '',
- // confirmColor: '#ff6c00',
- // cancelColor: '#949494',
- // placeholderText: '璇疯緭鍏ラ偖绠卞彿',
- // editable: true,
- // complete: (res) => {
- // if (res.cancel) {
- // console.log('鍙栨秷');
- // }
- // if (res.confirm) {
- // this.setData({
- // input: res.content
- // })
- // this.confirmM()
- // }
+ // wx.scanCode({
+ // success: res => {
+ // console.log(res);
// }
// })
},
@@ -448,6 +434,9 @@
},
//鎻愪氦
confirmM(e) {
+ wx.showLoading({
+ title: '鍙戦�佷腑...',
+ })
const isEmailValid = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(this.data.input);
if (isEmailValid && this.data.input) {
this.setData({
@@ -458,6 +447,7 @@
md5s: [this.data.Md5]
}
app.MG.file.sendFileWithEmail(query).then(res => {
+ wx.hideLoading()
if (res) {
wx.showToast({
icon: 'success',
diff --git a/pages/bibliographyList/index.wxml b/pages/bibliographyList/index.wxml
index 2a71667..e39a61a 100644
--- a/pages/bibliographyList/index.wxml
+++ b/pages/bibliographyList/index.wxml
@@ -264,24 +264,27 @@
<t-toast id="t-toast" />
<!-- 寮圭獥 -->
-<view class="info-center" style="top:{{height*0.3}}px;" wx:if="{{dialogBox}}">
- <view>
- <view class="row-info">
- <view class="body">
- <view class="dialog-title">璇疯緭鍏ラ偖绠�</view>
- <view class="input-box">
- <t-input
- style="{{inputStyle}}"
- class="input"
- placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"
- value="{{input}}"
- bind:change="inputChange"
- ></t-input>
+<view wx:if="{{dialogBox}}">
+ <view class="popup-box" bindtap="closeDialog"></view>
+ <view class="info-center" style="top:{{height*0.4}}px;">
+ <view>
+ <view class="row-info">
+ <view class="body">
+ <view class="dialog-title">璇疯緭鍏ラ偖绠�</view>
+ <view class="input-box">
+ <t-input
+ style="{{inputStyle}}"
+ class="input"
+ placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"
+ value="{{input}}"
+ bind:change="inputChange"
+ ></t-input>
+ </view>
</view>
- </view>
- <view class="row-btn">
- <view class="left-btn" bindtap="closeDialog">鍙栨秷</view>
- <view class="right-btn" bindtap="confirmM">纭</view>
+ <view class="row-btn">
+ <view class="left-btn" bindtap="closeDialog">鍙栨秷</view>
+ <view class="right-btn" bindtap="confirmM">纭</view>
+ </view>
</view>
</view>
</view>
diff --git a/pages/bibliographyList/index.wxss b/pages/bibliographyList/index.wxss
index 266fa46..9022d5f 100644
--- a/pages/bibliographyList/index.wxss
+++ b/pages/bibliographyList/index.wxss
@@ -248,6 +248,7 @@
.info-center {
position: fixed;
+ top: 80%;
z-index: 999;
background-color: white;
align-items: center;
@@ -297,11 +298,22 @@
}
.input-box {
- width: 100%;
+ padding: 0 20rpx;
+ width: 92%;
margin-bottom: 16rpx;
}
.input {
--td-input-border-radius: 20rpx;
border-radius: 20rpx;
+}
+
+/* 钂欏眰 */
+.popup-box {
+ position: absolute;
+ z-index: 99;
+ top: 0;
+ background-color: rgba(0, 0, 0, 0.5);
+ width: 100%;
+ height: 100%;
}
\ No newline at end of file
diff --git a/pages/bookExhibitionList/index.js b/pages/bookExhibitionList/index.js
index 91877cb..29e5a9a 100644
--- a/pages/bookExhibitionList/index.js
+++ b/pages/bookExhibitionList/index.js
@@ -23,7 +23,7 @@
start: 0,
size: 16,
},
- keynoteValue: null,
+ keynoteValue: [],
filteredItems: [],
newValue: null,
bookExhibitionList: [],
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index b6bf9af..3688e7a 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -37,6 +37,7 @@
color="#bbb"
bind:tap="navToSearchPage"
/>
+
</t-search>
</view>
<view class="swiper-wrap">
diff --git a/pages/retrievalPage/index.js b/pages/retrievalPage/index.js
index 0eaae66..2ededee 100644
--- a/pages/retrievalPage/index.js
+++ b/pages/retrievalPage/index.js
@@ -125,7 +125,6 @@
this.bibliographyGet()
},
-
//鏍囩鐨勫垏鎹�
onTabsChange(event) {
const value = event.detail.value
@@ -219,8 +218,6 @@
...searchObj,
...fields
}
-
-
let courseObj = {}
if (this.data.searchVal) {
courseObj = {
@@ -229,7 +226,6 @@
'||isbn*': this.data.searchVal.trim(),
'||seriesName*': this.data.searchVal.trim()
}
-
}
//璇剧▼
let queryCourse = {
@@ -412,7 +408,6 @@
data: body
}).then((resp) => {
console.log(resp, 'resp');
-
//鍥句功 0
const data1 = resp[0]
const datas1 = handleQueryResourceListData({
@@ -422,12 +417,7 @@
this.setData({
bookData: datas1,
bookTotal: data1.totalCount,
-
})
-
-
-
-
//鏁板瓧璇剧▼ 1
const data2 = resp[1]
const datas2 = handleQueryResourceListData({
@@ -438,9 +428,6 @@
courseData: datas2,
courseTotal: data2.totalCount
})
-
-
-
// 鏁板瓧鏁欐潗 2
const data3 = resp[2]
const datas3 = handleQueryResourceListData({
@@ -451,15 +438,12 @@
digitalTextbooksData: datas3,
digitalTextbooksTotal: data3.totalCount
})
-
// 涓撻鐮旇 3
-
const data4 = resp[3]
const datas4 = handleQueryResourceListData({
datas: data4.datas,
fields
})
-
this.setData({
seminarData: datas4,
seminarTotal: data4.totalCount
@@ -470,7 +454,6 @@
datas: data5.datas,
fields
})
-
datas5.forEach((items) => {
items.subtitleName = items.subtitle + items.name
})
@@ -479,18 +462,12 @@
biblioClassificationData: datas5,
biblioClassificationTotal: data5.totalCount
})
-
this.setData({
loading: false,
hidden: false,
})
-
-
})
wx.stopPullDownRefresh()
-
-
-
},
bibliographyGet() {
let bibliographyObj = {}
@@ -534,9 +511,7 @@
wx.stopPullDownRefresh()
},
downloadData(event) {
- console.log(111);
const item = event.currentTarget.dataset.item;
- // console.log(item.datas.freeFile.Value);
const URL = app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.datas.freeFile.Value
item.determine = false
console.log(URL, 'URL');
diff --git a/pages/retrievalPage/index.wxss b/pages/retrievalPage/index.wxss
index c2cf0ce..bda8a84 100644
--- a/pages/retrievalPage/index.wxss
+++ b/pages/retrievalPage/index.wxss
@@ -377,10 +377,6 @@
font-size: var(--td-search-font-size, var(--td-font-size-m, 28rpx)) !important;
}
-/* element.style {
- -webkit-transform: translateX(38.9921875px) !important;
- transform: translateX(38.9921875px) !important;
-} */
.t-tabs .t-tabs__item--active {
/* min-width: 210rpx; */
@@ -393,8 +389,8 @@
.t-tabs__track {
background-color: #FF6C00 !important;
- -webkit-transform: translateX(39px);
- transform: translateX(39px);
+ /* -webkit-transform: translateX(39px); */
+ /* transform: translateX(39px); */
/* height: var(--td-tab-track-thickness, 0rpx) !important; */
}
--
Gitblit v1.9.1