From cbdb2e5a1439b8f673e553578919b6cfe7ebe49b Mon Sep 17 00:00:00 2001 From: kola-web Date: Mon, 9 Dec 2024 16:04:05 +0800 Subject: [PATCH] =?UTF-8?q?bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/images/icon-collection-active.png | Bin 705 -> 1707 bytes src/images/icon-collection.png | Bin 930 -> 1305 bytes src/images/icon-collection1.png | Bin 1699 -> 2318 bytes src/pages/article/index.ts | 43 ++++++++++++++++++++++++++-------- src/pages/article/index.wxml | 4 ++-- src/pages/collection/index.ts | 8 +++++++ src/pages/collection/index.wxml | 4 ++-- src/pages/home/index.ts | 8 ++----- src/pages/login/index.json | 1 + src/pages/login/index.ts | 11 ++++++++- src/pages/login/index.wxml | 5 +++- src/pages/my/index.scss | 29 +++++++++++------------ src/pages/my/index.wxml | 2 +- src/pages/search/index.ts | 8 +++++++ src/pages/search/index.wxml | 4 ++-- src/pages/topic/index.scss | 9 +++---- 16 files changed, 90 insertions(+), 46 deletions(-) diff --git a/src/images/icon-collection-active.png b/src/images/icon-collection-active.png index 5ea867ac7f9478400285a57008230f0b35f36dc8..5d90bde849b49c00ed457ecc38aa1b044b669205 100644 GIT binary patch literal 1707 zcmV;c22}ZpP)@~0drDELIAGL9O(c600d`2O+f$vv5yPDm_LZ)n>;Uoxqz}#t;_iT% z0_MZIr}x-shA@0w*}BKNSLgSXfFzK9{!8cTegGf{f*=TjAP9mW2!bF8f&~f!W%18` zG8haJ`nQVI;pg^z7XlAW4n`vF0|5|(z^GPR zft-x9PZ{xE;AN5$$WIbN3cVLNNs>ZHq1OT@NMDBcDfC)k5ef1=h29EW+~~Jpvh-yn zKWzNh0#ET)Al9I;C5mXg{4p6G}4#hLkdfuz-go}!-o`>I)T$nUq;zeSn32$ zGkqClPhlw%NMkyWXO9y|p{bNgR1|%0ezoQegL9{Z>LTbKX#9eRJyh76AIx{lFt(IU z;BAr+bz=U%03Kpw9x9Tn@Q~!1FLgEOLr%Gc3cM-_0Tybt+LOy9k)Q-B#7%NB!rt8Z zT(3yEV+kZtM>9uFK-DBkXauRDsA@?XmrSm?`n@zwzktH-xP?+~fzLPlE9N(N@9S-^ z#PrNvYwMsLujbjwTA=mh5n)19H$H#3WP6*nZbtMUo~?*H4zSsuJzcZi+A4uGi~%Fq z0f7zM7YJ4f)JiXdz)CHev6^jVB~Yp8XAoF1mHi8w?QEZc2?(s1W`xfTJOHHdlQrEUFfsTqo#sr$F@Qe@)B;JApd85NRKqOwnk-X8N9U&4gaVT$e zc!yM8qGNfZAK{qFN@S2nIGjT~2uf{}gMbzJqXS0WFjIav)Y4beHXWtcuGn5%&6*$lr34~4xtRGVDTWIhJjA~K10#&4f7l?=nFv6Tb zT3RG*l!~4JBg_H=ZNPsEYbDAi@bWLMR07UQlue)pU710^5k@Uwf=!?)U|LWW6kpdF z-!o7t)`$C4LB4Zk6KKloDikn7Q1P8Bi$JQ%sx%RX&Xq-@;V1u?QTk&RZ?GKD0auoKgj9F5;&t4x~ze0p|j#6PLXL zrIBG8mJZsD)_%MGQ~|u=UM7XB5_K++wG)@dV;Wieuj^0u-p0Gxm-pK7*8c1GF}KL{ zB5i?VIBucNZ=W>J+{jstVDUhGBat-tmiBeI zco9eOHUqAqVT1^UGfZ3~ULSWH=Hwsg}W+#~o(J{5m{eQ}h+Hwf1cQps5K|YcAalhSo4-BwQ zFB>Ki@ZC)pfy#MWrMBLvuXE4v$-`YDhs_%E;oE=HSO+Fp1!g?oIDSE6WXwC#1=H9) zG-Z5u?$O+KnZ;cvgmVxCK@bE%5ClOG1VIq;@IPwn))&8+w)y}7002ovPDHLkV1nRQ B4iEqU literal 705 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 literal 1699 zcmV;U23+}xP)Px*T}ebiRA@u(nqi1lMHI*94A;kga7Dp|(6{T{Sp|avAtfUvBcVPB3MB~@7WqLi z(7?z@aD^nHA|s)qBtL9mWMrQzN-!)eQVc5E$ekIUD+%idVHMoB>zv+M?p@WdKf@evLiwy0vy%5Q!UzGS*_DfN9kW*WOI1SOlO~tyYES zdA$Je6aegSf=APhJZ?Y`u^#|VSZfE3F_#!)4mKs=}y%4QD4NwTN zmUDhCt<|935F*lgxdZ_8c|j@lLlzrS%5{kNU}XANv)HiKt~JK|>b98%D5ZS0ar!?T zWB6J)C4%+vPXIMwjG5TLi!NPVUGo<#SRkymv`m%(zPeM8xN`*8OSPx2hwAc$#xg z8+ll6SZg;KV}5MaHv0e6YcSeSO8Kvwz#SVKTXXsH`;M5D`)sCY9zfdQCw}ijg{D`K#*0heQ#zr)Uaub-8XBT}>0}9hpg?c< z&nBh*DQg{M*2BJj(ON%L_7wfw?X*c}r|R|kD^aj${overfHAfuh2xn|Oqmsou8Wv} zaRw0&8e`6+aM)Fp4%qKA#^|b)RASTfg-+3>OP5wFmC9KFpjV~I5=_;-S)*KxqML(2 zwJP$zA#3e=V+_4Ar7oEjB+CKh?jTyy3vPeHUY6RC1kjz0EIXy>&yS9d9?H50lFeLz txxJo+hI4?kFzAJLIj3Nu!#NAa{s-JoSY|?wE++s0002ovPDHLkV1m=1EX)7^ diff --git a/src/pages/article/index.ts b/src/pages/article/index.ts index 2059651..aca20cd 100644 --- a/src/pages/article/index.ts +++ b/src/pages/article/index.ts @@ -18,6 +18,7 @@ Page({ toastShow: false, toastType: 3, + currentTime: 0, }, innerAudioContext: null as WechatMiniprogram.InnerAudioContext | null, onLoad(options) { @@ -25,6 +26,11 @@ Page({ this.setData({ BookId: options.id, }); + if (options.cid) { + this.setData({ + ChapterId: options.cid, + }); + } app.waitLogin(false, true).then(() => { this.getChapterList(); this.getDetail(); @@ -78,6 +84,7 @@ Page({ time, }); } + this.handleView(); }) .catch(() => { this.setData({ @@ -86,6 +93,16 @@ Page({ }); }); }, + handleView() { + wx.ajax({ + method: 'POST', + url: '?r=shizhong/book/add-browse-record', + data: { + BookId: this.data.BookId, + ChapterId: this.data.ChapterId, + }, + }); + }, handleDirectory() { this.setData({ show: true, @@ -140,7 +157,7 @@ Page({ }, handlePlay() { - const { chapter, play } = this.data; + const { chapter, play, currentTime } = this.data; if (this.innerAudioContext) { if (play) { this.innerAudioContext.stop(); @@ -148,10 +165,8 @@ Page({ } this.innerAudioContext.stop(); this.innerAudioContext.src = chapter.AudioUrl.url; + this.innerAudioContext.seek(currentTime); this.innerAudioContext.play(); - this.setData({ - play: true, - }); const listener = () => { if (this.innerAudioContext) { const { currentTime, duration } = this.innerAudioContext; @@ -160,6 +175,8 @@ Page({ this.setData({ time, progress, + currentTime, + play: true, }); } }; @@ -169,7 +186,12 @@ Page({ play: false, }); }); - this.innerAudioContext.onStop(() => { + this.innerAudioContext.onPlay(() => { + this.setData({ + play: true, + }); + }); + this.innerAudioContext.onPause(() => { this.setData({ play: false, }); @@ -179,9 +201,10 @@ Page({ handlePause() { if (this.innerAudioContext) { this.innerAudioContext.pause(); - this.setData({ - play: false, - }); + this.innerAudioContext.offTimeUpdate() + this.innerAudioContext.offEnded() + this.innerAudioContext.offPlay() + this.innerAudioContext.offPause() } }, formatTime(time: number) { @@ -199,8 +222,8 @@ Page({ this.setData({ toastShow: false, }); - wx.reLaunch({ - url: '/pages/login/index', + wx.navigateTo({ + url: '/pages/login/index?back=1', }); }, }); diff --git a/src/pages/article/index.wxml b/src/pages/article/index.wxml index 8907e2f..18d4144 100644 --- a/src/pages/article/index.wxml +++ b/src/pages/article/index.wxml @@ -23,7 +23,7 @@ /> - + - {{item.ChapterName}} + {{index+1}}.{{item.ChapterName}} diff --git a/src/pages/collection/index.ts b/src/pages/collection/index.ts index 2b496a5..1c5d259 100644 --- a/src/pages/collection/index.ts +++ b/src/pages/collection/index.ts @@ -81,6 +81,14 @@ Page({ handleBack() { wx.navigateBack(); }, + handleDetail(e) { + const { id } = e.currentTarget.dataset; + app.waitLogin(false, true).then(() => { + wx.navigateTo({ + url: `/pages/article/index?id=${id}`, + }); + }); + }, }); export {}; diff --git a/src/pages/collection/index.wxml b/src/pages/collection/index.wxml index cfea2a4..34445d6 100644 --- a/src/pages/collection/index.wxml +++ b/src/pages/collection/index.wxml @@ -9,8 +9,8 @@ - - + + {{item.BookName}} {{item.CateName}}{{item.CateSecondName ? '/'+item.CateSecondName : ''}} diff --git a/src/pages/home/index.ts b/src/pages/home/index.ts index b53509b..1d92814 100644 --- a/src/pages/home/index.ts +++ b/src/pages/home/index.ts @@ -35,7 +35,7 @@ Page({ }); } else if (bannerItem.configType === '2') { wx.navigateTo({ - url: `/pages/article/index?id=${bannerItem.configContent}`, + url: `/pages/article/index?id=${bannerItem.configContentBookId}&cid=${bannerItem.configContent}`, }); } else if (bannerItem.configType === '3') { wx.navigateTo({ @@ -76,10 +76,6 @@ Page({ this.setData({ feedbackCount: res, }); - wx.showToast({ - icon: 'none', - title: '留言成功', - }); }); }, handleRemark() { @@ -94,7 +90,7 @@ Page({ }).then(() => { wx.showToast({ title: '提交成功', - icon: 'success', + icon: 'none', }); this.setData({ remark: '', diff --git a/src/pages/login/index.json b/src/pages/login/index.json index 0d4a6d0..b3238b0 100644 --- a/src/pages/login/index.json +++ b/src/pages/login/index.json @@ -1,6 +1,7 @@ { "usingComponents": { "van-icon": "@vant/weapp/icon/index", + "van-nav-bar": "@vant/weapp/nav-bar/index", "van-popup": "@vant/weapp/popup/index" } } diff --git a/src/pages/login/index.ts b/src/pages/login/index.ts index b15babf..87c2742 100644 --- a/src/pages/login/index.ts +++ b/src/pages/login/index.ts @@ -10,8 +10,14 @@ Page({ code: '', protool: false, codeText: '发送验证码', + + back: false, + }, + onLoad(options) { + this.setData({ + back: options.back === '1', + }); }, - onLoad() {}, getCode() { if (timer) return; const mobile = this.data.mobile; @@ -152,6 +158,9 @@ Page({ url: '/pages/home/index', }); }, + handleBack() { + wx.navigateBack(); + }, }); export {}; diff --git a/src/pages/login/index.wxml b/src/pages/login/index.wxml index 0fdc67e..ae7162b 100644 --- a/src/pages/login/index.wxml +++ b/src/pages/login/index.wxml @@ -1,3 +1,6 @@ + + + 手机号快捷登录 - + 游客访问 diff --git a/src/pages/my/index.scss b/src/pages/my/index.scss index c9e7c23..f2b7df5 100644 --- a/src/pages/my/index.scss +++ b/src/pages/my/index.scss @@ -3,24 +3,9 @@ page { } .page { background: linear-gradient(180deg, #d2f1fe 0%, rgba(244, 248, 249, 0) 100%) no-repeat top center / 100% 682rpx; - .no-login { - margin: 32rpx 62rpx 0; - display: flex; - align-items: center; - gap: 24rpx; - .avatar { - width: 160rpx; - height: 160rpx; - } - .name { - font-size: 40rpx; - color: #3795f7; - } - } .login { margin: 32rpx 62rpx 0; display: flex; - align-items: center; gap: 24rpx; .upload { flex-shrink: 0; @@ -61,6 +46,20 @@ page { color: #999999; } } + .no-login { + margin: 32rpx 62rpx 0; + display: flex; + align-items: center; + gap: 24rpx; + .avatar { + width: 160rpx; + height: 160rpx; + } + .name { + font-size: 40rpx; + color: #3795f7; + } + } .nav-list { margin: 70rpx 32rpx 0; padding: 0 30rpx; diff --git a/src/pages/my/index.wxml b/src/pages/my/index.wxml index 7b76a5a..74094d2 100644 --- a/src/pages/my/index.wxml +++ b/src/pages/my/index.wxml @@ -7,7 +7,7 @@ - {{userInfo.username || '---'}}health_1733302440913576 + {{userInfo.username || '---'}} {{userInfo.telephone}} diff --git a/src/pages/search/index.ts b/src/pages/search/index.ts index 551a7d0..16e0ff9 100644 --- a/src/pages/search/index.ts +++ b/src/pages/search/index.ts @@ -64,6 +64,14 @@ Page({ handleBack() { wx.navigateBack(); }, + handleDetail(e) { + const { id } = e.currentTarget.dataset; + app.waitLogin(false, true).then(() => { + wx.navigateTo({ + url: `/pages/article/index?id=${id}`, + }); + }); + }, }); export {}; diff --git a/src/pages/search/index.wxml b/src/pages/search/index.wxml index fca15b7..8e58794 100644 --- a/src/pages/search/index.wxml +++ b/src/pages/search/index.wxml @@ -23,7 +23,7 @@ /> 以下为搜到的内容 - + {{item.ChapterName}} @@ -33,7 +33,7 @@ - ??? + {{item.BrowseNum}} diff --git a/src/pages/topic/index.scss b/src/pages/topic/index.scss index f409d41..b550203 100644 --- a/src/pages/topic/index.scss +++ b/src/pages/topic/index.scss @@ -36,9 +36,9 @@ page { .content { margin-top: 34rpx; - font-size: 40rpx; + font-size: 36rpx; color: #222222; - line-height: 64rpx; + line-height: 1.4; } .btn { @@ -58,11 +58,8 @@ page { } .footer { - position: absolute; - bottom: 206rpx; - left: 0; width: 100%; - padding: 0 88rpx; + padding: 30rpx 88rpx; box-sizing: border-box; display: flex; align-items: center;