Commit 22fcce7c by xuzhenghua

pre

parent e8590c6d
...@@ -10,7 +10,6 @@ import Captcha from '@/common/Captcha'; ...@@ -10,7 +10,6 @@ import Captcha from '@/common/Captcha';
import FollowQRcode from './../followQRcode'; import FollowQRcode from './../followQRcode';
import './index.scss'; import './index.scss';
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import cookie from 'js-cookie' import cookie from 'js-cookie'
class RedPacket extends PureComponent { class RedPacket extends PureComponent {
...@@ -42,7 +41,7 @@ class RedPacket extends PureComponent { ...@@ -42,7 +41,7 @@ class RedPacket extends PureComponent {
endTime: 10, // 手机绑定时限 endTime: 10, // 手机绑定时限
countdownTimer: null, countdownTimer: null,
countdown: '00分00秒', // 绑定时间 countdown: '00分00秒', // 绑定时间
accountInfo: {}, accountInfo: {},
bindInfo: {}, bindInfo: {},
country: { country: {
num: '86' num: '86'
...@@ -165,7 +164,7 @@ class RedPacket extends PureComponent { ...@@ -165,7 +164,7 @@ class RedPacket extends PureComponent {
}); });
}else { }else {
// is_receive 是否领取过 0-否 1-是 // is_receive 是否领取过 0-否 1-是
if(data.is_receive) { if(data.is_receive) {
this.judgeReceiveStatus(data); this.judgeReceiveStatus(data);
}else { }else {
...@@ -572,7 +571,7 @@ class RedPacket extends PureComponent { ...@@ -572,7 +571,7 @@ class RedPacket extends PureComponent {
const { accountInfo: { tel, code}, country: {num = '0086'} } = this.state; const { accountInfo: { tel, code}, country: {num = '0086'} } = this.state;
// is_valid 是否验证 1:验证(默认),0不验证 // is_valid 是否验证 1:验证(默认),0不验证
http.post( http.post(
`${API['passport-api']}/m/personal/bindPhone`, `${API['passport-api']}/m/personal/bindPhone`,
{ {
area_code: num.padStart(4, '0'), area_code: num.padStart(4, '0'),
phone_num: tel, phone_num: tel,
...@@ -611,17 +610,17 @@ class RedPacket extends PureComponent { ...@@ -611,17 +610,17 @@ class RedPacket extends PureComponent {
render() { render() {
// console.log(this.props); // console.log(this.props);
const { history, userInfo } = this.props; const { history, userInfo } = this.props;
const { const {
type, type,
isCopy, isCopy,
validate, validate,
isTimer, isTimer,
seconds, seconds,
shareInfo: { shareInfo: {
command = '', command = '',
share_code = '' share_code = ''
}, },
money, money,
doneInfo, doneInfo,
countdown, countdown,
endTime, endTime,
...@@ -645,7 +644,7 @@ class RedPacket extends PureComponent { ...@@ -645,7 +644,7 @@ class RedPacket extends PureComponent {
{/* wechat */} {/* wechat */}
{ {
type == 2 && type == 2 &&
<div className="pupup-wechat"> <div className="pupup-wechat">
<h4 className="popup-wechat__title">当前环境不支持领红包活动</h4> <h4 className="popup-wechat__title">当前环境不支持领红包活动</h4>
<p className="popup-wechat__desc">请点击右上角“ ··· ”,选择在浏览器中打开 然后参与活动!</p> <p className="popup-wechat__desc">请点击右上角“ ··· ”,选择在浏览器中打开 然后参与活动!</p>
...@@ -692,8 +691,8 @@ class RedPacket extends PureComponent { ...@@ -692,8 +691,8 @@ class RedPacket extends PureComponent {
自己也可以领取哦~ 自己也可以领取哦~
</p> </p>
</div> </div>
<i <i
className="popup-password__button--close iconfont iconiconfront-2" className="popup-password__button--close iconfont iconiconfront-2"
onClick={() => { onClick={() => {
if(getParam('wechat') === '1') { if(getParam('wechat') === '1') {
if(userInfo && userInfo.uid) { if(userInfo && userInfo.uid) {
...@@ -716,14 +715,14 @@ class RedPacket extends PureComponent { ...@@ -716,14 +715,14 @@ class RedPacket extends PureComponent {
</div> </div>
} }
{/* red-packet--close */} {/* red-packet--close */}
{ {
type === 3 && type === 3 &&
<Packet <Packet
type={3} type={3}
packetInfo={{ packetInfo={{
title: '七月在线给你发了个红包~' title: '七月在线给你发了个红包~'
}} }}
handleToClose={() => this.handleToClose(false)} handleToClose={() => this.handleToClose(false)}
handleToOpen={this.handleToOpen} handleToOpen={this.handleToOpen}
...@@ -733,7 +732,7 @@ class RedPacket extends PureComponent { ...@@ -733,7 +732,7 @@ class RedPacket extends PureComponent {
{/* red-packet--open */} {/* red-packet--open */}
{ {
type === 4 && type === 4 &&
<Packet <Packet
type={4} type={4}
packetInfo={{ packetInfo={{
money, money,
...@@ -754,7 +753,7 @@ class RedPacket extends PureComponent { ...@@ -754,7 +753,7 @@ class RedPacket extends PureComponent {
{/* red-packet--money success */} {/* red-packet--money success */}
{ {
type === 5 && type === 5 &&
<Packet <Packet
type={5} type={5}
packetInfo={{ packetInfo={{
money, money,
...@@ -777,7 +776,7 @@ class RedPacket extends PureComponent { ...@@ -777,7 +776,7 @@ class RedPacket extends PureComponent {
{/* red-packet--fragment success */} {/* red-packet--fragment success */}
{ {
type === 6 && type === 6 &&
<Packet <Packet
type={6} type={6}
packetInfo={{ packetInfo={{
money, money,
...@@ -800,7 +799,7 @@ class RedPacket extends PureComponent { ...@@ -800,7 +799,7 @@ class RedPacket extends PureComponent {
{/* red-packet--late 来完了 */} {/* red-packet--late 来完了 */}
{ {
type === 7 && type === 7 &&
<Packet <Packet
type={7} type={7}
packetInfo={{ packetInfo={{
btn: { btn: {
...@@ -828,7 +827,7 @@ class RedPacket extends PureComponent { ...@@ -828,7 +827,7 @@ class RedPacket extends PureComponent {
}} }}
validate={({tel, code}) => { validate={({tel, code}) => {
const errors = {}; const errors = {};
// if (!validateTel(tel)) { // if (!validateTel(tel)) {
if(!/^\d+$/.test(tel)) { if(!/^\d+$/.test(tel)) {
errors.tel = '请填写正确格式的手机号'; errors.tel = '请填写正确格式的手机号';
...@@ -836,7 +835,7 @@ class RedPacket extends PureComponent { ...@@ -836,7 +835,7 @@ class RedPacket extends PureComponent {
if (!/[0-9]{6}/.test(code)) { if (!/[0-9]{6}/.test(code)) {
errors.code = '请输入验证码'; errors.code = '请输入验证码';
} }
return errors; return errors;
}} }}
onSubmit={(values, { setStatus, setSubmitting }) => { onSubmit={(values, { setStatus, setSubmitting }) => {
...@@ -852,7 +851,7 @@ class RedPacket extends PureComponent { ...@@ -852,7 +851,7 @@ class RedPacket extends PureComponent {
<h4 className="popup-form__title">绑定手机号</h4> <h4 className="popup-form__title">绑定手机号</h4>
<div className="popup-form__item"> <div className="popup-form__item">
<Link <Link
className="popup-form__button--num" className="popup-form__button--num"
to={`/country?id=${getParam('id')}&share_code=${share_code}`}> to={`/country?id=${getParam('id')}&share_code=${share_code}`}>
+{country.num} +{country.num}
<i className="iconfont iconiconfront-69"/> <i className="iconfont iconiconfront-69"/>
...@@ -861,9 +860,9 @@ class RedPacket extends PureComponent { ...@@ -861,9 +860,9 @@ class RedPacket extends PureComponent {
name="tel" name="tel"
render={({field}) => { render={({field}) => {
return ( return (
<input <input
{...field} {...field}
className="popup-form__ipt" className="popup-form__ipt"
data-bdrs="0 6px 6px 0" data-bdrs="0 6px 6px 0"
data-type="tel" data-type="tel"
type="text" type="text"
...@@ -873,7 +872,7 @@ class RedPacket extends PureComponent { ...@@ -873,7 +872,7 @@ class RedPacket extends PureComponent {
}} }}
/> />
</div> </div>
<Captcha <Captcha
mrBtm={15} mrBtm={15}
getInstance={this.getCaptchaInstance} getInstance={this.getCaptchaInstance}
onVerify={this.onVerify} onVerify={this.onVerify}
...@@ -887,8 +886,8 @@ class RedPacket extends PureComponent { ...@@ -887,8 +886,8 @@ class RedPacket extends PureComponent {
绑定超时,红包已失效! 绑定超时,红包已失效!
</p> </p>
</div> </div>
<button <button
className="popup-packet__button--bundle" className="popup-packet__button--bundle"
data-status="do" data-status="do"
type="button" type="button"
onClick={() => { onClick={() => {
...@@ -903,7 +902,7 @@ class RedPacket extends PureComponent { ...@@ -903,7 +902,7 @@ class RedPacket extends PureComponent {
name="code" name="code"
render={({field}) => { render={({field}) => {
return ( return (
<input <input
{...field} {...field}
className="popup-form__ipt popup-form__ipt--left" className="popup-form__ipt popup-form__ipt--left"
type="text" type="text"
...@@ -912,7 +911,7 @@ class RedPacket extends PureComponent { ...@@ -912,7 +911,7 @@ class RedPacket extends PureComponent {
); );
}} }}
/> />
<button <button
className="popup-form__button--code" className="popup-form__button--code"
data-status={(validate && !isTimer)? 'do': ''} data-status={(validate && !isTimer)? 'do': ''}
type="button" type="button"
...@@ -923,8 +922,8 @@ class RedPacket extends PureComponent { ...@@ -923,8 +922,8 @@ class RedPacket extends PureComponent {
} }
</button> </button>
</div> </div>
<button <button
className="popup-packet__button--bundle" className="popup-packet__button--bundle"
data-status={(tel && code && isEmpty(errors))? 'do': 'done'} data-status={(tel && code && isEmpty(errors))? 'do': 'done'}
type="submit" type="submit"
> >
...@@ -936,8 +935,8 @@ class RedPacket extends PureComponent { ...@@ -936,8 +935,8 @@ class RedPacket extends PureComponent {
</Form> </Form>
)} )}
/> />
<i <i
className="popup-password__button--close iconfont iconiconfront-2" className="popup-password__button--close iconfont iconiconfront-2"
onClick={() => this.handleToClose(false)} onClick={() => this.handleToClose(false)}
/> />
</div> </div>
...@@ -956,8 +955,8 @@ class RedPacket extends PureComponent { ...@@ -956,8 +955,8 @@ class RedPacket extends PureComponent {
{doneInfo.txt} {doneInfo.txt}
</h4> </h4>
<p className="popup-done__desc">{doneInfo.desc}</p> <p className="popup-done__desc">{doneInfo.desc}</p>
<button <button
className="popup-packet__button--bundle" className="popup-packet__button--bundle"
data-status="do" data-status="do"
type="submit" type="submit"
onClick={() => { onClick={() => {
...@@ -965,8 +964,8 @@ class RedPacket extends PureComponent { ...@@ -965,8 +964,8 @@ class RedPacket extends PureComponent {
}} }}
>获取更多奖励</button> >获取更多奖励</button>
</div> </div>
<i <i
className="popup-password__button--close iconfont iconiconfront-2" className="popup-password__button--close iconfont iconiconfront-2"
onClick={() => { onClick={() => {
const isShare = getParam('share_code')? true : false; const isShare = getParam('share_code')? true : false;
this.handleToClose(false, isShare); this.handleToClose(false, isShare);
...@@ -977,7 +976,7 @@ class RedPacket extends PureComponent { ...@@ -977,7 +976,7 @@ class RedPacket extends PureComponent {
{/* 手机号绑定提示 */} {/* 手机号绑定提示 */}
{ {
type === 10 && type === 10 &&
<div className="popup-bind"> <div className="popup-bind">
<div className="popup-bind__content"> <div className="popup-bind__content">
<h4 className="popup-bind__title">绑定确认</h4> <h4 className="popup-bind__title">绑定确认</h4>
...@@ -986,7 +985,7 @@ class RedPacket extends PureComponent { ...@@ -986,7 +985,7 @@ class RedPacket extends PureComponent {
{ {
bindInfo['email'] && bindInfo['email'] &&
<li className="popup-bind__account"> <li className="popup-bind__account">
{/* 邮箱 */} {/* 邮箱 */}
<i className="iconfont iconduanxin"></i> <i className="iconfont iconduanxin"></i>
<p className="popup-bind__account--name">{bindInfo['email']}</p> <p className="popup-bind__account--name">{bindInfo['email']}</p>
...@@ -1021,16 +1020,16 @@ class RedPacket extends PureComponent { ...@@ -1021,16 +1020,16 @@ class RedPacket extends PureComponent {
} }
</ul> </ul>
<div className="popup-bind__button"> <div className="popup-bind__button">
<button <button
className="popup-bind__button--cancle" className="popup-bind__button--cancle"
onClick={() => this.handleToClose(false)}>取消</button> onClick={() => this.handleToClose(false)}>取消</button>
<button <button
className="popup-bind__button--confirm" className="popup-bind__button--confirm"
onClick={() => this.toContinueBind(0)}>继续绑定</button> onClick={() => this.toContinueBind(0)}>继续绑定</button>
</div> </div>
</div> </div>
<i <i
className="popup-password__button--close iconfont iconiconfront-2" className="popup-password__button--close iconfont iconiconfront-2"
onClick={() => this.handleToClose(false)} onClick={() => this.handleToClose(false)}
/> />
</div> </div>
...@@ -1092,7 +1091,7 @@ const Packet = ({type, packetInfo, handleToClose, handleToOpen }) => { ...@@ -1092,7 +1091,7 @@ const Packet = ({type, packetInfo, handleToClose, handleToOpen }) => {
}) })
} }
</p> </p>
<button <button
className="popup-packet__button--bundle" className="popup-packet__button--bundle"
onClick={btn.onClick} onClick={btn.onClick}
> >
...@@ -1108,7 +1107,7 @@ const Packet = ({type, packetInfo, handleToClose, handleToOpen }) => { ...@@ -1108,7 +1107,7 @@ const Packet = ({type, packetInfo, handleToClose, handleToOpen }) => {
红包仅能当日领取,下次<br /> 红包仅能当日领取,下次<br />
早点来哦~ 早点来哦~
</p> </p>
<button <button
className="popup-packet__button--bundle" className="popup-packet__button--bundle"
onClick={btn.onClick} onClick={btn.onClick}
> >
...@@ -1117,8 +1116,8 @@ const Packet = ({type, packetInfo, handleToClose, handleToOpen }) => { ...@@ -1117,8 +1116,8 @@ const Packet = ({type, packetInfo, handleToClose, handleToOpen }) => {
</> </>
} }
</div> </div>
<i <i
className="popup-password__button--close iconfont iconiconfront-2" className="popup-password__button--close iconfont iconiconfront-2"
onClick={handleToClose} onClick={handleToClose}
/> />
</div> </div>
......
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