pull

public/api.js

@@ -5,5 +5,6 @@ var API = {
     'passport-api': 'http://passport-test.julyedu.com',
     'base-api': 'http://api-test.julyedu.com',
     'record': 'record.julyedu.com:8001',
-    'process-api': 'ws:process-test.julyedu.com:9502'
+    'process-api': 'ws:process-test.julyedu.com:9502',
+    'm': 'http://m-test.julyedu.com',
 }

src/components/blessingPreheat/collectBlessing/index.js

@@ -16,7 +16,7 @@ class CollectBlessing extends Component {
     super(props);
     this.state = {
       rules: [
-        'app、h5、pc端活动页签到+5点福气值（每天一次）',
+        'app/h5/pc端活动页签到+5点福气值（每天一次）',
         '关注七月在线微信服务号+30点福气值（仅限一次）',
         '分享活动页到朋友圈、qq，分别+2点福气值（每个平台每天一次）',
         '浏览指定课程详情页，一门课程+2点福气值（每天一次）',
@@ -109,13 +109,27 @@ class CollectBlessing extends Component {
 
   weiboToShare = () => {
     const { uid, history } = this.props;
-    if(!uid) {
-      history.push('/passport');
+    if(getParam('version')) {
+      if(!uid) {
+        SendMessageToApp("toLogin");
+      }else {
+        let data = {
+          title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！',
+          desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线',
+          link: 'https://m.julyedu.com/blessingPreheat',
+          imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png',
+        };
+        SendMessageToApp("WXshare", data);
+      }
     }else {
-      history.push('/blessingPreheat?utm_source=sina&utm_medium=11&utm_campaign=sina11&utm_content=1&utm_term=11');
-      this.fetchUserBlessing(2, () => {
-        this.handleToAddBlessing(2);
-      });
+      if(!uid) {
+        history.push('/passport');
+      }else {
+        history.push('/blessingPreheat?utm_source=sina&utm_medium=11&utm_campaign=sina11&utm_content=1&utm_term=11');
+        this.fetchUserBlessing(2, () => {
+          this.handleToAddBlessing(2);
+        });
+      }
     }
   }
 
@@ -186,7 +200,7 @@ class CollectBlessing extends Component {
             </ListHeader>
           )
         }
-        <p className='activity__over'>活动结束 福气榜前20名可获奖品一份</p>
+        <p className='activity__over'>活动结束前福气榜前50名可获奖品一份</p>
         {
           welfareRuleList.map((item, index) => (
             <div className="rules__item" key={index}>

src/components/blessingPreheat/courseList/index.js

@@ -273,14 +273,14 @@ class CourseList extends Component {
 
   // 去课程详情页
   toCourse = (courseId) => {
-    const {history} = this.props;
+    const { history } = this.props;
     if (!getParam('version')) {
-      history.push(`/detail?id=${courseId}`)
+      history.push(`/detail?id=${courseId}`);
     } else {
       let data = {
         courseId: courseId,
         type: 0 // 正常跳课程详情页type:0,积福气浏览课程详情页-没有浏览过type:1 已浏览过type:2
-      }
+      };
       SendMessageToApp("toCourse", data);
     }
   }

src/components/blessingPreheat/index.js

@@ -259,7 +259,7 @@ class BlessingPreheat extends Component {
     const { userInfo } = this.state;
     if(userInfo.isLogin) {
       if(!getParam('version')) {
-        QRCode.toDataURL('http://m.julyedu.com/invite', {
+        QRCode.toDataURL(`${API.m}/invite`, {
           width: 120,
           height: 120,
           margin: 1
@@ -436,7 +436,12 @@ class BlessingPreheat extends Component {
 
         {/* 精品课程特惠专区 */}
         <ListHeader id={'best-courses'} text="精品课程特惠专区" styles={{margin: '30px 0 15px'}}/>
-        <CourseList isFormal={isFormal} isLogin={userInfo.isLogin} toLogin={this.toLogin}/>
+        <CourseList 
+          isFormal={isFormal} 
+          isLogin={userInfo.isLogin} 
+          history={this.props.history}
+          toLogin={this.toLogin}
+        />
 
         {
           isRule &&
@@ -460,7 +465,7 @@ class BlessingPreheat extends Component {
           className={'invite-popup'}
         >
           <img src={inviteUrl} alt="barcode" className="qr-code"/>
-          <CopyToClipboard text="http://m.julyedu.com/invite" onCopy={this.onCopy}>
+          <CopyToClipboard text={`${API.m}/invite"`} onCopy={this.onCopy}>
             <button>一键复制网址</button>
           </CopyToClipboard>
         </Popup>

src/components/blessingPreheat/sharePopup/index.js

@@ -7,13 +7,13 @@ export default class SharePopup extends Component {
     return (
       <div className="share__container">
         {
-          !browser.isWeixin && 
+          browser.isWeixin && 
           <div className="share__row">
             <img src='https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/throw_icon.png' />
           </div>
         }
         <div className="share__content">
-          <p className="share__text">分享活动页到朋友圈、qq分别</p>
+          <p className="share__text">分享活动页到朋友圈、qq、微博分别</p>
           <div className='share__rule'>
             <img src='https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/add2.png' />
             <span>（每个平台每天一次）</span>