diff --git a/src/App.js b/src/App.js index 10a94549e..fe07cba21 100644 --- a/src/App.js +++ b/src/App.js @@ -63,6 +63,11 @@ const SoftwareFactoryResourceDetail= Loadable({ loading: Loading, }) +const SoftwareFactoryResourceDetailCommon= Loadable({ + loader: () => import('./factory/resource/commonTools/detail/index'), + loading: Loading, +}) + const SoftwareFactoryNews = Loadable({ @@ -497,6 +502,15 @@ class App extends Component { }> + { + return () + } + }> + + {
{item.name}
{item.summary}
- +
diff --git a/src/factory/resource/commonTools/detail/index.jsx b/src/factory/resource/commonTools/detail/index.jsx index 834c8db0f..7b0a8627a 100644 --- a/src/factory/resource/commonTools/detail/index.jsx +++ b/src/factory/resource/commonTools/detail/index.jsx @@ -45,10 +45,11 @@ function Index(props) { extendData = JSON.parse(response.data.data.extendData) } document.title = response.data.data.name - if (extendData.content) { - setContent(Base64.decode(extendData.content)) - } - setDetail({...response.data.data, ...extendData}); + if (extendData.content) { + const base64content = Base64.decode(extendData.content) + setContent(base64content !== '


' ? base64content : '') + } + setDetail({ ...response.data.data, ...extendData }); } }).catch(error => { }) } @@ -65,12 +66,12 @@ function Index(props) {
首页 - 开发工具 + 共建工具 {detail.name}

{detail.name}

-

{detail.summary}

+

{detail.summary}

{detail.downloadCount} @@ -107,11 +108,12 @@ function Index(props) {
-
- { - content && - } -
+ { + content && +
+ +
+ }
) diff --git a/src/factory/resource/commonTools/detail/index.scss b/src/factory/resource/commonTools/detail/index.scss index eb157cacf..3ad889182 100644 --- a/src/factory/resource/commonTools/detail/index.scss +++ b/src/factory/resource/commonTools/detail/index.scss @@ -221,7 +221,7 @@ width: 1600px; height: 100%; margin: 52px auto; - margin-top: -100px; + margin-top: -130px; position: relative; z-index: 1; @@ -241,9 +241,12 @@ } .news-detail-content-wrapper { - width: 1600px; - float: left; - padding-bottom: 60px; + background-image: url('../../../../images/factory/resource/detail-bg.png'); + background-repeat: no-repeat; + background-size: 100% 100%; + padding: 30px; + border-radius: 16px; + margin-bottom: 60px; } .news-detail-content-others { diff --git a/src/factory/resource/commonTools/index.jsx b/src/factory/resource/commonTools/index.jsx index 9dc4e5252..74c08ae87 100644 --- a/src/factory/resource/commonTools/index.jsx +++ b/src/factory/resource/commonTools/index.jsx @@ -107,7 +107,7 @@ function Index(props) {
- +
}) diff --git a/src/factory/resource/developmentTools/detail/index.jsx b/src/factory/resource/developmentTools/detail/index.jsx index 2f0be727c..7285da708 100644 --- a/src/factory/resource/developmentTools/detail/index.jsx +++ b/src/factory/resource/developmentTools/detail/index.jsx @@ -66,7 +66,7 @@ function Index(props) {
首页 - 开发工具 + 开源工具 {detail.name}