hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-14 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-12 18:14:07 +08:00
parent 47a24f9be1 613084363d
commit ed3487a2d5
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/api.js
View File

@@ -14,7 +14,7 @@ export const COMMON_TOKEN = 'https://upload-z2.qiniup.com'
export const ROUTER_CHAPTER_LIST = '/stu/router/chapterList' export const ROUTER_CHAPTER_LIST = '/stu/router/chapterList'
export const ROUTER_LIST = '/stu/router/list post' export const ROUTER_LIST = '/stu/router/list post'
export const ROUTER_PROCESS = '/stu/router/process' export const ROUTER_PROCESS = '/stu/router/process'
export const ROUTER_UNCOMPLETE_LIST = '/stu/router/unCompleteTaskList' export const ROUTER_UNCOMPLETE_LIST = '/stu/router/unCompleteTaskList post'
export const TAS_ACTIVITY_DETAIL = '/activity' export const TAS_ACTIVITY_DETAIL = '/activity'
export const TASK_ACTIVITY_SIGN = '/activitySubmit/updateActivitySignInStatus post' export const TASK_ACTIVITY_SIGN = '/activitySubmit/updateActivitySignInStatus post'
export const TASK_BROADCAST_COMMIT = '/stu/task/broadcast/commit' export const TASK_BROADCAST_COMMIT = '/stu/task/broadcast/commit'

2
src/api/request.js
View File

@@ -21,7 +21,7 @@ export function usePage(_url, param) {
function fetchData() { function fetchData() {
state.loading = true state.loading = true
request(_url, state.params).then(r => { request(_url, state.params).then(r => {
state.params.pageNo === 1 ? (state.data = r.data.records) : (state.data = [...state.data, ...r.data.records]) state.params.pageNo === 1 ? (state.data = (r.data.records||r.data.rows)) : (state.data = [...state.data, ...(r.data.records||r.data.rows)])
state.size = r.data.size state.size = r.data.size
state.total = r.data.total state.total = r.data.total
state.current = r.data.current state.current = r.data.current

7
src/views/roadmap/LearnPath.vue
View File

@@ -64,7 +64,7 @@
<!-- 路径列表--> <!-- 路径列表-->
<div :style="{ display: !showmapdetail ? 'flex' : 'none' }" class="head"> <div :style="{ display: !showmapdetail ? 'flex' : 'none' }" class="head">
<div style="min-width: 770px; width: 100%"> <div style="min-width: 770px; width: 100%">
<el-table :data="data.rows" style="width: 100%" @row-click="gofun"> <el-table :data="data" style="width: 100%" @row-click="gofun">
<el-table-column <el-table-column
prop="img" prop="img"
label="缩略图" label="缩略图"
@@ -131,12 +131,13 @@ import {reactive, toRefs, ref} from "vue";
import nostarted from '../../assets/image/nostarted.png' import nostarted from '../../assets/image/nostarted.png'
import completed from '../../assets/image/completed.png' import completed from '../../assets/image/completed.png'
import ongoing from '../../assets/image/ongoing.png' import ongoing from '../../assets/image/ongoing.png'
import {request, useRequest} from "@/api/request"; import {request, usePage, useRequest} from "@/api/request";
import {ROUTER_CHAPTER_LIST, ROUTER_LIST, ROUTER_UNCOMPLETE_LIST} from "@/api/api"; import {ROUTER_CHAPTER_LIST, ROUTER_LIST, ROUTER_UNCOMPLETE_LIST} from "@/api/api";
import {useImage} from "@/api/utils"; import {useImage} from "@/api/utils";
const detail = ref() const detail = ref()
const {data} = useRequest(ROUTER_LIST, {}) const {data} = usePage(ROUTER_LIST, {})
const {unCompleteTaskList} = useRequest(ROUTER_UNCOMPLETE_LIST, {}) const {unCompleteTaskList} = useRequest(ROUTER_UNCOMPLETE_LIST, {})
const state = reactive({ const state = reactive({
showmapdetail: false, showmapdetail: false,