Merge branch '00-formal' into pre

src/components/detail/group/togroup.js

@@ -35,7 +35,7 @@ class ToGroup extends Component {
             wxShare({
                 title: `【仅剩${number}个名额】我${pdd_price}元拼了《${data.course_title}》`,
                 desc: data.course_title,
-                link: location.href,
+                link: location.href+'&is_originator=1',
                 imgUrl: data.image_name,
             });
 
@@ -248,10 +248,14 @@ function GorupContent(props) {
     </div>);
 
     if (groupon_member && groupon_member.length > 0) {
-        let flag = false;
+        let flag = true;
         !userInfo.hasError && groupon_member.map(item => {
             if (item.uid == userInfo.data.uid) {
                 flag = true
+                return;
+            } else {
+                flag = false;
+                return;
             }
         })
 
@@ -260,15 +264,14 @@ function GorupContent(props) {
             btn = <span className='group-btn' onClick={props.invitedFriends}>邀请好友参团 {countdown} 后结束</span>
             dec = <p className='dec'>分享到3个群后，成团率高达98%</p>
         } else {
+            if(getParam('getParam') == 1){
                 tip = <p className='tip'>{`拼团省￥${data.price1 - pdd_price}元`}</p>
-            // btn = <Link to={{
-            //     pathname: '/order',
-            //     search: `?id=${data.course_id}`,
-            //     state: {
-            //         group: 1
-            //     }
-            // }} className='group-btn'>一键参团</Link>
                 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>
+          }
         }
     }