diff --git a/src/factory/api.js b/src/factory/api.js index 91ef8924..4f23c35e 100644 --- a/src/factory/api.js +++ b/src/factory/api.js @@ -40,12 +40,23 @@ export function getProjectsLists(id,params){ * @param {*} params * @returns */ -export function getSourceList(params){ - return fetch({ +export async function getSourceList(params){ + const res = await fetch({ url:`/zone/open/${params.id}/resource/list`, method: 'get', params - }) + }); + + if (res && res.data && res.data.rows) { + res.data.rows = res.data.rows.map(row => { + if (row && row.extendData) { + return { ...row, extendData: JSON.stringify(row.extendData) }; + } + return row; + }); + } + + return res; } /** @@ -74,11 +85,17 @@ export function getNewsDetail(id){ }) } -export function getSourceDetail(id){ - return fetch({ +export async function getSourceDetail(id){ + const res = await fetch({ url:`/zone/open/resource/detail/${id}`, method: 'get' - }) + }); + + if (res && res.data && res.data.data && res.data.data.extendData) { + res.data.data.extendData = JSON.stringify(res.data.data.extendData); + } + + return res; } export function getMainInfos(deptId, params) { @@ -196,3 +213,4 @@ export function checkInstantUpload(data) { data }); } + diff --git a/src/factory/lessons/detail/index.jsx b/src/factory/lessons/detail/index.jsx index 163cceef..0e1e6f9b 100644 --- a/src/factory/lessons/detail/index.jsx +++ b/src/factory/lessons/detail/index.jsx @@ -49,7 +49,7 @@ function Index(props) { return ( -
+
diff --git a/src/factory/lessons/detail/index.scss b/src/factory/lessons/detail/index.scss index 7daa9d29..2d5abb8b 100644 --- a/src/factory/lessons/detail/index.scss +++ b/src/factory/lessons/detail/index.scss @@ -1,4 +1,4 @@ -.news-detail { +.lessons-detail { min-height: calc(100vh - 58px); .news-detail-header { diff --git a/src/factory/resource/commonTools/detail/index.jsx b/src/factory/resource/commonTools/detail/index.jsx index 6243a89d..275c4ba4 100644 --- a/src/factory/resource/commonTools/detail/index.jsx +++ b/src/factory/resource/commonTools/detail/index.jsx @@ -61,7 +61,7 @@ function Index(props) { } return ( -
+
diff --git a/src/factory/resource/commonTools/detail/index.scss b/src/factory/resource/commonTools/detail/index.scss index 1de73c17..15687771 100644 --- a/src/factory/resource/commonTools/detail/index.scss +++ b/src/factory/resource/commonTools/detail/index.scss @@ -1,4 +1,4 @@ -.news-detail { +.tool-detail { min-height: calc(100vh - 58px); .news-detail-header { diff --git a/src/factory/resource/factoryVersion/detail/index.jsx b/src/factory/resource/factoryVersion/detail/index.jsx index f1601672..25f5e1f7 100644 --- a/src/factory/resource/factoryVersion/detail/index.jsx +++ b/src/factory/resource/factoryVersion/detail/index.jsx @@ -138,7 +138,7 @@ function Index(props) { } return ( -
+
diff --git a/src/factory/resource/factoryVersion/detail/index.scss b/src/factory/resource/factoryVersion/detail/index.scss index e32e7978..fcc6d5fc 100644 --- a/src/factory/resource/factoryVersion/detail/index.scss +++ b/src/factory/resource/factoryVersion/detail/index.scss @@ -1,4 +1,4 @@ -.news-detail { +.release-detail { min-height: calc(100vh - 58px); margin-bottom: 158px;