bug

src/components/detail/group/index.js

@@ -37,7 +37,8 @@ class Group extends Component {
     toPay = (pdd_order_id) => {
         const courseInfo = this.props.courseInfo.courseInfo.course_info;
         if (courseInfo.group_status === 3) {
-            this.props.history.push(`/order?id=${getParam('id')}&&groupon_code=${pdd_order_id}`);
+            this.props.history.push(`/order?id=${getParam('id')}`, {group: 1})
+
         } else {
             this.setState({
                 isShowMore: false,

src/components/myOrders/index.js

@@ -61,7 +61,7 @@ class MyOrders extends Component {
                     }
                     http.post(`${API.home}/m/cancel_order`, data).then((res) => {
                         if (res.data.code === 200) {
-                            this.getList()
+                            location.reload();
                         } else {
                             Toast.info(res.data.msg, 2);
                         }
@@ -139,7 +139,7 @@ function OrderInfo(props) {
     let btn
     if (props.item.pay_time === '0' && props.item.member_num === 0) {
         btn = <span className='oid-status'>等待支付</span>
-    } else if ((props.item.member_num === props.item.pdd_info.length) && props.item.member_num !== 0) {
+    } else if (props.item.pdd_info && (props.item.member_num === props.item.pdd_info.length) && props.item.member_num !== 0) {
         btn = <span className='oid-success'>拼团成功</span>
     } else {
         btn = <span className='oid-success'>支付成功</span>

src/components/myOrders/index.scss

@@ -37,6 +37,12 @@
       background-color: $bg_fff;
       border-bottom: 1px solid $border_e7eaf1;
     }
+    .order-info {
+      .order-des{
+        position: absolute;
+        bottom: 0;
+      }
+    }
 
     .order-btm {
       width: 100%;

src/components/order/payOrder/PayOrder.js

@@ -67,7 +67,7 @@ export default class PayOrder extends Component {
             this.alipayPay(orderId)
         } else if (payType === 1) {
             this.weixinPay(orderId)
-        } 
+        }
         // else { // 花呗分期暂时不做
         //     this.huabeiPay(orderId)
         // }
@@ -154,7 +154,7 @@ export default class PayOrder extends Component {
     // 花呗分期 暂时不做
     huabeiPay = (orderId) => {
         const {singleMoney, periodNumber} = this.state;
- 
+
         console.log('花呗分期支付');
         http.get(`/pay/alipay/wap_charge/oid/${orderId}/plat/{plat} /hb_num/${periodNumber}`).then(res=>{
             console.log(res);
@@ -290,7 +290,7 @@ export default class PayOrder extends Component {
                         </RadioItem>
                     ))}
                 </List>
-                <div className='pay-tip'>请在24小时内完成支付，否则届时系统将关闭该订单。</div>
+                <div className='pay-tip'>请在15分钟内完成支付，否则届时系统将关闭该订单。</div>
 
                 <div className='pay-button' onClick={this.pay}>确认支付</div>
 

src/components/search/recommendation/index.js

@@ -43,13 +43,14 @@ class Recommendation extends Component {
                         courses.map((item, index) => {
                             const Bottom = (
                                 <div className='bottom'>
-                                    <span className='price'>{item['price1']}</span>
-                                    <span className='old-price'>{item['price0']}</span>
+                                    <span className='price'>¥{item['price1']}</span>
+                                    <span className='old-price'>¥{item['price0']}</span>
 
                                 </div>
                             )
                             return (
                                 <Course
+                                    className={'text-overflow-2'}
                                     key={item['course_id']}
                                     id={item['course_id']}
                                     img={item['image_name']}