Skip to content

M
mr-julyedu
Commit 57928bc2 by FE
Options

pull 00

parent 0eb0b13b
Showing with 470 additions and 22 deletions
build/precache-manifest.1ca12684c66b67d44965c682f46c4ccc.js 0 → 100644
self.__precacheManifest = [
{
"revision": "7b2febc10db23aa967d6",
"url": "/mrstatic/css/main.532b6b06.chunk.css"
},
{
"revision": "4d6d121c22da1de49c2d",
"url": "/mrstatic/js/0.fca6c57e.chunk.js"
},
{
"revision": "8edaf2ff2566ed17e2dd22cf4f8ad7ae",
"url": "/mrstatic/media/redb_chai_bj@2x.8edaf2ff.png"
},
{
"revision": "62ba4ac587b81d5dbbf1",
"url": "/mrstatic/js/2.fff55e41.chunk.js"
},
{
"revision": "c79abf5cb7ae8a82009cf68fe44d1078",
"url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
},
{
"revision": "f0a1bb8ab4b3c9c3d837",
"url": "/mrstatic/js/3.887af415.chunk.js"
},
{
"revision": "6902434f8f18a23319d57d0ac8aaea8c",
"url": "/mrstatic/media/redb_sp_bj@2x.6902434f.png"
},
{
"revision": "dce824e977554caec221",
"url": "/mrstatic/js/4.8986e0eb.chunk.js"
},
{
"revision": "d6df8c14d29ec02ec286",
"url": "/mrstatic/js/5.0fa85971.chunk.js"
},
{
"revision": "79139f6aad350256e151f9f73c226348",
"url": "/mrstatic/media/hb_bj.79139f6a.png"
},
{
"revision": "ea3a374dc5c591341bcb",
"url": "/mrstatic/js/Activity.bbb32ff9.chunk.js"
},
{
"revision": "80011994e30adf599e5f47fcc81bc06d",
"url": "/mrstatic/media/progress-share-bg.80011994.png"
},
{
"revision": "1dc1571c02cfe2cfe8cf",
"url": "/mrstatic/js/BargainMiddlePage.19e9b5f4.chunk.js"
},
{
"revision": "d76ebce726bdf3459fa14e96d84c5b9a",
"url": "/mrstatic/media/formal-banner.d76ebce7.png"
},
{
"revision": "940aaacd5fee3b50c57f",
"url": "/mrstatic/js/Classify.9ede63f4.chunk.js"
},
{
"revision": "9ab091267ae7c83bd30d0f5ad018a8c9",
"url": "/mrstatic/media/dalibao_bj.9ab09126.png"
},
{
"revision": "1f26b83d1f4162e2d184",
"url": "/mrstatic/js/Country.35064829.chunk.js"
},
{
"revision": "81a489ac63f2f2df5ab412e0782bd54c",
"url": "/mrstatic/media/kanjia_cg_icon.81a489ac.png"
},
{
"revision": "c6acef0afee3012e27af",
"url": "/mrstatic/js/CourseList.23f60fb6.chunk.js"
},
{
"revision": "b9b072e1116fd1830cc8f425dc163a6b",
"url": "/mrstatic/media/iconfont.b9b072e1.svg"
},
{
"revision": "d96e0daaecd1b6874f9d",
"url": "/mrstatic/js/DrawDocument.d7cca39c.chunk.js"
},
{
"revision": "7aa984cefad739ea18edb76c541aa1fd",
"url": "/mrstatic/media/iconfont.7aa984ce.eot"
},
{
"revision": "cb7325409f4df13cd225",
"url": "/mrstatic/js/Examination.ab78ae34.chunk.js"
},
{
"revision": "258b4b114d3d9be3018cd113b2470a13",
"url": "/mrstatic/media/iconfont.258b4b11.ttf"
},
{
"revision": "760506f7926fbc56bd5d",
"url": "/mrstatic/js/Invite.810acbcc.chunk.js"
},
{
"revision": "47e5717846697729e115",
"url": "/mrstatic/js/MyEdit.85e7fd93.chunk.js"
},
{
"revision": "e0655d4da66dce391e6b5227b400e037",
"url": "/mrstatic/media/iconfont.e0655d4d.woff"
},
{
"revision": "38324b69eb273f2d58dd",
"url": "/mrstatic/js/Order.4f912514.chunk.js"
},
{
"revision": "8db6d0a282c1038b015b",
"url": "/mrstatic/js/Orderinfo.bbe4abd7.chunk.js"
},
{
"revision": "59ffeabb19b4f035b676",
"url": "/mrstatic/js/51.20e1591a.chunk.js"
},
{
"revision": "88e78491ea4acd604e47",
"url": "/mrstatic/js/PayOrder.57e0a057.chunk.js"
},
{
"revision": "81a9e78bf953c5c4308c",
"url": "/mrstatic/js/50.599b175e.chunk.js"
},
{
"revision": "41f935a377ea875382a5",
"url": "/mrstatic/js/Preferential.e194c179.chunk.js"
},
{
"revision": "17e08530adcf7f3ac3ce",
"url": "/mrstatic/js/49.46e3ca0f.chunk.js"
},
{
"revision": "fe141815223caa290002",
"url": "/mrstatic/js/SearchResult.40c95eac.chunk.js"
},
{
"revision": "44caa1497418c9050094",
"url": "/mrstatic/js/48.8cced5a9.chunk.js"
},
{
"revision": "2c7da54842b9da3f02d3",
"url": "/mrstatic/js/ShareCourse.68b4ce5d.chunk.js"
},
{
"revision": "903a342a67b65e016113",
"url": "/mrstatic/js/47.33a8c3bc.chunk.js"
},
{
"revision": "84c7e3af4f6bdfd502d3",
"url": "/mrstatic/js/ShopCart.04fdb268.chunk.js"
},
{
"revision": "4fd9447929d4f3725446",
"url": "/mrstatic/js/46.296ab055.chunk.js"
},
{
"revision": "324ab7883df55facadbe",
"url": "/mrstatic/js/aist-share.fd432927.chunk.js"
},
{
"revision": "779ddd903e31f846b047",
"url": "/mrstatic/js/45.b9ad70e1.chunk.js"
},
{
"revision": "8c87b5e1196585f9ff73",
"url": "/mrstatic/js/blessing-getPrize.7bf56432.chunk.js"
},
{
"revision": "0c01bf52bd5dcf46b896",
"url": "/mrstatic/js/44.642b6246.chunk.js"
},
{
"revision": "288c4ed7036dcd62cfd2",
"url": "/mrstatic/js/blessing-preheat.45a8fb0d.chunk.js"
},
{
"revision": "7a70c69582ae03b9cb88",
"url": "/mrstatic/js/video.23aa9835.chunk.js"
},
{
"revision": "8b6e7d74fb4045caef72",
"url": "/mrstatic/js/blessing-rank.011deb41.chunk.js"
},
{
"revision": "230942f83e094f64e848",
"url": "/mrstatic/js/togroup.fa94cde5.chunk.js"
},
{
"revision": "b443b2f2d905d5b45496",
"url": "/mrstatic/js/coupons.f4692aac.chunk.js"
},
{
"revision": "cf5c1ade76ba63a3a323",
"url": "/mrstatic/js/system-notices.63f4fa0f.chunk.js"
},
{
"revision": "9629da5332a6f2c4a43d",
"url": "/mrstatic/js/deposit-order.975377d0.chunk.js"
},
{
"revision": "0a0b9701a5defeed6572",
"url": "/mrstatic/js/study.5eccc49d.chunk.js"
},
{
"revision": "0fed33d1e2f557e30eca",
"url": "/mrstatic/js/deposit-pay-order.f9902f98.chunk.js"
},
{
"revision": "57dc950154bdd9d90ce1",
"url": "/mrstatic/js/shareposter.0da28346.chunk.js"
},
{
"revision": "21e794517e1315560c42",
"url": "/mrstatic/js/detail.25021b2f.chunk.js"
},
{
"revision": "6f0e872d7a1391f9b4cd",
"url": "/mrstatic/js/1.79bef975.chunk.js"
},
{
"revision": "7b2febc10db23aa967d6",
"url": "/mrstatic/js/main.b1467882.chunk.js"
},
{
"revision": "9ca91f7e2f41ac8b2d97",
"url": "/mrstatic/js/search.ca3c9036.chunk.js"
},
{
"revision": "a7e51a1a4c39aa53e675",
"url": "/mrstatic/js/myorders.7f319191.chunk.js"
},
{
"revision": "54692df65b9b3b79ab8d",
"url": "/mrstatic/js/runtime~main.daa1d357.js"
},
{
"revision": "8d12f62cf0b7b88d2ca1",
"url": "/mrstatic/js/newyear-2019-landing.350750d1.chunk.js"
},
{
"revision": "f5f7b831ac3173e00efe",
"url": "/mrstatic/js/python-class.4b294dde.chunk.js"
},
{
"revision": "8be50bdfae1b81f4c73c",
"url": "/mrstatic/js/newyear-yearIndex.cbd82e5d.chunk.js"
},
{
"revision": "3b51e2ae90ec589749da",
"url": "/mrstatic/js/purchased.e9d34e7e.chunk.js"
},
{
"revision": "5fb9324d3efd29a799ec",
"url": "/mrstatic/js/prize-winner-list.7f6db414.chunk.js"
},
{
"revision": "903a342a67b65e016113",
"url": "/mrstatic/css/47.820320a6.chunk.css"
},
{
"revision": "3b51e2ae90ec589749da",
"url": "/mrstatic/css/purchased.bb758677.chunk.css"
},
{
"revision": "f5f7b831ac3173e00efe",
"url": "/mrstatic/css/python-class.49baf51f.chunk.css"
},
{
"revision": "7a70c69582ae03b9cb88",
"url": "/mrstatic/css/video.1c1131c9.chunk.css"
},
{
"revision": "230942f83e094f64e848",
"url": "/mrstatic/css/togroup.f08bc5f3.chunk.css"
},
{
"revision": "9ca91f7e2f41ac8b2d97",
"url": "/mrstatic/css/search.5716d9b3.chunk.css"
},
{
"revision": "cf5c1ade76ba63a3a323",
"url": "/mrstatic/css/system-notices.eb114e8b.chunk.css"
},
{
"revision": "57dc950154bdd9d90ce1",
"url": "/mrstatic/css/shareposter.76774ba4.chunk.css"
},
{
"revision": "0a0b9701a5defeed6572",
"url": "/mrstatic/css/study.bf6b9b43.chunk.css"
},
{
"revision": "17e08530adcf7f3ac3ce",
"url": "/mrstatic/css/49.1146f09d.chunk.css"
},
{
"revision": "21e794517e1315560c42",
"url": "/mrstatic/css/detail.54d9956e.chunk.css"
},
{
"revision": "a7e51a1a4c39aa53e675",
"url": "/mrstatic/css/myorders.179a42fc.chunk.css"
},
{
"revision": "5fb9324d3efd29a799ec",
"url": "/mrstatic/css/prize-winner-list.3eee90af.chunk.css"
},
{
"revision": "8d12f62cf0b7b88d2ca1",
"url": "/mrstatic/css/newyear-2019-landing.12a2755e.chunk.css"
},
{
"revision": "8be50bdfae1b81f4c73c",
"url": "/mrstatic/css/newyear-yearIndex.033abe4b.chunk.css"
},
{
"revision": "41f935a377ea875382a5",
"url": "/mrstatic/css/Preferential.12a8297c.chunk.css"
},
{
"revision": "b443b2f2d905d5b45496",
"url": "/mrstatic/css/coupons.466858c7.chunk.css"
},
{
"revision": "0fed33d1e2f557e30eca",
"url": "/mrstatic/css/deposit-pay-order.09ce6fd5.chunk.css"
},
{
"revision": "9629da5332a6f2c4a43d",
"url": "/mrstatic/css/deposit-order.5ea077aa.chunk.css"
},
{
"revision": "88e78491ea4acd604e47",
"url": "/mrstatic/css/PayOrder.7eb7d317.chunk.css"
},
{
"revision": "779ddd903e31f846b047",
"url": "/mrstatic/css/45.a156a0a0.chunk.css"
},
{
"revision": "4fd9447929d4f3725446",
"url": "/mrstatic/css/46.bff100af.chunk.css"
},
{
"revision": "324ab7883df55facadbe",
"url": "/mrstatic/css/aist-share.40873df0.chunk.css"
},
{
"revision": "288c4ed7036dcd62cfd2",
"url": "/mrstatic/css/blessing-preheat.4e9bf434.chunk.css"
},
{
"revision": "84c7e3af4f6bdfd502d3",
"url": "/mrstatic/css/ShopCart.92ab48a3.chunk.css"
},
{
"revision": "44caa1497418c9050094",
"url": "/mrstatic/css/48.35e22f8c.chunk.css"
},
{
"revision": "2c7da54842b9da3f02d3",
"url": "/mrstatic/css/ShareCourse.8046fb41.chunk.css"
},
{
"revision": "ea3a374dc5c591341bcb",
"url": "/mrstatic/css/Activity.6260646a.chunk.css"
},
{
"revision": "fe141815223caa290002",
"url": "/mrstatic/css/SearchResult.cdf852c1.chunk.css"
},
{
"revision": "81a9e78bf953c5c4308c",
"url": "/mrstatic/css/50.befec011.chunk.css"
},
{
"revision": "8b6e7d74fb4045caef72",
"url": "/mrstatic/css/blessing-rank.91e559d5.chunk.css"
},
{
"revision": "59ffeabb19b4f035b676",
"url": "/mrstatic/css/51.b02d1de6.chunk.css"
},
{
"revision": "8c87b5e1196585f9ff73",
"url": "/mrstatic/css/blessing-getPrize.5a935f68.chunk.css"
},
{
"revision": "38324b69eb273f2d58dd",
"url": "/mrstatic/css/Order.8c058a7a.chunk.css"
},
{
"revision": "760506f7926fbc56bd5d",
"url": "/mrstatic/css/Invite.6260646a.chunk.css"
},
{
"revision": "cb7325409f4df13cd225",
"url": "/mrstatic/css/Examination.7bb0622b.chunk.css"
},
{
"revision": "d96e0daaecd1b6874f9d",
"url": "/mrstatic/css/DrawDocument.aeb3f822.chunk.css"
},
{
"revision": "c6acef0afee3012e27af",
"url": "/mrstatic/css/CourseList.afc8902e.chunk.css"
},
{
"revision": "1f26b83d1f4162e2d184",
"url": "/mrstatic/css/Country.2d34330b.chunk.css"
},
{
"revision": "940aaacd5fee3b50c57f",
"url": "/mrstatic/css/Classify.fb4bedde.chunk.css"
},
{
"revision": "1dc1571c02cfe2cfe8cf",
"url": "/mrstatic/css/BargainMiddlePage.eb686c74.chunk.css"
},
{
"revision": "0c01bf52bd5dcf46b896",
"url": "/mrstatic/css/44.b198ad93.chunk.css"
},
{
"revision": "dce824e977554caec221",
"url": "/mrstatic/css/4.161e1f66.chunk.css"
},
{
"revision": "f0a1bb8ab4b3c9c3d837",
"url": "/mrstatic/css/3.bf839917.chunk.css"
},
{
"revision": "62ba4ac587b81d5dbbf1",
"url": "/mrstatic/css/2.bfae6ada.chunk.css"
},
{
"revision": "14f2c93b6ca763b362d5596a25520a01",
"url": "/index.html"
}
];
\ No newline at end of file
src/components/activity/newyear-2019/landing/index.js
......@@ -158,7 +158,7 @@ class Landing extends Component {
this.fetchPageData()
this.getFollowStatus()
.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 {
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.getFollowStatus()
.then(isFollow => {
......@@ -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
http.get(`${API["base-api"]}/wx/user_temporary_qrcode/${user.data.uid}`)
.then(res => {
......@@ -255,7 +255,7 @@ class Landing extends Component {
// history.replace(`${match.path}?treasure_code=${treasure_code}&origin=1`)
this.fetchPageData({
treasure_code,
origin: '1'
origin
})
}
})
......@@ -290,7 +290,7 @@ class Landing extends Component {
sessionStorage.removeItem('showShareTip')
this.getFollowStatus()
.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 {
</div>
<div className="price">
{item.type == 2 ? '到手最低:¥' : '¥'}
<span className="new-price">{item.price1}</span>
<span className="new-price">{item.price2}</span>
<span
className="old-price">
{item.type == 2 ? '' : '现价：'}
<s>¥{item.price0}</s></span>
<s>¥{item.price1}</s></span>
</div>
<div className="status">
......@@ -676,11 +676,11 @@ class YearCourse extends Component {
</div>
<div className="price">
{item.type == 2 ? '到手最低:¥' : '¥'}
<span className="new-price">{item.price1}</span>
<span className="new-price">{item.price2}</span>
<span
className="old-price">
{item.type == 2 ? '' : '现价：'}
<s>¥{item.price0}</s></span>
<s>¥{item.price1}</s></span>
</div>
<div className="status">
......@@ -767,11 +767,11 @@ class YearCourse extends Component {
</div>
<div className="price">
{item.type == 2 ? '到手最低:¥' : '¥'}
<span className="new-price">{item.price1}</span>
<span className="new-price">{item.price2}</span>
<span
className="old-price">
{item.type == 2 ? '' : '现价：'}
<s>¥{item.price0}</s></span>
<s>¥{item.price1}</s></span>
</div>
<div className="status">
......@@ -858,11 +858,11 @@ class YearCourse extends Component {
</div>
<div className="price">
{item.type == 2 ? '到手最低:¥' : '¥'}
<span className="new-price">{item.price1}</span>
<span className="new-price">{item.price2}</span>
<span
className="old-price">
{item.type == 2 ? '' : '现价：'}
<s>¥{item.price0}</s></span>
<s>¥{item.price1}</s></span>
</div>
<div className="status">
......
src/components/activity/newyear-2019/year-wish/index.js
......@@ -61,7 +61,7 @@ class YarnWish extends Component {
const {list, activityStage} = this.state
return (
<div className='yarn-wish'>
<div className='year-wish'>
<div className="banner"><img
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 {
toCourse={this.toCourse}>
{
item.type == 4 &&
item.type == 4 && item.is_buy != 1 &&
<div className="group-num">限量300个</div>
}
......@@ -99,7 +99,7 @@ class YarnWish extends Component {
</>
}
{
item.type == 1 &&
(item.type == 1 || item.type == 4) &&
<>
<span className="tag">拼团价</span>
<span className="time">12.23开团</span>
......@@ -116,11 +116,8 @@ class YarnWish extends Component {
</div>
<div className="price">
{item.type == 2 ? '到手最低:¥' : '¥'}
<span className="new-price">{item.price1}</span>
<span
className="old-price">
{item.type == 2 ? '' : '现价：'}
<s>¥{item.price0}</s></span>
<span className="new-price">{item.type == 4?'0.01':item.price2}</span>
<span className="old-price"> 现价：<s>¥{item.price1}</s></span>
</div>
<div className="status">
......
src/components/activity/newyear-2019/year-wish/index.scss
......@@ -2,7 +2,7 @@ html, body, #root {
height: 100%;
}
.yarn-wish {
.year-wish {
min-height: 100%;
background-color: #BA2C21;
padding-bottom: 35px;
......@@ -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