Merge branch '11-11' into dev

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);
-        }
-      })
+      Toast.info('领取成功，你可前往七月在线官网/APP进行查看', 2);
     }
   }
 

src/components/activity/invite.js

@@ -34,6 +34,12 @@ class Invite extends Component {
       this.getUserList();
       this.getHotValue();
     }
+    wxShare({
+      title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！',
+      desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线',
+      link: encodeURI(location.origin + `/invite?shareuid=${jsCookie.get('uid')}&new=1&inviteCode=${inviteCode}`),
+      imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png',
+    });
   }
 
   componentWillReceiveProps(nextProps) {
@@ -105,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/addressPopup/index.js

@@ -77,6 +77,8 @@ class AddressPopup extends Component {
 
               return errors;
             }}
+            validateOnBlur={false}
+            validateOnChange={false}
             onSubmit={(values) => {
               this.handleToSubmit(values);
             }}
@@ -136,7 +138,7 @@ class AddressPopup extends Component {
                 />
                 <button 
                   className="address-form__submit" 
-                  data-status={isEmpty(errors)? 'do' : ''}
+                  data-status="do"
                   type="submit"
                 >提交</button>
               </Form>

src/components/blessingPreheat/collectBlessing/index.js

@@ -71,11 +71,8 @@ class CollectBlessing extends Component {
       }
     }else {
       if(!uid) {
-        console.log(1,1);
         history.push('/passport');
       }else {
-        console.log(2,1);
-
         history.push('/blessingPreheat?utm_source=qq&utm_medium=11&utm_campaign=QQ11&utm_content=11&utm_term=11')
         this.fetchUserBlessing(3, () => {
           this.handleToAddBlessing(3);

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}`);