From 399ec490b55265440974d64b9a0f94999619e754 Mon Sep 17 00:00:00 2001 From: kola-web Date: Tue, 10 Dec 2024 11:12:41 +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 --- project.private.config.json | 2 +- src/components/global-toast/index.wxml | 2 +- src/images/my-list-icon4.png | Bin 0 -> 1956 bytes src/images/relove.png | Bin 0 -> 3445 bytes src/pages/article/index.scss | 5 +++++ src/pages/article/index.ts | 33 +++++++++++++++++++++++++++------ src/pages/article/index.wxml | 24 +++++++++++++++++++----- src/pages/classify/index.wxml | 4 ++-- src/pages/collection/index.wxml | 2 +- src/pages/home/index.wxml | 2 -- src/pages/my/index.ts | 7 ++++++- src/pages/my/index.wxml | 4 ++++ src/pages/search/index.scss | 6 ++---- src/pages/search/index.wxml | 2 +- src/pages/topic/index.json | 4 +++- src/pages/topic/index.scss | 32 +++++++++++++++++++++++++++++--- src/pages/topic/index.ts | 31 ++++++++++++++++++++++++++++++- src/pages/topic/index.wxml | 17 ++++++++++++++++- src/pages/userInfo/index.wxml | 3 +-- src/utils/page.ts | 8 +++----- 20 files changed, 151 insertions(+), 37 deletions(-) create mode 100644 src/images/my-list-icon4.png create mode 100644 src/images/relove.png diff --git a/project.private.config.json b/project.private.config.json index 7e84be8..153bcdb 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -11,7 +11,7 @@ { "name": "文章详情", "pathName": "pages/article/index", - "query": "id=1", + "query": "id=3", "launchMode": "default", "scene": null }, diff --git a/src/components/global-toast/index.wxml b/src/components/global-toast/index.wxml index ec594ed..643dbd8 100644 --- a/src/components/global-toast/index.wxml +++ b/src/components/global-toast/index.wxml @@ -28,7 +28,7 @@ src="{{imageUrl}}{{params.qwPicture}}" show-menu-by-longpress > - 长按识别二维码关注 + 长按识别二维码添加 diff --git a/src/images/my-list-icon4.png b/src/images/my-list-icon4.png new file mode 100644 index 0000000000000000000000000000000000000000..abb7fe9a783a052db17f3e1975c261f15df856bd GIT binary patch literal 1956 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 Xrp2??M4L{300000NkvXXu0mjf5rb`J literal 0 HcmV?d00001 diff --git a/src/pages/article/index.scss b/src/pages/article/index.scss index 45f83ab..7fab90e 100644 --- a/src/pages/article/index.scss +++ b/src/pages/article/index.scss @@ -51,6 +51,11 @@ .progress { display: block; margin-top: 30rpx; + .custom-button { + width: 64rpx; + height: 64rpx; + background-color: transparent; + } } } diff --git a/src/pages/article/index.ts b/src/pages/article/index.ts index aca20cd..4f19948 100644 --- a/src/pages/article/index.ts +++ b/src/pages/article/index.ts @@ -15,10 +15,11 @@ Page({ url: 'http://m10.music.126.net/20241126110303/3f2481d2d6d50acd2009359539eadda0/ymusic/5353/0f0f/0358/d99739615f8e5153d77042092f07fd77.mp3', play: false, time: '00:00/00:00', + currentTime: 0, + drag: false, toastShow: false, toastType: 3, - currentTime: 0, }, innerAudioContext: null as WechatMiniprogram.InnerAudioContext | null, onLoad(options) { @@ -168,7 +169,7 @@ Page({ this.innerAudioContext.seek(currentTime); this.innerAudioContext.play(); const listener = () => { - if (this.innerAudioContext) { + if (this.innerAudioContext && !this.data.drag) { const { currentTime, duration } = this.innerAudioContext; const time = `${this.formatTime(currentTime)}/${this.formatTime(duration)}`; const progress = (currentTime / duration) * 100; @@ -182,6 +183,7 @@ Page({ }; this.innerAudioContext.onTimeUpdate(listener); this.innerAudioContext.onEnded(() => { + this.innerAudioContext?.seek(0); this.setData({ play: false, }); @@ -201,12 +203,31 @@ Page({ handlePause() { if (this.innerAudioContext) { this.innerAudioContext.pause(); - this.innerAudioContext.offTimeUpdate() - this.innerAudioContext.offEnded() - this.innerAudioContext.offPlay() - this.innerAudioContext.offPause() } }, + handleDragStart() { + this.setData({ + drag: true, + }); + }, + handleDragEnd() { + this.setData({ + drag: false, + }); + if (this.data.play) { + this.innerAudioContext?.seek(this.data.currentTime); + } + }, + handleDrag(e: any) { + const current = e.detail.value; + const duration = this.innerAudioContext?.duration || this.data.chapter.AudioUrl.duration; + const currentTime = (current / 100) * duration; + const time = `${this.formatTime(currentTime)}/${this.formatTime(duration)}`; + this.setData({ + time, + currentTime, + }); + }, formatTime(time: number) { const minutes = Math.floor(time / 60); const seconds = Math.floor(time % 60); diff --git a/src/pages/article/index.wxml b/src/pages/article/index.wxml index 18d4144..5e30097 100644 --- a/src/pages/article/index.wxml +++ b/src/pages/article/index.wxml @@ -7,20 +7,29 @@ 概要解读 {{time}} - + + bind:drag-start="handleDragStart" + bind:drag-end="handleDragEnd" + bind:drag="handleDrag" + > + + @@ -91,4 +100,9 @@ - + diff --git a/src/pages/classify/index.wxml b/src/pages/classify/index.wxml index 6e7a1d8..9f3bec5 100644 --- a/src/pages/classify/index.wxml +++ b/src/pages/classify/index.wxml @@ -34,7 +34,7 @@ - {{item.BrowseNum}} + {{~~item.OperateNum + ~~item.BrowseNum}} - {{item.BrowseNum}} + {{~~item.OperateNum + ~~item.BrowseNum}} - {{item.BrowseNum}} + {{~~item.OperateNum + ~~item.BrowseNum}} 提交 提交 diff --git a/src/pages/my/index.ts b/src/pages/my/index.ts index 7e3ce9c..2e035c3 100644 --- a/src/pages/my/index.ts +++ b/src/pages/my/index.ts @@ -7,7 +7,7 @@ Page({ userInfo: {} as any, }, - onLoad() { + onShow() { app.waitLogin().then(() => { app.getUserInfo(this); }); @@ -75,4 +75,9 @@ Page({ toastShow: false, }); }, + handleTopic() { + wx.navigateTo({ + url: '/pages/topic/index?back=1', + }); + }, }); diff --git a/src/pages/my/index.wxml b/src/pages/my/index.wxml index 74094d2..9a267c3 100644 --- a/src/pages/my/index.wxml +++ b/src/pages/my/index.wxml @@ -27,6 +27,10 @@ 我的收藏 + + + 问卷调查 + 关注公众号 diff --git a/src/pages/search/index.scss b/src/pages/search/index.scss index 3f0598f..9fc5c04 100644 --- a/src/pages/search/index.scss +++ b/src/pages/search/index.scss @@ -65,17 +65,15 @@ page { .c-footer { margin-top: 20px; display: flex; - align-items: center; justify-content: space-between; + gap: 20rpx; .type { font-size: 28rpx; color: #999999; line-height: 28rpx; } .stat { - display: flex; - align-items: center; - gap: 40rpx; + flex-shrink: 0; .s-item { display: flex; align-items: center; diff --git a/src/pages/search/index.wxml b/src/pages/search/index.wxml index 8e58794..ec3d820 100644 --- a/src/pages/search/index.wxml +++ b/src/pages/search/index.wxml @@ -33,7 +33,7 @@ - {{item.BrowseNum}} + {{~~item.OperateNum + ~~item.BrowseNum}} diff --git a/src/pages/topic/index.json b/src/pages/topic/index.json index 0700ef8..3a3e83a 100644 --- a/src/pages/topic/index.json +++ b/src/pages/topic/index.json @@ -1,5 +1,7 @@ { "usingComponents": { - "van-progress": "@vant/weapp/progress/index" + "van-progress": "@vant/weapp/progress/index", + "van-nav-bar": "@vant/weapp/nav-bar/index", + "van-icon": "@vant/weapp/icon/index" } } diff --git a/src/pages/topic/index.scss b/src/pages/topic/index.scss index b550203..81cbc91 100644 --- a/src/pages/topic/index.scss +++ b/src/pages/topic/index.scss @@ -59,11 +59,11 @@ page { .footer { width: 100%; - padding: 30rpx 88rpx; + padding: 80rpx 0; box-sizing: border-box; display: flex; align-items: center; - justify-content: center; + justify-content: space-between; .prev { flex: 1; @@ -83,7 +83,7 @@ page { } .submit { - flex: 1; + width: 290rpx; height: 88rpx; font-size: 36rpx; color: #ffffff; @@ -96,3 +96,29 @@ page { } } } + +.relove { + position: fixed; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + z-index: 10; + width: 388rpx; + height: 350rpx; + background: rgba(0, 0, 0, 0.67); + border-radius: 42rpx 42rpx 42rpx 42rpx; + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + text-align: center; + .icon { + width: 84rpx; + height: 84rpx; + } + .content { + margin-top: 26rpx; + font-size: 40rpx; + color: #ffffff; + } +} diff --git a/src/pages/topic/index.ts b/src/pages/topic/index.ts index f5a26e7..ec88e34 100644 --- a/src/pages/topic/index.ts +++ b/src/pages/topic/index.ts @@ -5,8 +5,15 @@ Page({ nav: 0, percentage: 0, question: [] as { questionId: string; title: string; answer?: '1' | '2' }[], + + relove: false, + + back: false, }, - onLoad() { + onLoad(options) { + this.setData({ + back: options.back === '1', + }); app.waitLogin(true).then(() => { this.getList(); }); @@ -51,6 +58,9 @@ Page({ answer: JSON.stringify(answer), }, }).then(() => { + this.setData({ + relove: true, + }); app.waitLogin().then(() => { wx.reLaunch({ url: '/pages/home/index', @@ -63,6 +73,25 @@ Page({ nav: this.data.nav, }); }, + handleBack() { + wx.showModal({ + title: '确认退出？', + content: '还差一点就完成了，退出会清空所有答题，确认现在要退出吗？', + cancelText: '退出', + confirmText: '继续答题', + success: (res) => { + if (res.cancel) { + if (this.data.back) { + wx.navigateBack(); + } else { + wx.reLaunch({ + url: '/pages/home/index', + }); + } + } + }, + }); + }, }); export {}; diff --git a/src/pages/topic/index.wxml b/src/pages/topic/index.wxml index 599a3ee..7357140 100644 --- a/src/pages/topic/index.wxml +++ b/src/pages/topic/index.wxml @@ -2,6 +2,9 @@ class="page" style="background: url('{{imageUrl}}topic-bg.png?t={{Timestamp}}') no-repeat {{menuButtonInfo.bottom+62}}rpx center/100% 1284rpx;" > + + + - + {{index + 1}}/ {{question.length}} @@ -65,3 +71,12 @@ + + + + + 提交成功 + + 感谢您的参与 + + diff --git a/src/pages/userInfo/index.wxml b/src/pages/userInfo/index.wxml index 926646a..e51f40d 100644 --- a/src/pages/userInfo/index.wxml +++ b/src/pages/userInfo/index.wxml @@ -7,9 +7,8 @@ 20) { - background = "#fff"; + background = '#fff'; } this.setData({ background,