From 4f749d1e926d6c528fad0a8d6540759557b8bc93 Mon Sep 17 00:00:00 2001 From: MaggieMii <1350383261@qq.com> Date: Sun, 22 Sep 2024 12:52:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E2=9C=A8=20feat:=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8F=90=E9=97=AE=E6=8C=89=E9=92=AE=E5=92=8C=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.config.ts | 1 + src/auto-imports.d.ts | 144 +++++++++--------- .../components/CommentComponent/index.scss | 4 +- src/pages/QuestionList/index.scss | 8 + src/pages/QuestionList/index.tsx | 29 +++- src/pages/classInfo/index.tsx | 4 +- src/pages/publishQuestion/index.tsx | 13 +- src/pages/questionList/index.scss | 8 + src/pages/questionList/index.tsx | 29 +++- 9 files changed, 156 insertions(+), 84 deletions(-) diff --git a/src/app.config.ts b/src/app.config.ts index 4dded60..e73ac33 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -17,6 +17,7 @@ export default defineAppConfig({ 'pages/editUser/index', 'pages/guide/index', 'pages/shareGrades/index', + 'pages/questionList/index', ], subpackages: [ { diff --git a/src/auto-imports.d.ts b/src/auto-imports.d.ts index 28514c4..985f2e1 100644 --- a/src/auto-imports.d.ts +++ b/src/auto-imports.d.ts @@ -3,77 +3,77 @@ // @ts-nocheck // noinspection JSUnusedGlobalSymbols // Generated by unplugin-auto-import -export {} +export { } declare global { - const useAPICheck: typeof import('taro-hooks')['useAPICheck'] - const useAccountInfo: typeof import('taro-hooks')['useAccountInfo'] - const useActionSheet: typeof import('taro-hooks')['useActionSheet'] - const useAlertBeforeUnload: typeof import('taro-hooks')['useAlertBeforeUnload'] - const useApp: typeof import('taro-hooks')['useApp'] - const useArrayBuffer: typeof import('taro-hooks')['useArrayBuffer'] - const useAudio: typeof import('taro-hooks')['useAudio'] - const useAuthorize: typeof import('taro-hooks')['useAuthorize'] - const useBackground: typeof import('taro-hooks')['useBackground'] - const useBattery: typeof import('taro-hooks')['useBattery'] - const useBluetooth: typeof import('taro-hooks')['useBluetooth'] - const useBoolean: typeof import('taro-hooks')['useBoolean'] - const useBrightness: typeof import('taro-hooks')['useBrightness'] - const useCamera: typeof import('taro-hooks')['useCamera'] - const useChooseAddress: typeof import('taro-hooks')['useChooseAddress'] - const useClipboardData: typeof import('taro-hooks')['useClipboardData'] - const useCreation: typeof import('taro-hooks')['useCreation'] - const useDebounce: typeof import('taro-hooks')['useDebounce'] - const useDebounceFn: typeof import('taro-hooks')['useDebounceFn'] - const useDeviceInfo: typeof import('taro-hooks')['useDeviceInfo'] - const useEnterOptions: typeof import('taro-hooks')['useEnterOptions'] - const useEnv: typeof import('taro-hooks')['useEnv'] - const useEvent: typeof import('taro-hooks')['useEvent'] - const useFile: typeof import('taro-hooks')['useFile'] - const useFrom: typeof import('taro-hooks')['useFrom'] - const useImage: typeof import('taro-hooks')['useImage'] - const useInvoice: typeof import('taro-hooks')['useInvoice'] - const useKeyboard: typeof import('taro-hooks')['useKeyboard'] - const useLatest: typeof import('taro-hooks')['useLatest'] - const useLaunchOptions: typeof import('taro-hooks')['useLaunchOptions'] - const useLoading: typeof import('taro-hooks')['useLoading'] - const useLocation: typeof import('taro-hooks')['useLocation'] - const useLogin: typeof import('taro-hooks')['useLogin'] - const useManualPullDownRefresh: typeof import('taro-hooks')['useManualPullDownRefresh'] - const useMap: typeof import('taro-hooks')['useMap'] - const useMemoizedFn: typeof import('taro-hooks')['useMemoizedFn'] - const useMenuButtonBoundingClientRect: typeof import('taro-hooks')['useMenuButtonBoundingClientRect'] - const useModal: typeof import('taro-hooks')['useModal'] - const useMotion: typeof import('taro-hooks')['useMotion'] - const useMount: typeof import('taro-hooks')['useMount'] - const useNavigationBar: typeof import('taro-hooks')['useNavigationBar'] - const useNetworkType: typeof import('taro-hooks')['useNetworkType'] - const useOnline: typeof import('taro-hooks')['useOnline'] - const usePage: typeof import('taro-hooks')['usePage'] - const usePreload: typeof import('taro-hooks')['usePreload'] - const usePromise: typeof import('taro-hooks')['usePromise'] - const useRecord: typeof import('taro-hooks')['useRecord'] - const useRequest: typeof import('taro-hooks')['useRequest'] - const useRequestSubscribeMessage: typeof import('taro-hooks')['useRequestSubscribeMessage'] - const useRouter: typeof import('taro-hooks')['useRouter'] - const useScanCode: typeof import('taro-hooks')['useScanCode'] - const useSelectorQuery: typeof import('taro-hooks')['useSelectorQuery'] - const useStorage: typeof import('taro-hooks')['useStorage'] - const useSystemInfo: typeof import('taro-hooks')['useSystemInfo'] - const useTabBar: typeof import('taro-hooks')['useTabBar'] - const useThrottle: typeof import('taro-hooks')['useThrottle'] - const useThrottleFn: typeof import('taro-hooks')['useThrottleFn'] - const useToast: typeof import('taro-hooks')['useToast'] - const useToggle: typeof import('taro-hooks')['useToggle'] - const useTopBarText: typeof import('taro-hooks')['useTopBarText'] - const useUnmount: typeof import('taro-hooks')['useUnmount'] - const useUpdate: typeof import('taro-hooks')['useUpdate'] - const useUpdateEffect: typeof import('taro-hooks')['useUpdateEffect'] - const useUpdateManager: typeof import('taro-hooks')['useUpdateManager'] - const useUserInfo: typeof import('taro-hooks')['useUserInfo'] - const useVibrate: typeof import('taro-hooks')['useVibrate'] - const useVideo: typeof import('taro-hooks')['useVideo'] - const useVisible: typeof import('taro-hooks')['useVisible'] - const useWeRun: typeof import('taro-hooks')['useWeRun'] - const useWebp: typeof import('taro-hooks')['useWebp'] - const useWindowInfo: typeof import('taro-hooks')['useWindowInfo'] + const useAPICheck: (typeof import('taro-hooks'))['useAPICheck']; + const useAccountInfo: (typeof import('taro-hooks'))['useAccountInfo']; + const useActionSheet: (typeof import('taro-hooks'))['useActionSheet']; + const useAlertBeforeUnload: (typeof import('taro-hooks'))['useAlertBeforeUnload']; + const useApp: (typeof import('taro-hooks'))['useApp']; + const useArrayBuffer: (typeof import('taro-hooks'))['useArrayBuffer']; + const useAudio: (typeof import('taro-hooks'))['useAudio']; + const useAuthorize: (typeof import('taro-hooks'))['useAuthorize']; + const useBackground: (typeof import('taro-hooks'))['useBackground']; + const useBattery: (typeof import('taro-hooks'))['useBattery']; + const useBluetooth: (typeof import('taro-hooks'))['useBluetooth']; + const useBoolean: (typeof import('taro-hooks'))['useBoolean']; + const useBrightness: (typeof import('taro-hooks'))['useBrightness']; + const useCamera: (typeof import('taro-hooks'))['useCamera']; + const useChooseAddress: (typeof import('taro-hooks'))['useChooseAddress']; + const useClipboardData: (typeof import('taro-hooks'))['useClipboardData']; + const useCreation: (typeof import('taro-hooks'))['useCreation']; + const useDebounce: (typeof import('taro-hooks'))['useDebounce']; + const useDebounceFn: (typeof import('taro-hooks'))['useDebounceFn']; + const useDeviceInfo: (typeof import('taro-hooks'))['useDeviceInfo']; + const useEnterOptions: (typeof import('taro-hooks'))['useEnterOptions']; + const useEnv: (typeof import('taro-hooks'))['useEnv']; + const useEvent: (typeof import('taro-hooks'))['useEvent']; + const useFile: (typeof import('taro-hooks'))['useFile']; + const useFrom: (typeof import('taro-hooks'))['useFrom']; + const useImage: (typeof import('taro-hooks'))['useImage']; + const useInvoice: (typeof import('taro-hooks'))['useInvoice']; + const useKeyboard: (typeof import('taro-hooks'))['useKeyboard']; + const useLatest: (typeof import('taro-hooks'))['useLatest']; + const useLaunchOptions: (typeof import('taro-hooks'))['useLaunchOptions']; + const useLoading: (typeof import('taro-hooks'))['useLoading']; + const useLocation: (typeof import('taro-hooks'))['useLocation']; + const useLogin: (typeof import('taro-hooks'))['useLogin']; + const useManualPullDownRefresh: (typeof import('taro-hooks'))['useManualPullDownRefresh']; + const useMap: (typeof import('taro-hooks'))['useMap']; + const useMemoizedFn: (typeof import('taro-hooks'))['useMemoizedFn']; + const useMenuButtonBoundingClientRect: (typeof import('taro-hooks'))['useMenuButtonBoundingClientRect']; + const useModal: (typeof import('taro-hooks'))['useModal']; + const useMotion: (typeof import('taro-hooks'))['useMotion']; + const useMount: (typeof import('taro-hooks'))['useMount']; + const useNavigationBar: (typeof import('taro-hooks'))['useNavigationBar']; + const useNetworkType: (typeof import('taro-hooks'))['useNetworkType']; + const useOnline: (typeof import('taro-hooks'))['useOnline']; + const usePage: (typeof import('taro-hooks'))['usePage']; + const usePreload: (typeof import('taro-hooks'))['usePreload']; + const usePromise: (typeof import('taro-hooks'))['usePromise']; + const useRecord: (typeof import('taro-hooks'))['useRecord']; + const useRequest: (typeof import('taro-hooks'))['useRequest']; + const useRequestSubscribeMessage: (typeof import('taro-hooks'))['useRequestSubscribeMessage']; + const useRouter: (typeof import('taro-hooks'))['useRouter']; + const useScanCode: (typeof import('taro-hooks'))['useScanCode']; + const useSelectorQuery: (typeof import('taro-hooks'))['useSelectorQuery']; + const useStorage: (typeof import('taro-hooks'))['useStorage']; + const useSystemInfo: (typeof import('taro-hooks'))['useSystemInfo']; + const useTabBar: (typeof import('taro-hooks'))['useTabBar']; + const useThrottle: (typeof import('taro-hooks'))['useThrottle']; + const useThrottleFn: (typeof import('taro-hooks'))['useThrottleFn']; + const useToast: (typeof import('taro-hooks'))['useToast']; + const useToggle: (typeof import('taro-hooks'))['useToggle']; + const useTopBarText: (typeof import('taro-hooks'))['useTopBarText']; + const useUnmount: (typeof import('taro-hooks'))['useUnmount']; + const useUpdate: (typeof import('taro-hooks'))['useUpdate']; + const useUpdateEffect: (typeof import('taro-hooks'))['useUpdateEffect']; + const useUpdateManager: (typeof import('taro-hooks'))['useUpdateManager']; + const useUserInfo: (typeof import('taro-hooks'))['useUserInfo']; + const useVibrate: (typeof import('taro-hooks'))['useVibrate']; + const useVideo: (typeof import('taro-hooks'))['useVideo']; + const useVisible: (typeof import('taro-hooks'))['useVisible']; + const useWeRun: (typeof import('taro-hooks'))['useWeRun']; + const useWebp: (typeof import('taro-hooks'))['useWebp']; + const useWindowInfo: (typeof import('taro-hooks'))['useWindowInfo']; } diff --git a/src/common/components/CommentComponent/index.scss b/src/common/components/CommentComponent/index.scss index c7e33b9..f7ab1a8 100644 --- a/src/common/components/CommentComponent/index.scss +++ b/src/common/components/CommentComponent/index.scss @@ -19,8 +19,8 @@ } .avatar { - width: 57.97rpx; - height: 57.97rpx; + width: 57.97rpx !important; + height: 57.97rpx !important; border-radius: 100%; margin-right: 10px; border: #d2d5d8 solid 5rpx; diff --git a/src/pages/QuestionList/index.scss b/src/pages/QuestionList/index.scss index e69de29..204960d 100644 --- a/src/pages/QuestionList/index.scss +++ b/src/pages/QuestionList/index.scss @@ -0,0 +1,8 @@ +.btn { + margin-top: 60rpx; + padding: 0 50rpx; + width: max-content; + border-radius: 50rpx; + background-color: #ffd777; + color: white; +} diff --git a/src/pages/QuestionList/index.tsx b/src/pages/QuestionList/index.tsx index 5103fda..981f2b9 100644 --- a/src/pages/QuestionList/index.tsx +++ b/src/pages/QuestionList/index.tsx @@ -1,11 +1,12 @@ // import React from 'react'; -import { View } from '@tarojs/components'; -import { useEffect, useState } from 'react'; - import { Course } from '@/common/assets/types'; import CourseInfo from '@/common/components/CourseInfo/CourseInfo'; import QuestionListComponent from '@/common/components/QuestionListComponent/QuestionListComponent'; import { get } from '@/common/utils/fetch'; +import { Button, View } from '@tarojs/components'; +import Taro from '@tarojs/taro'; +import { useEffect, useState } from 'react'; +import './index.scss'; interface IQuestion { id: number; @@ -29,7 +30,18 @@ interface IQuestion { const App = () => { const [course, setCourse] = useState(null); const [questions, setQuestions] = useState(null); - const courseId = 2347; //先用概率统计A来调试吧 + // const courseId = 2347; //先用概率统计A来调试吧 + const [courseId, setCourseId] = useState(null); + useEffect(() => { + const getParams = () => { + const instance = Taro.getCurrentInstance(); + const params = instance?.router?.params || {}; + + if (params.course_id) setCourseId(params.course_id); + }; + + getParams(); + }, []); useEffect(() => { // eslint-disable-next-line @typescript-eslint/require-await @@ -70,6 +82,12 @@ const App = () => { if (courseId) void getQuestionList().then((r) => console.log(r)); }, [courseId]); + const handleAsk = () => { + void Taro.navigateTo({ + url: `/pages/publishQuestion/index?course_id=${courseId}`, + }); + }; + return ( @@ -77,6 +95,9 @@ const App = () => { questions.map((question, index) => ( ))} + ); }; diff --git a/src/pages/classInfo/index.tsx b/src/pages/classInfo/index.tsx index ed6623f..c6f05a7 100644 --- a/src/pages/classInfo/index.tsx +++ b/src/pages/classInfo/index.tsx @@ -177,7 +177,9 @@ export default function Index() { { - void Taro.navigateTo({ url: '/pages/questionInfo/index' }); + void Taro.navigateTo({ + url: `/pages/questionList/index?course_id=${courseId}`, + }); }} className="text-right" > diff --git a/src/pages/publishQuestion/index.tsx b/src/pages/publishQuestion/index.tsx index efb0d00..0325475 100644 --- a/src/pages/publishQuestion/index.tsx +++ b/src/pages/publishQuestion/index.tsx @@ -60,7 +60,18 @@ const getCurrentDate = () => { export default function Index() { const [course, setCourse] = useState(null); - const courseId = 2347; //先用概率统计A来调试吧！ + // const courseId = 2347; //先用概率统计A来调试吧！ + const [courseId, setCourseId] = useState(null); + useEffect(() => { + const getParams = () => { + const instance = Taro.getCurrentInstance(); + const params = instance?.router?.params || {}; + + if (params.course_id) setCourseId(params.course_id); + }; + + getParams(); + }, []); //用户个人身份信息 const [avatarUrl, setAvatarUrl] = useState(''); diff --git a/src/pages/questionList/index.scss b/src/pages/questionList/index.scss index e69de29..204960d 100644 --- a/src/pages/questionList/index.scss +++ b/src/pages/questionList/index.scss @@ -0,0 +1,8 @@ +.btn { + margin-top: 60rpx; + padding: 0 50rpx; + width: max-content; + border-radius: 50rpx; + background-color: #ffd777; + color: white; +} diff --git a/src/pages/questionList/index.tsx b/src/pages/questionList/index.tsx index 5103fda..981f2b9 100644 --- a/src/pages/questionList/index.tsx +++ b/src/pages/questionList/index.tsx @@ -1,11 +1,12 @@ // import React from 'react'; -import { View } from '@tarojs/components'; -import { useEffect, useState } from 'react'; - import { Course } from '@/common/assets/types'; import CourseInfo from '@/common/components/CourseInfo/CourseInfo'; import QuestionListComponent from '@/common/components/QuestionListComponent/QuestionListComponent'; import { get } from '@/common/utils/fetch'; +import { Button, View } from '@tarojs/components'; +import Taro from '@tarojs/taro'; +import { useEffect, useState } from 'react'; +import './index.scss'; interface IQuestion { id: number; @@ -29,7 +30,18 @@ interface IQuestion { const App = () => { const [course, setCourse] = useState(null); const [questions, setQuestions] = useState(null); - const courseId = 2347; //先用概率统计A来调试吧 + // const courseId = 2347; //先用概率统计A来调试吧 + const [courseId, setCourseId] = useState(null); + useEffect(() => { + const getParams = () => { + const instance = Taro.getCurrentInstance(); + const params = instance?.router?.params || {}; + + if (params.course_id) setCourseId(params.course_id); + }; + + getParams(); + }, []); useEffect(() => { // eslint-disable-next-line @typescript-eslint/require-await @@ -70,6 +82,12 @@ const App = () => { if (courseId) void getQuestionList().then((r) => console.log(r)); }, [courseId]); + const handleAsk = () => { + void Taro.navigateTo({ + url: `/pages/publishQuestion/index?course_id=${courseId}`, + }); + }; + return ( @@ -77,6 +95,9 @@ const App = () => { questions.map((question, index) => ( ))} + ); }; From b22312dfcac44e47eea2adb3837d6e6802577cd9 Mon Sep 17 00:00:00 2001 From: MaggieMii <1350383261@qq.com> Date: Sun, 22 Sep 2024 12:57:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8F=90=E9=97=AEbutton=E4=BB=A5=E5=8F=8A=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/classInfo/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/classInfo/index.tsx b/src/pages/classInfo/index.tsx index 924608c..38abb14 100644 --- a/src/pages/classInfo/index.tsx +++ b/src/pages/classInfo/index.tsx @@ -197,7 +197,7 @@ export default function Index() { {questionlist.length > 0 && ( { - void Taro.navigateTo({ url: '/pages/questionInfo/index' }); + void Taro.navigateTo({ url: `/pages/questionList/index?course_id=${courseId}` }); }} className="text-right" > From fd04a1e38723428236ac78d23a3ee3177d2e11b8 Mon Sep 17 00:00:00 2001 From: MaggieMii <1350383261@qq.com> Date: Wed, 25 Sep 2024 10:57:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=8C=88=20style:=20prettier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/auto-imports.d.ts | 2 +- src/pages/classInfo/index.tsx | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/auto-imports.d.ts b/src/auto-imports.d.ts index 985f2e1..355c432 100644 --- a/src/auto-imports.d.ts +++ b/src/auto-imports.d.ts @@ -3,7 +3,7 @@ // @ts-nocheck // noinspection JSUnusedGlobalSymbols // Generated by unplugin-auto-import -export { } +export { }; declare global { const useAPICheck: (typeof import('taro-hooks'))['useAPICheck']; const useAccountInfo: (typeof import('taro-hooks'))['useAccountInfo']; diff --git a/src/pages/classInfo/index.tsx b/src/pages/classInfo/index.tsx index 38abb14..0796130 100644 --- a/src/pages/classInfo/index.tsx +++ b/src/pages/classInfo/index.tsx @@ -197,7 +197,9 @@ export default function Index() { {questionlist.length > 0 && ( { - void Taro.navigateTo({ url: `/pages/questionList/index?course_id=${courseId}` }); + void Taro.navigateTo({ + url: `/pages/questionList/index?course_id=${courseId}`, + }); }} className="text-right" >