Skip to content

M
mr-julyedu
Commit 57928bc2 by FE
Options

pull 00

parent 0eb0b13b
Showing with 23 additions and 22 deletions
src/components/activity/newyear-2019/landing/index.js
...@@ -158,7 +158,7 @@ class Landing extends Component { ...@@ -158,7 +158,7 @@ class Landing extends Component {
this.fetchPageData() this.fetchPageData()
this.getFollowStatus() this.getFollowStatus()
.then(isFollow => { .then(isFollow => {
!isFollow && this.remind('join', getParam('treasure_code')) !isFollow && this.remind('join', this.state.treasure_code, 2)
}) })
} }
}) })
...@@ -191,7 +191,7 @@ class Landing extends Component { ...@@ -191,7 +191,7 @@ class Landing extends Component {
return code === 200 && data['is_follow'] return code === 200 && data['is_follow']
}) })
createTeamSuccess = (member, team_num, lack_member, treasure_code) => { createTeamSuccess = ({member, team_num, lack_member, treasure_code}) => {
this.joinSuccessPopup && this.joinSuccessPopup.remove() && (this.joinSuccessPopup = null) this.joinSuccessPopup && this.joinSuccessPopup.remove() && (this.joinSuccessPopup = null)
this.getFollowStatus() this.getFollowStatus()
.then(isFollow => { .then(isFollow => {
...@@ -233,7 +233,7 @@ class Landing extends Component { ...@@ -233,7 +233,7 @@ class Landing extends Component {
}) })
} }
remind = (type = 'create', treasure_code) => { remind = (type = 'create', treasure_code, origin = 1) => {
const {match, history, user} = this.props const {match, history, user} = this.props
http.get(`${API["base-api"]}/wx/user_temporary_qrcode/${user.data.uid}`) http.get(`${API["base-api"]}/wx/user_temporary_qrcode/${user.data.uid}`)
.then(res => { .then(res => {
...@@ -255,7 +255,7 @@ class Landing extends Component { ...@@ -255,7 +255,7 @@ class Landing extends Component {
// history.replace(`${match.path}?treasure_code=${treasure_code}&origin=1`) // history.replace(`${match.path}?treasure_code=${treasure_code}&origin=1`)
this.fetchPageData({ this.fetchPageData({
treasure_code, treasure_code,
origin: '1' origin
}) })
} }
}) })
...@@ -290,7 +290,7 @@ class Landing extends Component { ...@@ -290,7 +290,7 @@ class Landing extends Component {
sessionStorage.removeItem('showShareTip') sessionStorage.removeItem('showShareTip')
this.getFollowStatus() this.getFollowStatus()
.then(isFollow => { .then(isFollow => {
!isFollow && this.remind('create', getParam('treasure_code')) !isFollow && this.remind('create', getParam('treasure_code'), 1)
}) })
} }
}) })
......
src/components/activity/newyear-2019/preheat/YearCourse/index.js
...@@ -585,11 +585,11 @@ class YearCourse extends Component { ...@@ -585,11 +585,11 @@ class YearCourse extends Component {
</div> </div>
<div className="price"> <div className="price">
{item.type == 2 ? '到手最低:¥' : '¥'} {item.type == 2 ? '到手最低:¥' : '¥'}
<span className="new-price">{item.price1}</span> <span className="new-price">{item.price2}</span>
<span <span
className="old-price"> className="old-price">
{item.type == 2 ? '' : '现价：'} {item.type == 2 ? '' : '现价：'}
<s>¥{item.price0}</s></span> <s>¥{item.price1}</s></span>
</div> </div>
<div className="status"> <div className="status">
...@@ -676,11 +676,11 @@ class YearCourse extends Component { ...@@ -676,11 +676,11 @@ class YearCourse extends Component {
</div> </div>
<div className="price"> <div className="price">
{item.type == 2 ? '到手最低:¥' : '¥'} {item.type == 2 ? '到手最低:¥' : '¥'}
<span className="new-price">{item.price1}</span> <span className="new-price">{item.price2}</span>
<span <span
className="old-price"> className="old-price">
{item.type == 2 ? '' : '现价：'} {item.type == 2 ? '' : '现价：'}
<s>¥{item.price0}</s></span> <s>¥{item.price1}</s></span>
</div> </div>
<div className="status"> <div className="status">
...@@ -767,11 +767,11 @@ class YearCourse extends Component { ...@@ -767,11 +767,11 @@ class YearCourse extends Component {
</div> </div>
<div className="price"> <div className="price">
{item.type == 2 ? '到手最低:¥' : '¥'} {item.type == 2 ? '到手最低:¥' : '¥'}
<span className="new-price">{item.price1}</span> <span className="new-price">{item.price2}</span>
<span <span
className="old-price"> className="old-price">
{item.type == 2 ? '' : '现价：'} {item.type == 2 ? '' : '现价：'}
<s>¥{item.price0}</s></span> <s>¥{item.price1}</s></span>
</div> </div>
<div className="status"> <div className="status">
...@@ -858,11 +858,11 @@ class YearCourse extends Component { ...@@ -858,11 +858,11 @@ class YearCourse extends Component {
</div> </div>
<div className="price"> <div className="price">
{item.type == 2 ? '到手最低:¥' : '¥'} {item.type == 2 ? '到手最低:¥' : '¥'}
<span className="new-price">{item.price1}</span> <span className="new-price">{item.price2}</span>
<span <span
className="old-price"> className="old-price">
{item.type == 2 ? '' : '现价：'} {item.type == 2 ? '' : '现价：'}
<s>¥{item.price0}</s></span> <s>¥{item.price1}</s></span>
</div> </div>
<div className="status"> <div className="status">
......
src/components/activity/newyear-2019/year-wish/index.js
...@@ -61,7 +61,7 @@ class YarnWish extends Component { ...@@ -61,7 +61,7 @@ class YarnWish extends Component {
const {list, activityStage} = this.state const {list, activityStage} = this.state
return ( return (
<div className='yarn-wish'> <div className='year-wish'>
<div className="banner"><img <div className="banner"><img
src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/xy_banner_bj.png" alt=""/></div> src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/xy_banner_bj.png" alt=""/></div>
{ {
...@@ -73,7 +73,7 @@ class YarnWish extends Component { ...@@ -73,7 +73,7 @@ class YarnWish extends Component {
toCourse={this.toCourse}> toCourse={this.toCourse}>
{ {
item.type == 4 && item.type == 4 && item.is_buy != 1 &&
<div className="group-num">限量300个</div> <div className="group-num">限量300个</div>
} }
...@@ -99,7 +99,7 @@ class YarnWish extends Component { ...@@ -99,7 +99,7 @@ class YarnWish extends Component {
</> </>
} }
{ {
item.type == 1 && (item.type == 1 || item.type == 4) &&
<> <>
<span className="tag">拼团价</span> <span className="tag">拼团价</span>
<span className="time">12.23开团</span> <span className="time">12.23开团</span>
...@@ -116,11 +116,8 @@ class YarnWish extends Component { ...@@ -116,11 +116,8 @@ class YarnWish extends Component {
</div> </div>
<div className="price"> <div className="price">
{item.type == 2 ? '到手最低:¥' : '¥'} {item.type == 2 ? '到手最低:¥' : '¥'}
<span className="new-price">{item.price1}</span> <span className="new-price">{item.type == 4?'0.01':item.price2}</span>
<span <span className="old-price"> 现价：<s>¥{item.price1}</s></span>
className="old-price">
{item.type == 2 ? '' : '现价：'}
<s>¥{item.price0}</s></span>
</div> </div>
<div className="status"> <div className="status">
......
src/components/activity/newyear-2019/year-wish/index.scss
...@@ -2,7 +2,7 @@ html, body, #root { ...@@ -2,7 +2,7 @@ html, body, #root {
height: 100%; height: 100%;
} }
.yarn-wish { .year-wish {
min-height: 100%; min-height: 100%;
background-color: #BA2C21; background-color: #BA2C21;
padding-bottom: 35px; padding-bottom: 35px;
...@@ -214,3 +214,7 @@ html, body, #root { ...@@ -214,3 +214,7 @@ html, body, #root {
} }
} }
.year-wish + .year19-index {
display: none;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment