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}`})}>
)