fix conflict

@@ -198,6 +198,7 @@ class GroupService extends global.yoho.BaseModel {
             ...params
         };
 
+
         const result = await this.api._getPromoteList(newParams);
         let finalResult = {};
 
@@ -305,14 +306,12 @@ class GroupService extends global.yoho.BaseModel {
                 reasons.forEach(reason => {
                     if (item.refund_status === reason.id) {
                         item.refund_status_str = reason.reason;
-                        console.log(reason.reason);
                     }
                 });
                 return item;
             });
 
             result.reasons = reasons;
-            console.log(result);
             return result;
         } catch (error) {
             throw new Error('Group order fail to load resources.');

@@ -99,7 +99,6 @@ $('#group-order').on('click', function(e) {
     $order = $cur.closest('.group-order-list-cell');
     id = $order.data('id');
     selectIndex = $order.data('selectIndex');
-    console.log(selectIndex);
 
     // $reaMask.data('orderId', id);
     // $refundReaMask.data('orderId', id);