Commit 1529e08f by FE

pull and solce

parents 2c2dadca 06a850cb
...@@ -19,14 +19,7 @@ class Activity extends Component { ...@@ -19,14 +19,7 @@ class Activity extends Component {
if(this.props.user.hasError) { if(this.props.user.hasError) {
this.props.history.push('/passport'); this.props.history.push('/passport');
} else { } else {
http.get(`${API.home}/sys/receive/reg/gift`).then(res => { Toast.info('领取成功,你可前往七月在线官网/APP进行查看', 2);
let {code, msg} = res.data;
if(code === 200) {
Toast.info('领取成功,你可前往七月在线官网/APP进行查看', 2);
}else{
Toast.info(msg, 2);
}
})
} }
} }
......
...@@ -111,7 +111,7 @@ class Invite extends Component { ...@@ -111,7 +111,7 @@ class Invite extends Component {
isWeiXin: true, isWeiXin: true,
}); });
}else{ }else{
history.push(`invite?shareuid=${jsCookie.get('uid')}&new=1&inviteCode=${inviteCode}`) history.push(`/invite?shareuid=${jsCookie.get('uid')}&new=1&inviteCode=${inviteCode}`)
this.setState({ this.setState({
showTip: true, showTip: true,
}); });
......
...@@ -73,10 +73,10 @@ class Live extends Component { ...@@ -73,10 +73,10 @@ class Live extends Component {
if (user.hasError) { if (user.hasError) {
history.push('/passport/login') history.push('/passport/login')
} }
http.get(`${API.home}/sys/createLiveQrcode/${id}`) http.get(`${API['base-api']}/sys/createLiveQrcode/${id}`)
.then(res => { .then(res => {
const {data} = res const {data} = res
if (data.code == 200) { if (data.errno == 200) {
QRCode.toDataURL(data.data.url, (err, url) => { QRCode.toDataURL(data.data.url, (err, url) => {
Popup({ Popup({
title: '扫码关注“七月在线”服务号即可预约', title: '扫码关注“七月在线”服务号即可预约',
......
...@@ -145,8 +145,7 @@ class Order extends Component { ...@@ -145,8 +145,7 @@ class Order extends Component {
ischeck: this.state.useBalance, ischeck: this.state.useBalance,
} }
http.post(`${API['base-api']}/pdd/m`, params).then(res => { http.post(`${API['base-api']}/pdd/m`, params).then(res => {
console.log(res); if(Number(res.data.errno) === 200) {
if(res.data.errno === 200) {
sessionStorage.removeItem('orderUseCacheObj'); sessionStorage.removeItem('orderUseCacheObj');
if (res.data.data.pay_jump === 1) { if (res.data.data.pay_jump === 1) {
this.props.history.push(`/togroup?id=${res.data.data.oid}`); this.props.history.push(`/togroup?id=${res.data.data.oid}`);
......
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