Skip to content

M
mr-julyedu
Commit 429394bb by zhanghaozhe
Options

详情页直接购买按钮样式

parents adce7590 e651e2e8
Showing with 147 additions and 47 deletions
build/asset-manifest.json
......@@ -82,15 +82,15 @@
"deposit-pay-order.css": "/mrstatic/css/deposit-pay-order.bd75adfd.chunk.css",
"deposit-pay-order.js": "/mrstatic/js/deposit-pay-order.01c1a3ef.chunk.js",
"deposit-pay-order.js.map": "/mrstatic/js/deposit-pay-order.01c1a3ef.chunk.js.map",
"detail.css": "/mrstatic/css/detail.7d532a3c.chunk.css",
"detail.js": "/mrstatic/js/detail.8898be8e.chunk.js",
"detail.js.map": "/mrstatic/js/detail.8898be8e.chunk.js.map",
"detail.css": "/mrstatic/css/detail.40b9c18a.chunk.css",
"detail.js": "/mrstatic/js/detail.cf94f285.chunk.js",
"detail.js.map": "/mrstatic/js/detail.cf94f285.chunk.js.map",
"intelligent-recommend.css": "/mrstatic/css/intelligent-recommend.7bfe9898.chunk.css",
"intelligent-recommend.js": "/mrstatic/js/intelligent-recommend.c9c60ca7.chunk.js",
"intelligent-recommend.js.map": "/mrstatic/js/intelligent-recommend.c9c60ca7.chunk.js.map",
"main.css": "/mrstatic/css/main.a071af85.chunk.css",
"main.js": "/mrstatic/js/main.07f9fe2e.chunk.js",
"main.js.map": "/mrstatic/js/main.07f9fe2e.chunk.js.map",
"main.js": "/mrstatic/js/main.9d79c12f.chunk.js",
"main.js.map": "/mrstatic/js/main.9d79c12f.chunk.js.map",
"ml.css": "/mrstatic/css/ml.1bb9f764.chunk.css",
"ml.js": "/mrstatic/js/ml.2d9658a8.chunk.js",
"ml.js.map": "/mrstatic/js/ml.2d9658a8.chunk.js.map",
......@@ -115,8 +115,8 @@
"python-class.css": "/mrstatic/css/python-class.9cc168c1.chunk.css",
"python-class.js": "/mrstatic/js/python-class.d79d603c.chunk.js",
"python-class.js.map": "/mrstatic/js/python-class.d79d603c.chunk.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.1b53ce26.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.1b53ce26.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.d40d67c4.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.d40d67c4.js.map",
"search.css": "/mrstatic/css/search.cbabc366.chunk.css",
"search.js": "/mrstatic/js/search.a96fa887.chunk.js",
"search.js.map": "/mrstatic/js/search.a96fa887.chunk.js.map",
......@@ -155,9 +155,9 @@
"mrstatic/css/53.0bb224f2.chunk.css": "/mrstatic/css/53.0bb224f2.chunk.css",
"mrstatic/js/53.251ddd70.chunk.js": "/mrstatic/js/53.251ddd70.chunk.js",
"mrstatic/js/53.251ddd70.chunk.js.map": "/mrstatic/js/53.251ddd70.chunk.js.map",
"mrstatic/css/54.504ef53f.chunk.css": "/mrstatic/css/54.504ef53f.chunk.css",
"mrstatic/js/54.45588610.chunk.js": "/mrstatic/js/54.45588610.chunk.js",
"mrstatic/js/54.45588610.chunk.js.map": "/mrstatic/js/54.45588610.chunk.js.map",
"mrstatic/css/54.453a734f.chunk.css": "/mrstatic/css/54.453a734f.chunk.css",
"mrstatic/js/54.dadf42f8.chunk.js": "/mrstatic/js/54.dadf42f8.chunk.js",
"mrstatic/js/54.dadf42f8.chunk.js.map": "/mrstatic/js/54.dadf42f8.chunk.js.map",
"mrstatic/css/55.ecbb6f9a.chunk.css": "/mrstatic/css/55.ecbb6f9a.chunk.css",
"mrstatic/js/55.01bdfe9d.chunk.js": "/mrstatic/js/55.01bdfe9d.chunk.js",
"mrstatic/js/55.01bdfe9d.chunk.js.map": "/mrstatic/js/55.01bdfe9d.chunk.js.map",
......@@ -209,7 +209,7 @@
"mrstatic/css/51.50547718.chunk.css.map": "/mrstatic/css/51.50547718.chunk.css.map",
"mrstatic/css/52.2471f477.chunk.css.map": "/mrstatic/css/52.2471f477.chunk.css.map",
"mrstatic/css/53.0bb224f2.chunk.css.map": "/mrstatic/css/53.0bb224f2.chunk.css.map",
"mrstatic/css/54.504ef53f.chunk.css.map": "/mrstatic/css/54.504ef53f.chunk.css.map",
"mrstatic/css/54.453a734f.chunk.css.map": "/mrstatic/css/54.453a734f.chunk.css.map",
"mrstatic/css/55.ecbb6f9a.chunk.css.map": "/mrstatic/css/55.ecbb6f9a.chunk.css.map",
"mrstatic/css/56.bc06dce4.chunk.css.map": "/mrstatic/css/56.bc06dce4.chunk.css.map",
"mrstatic/css/57.e932ddaf.chunk.css.map": "/mrstatic/css/57.e932ddaf.chunk.css.map",
......@@ -245,7 +245,7 @@
"mrstatic/css/coupons.5de33712.chunk.css.map": "/mrstatic/css/coupons.5de33712.chunk.css.map",
"mrstatic/css/deposit-order.c5f96122.chunk.css.map": "/mrstatic/css/deposit-order.c5f96122.chunk.css.map",
"mrstatic/css/deposit-pay-order.bd75adfd.chunk.css.map": "/mrstatic/css/deposit-pay-order.bd75adfd.chunk.css.map",
"mrstatic/css/detail.7d532a3c.chunk.css.map": "/mrstatic/css/detail.7d532a3c.chunk.css.map",
"mrstatic/css/detail.40b9c18a.chunk.css.map": "/mrstatic/css/detail.40b9c18a.chunk.css.map",
"mrstatic/css/intelligent-recommend.7bfe9898.chunk.css.map": "/mrstatic/css/intelligent-recommend.7bfe9898.chunk.css.map",
"mrstatic/css/main.a071af85.chunk.css.map": "/mrstatic/css/main.a071af85.chunk.css.map",
"mrstatic/css/ml.1bb9f764.chunk.css.map": "/mrstatic/css/ml.1bb9f764.chunk.css.map",
......@@ -268,6 +268,6 @@
"mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.f2f4294d.woff",
"mrstatic/media/kanjia_cg_icon.png": "/mrstatic/media/kanjia_cg_icon.81a489ac.png",
"mrstatic/media/video.scss": "/mrstatic/media/progress-share-bg.80011994.png",
"precache-manifest.0d745e6b7e3800b3dad2f57943066177.js": "/precache-manifest.0d745e6b7e3800b3dad2f57943066177.js",
"precache-manifest.ea8864e26dd4b37c111458852144abf5.js": "/precache-manifest.ea8864e26dd4b37c111458852144abf5.js",
"service-worker.js": "/service-worker.js"
}
\ No newline at end of file
build/mrstatic/js/54.45588610.chunk.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/54.45588610.chunk.js → build/mrstatic/js/54.dadf42f8.chunk.js
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/54.dadf42f8.chunk.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/main.07f9fe2e.chunk.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/main.07f9fe2e.chunk.js → build/mrstatic/js/main.9d79c12f.chunk.js
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/main.9d79c12f.chunk.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/precache-manifest.0d745e6b7e3800b3dad2f57943066177.js → build/precache-manifest.ea8864e26dd4b37c111458852144abf5.js
......@@ -216,12 +216,12 @@ self.__precacheManifest = [
"url": "/mrstatic/js/deposit-pay-order.01c1a3ef.chunk.js"
},
{
"revision": "d85a118a1da070acebdc",
"url": "/mrstatic/css/detail.7d532a3c.chunk.css"
"revision": "1f67234fee1aa4e21fd3",
"url": "/mrstatic/css/detail.40b9c18a.chunk.css"
},
{
"revision": "d85a118a1da070acebdc",
"url": "/mrstatic/js/detail.8898be8e.chunk.js"
"revision": "1f67234fee1aa4e21fd3",
"url": "/mrstatic/js/detail.cf94f285.chunk.js"
},
{
"revision": "306af78018590c5c0fee",
......@@ -232,12 +232,12 @@ self.__precacheManifest = [
"url": "/mrstatic/js/intelligent-recommend.c9c60ca7.chunk.js"
},
{
"revision": "f5b440db3afc8ad97f31",
"revision": "2b8576be6bb48833ac4e",
"url": "/mrstatic/css/main.a071af85.chunk.css"
},
{
"revision": "f5b440db3afc8ad97f31",
"url": "/mrstatic/js/main.07f9fe2e.chunk.js"
"revision": "2b8576be6bb48833ac4e",
"url": "/mrstatic/js/main.9d79c12f.chunk.js"
},
{
"revision": "0576acd8fa5a197b079e",
......@@ -304,8 +304,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/python-class.d79d603c.chunk.js"
},
{
"revision": "1458889a2559d47427ad",
"url": "/mrstatic/js/runtime~main.1b53ce26.js"
"revision": "fcdb2952e9f67af4f68a",
"url": "/mrstatic/js/runtime~main.d40d67c4.js"
},
{
"revision": "a12dcdfa6b8323c11440",
......@@ -408,12 +408,12 @@ self.__precacheManifest = [
"url": "/mrstatic/js/53.251ddd70.chunk.js"
},
{
"revision": "949247e5122a0d7b55c1",
"url": "/mrstatic/css/54.504ef53f.chunk.css"
"revision": "3f122719e580b14a37df",
"url": "/mrstatic/css/54.453a734f.chunk.css"
},
{
"revision": "949247e5122a0d7b55c1",
"url": "/mrstatic/js/54.45588610.chunk.js"
"revision": "3f122719e580b14a37df",
"url": "/mrstatic/js/54.dadf42f8.chunk.js"
},
{
"revision": "9192cd0f65dc28870ede",
......@@ -568,15 +568,15 @@ self.__precacheManifest = [
"url": "/mrstatic/media/redb_chai_bj@2x.8edaf2ff.png"
},
{
"revision": "79139f6aad350256e151f9f73c226348",
"url": "/mrstatic/media/hb_bj.79139f6a.png"
},
{
"revision": "6902434f8f18a23319d57d0ac8aaea8c",
"url": "/mrstatic/media/redb_sp_bj@2x.6902434f.png"
},
{
"revision": "9c2cdf60607a3ccc8d59deb55f97e65a",
"revision": "79139f6aad350256e151f9f73c226348",
"url": "/mrstatic/media/hb_bj.79139f6a.png"
},
{
"revision": "d529dfd37193e1267603a743b7459031",
"url": "/index.html"
}
];
\ No newline at end of file
build/service-worker.js
......@@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
importScripts(
"/precache-manifest.0d745e6b7e3800b3dad2f57943066177.js"
"/precache-manifest.ea8864e26dd4b37c111458852144abf5.js"
);
workbox.clientsClaim();
......
src/components/Index/TopSwiper/index.js
......@@ -24,7 +24,7 @@ class Index extends Component {
}
componentWillUnmount() {
this.swiper.destroy()
this.swiper && this.swiper.destroy()
}
......
src/components/activity/2020-717/activity/index.js
......@@ -3,6 +3,7 @@ import { debounce, groupBy, isEmpty } from "lodash";
import { http } from "@/utils"
import { Toast, Carousel } from "antd-mobile";
import { Link } from "react-router-dom";
import {logout} from '@/store/userAction'
import { connect } from "react-redux";
import './index.scss'
import { Popup } from "@common/index"
......@@ -93,6 +94,7 @@ class Anniversary2020 extends Component {
isShowUserAddress: false,
isShowPrizesRecords: false,
isWinPrize: false, //抽中奖品弹框
isReLogin: false,
isShowTeamMember: false,
isShowFollow: false,
//抽奖
......@@ -105,6 +107,8 @@ class Anniversary2020 extends Component {
prizeRecords: [],
prizeRecordsPagination: 0,
bulletScreenList: [],
prizeType: '',
needMobile: false // 是否需要绑定手机号
}
componentDidMount() {
......@@ -450,6 +454,8 @@ class Anniversary2020 extends Component {
setTimeout(() => {
this.setState({
drawResult: data,
prizeType: data.prize_type,
needMobile: data.need_mobile
});
}, 3000)
} else {
......@@ -551,6 +557,11 @@ class Anniversary2020 extends Component {
});
}
reLogin=()=>{
this.props.logout()
this.props.history.push('/passport')
}
render() {
const {
navs,
......@@ -570,8 +581,11 @@ class Anniversary2020 extends Component {
isShowPrizesRecords,
prizeRecords,
isWinPrize,
isReLogin,
drawingItemId,
drawResult,
prizeType,
needMobile,
isShowTeamMember,
bulletScreenList,
rankList,
......@@ -588,6 +602,9 @@ class Anniversary2020 extends Component {
return (
<div className={'anniversary-2020'}>
<Link className="to-index-tip" to={'/'}>前往七月在线官网 学更多精品课程 >></Link>
<div className="banner">
<img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active20_717/m/banner.png" alt=""/>
{
......@@ -887,10 +904,10 @@ class Anniversary2020 extends Component {
<div className="title">组队答题抽奖</div>
<ol>
<li>
1. 邀请好友加入队伍，好友答对题可获得一次抽奖机会；
1. 邀请好友加入队伍，好友答对题你和好友均可增加抽奖机会；
</li>
<li>
2. 每3个队员答对题，你可以获得N次抽奖机会，N=1，2，3（上限）。
2. 有3个队员答对题，你可+1次抽奖机会；6个队员答对题，你再+2次抽奖机会，超过6个队员答对题时，每+3人答对题都可+3次抽奖机会。
</li>
</ol>
</div>
......@@ -928,8 +945,8 @@ class Anniversary2020 extends Component {
<div className="des">
<div className="title">练一练</div>
<ol>
<li>1. 每日可练习 2 次 。每次 1 道题，从题库中随机抽取；</li>
<li> 2. 答对可增加1次抽奖机会。</li>
<li>1. 每日可练习 2 次 。每次 1 道题；</li>
<li>2. 每答对1题可+1次抽奖机会。</li>
</ol>
</div>
</div>
......@@ -1017,7 +1034,7 @@ class Anniversary2020 extends Component {
<section id={'audition'} className={'audition'}>
<div className="block-title"
style={{background: `url(${titleImages[3]}) no-repeat`, backgroundSize: 'contain'}}></div>
<h4>报名集训营/就业班有豪礼相送，不止AirPods，送完即止</h4>
<h4><span>报名集训营/就业班有豪礼相送，不止AirPods，送完即止</span></h4>
<ul className="course-container">
{
!!_auditions.length && _auditions.map((item, index) => {
......@@ -1091,7 +1108,7 @@ class Anniversary2020 extends Component {
} else if (activityData.stage === 2) {
switch (item.type) {
case 0:
Button = <button><Link to={`/detail?id=${item.course_id}`}>立即报名</Link></button>
Button = <button><Link to={`/detail?id=${item.course_id}`}>立即抢购</Link></button>
break
case 1:
Button =
......@@ -1231,10 +1248,19 @@ class Anniversary2020 extends Component {
this.setState({
isWinPrize: false,
drawResult: {},
isReLogin: (prizeType == 1 || prizeType == 3) && needMobile ? true : false
});
}}></WinPrize>
}
{
isReLogin && <ReLogin reLogin={this.reLogin} close={() => {
this.setState({
isReLogin: false,
});
}}></ReLogin>
}
{
isShowTeamMember && <TeamMember members={team.team_info} uid={user.data.uid} close={() => {
this.setState({
isShowTeamMember: false,
......@@ -1263,6 +1289,7 @@ class Anniversary2020 extends Component {
}
}
function WinPrize({name, close, info}) {
return <div className={'modal-cover'}>
<div className="modal win-prize">
......@@ -1274,6 +1301,22 @@ function WinPrize({name, close, info}) {
</div>
}
function ReLogin({close,reLogin}) {
return <div className={'modal-cover'}>
<div className="modal re-login">
<div className="title">温馨提示</div>
<div className="des">为了您的账号安全，请尽快绑定手机号，以免影响奖品发放。</div>
<div className="contact">点击下方"重新登录”，<br/>
选择"微信授权登录"，按提示绑定即可。</div>
<button onClick={reLogin}>重新登录</button>
<i className={'iconfont iconiconfront-2 close'} onClick={close}></i>
</div>
</div>
}
function TeamMember({members, close, uid}) {
const _members = Array.isArray(members) && members.filter(item => item.uid != uid)
const statusText = ['回答错误', '回答正确', '未作答']
......@@ -1304,7 +1347,9 @@ function TeamMember({members, close, uid}) {
export default connect(
({user}) => ({user}),
dispatch => ({
dispatch => ({
addData: data => dispatch(addData(data)),
logout: data => dispatch(logout(data)),
}),
)(Anniversary2020);
\ No newline at end of file
src/components/activity/2020-717/activity/index.scss
......@@ -6,6 +6,19 @@
display: none;
}
.to-index-tip {
display: block;
height:30px;
line-height: 30px;
margin-left: -10px;
margin-right: -10px;
background-color: #FFF066;
text-align: center;
font-size: 14px;
color: #FF2121;
}
.banner {
position: relative;
height: 300px;
......@@ -578,7 +591,7 @@
.des {
width: 341px;
height: 95px;
padding-bottom: 15px;
margin-top: -9px;
margin-bottom: 15px;
background: rgba(34, 39, 255, 1);
......@@ -834,10 +847,18 @@
margin-bottom: 20px;
h4 {
color: #fff;
height: 28px;
margin: 10px auto;
font-size: 12px;
margin: 10px 0 15px;
text-align: center;
span {
padding: 5px 10px;
background: #ffe400;
color: #2e00dc;
border-radius: 20px;
line-height: 28px;
}
}
.block-title {
......@@ -1206,6 +1227,37 @@
}
}
.re-login {
padding: 20px!important;
.des {
text-align: justify;
font-size: 15px;
color: #545C64;
}
.contact {
margin-top: 15px;
font-size: 15px;
font-weight: 400;
color: #271BD3;
}
button {
width: 121px;
height: 33px;
transform: translateX(50%);
background: rgba(0, 153, 255, 1);
border-radius: 17px;
font-size: 15px;
color: #fff;
-webkit-appearance: none;
outline: 0;
border: 0;
margin-top: 10px;
}
}
.members {
ul {
max-height: 230px;
......
src/components/detail/btnstatus/index.js
......@@ -403,7 +403,7 @@ class BtnStatus extends Component {
<i className='iconfont iconerji'></i>
<span>课程咨询</span>
</a>
<button className='btn btn-s bg-F4AAA7' onClick={this.simpleCourse}>
<button className='btn btn-s buy' onClick={this.simpleCourse}>
<span>{`¥ ${info.price1}`}</span>
<span>直接购买</span>
</button>
......@@ -438,7 +438,7 @@ class BtnStatus extends Component {
<i className='iconfont iconerji'></i>
<span>课程咨询</span>
</a>
<button className='btn btn-s bg-F4AAA7'>
<button className='btn btn-s buy'>
<span>¥{info.price1}</span>
<span onClick={this.tobuy}>直接购买</span>
</button>
......
src/components/detail/btnstatus/index.scss
......@@ -124,8 +124,8 @@
background: linear-gradient(90deg, $bg_0198FE 0%, $bg_077FD0 100%);
}
.bg-F4AAA7 {
background-color: $bg-F4AAA7;
.buy {
background-color: #FA736E;
}
.bg-E02E24 {
......
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