Merge branch '11-11' into dev

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/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({
+      if (bool && !this.popupInstance) {
+        this.popupInstance = Popup({
           title: '收货信息',
           content: <AddressPopup handleToHide={() => this.handleToSwitch(false)}/>
         })
+      } else {
+        this.popupInstance.close()
+        this.popupInstance = null
+      }
     }
   }