From ce014364ba66bac5b2dfb860d2464f94b8cded22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Sun, 28 Sep 2025 14:34:22 +0800 Subject: [PATCH] =?UTF-8?q?feat(practice):=20=E6=B7=BB=E5=8A=A0=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E7=9F=A5=E8=AF=86=E5=AD=A6=E4=B9=A0=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=B9=B6=E6=9B=B4=E6=96=B0=E8=B7=AF=E7=94=B1=E9=85=8D=E7=BD=AE?= =?UTF-8?q?-=20=E5=B0=86=E8=A7=86=E9=A2=91=E9=A1=B5=E9=9D=A2=E9=87=8D?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E4=B8=BA=E5=AE=9E=E8=B7=B5=E7=BB=83=E4=B9=A0?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20-=20=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84=E5=8F=8A?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=B8=BA=E2=80=9C=E5=AE=89=E5=85=A8=E7=9F=A5?= =?UTF-8?q?=E8=AF=86=E5=AD=A6=E4=B9=A0=E2=80=9D-=20=E6=96=B0=E5=A2=9E=20CM?= =?UTF-8?q?S=20=E7=BD=91=E7=AB=99=E5=AD=97=E6=AE=B5=20onWxCheck=20?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E9=A1=B5=E9=9D=A2=E5=86=85=E5=AE=B9=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91=20-=20=E6=A0=B9=E6=8D=AE=20onWxChec?= =?UTF-8?q?k=20=E5=AD=97=E6=AE=B5=E5=80=BC=E5=88=87=E6=8D=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=A7=86=E9=A2=91=E6=88=96=E8=AF=95=E9=A2=98=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=20-=20=E5=9C=A8=20study=20=E9=A1=B5=E9=9D=A2=E4=B8=AD?= =?UTF-8?q?=E5=B0=86=E5=AF=BC=E8=88=AA=E9=93=BE=E6=8E=A5=E6=8C=87=E5=90=91?= =?UTF-8?q?=E6=96=B0=E7=9A=84=20practice=20=E9=A1=B5=E9=9D=A2=20-=20?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A7=E7=9A=84=20video=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=20-=20=E5=BC=95=E5=85=A5=20Question?= =?UTF-8?q?s=20=E7=BB=84=E4=BB=B6=E7=94=A8=E4=BA=8E=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=9F=A5=E8=AF=86=E9=A2=98=E7=9B=AE=20-=20?= =?UTF-8?q?=E8=B0=83=E7=94=A8=20configWebsiteField=20=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=A1=B5=E9=9D=A2=E6=8E=A7=E5=88=B6=E5=8F=82?= =?UTF-8?q?=E6=95=B0=20-=20=E4=BF=9D=E7=95=99=E5=8E=9F=E6=9C=89=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E6=92=AD=E6=94=BE=E5=8A=9F=E8=83=BD=E5=B9=B6=E5=9C=A8?= =?UTF-8?q?=20onWxCheck=E4=B8=BA=20'0'=20=E6=97=B6=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/cms/cmsWebsiteField/model/index.ts | 1 + src/app.config.ts | 2 +- src/hjm/practice/practice.config.ts | 3 ++ .../video.tsx => practice/practice.tsx} | 51 +++++++++++++------ src/hjm/video/video.config.ts | 3 -- src/pages/study/study.tsx | 2 +- 6 files changed, 41 insertions(+), 21 deletions(-) create mode 100644 src/hjm/practice/practice.config.ts rename src/hjm/{video/video.tsx => practice/practice.tsx} (55%) delete mode 100644 src/hjm/video/video.config.ts diff --git a/src/api/cms/cmsWebsiteField/model/index.ts b/src/api/cms/cmsWebsiteField/model/index.ts index 36560d1..e54896f 100644 --- a/src/api/cms/cmsWebsiteField/model/index.ts +++ b/src/api/cms/cmsWebsiteField/model/index.ts @@ -53,4 +53,5 @@ export interface Config { email?: string; loginTitle?: string; sysLogo?: string; + onWxCheck?: string; } diff --git a/src/app.config.ts b/src/app.config.ts index 8407d4c..d142db4 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -47,7 +47,7 @@ export default defineAppConfig({ "location", "query", "fence", - "video/video", + "practice/practice", "exam/exam", "bx/bx", "bx/bx-add", diff --git a/src/hjm/practice/practice.config.ts b/src/hjm/practice/practice.config.ts new file mode 100644 index 0000000..08a158e --- /dev/null +++ b/src/hjm/practice/practice.config.ts @@ -0,0 +1,3 @@ +export default definePageConfig({ + navigationBarTitleText: '安全知识学习' +}) diff --git a/src/hjm/video/video.tsx b/src/hjm/practice/practice.tsx similarity index 55% rename from src/hjm/video/video.tsx rename to src/hjm/practice/practice.tsx index b60f56e..4358860 100644 --- a/src/hjm/video/video.tsx +++ b/src/hjm/practice/practice.tsx @@ -5,6 +5,9 @@ import {useRouter} from '@tarojs/taro' import {getCmsArticle} from "@/api/cms/cmsArticle"; import {CmsArticle} from "@/api/cms/cmsArticle/model"; import {View} from '@tarojs/components' +import {Config} from "@/api/cms/cmsWebsiteField/model"; +import {configWebsiteField} from "@/api/cms/cmsWebsiteField"; +import Questions from "@/components/Questions"; /** * 文章终极列表 @@ -12,6 +15,7 @@ import {View} from '@tarojs/components' */ const VideoForm = () => { const {params} = useRouter(); + const [config, setConfig] = useState() const [item, setItem] = useState() const [source, setSource] = useState({ src: '', @@ -31,6 +35,9 @@ const VideoForm = () => { } const reload = () => { + configWebsiteField().then(data => { + setConfig(data) + }) getCmsArticle(Number(params.id)).then(data => { setItem(data) Taro.setNavigationBarTitle({ @@ -48,22 +55,34 @@ const VideoForm = () => { reload() }, []) - return ( -
-
-
- - 观看完视频后开始考试！ + + if (config?.onWxCheck === '1') { + console.log(config?.onWxCheck, 'config?.onWxCheckconfig?.onWxCheckconfig?.onWxCheck') + return ( + + -
- ) + ) + } + + if (config?.onWxCheck === '0') + return ( +
+
+
+ + 观看完视频后开始考试！ + +
+ ) + } export default VideoForm diff --git a/src/hjm/video/video.config.ts b/src/hjm/video/video.config.ts deleted file mode 100644 index bee83c1..0000000 --- a/src/hjm/video/video.config.ts +++ /dev/null @@ -1,3 +0,0 @@ -export default definePageConfig({ - navigationBarTitleText: '观看视频' -}) diff --git a/src/pages/study/study.tsx b/src/pages/study/study.tsx index 8d27de4..e44ea30 100644 --- a/src/pages/study/study.tsx +++ b/src/pages/study/study.tsx @@ -59,7 +59,7 @@ const Study = () => { !monthTaskCompleted && list?.map((item, index) => { return (
Taro.navigateTo({url: `/hjm/video/video?id=${item.articleId}`})}> + onClick={() => Taro.navigateTo({url: `/hjm/practice/practice?id=${item.articleId}`})}>
)