Merge branch '11-11' of gitlab.julyedu.com:baiguangyao/mr-julyedu into 11-11

src/components/blessingPreheat/collectBlessing/index.js

@@ -287,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>
               }
               {
@@ -296,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/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>