Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

dev_hss
杨树明 5 years ago
commit d952ee8d4d

File diff suppressed because one or more lines are too long

@ -330,7 +330,8 @@ class App extends Component {
title: 'EduCoder',
desc: '创新源于实践',
link: currentUrl,
imgUrl: (currentUrl.endsWith('/') ? currentUrl : currentUrl + '/') + 'images/educoder/index/subject/subject15.jpg'
imgUrl: window.__testImageUrl
|| (currentUrl.endsWith('/') ? currentUrl : currentUrl + '/') + 'images/educoder/index/subject/subject15.jpg'
};
wx.onMenuShareAppMessage(shareData);//分享给好友

@ -59,7 +59,7 @@ class Cooperatives extends React.Component {
<List.Item>
<div className="cooperative-item-list-item">
<a href={obj.url || 'javascript:void(0)'} target={obj.url && '_blank'}>
<img className="" height="90" src={getImageUrl(obj.img)} />
<img className="" height="90" src={getImageUrl(obj.img.substr(1))} />
</a>
</div>
</List.Item>

@ -68,12 +68,16 @@
overflow: hidden;
display: block;
border-radius: 6px;
position: relative;
}
.squareCard .squareImg img{
transition: all 1s;
-webkit-transition: all 1s;
-o-transition: all 1s;
width: 100%;
position: absolute;
top: -50%;
margin-top: 67.5px;
}
.squareCard .squareImg img:hover{
transform: scale(1.05);

Loading…
Cancel
Save