pull

src/components/blessingPreheat/collectBlessing/index.js

@@ -231,16 +231,22 @@ class CollectBlessing extends Component {
               <i className="collect-blessing__num">{index+1}</i>
               <p className="collect-blessing__title">{item}</p>
               {
-                index === 0 && (isLogin && isSign) &&
-                <a className="collect-blessing__content" data-status="done">
-                  +5点<br/>福气值
-                </a>
-              }
-              {
-                index === 0 && (!isLogin || !isSign) &&
-                <span onClick={toLogin} className="collect-blessing__content">
-                  点击<br/>签到
-                </span>
+                index === 0 && 
+                <>
+                  {
+                    (isLogin && isSign)
+                    ? (
+                      <a className="collect-blessing__content" data-status="done">
+                        +5点<br/>福气值
+                      </a>
+                    )
+                    : (
+                      <span onClick={toLogin} className="collect-blessing__content">
+                        点击<br/>签到
+                      </span>
+                    )
+                  }
+                </>
               }
               {
                 index === 1 &&
@@ -281,7 +287,9 @@ class CollectBlessing extends Component {
                 index === 4 &&
                 <a className="collect-blessing__content" onClick={handleToShowInvite}>
                   <span>邀请链接</span>
-                  <i>已加{inviteBlessing}点</i>
+                  {
+                    inviteBlessing > 0 && <i>已加{inviteBlessing}点</i>
+                  }
                 </a>
               }
               {
@@ -290,7 +298,9 @@ class CollectBlessing extends Component {
                 className="collect-blessing__content"
                 onClick={toSection}>
                   <span>去选课</span>
-                  <i>已加{buyBlessing}点</i>
+                  {
+                    buyBlessing > 0 && <i>已加{buyBlessing}点</i>
+                  }
                 </a>
               }
             </div>

src/components/blessingPreheat/live/index.js

@@ -115,6 +115,7 @@ class Live extends Component {
               tabBarInactiveTextColor={'#FFF604'}
               tabBarUnderlineStyle={{display: 'none'}}
               initialPage={today}
+              swipeable={false}
             >
               {
                 this.props.isFormal

src/components/detail/index.scss

@@ -60,6 +60,7 @@
         font-size: 14px;
         color: $color_666;
         margin-top: 10px;
+        line-height: 16px;
       }
 
       .des {

src/components/expand/share.js

@@ -164,8 +164,7 @@ class ExpandShare extends Component {
                         step: 2,
                         helpData: data
                     })
-
-                    console.log(data)
+                    this.getListorData()
                 } else if (errno === 17018 || errno === 17020) {
                     this.setState({
                         isShow: true,

src/components/expand/share.scss

@@ -569,6 +569,7 @@
         color: #fff;
         font-size: 15px;
         margin-top: 20px;
+        border: none;
       }
 
     }
@@ -596,6 +597,7 @@
         border-radius: 17px;
         color: #fff;
         font-size: 15px;
+        border: none;
       }
 
     }

src/components/myOrders/index.js

@@ -193,7 +193,7 @@ function PayInfo(props) {
                 </p>
                 <p>
                     <span className='payable'>已优惠：</span>
-                    <span className='price'>¥{props.item.deposit_cut}</span>
+                    <span className='price'>¥{props.item.discount}</span>
                 </p>
             </div>