diff --git a/public/react/src/common/util/ShareUtil.js b/public/react/src/common/util/ShareUtil.js index 1ea3326d9..c11ed6381 100644 --- a/public/react/src/common/util/ShareUtil.js +++ b/public/react/src/common/util/ShareUtil.js @@ -119,14 +119,14 @@ export function configShareForCourses () { } // detail -export function configShareForCustom (title, desc, path, imgUrl) { +export function configShareForCustom (title, desc, imgUrl, path) { requestForSignatrue(() => { console.log('configShareForCustom', host) - + const _path = window.location.href.split('#')[0]; var shareData = { title: title, desc: desc, - link: `${host}/${path}`, + link: `${host}/${path || _path}`, imgUrl: imgUrl || window.__testImageUrl || host + '/react/build/images/share_logo_icon.jpg' }; diff --git a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js index fbb97cbb5..bae89a7ba 100644 --- a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js +++ b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js @@ -78,7 +78,7 @@ class NewShixunModel extends Component{ {item.map((list,key)=>{ return( - {list.name} + {list.name} ) })} @@ -340,26 +340,45 @@ class NewShixunModel extends Component{ `body{ overflow: hidden !important; } .ant-drawer-content{ overflow:auto !important; background: #f5f5f5; } .yslbottomsj{position: absolute;bottom: -8px;} + .ant-drawer-close{ + font-size:24px !important; + } + .ant-drawer-body { + padding:15px 24px 24px 0px; + } ` } this.props.hideNewShixunModelType()} visible={this.props.NewShixunModelType} height={'100%'} > -
+
+ this.updatedlist(order)}>学习人数 - - + + @@ -397,8 +416,8 @@ class NewShixunModel extends Component{
- this.props.hideNewShixunModelType()}>返回 - this.belongto("mine")}>我的实训 + {/*this.props.hideNewShixunModelType()}>返回*/} + this.belongto("mine")}>我的实训 this.belongto("all")}>全部实训
@@ -409,7 +428,7 @@ class NewShixunModel extends Component{ {shixun_list===undefined?"":shixun_list.length===0?"":shixun_list.map((item,key)=>{ return( -
+
@@ -419,7 +438,7 @@ class NewShixunModel extends Component{ className="fl task-hide edu-txt-left mt3" name="shixun_homework[]" > - @@ -439,7 +458,7 @@ class NewShixunModel extends Component{ ` } - {JSON.stringify(item.description) == "{}"?"":
+ {JSON.stringify(item.description) == "{}"?"":
} {item.challenge_names.length===0?"":
@@ -511,15 +530,21 @@ class NewShixunModel extends Component{ :shixun_list.length===0? :"" } - { - shixun_list===undefined?"":shixun_list.length===0?"":
- - -
} +
+ +
+ { + shixun_list===undefined?"":shixun_list.length===0?"":
+ + +
} +
diff --git a/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css b/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css index 2e8abce53..f0f45a468 100644 --- a/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css +++ b/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css @@ -195,7 +195,7 @@ width: 100px; height: 38px; border-radius: 3px; - border: 1px solid rgba(191,191,191,1); + /*border: 1px solid rgba(191,191,191,1);*/ } .ntopsj { @@ -248,3 +248,22 @@ color: #4CACFF; } +.newshixunbottombtn{ + position: fixed; + z-index: 1000; + bottom: 0px; + width: 100%; + height: 63px; + background: rgba(255,255,255,1); + box-shadow: 0px -4px 4px 0px rgba(0,0,0,0.05); +} + + +.mb60shixun{ + margin-bottom: 60px !important; +} + +.padding13-30 { + padding: 13px 30px; + box-sizing: border-box; +} \ No newline at end of file diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js index a60080379..5677193d5 100644 --- a/public/react/src/modules/home/shixunsHome.js +++ b/public/react/src/modules/home/shixunsHome.js @@ -408,7 +408,7 @@ class ShixunsHome extends Component { - {item.username} +

{item.username}

) @@ -422,7 +422,7 @@ class ShixunsHome extends Component { - {item.username} +

{item.username}

) @@ -436,7 +436,7 @@ class ShixunsHome extends Component { - {item.username} +

{item.username}

) @@ -452,7 +452,7 @@ class ShixunsHome extends Component {
  • - {item.username} +

    {item.username}

  • ) @@ -484,7 +484,7 @@ class ShixunsHome extends Component { - {item.username} +

    {item.username}

    ) @@ -498,7 +498,7 @@ class ShixunsHome extends Component { - {item.username} +

    {item.username}

    ) @@ -512,7 +512,7 @@ class ShixunsHome extends Component { - {item.username} +

    {item.username}

    ) @@ -528,7 +528,7 @@ class ShixunsHome extends Component {
  • - {item.username} +

    {item.username}

  • ) diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js index ef94f7fa4..e637bf42e 100644 --- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js +++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js @@ -8,7 +8,7 @@ import PropTypes from 'prop-types'; import classNames from 'classnames'; -import { getImageUrl ,markdownToHTML} from 'educoder' +import { getImageUrl ,markdownToHTML, configShareForCustom} from 'educoder' import { CircularProgress } from 'material-ui/Progress'; @@ -51,6 +51,7 @@ class Challenges extends Component { if (response.data.status === 403||response.data.status === 401||response.data.status === 500) { }else{ + configShareForCustom(this.props.shixunsDetails.name, response.data.description) this.setState({ ChallengesDataList: response.data, sumidtype: false,