Merge branch '11-11' into dev

src/components/blessingPreheat/live/index.js

@@ -183,7 +183,9 @@ function LiveContent({item, makeSubscribe}) {
         item['on_live']
           ? <button className={'on-living'} onClick={this.toLiveRoom.bind(this, item['live_id'])}>正在直播</button>
           :
-          item['is_subscribe']
+          item['is_end']
+            ? <button className={'subscribed'}>已结束</button>
+            : item['is_subscribe']
             ? <button className={'subscribed'}>已预约</button>
             : <button className={'subscribe'}
                       onClick={makeSubscribe.bind(this, item['live_id'])}>立即预约</button>

src/components/coupons/Coupon/index.js

@@ -17,7 +17,7 @@ class Coupon extends PureComponent {
   pick = (e) => {
     let {useCoupon, invalid, start_amount, id, location, history, code} = this.props
     const {state} = location
-    if(state && state.from && state.from === '/my'){
+    if(state && state.from && state.from === '/my' && typeof start_amount !== 'undefined'){
       history.push(`/expand/index?deposit_code=${code}`)
       return
     }