Merge branch 'V1130_Date' into V1217_Date

@@ -100,6 +100,7 @@ export default class GroupDetailHeader extends React.Component {
         if(!resource){
           return null;
         }
+
         let groupId = resource.groupId;
         let leftTime = resource.leftTime;
         let isNewCustomer = resource.isNewCustomer;
@@ -118,9 +119,8 @@ export default class GroupDetailHeader extends React.Component {
         let buttonText = '';
         let tipTitle = '';
         let tipTitlecolor = '#D0021B';
-        if(diffTime == 0 ){
-          diffTime = parseInt(leftTime);
-        }
+        diffTime = parseInt(leftTime);
+ 
         if(pageGo == 1 || pageGo == 2 || pageGo == 3){
           this.startTimer();
         }else {

@@ -117,7 +117,7 @@ export default function couponReducer(state = initialState, action) {
                 .setIn(['groupDetail', 'error'], action.payload);
         }
         case UPDATE_LEFTTIME: {
-          state.setIn(['groupDetail', 'leftTime'], action.payload);
+          return state.setIn(['groupDetail', 'leftTime'], action.payload);
         }
     }