pull and solve

src/common/closable-popup/index.js

@@ -45,6 +45,10 @@ function ClosablePopup({
 
 
   ReactDOM.render(closablePopup, div)
+
+  return {
+    close: _close
+  }
 }
 
 export default ClosablePopup

src/components/blessingPreheat/courseList/index.js

@@ -245,7 +245,6 @@ class CourseList extends Component {
   toReceiveCoupon(id, key = '') {
     const {isLogin, toLogin} = this.props;
 
-    alert(cookie.get("uid"))
 
     if(isLogin) {
       http.post(`${API.home}/sys/activity/coupon/receive`, {
@@ -734,4 +733,4 @@ class CourseList extends Component {
   }
 }
 
-export default ListFrame(CourseList);
\ No newline at end of file
+export default ListFrame(CourseList);

src/components/blessingPreheat/index.js

@@ -112,15 +112,22 @@ class BlessingPreheat extends Component {
         const {code} = res.data
         if (code === 200) {
           Toast.info('+2点福气值~', 2, null, false)
+          this.fetchUserBlessing()
         }
       })
-      this.fetchUserBlessing()
     }
     window['QQWXWBshare'] = result => {
-      if (result != 0) {
-        this.handleToAddBlessing(result)
-      }
-      this.fetchUserBlessing()
+      // this.handleToAddBlessing(result)
+      http.post(`${API.home}/sys/add/blessing`, {
+        share_platform: result, // 1 朋友圈 2 微博 3 qq
+        type: 3 // 1：签到；3：分享；4：浏览课程；
+      }).then(res => {
+        const {code} = res.data
+        if (code === 200) {
+          Toast.info('+2点福气值~', 2, null, false)
+          this.fetchUserBlessing()
+        }
+      })
     }
 
   }
@@ -142,7 +149,6 @@ class BlessingPreheat extends Component {
   appLogin = () => {
     let expires = addDays(new Date(), 90)
     this.state.userInfoList.map((item, index) => {
-      Toast.info(item.uid)
       cookie.set("token", item.token, {expires, path: '/', domain: '.julyedu.com'})
       cookie.set("plat", item.plat, {expires, path: '/', domain: '.julyedu.com'})
       cookie.set("uid", item.uid, {expires, path: '/', domain: '.julyedu.com'})
@@ -193,13 +199,13 @@ class BlessingPreheat extends Component {
         }
       }
     }
-     
-}
 
-    fetchMoudleId = (str) => {
-        const {navs} = this.state
-        return findIndex(navs, item => item.id === str)
-    }
+  }
+
+  fetchMoudleId = (str) => {
+    const {navs} = this.state
+    return findIndex(navs, item => item.id === str)
+  }
 
 
   setInitialNavActiveStatus = () => {
@@ -240,13 +246,12 @@ class BlessingPreheat extends Component {
           isSign: !!data.today_signed,
           isFormal: data.is_activity,
           userInfo: Object.assign({}, userInfo, {
-            isFollow: data.subscribed, 
+            isFollow: data.subscribed,
             blessingVal: data.user_blessing_value,
             buyBlessing: (data.types_total_blessing_value && data.types_total_blessing_value.buy_course) ? data.types_total_blessing_value.buy_course : 0,
             inviteBlessing: (data.types_total_blessing_value && data.types_total_blessing_value.invite) ? data.types_total_blessing_value.invite : 0,
           })
         })
-        alert(cookie.get('uid'))
         if (data.is_login === 1) {
           this.handleToSign()
         }
@@ -270,6 +275,7 @@ class BlessingPreheat extends Component {
 
 
   handleToSign = () => {
+    const { userInfo } = this.state;
     http.post(`${API.home}/sys/add/blessing`, {
       type: 1 // 1：签到；3：分享；4：浏览课程；
     }).then(res => {
@@ -277,7 +283,11 @@ class BlessingPreheat extends Component {
       if (code === 200) {
         this.setState({
           isSign: true,
-        })
+          userInfo: Object.assign({}, userInfo, {
+            blessingVal: userInfo.blessingVal + 5
+          })
+        });
+
         Toast.info('+5点福气值~', 2, null, false)
       }
     })

src/components/blessingPreheat/live/index.js

@@ -131,7 +131,7 @@ class Live extends Component {
                       <div key={index}>
                         {
                           preheatLives.map((item, index) => {
-                            return <LiveContent key={index} item={item} makeSubscribe={this.makeSubscribe}/>
+                            return <LiveContent key={index} item={item} makeSubscribe={this.makeSubscribe} toLiveRoom={this.toLiveRoom}/>
                           })
                         }
                       </div>
@@ -147,7 +147,7 @@ class Live extends Component {
   }
 }
 
-function LiveContent({item, makeSubscribe}) {
+function LiveContent({item, makeSubscribe, toLiveRoom}) {
   return (
     <div className="content">
       {
@@ -181,7 +181,7 @@ function LiveContent({item, makeSubscribe}) {
       </div>
       {
         item['on_live']
-          ? <button className={'on-living'} onClick={this.toLiveRoom.bind(this, item['live_id'])}>正在直播</button>
+          ? <button className={'on-living'} onClick={() => {toLiveRoom(item['live_id'])}}>正在直播</button>
           :
           item['is_end']
             ? <button className={'subscribed'}>已结束</button>

src/components/blessingRank/index.js

@@ -11,6 +11,7 @@ import './index.scss'
   }
 ))
 class BlessingRank extends Component {
+  popupInstance = null
   constructor(props) {
     super(props)
     this.state = {
@@ -44,10 +45,15 @@ class BlessingRank extends Component {
     if (bool && !uid) {
       history.push('/passport')
     } else {
-      Popup({
-        title: '收货信息',
-        content: <AddressPopup handleToHide={() => this.handleToSwitch(false)}/>
-      })
+      if (bool && !this.popupInstance) {
+        this.popupInstance = Popup({
+          title: '收货信息',
+          content: <AddressPopup handleToHide={() => this.handleToSwitch(false)}/>
+        })
+      } else {
+        this.popupInstance.close()
+        this.popupInstance = null
+      }
     }
   }