pull and solce

src/components/activity/index.js

@@ -19,14 +19,7 @@ class Activity extends Component {
     if(this.props.user.hasError) {
       this.props.history.push('/passport');
     } else {
-      http.get(`${API.home}/sys/receive/reg/gift`).then(res => {
-        let {code, msg} = res.data;
-        if(code === 200) {
       Toast.info('领取成功，你可前往七月在线官网/APP进行查看', 2);
-        }else{
-          Toast.info(msg, 2);
-        }
-      })
     }
   }
 

src/components/activity/invite.js

@@ -111,7 +111,7 @@ class Invite extends Component {
                 isWeiXin: true,
               });
             }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({
                 showTip: true,
               });

src/components/blessingPreheat/live/index.js

@@ -73,10 +73,10 @@ class Live extends Component {
     if (user.hasError) {
       history.push('/passport/login')
     }
-    http.get(`${API.home}/sys/createLiveQrcode/${id}`)
+    http.get(`${API['base-api']}/sys/createLiveQrcode/${id}`)
       .then(res => {
         const {data} = res
-        if (data.code == 200) {
+        if (data.errno == 200) {
           QRCode.toDataURL(data.data.url, (err, url) => {
             Popup({
               title: '扫码关注“七月在线”服务号即可预约',

src/components/order/index.js

@@ -145,8 +145,7 @@ class Order extends Component {
         ischeck: this.state.useBalance,
       }
       http.post(`${API['base-api']}/pdd/m`, params).then(res => {
-        console.log(res);
-        if(res.data.errno === 200) {
+        if(Number(res.data.errno) === 200) {
           sessionStorage.removeItem('orderUseCacheObj');
           if (res.data.data.pay_jump === 1) {
             this.props.history.push(`/togroup?id=${res.data.data.oid}`);