Merge branch '6.7.0' into 6.6.0-0.54.4

@@ -91,7 +91,7 @@ export default class Alliance extends Component {
                     <View>
                         <View style={styles.orderView}>
                             <Text style={[styles.hasWithDrawText, {fontWeight: 'bold'}]}>最近订单</Text>
-                            <Text style={styles.orderTipsText}>当天订单第二天显示</Text>
+                            <Text style={styles.orderTipsText}>当天订单第2天显示</Text>
                         </View>
                         <View style={styles.titleBottomLine}/>
                         {this.props.recentlyOrder.recentlyOrder_list.toArray().length > 0 ? null :

@@ -66,7 +66,7 @@ export default class BannerSwiper extends React.Component {
 	                    showsButtons={false}
 	                    loop={true}
 	                    autoplay={true}
-	                    autoplayTimeout={2}
+	                    autoplayTimeout={3}
 	                    paginationStyle={{bottom: 8}}
 	                    width={width}
 	                    height={swiperHeight}

@@ -30,7 +30,7 @@ export default class SureModal extends React.Component {
                 <View style={styles.modalContainer}>
                     <View style={styles.modalView}>
                         <View style={styles.confirmTitleContainer}>
-                            <Text style={styles.confirmTitle}>申请提现后不能取消，确定要提现吗？</Text>
+                            <Text style={styles.confirmTitle}>申请后不能取消，确定要提现吗？</Text>
                         </View>
                         <View style={{width: '100%', height: 0.5, backgroundColor: '#e0e0e0'}}/>
                         <View style={styles.confirmBtnContainer}>

@@ -287,7 +287,6 @@ export function getAddSettlement() {
             dispatch(addSettlementRequest());
             return new AllianceService(app.host).fetchAddSettlement(uid)
                 .then(json => {
-                    json.isShow = true;
                     dispatch(addSettlementSuccess(json));
                 })
                 .catch(error => {

@@ -105,7 +105,7 @@ export default function couponReducer(state = initialState, action) {
 
         case ADD_SETTLEMENT_SUCCESS: {
             return state.setIn(['addSettlement', 'isFetching'], true)
-                .set('showWithdrawalDialog', action.payload.isShow)
+                .set('showWithdrawalDialog', true)
                 .setIn(['addSettlement', 'error'], null);
         }