Merge branch '00-formal'

src/components/activity/newyear-2019/preheat/YearCourse/index.scss

@@ -196,6 +196,7 @@
         display: flex;
 
         .to-group {
+          font-size: 12px;
 
           &:nth-child(1) {
             margin-right: 2px;

src/components/activity/newyear-2019/year-wish/index.scss

@@ -207,6 +207,7 @@ html, body, #root {
         display: flex;
 
         .to-group {
+          font-size: 12px;
 
           &:nth-child(1) {
             margin-right: 2px;

src/components/detail/group/togroup.js

@@ -248,30 +248,26 @@ function GorupContent(props) {
     </div>);
 
     if (groupon_member && groupon_member.length > 0) {
-        let flag = true;
+        let flag = false;
         !userInfo.hasError && groupon_member.map(item => {
             if (item.uid == userInfo.data.uid) {
                 flag = true
                 return;
-            } else {
-                flag = false;
-                return;
             }
         })
-
         if (flag) {
             tip = <p className='tip'>{`拼团省￥${data.price1 - pdd_price}元`}</p>
             btn = <span className='group-btn' onClick={props.invitedFriends}>邀请好友参团 {countdown} 后结束</span>
             dec = <p className='dec'>分享到3个群后，成团率高达98%</p>
         } else {
-            if(getParam('getParam') == 1){
+            if(getParam('is_originator') == 1){
                 tip = <p className='tip'>{`拼团省￥${data.price1 - pdd_price}元`}</p>
                 btn = <a href="javascript:;" className='group-btn' onClick={props.handleToGroup}>一键参团</a>
             } else {
                 tip = <p className='tip'>{`拼团省￥${data.price1 - pdd_price}元`}</p>
                 btn = <span className='group-btn' onClick={props.invitedFriends}>邀请好友参团 {countdown} 后结束</span>
                 dec = <p className='dec'>分享到3个群后，成团率高达98%</p>
-          }
+            }
         }
     }