diff --git a/miniprogram/pages/assessment/assessment.ts b/miniprogram/pages/assessment/assessment.ts index f0f7ad5..5a0563c 100644 --- a/miniprogram/pages/assessment/assessment.ts +++ b/miniprogram/pages/assessment/assessment.ts @@ -178,6 +178,7 @@ type IPageMethods = { ensureRecordPermission: () => void onMoreTap: () => void onSceneSentenceTap: () => void + onImageQaExerciseTap: () => void onSentenceTouchStart: (e: any) => void onSentenceTouchMove: (e: any) => void onSentenceTouchEnd: () => void @@ -1411,6 +1412,18 @@ Page({ }) }, + onImageQaExerciseTap() { + const imageId = this.data.imageId || '' + if (!imageId) { + wx.showToast({ title: '缺少图片ID', icon: 'none' }) + return + } + this.setData({ isMoreMenuOpen: false, isMoreMenuClosing: false }) + wx.navigateTo({ + url: `/pages/qa_exercise/qa_exercise?image_id=${encodeURIComponent(imageId)}` + }) + }, + noop() {}, onUnload() { diff --git a/miniprogram/pages/assessment/assessment.wxml b/miniprogram/pages/assessment/assessment.wxml index 402aeb9..5d99986 100644 --- a/miniprogram/pages/assessment/assessment.wxml +++ b/miniprogram/pages/assessment/assessment.wxml @@ -71,7 +71,7 @@ 场景句型 - + 场景练习 diff --git a/miniprogram/pages/order/order.wxml b/miniprogram/pages/order/order.wxml index bbe18c1..ad58490 100644 --- a/miniprogram/pages/order/order.wxml +++ b/miniprogram/pages/order/order.wxml @@ -10,10 +10,10 @@ ¥{{item.displayAmount}} · 积分 {{item.points}} · 可退 ¥{{item.displayRefundable}} - + diff --git a/miniprogram/pages/qa_exercise/qa_exercise.ts b/miniprogram/pages/qa_exercise/qa_exercise.ts index cf67f28..87987d8 100644 --- a/miniprogram/pages/qa_exercise/qa_exercise.ts +++ b/miniprogram/pages/qa_exercise/qa_exercise.ts @@ -239,7 +239,11 @@ Page({ }, onOptionLongPress(e: any) { const ds = e?.currentTarget?.dataset || {} - const word = String(ds.word || '').replace(/[^A-Za-z-]/g, '') + const raw = String(ds.word || '').trim() + // 只有独立的单词能够触发查询,如果包含空格则认为是短语或句子 + if (!raw || /\s/.test(raw)) return + + const word = raw.replace(/[^A-Za-z-]/g, '') if (!word) return this.setData({ showDictPopup: true, showDictExtended: false }) const comp = this.selectComponent('#wordDict') as any diff --git a/miniprogram/pages/qa_exercise/qa_exercise.wxml b/miniprogram/pages/qa_exercise/qa_exercise.wxml index 3ba3d02..b26e676 100644 --- a/miniprogram/pages/qa_exercise/qa_exercise.wxml +++ b/miniprogram/pages/qa_exercise/qa_exercise.wxml @@ -80,7 +80,7 @@ - +