diff --git a/components.d.ts b/components.d.ts index 6e75820..6ad8f77 100644 --- a/components.d.ts +++ b/components.d.ts @@ -9,6 +9,7 @@ declare module 'vue' { export interface GlobalComponents { PageWrapper: typeof import('./src/components/page-wrapper.vue')['default'] TabBar: typeof import('./src/components/TabBar.vue')['default'] + WdBadge: typeof import('wot-design-uni/components/wd-badge/wd-badge.vue')['default'] WdButton: typeof import('wot-design-uni/components/wd-button/wd-button.vue')['default'] WdCell: typeof import('wot-design-uni/components/wd-cell/wd-cell.vue')['default'] WdCellGroup: typeof import('wot-design-uni/components/wd-cell-group/wd-cell-group.vue')['default'] diff --git a/src/api/BussApi.ts b/src/api/BussApi.ts index 507f5fb..a7ce03e 100644 --- a/src/api/BussApi.ts +++ b/src/api/BussApi.ts @@ -198,6 +198,7 @@ export default class BussApi { */ static updateLessonTask(id: number, params: UpdateLessonTaskRequest): Promise { const user = useUser(); + console.log("params: " + JSON.stringify(params)) return http .server() .put(`lesson-tasks/${id}`, params, { diff --git a/src/composables/useConfig.ts b/src/composables/useConfig.ts index 63634ff..e22b42a 100644 --- a/src/composables/useConfig.ts +++ b/src/composables/useConfig.ts @@ -5,6 +5,7 @@ export const useConfig = defineStore('config', () => { // const BASE_URL = ref("https://ppmp.fenshenzhike.com/api"); // const BASE_URL = ref("http://localhost:1218/api"); const BASE_URL = ref("http://192.168.0.178:1218/api"); + // const BASE_URL = ref("http://192.30.5.16:1218/api"); return { BASE_URL diff --git a/src/pages.json b/src/pages.json index a9a5d1b..34c8d66 100644 --- a/src/pages.json +++ b/src/pages.json @@ -60,7 +60,8 @@ "navigationBarTextStyle": "black", "navigationBarTitleText": "XSH PPMP", "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8" + "backgroundColor": "#F8F8F8", + "enablePullDownRefresh": true }, "easycom": { "autoscan": true, diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index b8f1dc3..5c3068a 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -165,9 +165,6 @@ const getUsernameById = (userId: number) => { 共{{ courses.length }}节微课 -
@@ -199,12 +196,16 @@ const getUsernameById = (userId: number) => {
-
+
-
-
-
+ {{ lesson.microLessonName || '无标题视频' }}
diff --git a/src/pages/progress/index.vue b/src/pages/progress/index.vue index 9d830bf..b0b535d 100644 --- a/src/pages/progress/index.vue +++ b/src/pages/progress/index.vue @@ -8,6 +8,7 @@ import { useMessage, useToast } from 'wot-design-uni'; import StatusBlock from './StatusBlock.vue'; import { useRoute } from 'uni-mini-router'; import { useUser } from '@/stores/useUser'; +import { onPullDownRefresh } from '@dcloudio/uni-app' const route = useRoute() const message = useMessage() @@ -31,6 +32,7 @@ const pickerLessonColumns = computed(() => { }) : [] }) const pickerLessonValue = ref() +const adviseText = ref('') const selectedLesson = computed(() => { if (!pickerLessonValue.value) return null @@ -72,11 +74,8 @@ const onStep1 = () => { msg: '正在提交...' }) const params = { - advise: JSON.stringify({ - method: script_file_destination.value, - uploaded: false - }), - scriptUploadTime: dayjs().unix(), + // advise: adviseText.value, + // scriptUploadTime: dayjs().unix(), courseName: selectedLesson.value.courseName, microLessonName: selectedLesson.value.microLessonName, userId: selectedLesson.value.userId, @@ -97,6 +96,7 @@ const onStep1 = () => { } const onStep2 = (rejected: boolean = false) => { + console.log("adviseText.value: " + adviseText.value) message.confirm({ title: rejected ? '驳回脚本' : '通过脚本', msg: rejected ? '脚本不符合要求，驳回制作方重做' : '请确认脚本合格无误后，再确认审核通过' @@ -113,17 +113,15 @@ const onStep2 = (rejected: boolean = false) => { BussApi.updateLessonTask( selectedLesson.value.id, rejected ? { - advise: JSON.stringify({ - ...parseCombinedFileString(selectedLesson.value, 'advise'), - uploaded: false - }), - scriptUploadTime: 0, + advise: adviseText.value.toString(), + // scriptUploadTime: 0, courseName: selectedLesson.value.courseName, microLessonName: selectedLesson.value.microLessonName, userId: selectedLesson.value.userId, progressStatus: 0 } : { - scriptConfirmTime: dayjs().unix(), + advise: adviseText.value.toString(), + // scriptConfirmTime: dayjs().unix(), courseName: selectedLesson.value.courseName, microLessonName: selectedLesson.value.microLessonName, userId: selectedLesson.value.userId, @@ -142,6 +140,7 @@ const onStep2 = (rejected: boolean = false) => { } const onStep3 = (rejected: boolean = false) => { + console.log("adviseText.value: " + adviseText.value) message.confirm({ title: rejected ? '驳回视频' : '通过视频', msg: rejected ? '视频不符合要求，驳回制作方重做' : '请确认视频合格无误后，再确认审核通过' @@ -158,17 +157,15 @@ const onStep3 = (rejected: boolean = false) => { BussApi.updateLessonTask( selectedLesson.value.id, rejected ? { - advise: JSON.stringify({ - ...parseCombinedFileString(selectedLesson.value, 'advise'), - uploaded: false - }), - videoCaptureTime: 0, + advise: adviseText.value.toString(), + // videoCaptureTime: 0, courseName: selectedLesson.value.courseName, microLessonName: selectedLesson.value.microLessonName, userId: selectedLesson.value.userId, progressStatus: 1 } : { - videoConfirmTime: dayjs().unix(), + advise: adviseText.value.toString(), + // videoConfirmTime: dayjs().unix(), courseName: selectedLesson.value.courseName, microLessonName: selectedLesson.value.microLessonName, userId: selectedLesson.value.userId, @@ -187,6 +184,7 @@ const onStep3 = (rejected: boolean = false) => { } const onPostProduction = (rejected: boolean = false) => { + console.log("adviseText.value: " + adviseText.value) message.confirm({ title: rejected ? '驳回后期制作' : '通过后期制作', msg: rejected ? '后期制作不符合要求，驳回制作方重做' : '请确认后期制作合格无误后，再确认审核通过' @@ -203,17 +201,15 @@ const onPostProduction = (rejected: boolean = false) => { BussApi.updateLessonTask( selectedLesson.value.id, rejected ? { - advise: JSON.stringify({ - ...parseCombinedFileString(selectedLesson.value, 'advise'), - uploaded: false - }), - videoCaptureTime: 0, + advise: adviseText.value.toString(), + // videoCaptureTime: 0, courseName: selectedLesson.value.courseName, microLessonName: selectedLesson.value.microLessonName, userId: selectedLesson.value.userId, progressStatus: 2 } : { - videoConfirmTime: dayjs().unix(), + advise: adviseText.value.toString(), + // videoConfirmTime: dayjs().unix(), courseName: selectedLesson.value.courseName, microLessonName: selectedLesson.value.microLessonName, userId: selectedLesson.value.userId, @@ -232,6 +228,7 @@ const onPostProduction = (rejected: boolean = false) => { } const updateLessons = async () => { + adviseText.value = "" if (!user.userinfo) { toast.error({ msg: '请先登录' }) return @@ -289,6 +286,20 @@ const updateLessons = async () => { onMounted(() => { updateLessons() }) +const refresh = async () => { + try { + await updateLessons() + } catch (err) { + } finally { + // 停止下拉刷新动画 + uni.stopPullDownRefresh() + } +} + +// 添加下拉刷新处理函数 +onPullDownRefresh(() => { + refresh() +}) -
- 通过 - 驳回 +
+
+ +
+
+ 通过 + 驳回 +
+
- + +
-
- 通过 - 驳回 +
+
+ +
+
+ 通过 + 驳回 +
- + +
-
- 通过 - 驳回 +
+
+ +
+
+ 通过 + 驳回 +
diff --git a/src/types/api/lesson.ts b/src/types/api/lesson.ts index 4ecd126..6adebe6 100644 --- a/src/types/api/lesson.ts +++ b/src/types/api/lesson.ts @@ -28,12 +28,6 @@ export interface LessonTask { createdAt: number; /** 更新时间（时间戳） */ updatedAt: number; - /** 脚本文件路径 */ - script_file?: string; - /** 视频拍摄文件路径 */ - capture_file?: string; - /** 素材文件路径 */ - material_file?: string; } export interface LessonTaskPagination {