Authored by 王海元

修改文案 -- review by 孙凯

... ... @@ -29,7 +29,7 @@ export default class Alliance extends Component {
<View style={styles.helpView}>
<Text style={styles.canWithDrawText}>可提现金额</Text>
<TouchableOpacity activeOpacity={1} onPress={() => {
this.props.showHelpDialog && this.props.showHelpDialog('仅计算到当天0点前的可提现的金额,每月15日可以提取当月之前的收益');
this.props.showHelpDialog && this.props.showHelpDialog('仅计算当天0点前产生的有效订单结算后的可提现金额,具体说明请参见规则说明');
}}>
<Image style={styles.helpImage} source={require('../images/help.png')}/>
</TouchableOpacity>
... ... @@ -42,7 +42,7 @@ export default class Alliance extends Component {
<View style={[styles.textView, {paddingRight: 30}]}>
<TouchableOpacity activeOpacity={1} onPress={() => {
NativeModules.YH_CommonHelper.logEvent('YB_SHARE_PROMOTION_WITHDRAW_C', {});
if (this.props.settlementInfo.settlementInfoData || this.props.settlementInfo.settlementInfoData.settlementAmount === 0) {
if (!this.props.settlementInfo.settlementInfoData.settlementAmount || this.props.settlementInfo.settlementInfoData.settlementAmount === 0) {
return
}
if (this.props.settlementInfo.settlementInfoData.canSettlement) {
... ...
... ... @@ -21,7 +21,7 @@ export default class OrderDetail extends Component {
return (
<View>
<View style={styles.header}>
<Text style={[styles.headerText]}>交易成功</Text>
<Text style={[styles.headerText]}>{this.props.orderDetail.orderStatus}</Text>
</View>
<View style={styles.lineView}/>
<View style={styles.content}>
... ...
... ... @@ -16,7 +16,6 @@ export default class WithdrawalRecord extends Component {
}
_renderRow(rowData, sectionID, rowID) {
let status = rowData.get('status') === 2 ? '已提现' : '处理中';
return (
<View>
<View style={styles.rowView}>
... ... @@ -25,7 +24,7 @@ export default class WithdrawalRecord extends Component {
</View>
<View style={[styles.rowView, {height: 20, marginTop: 4, marginBottom: 12}]}>
<Text style={styles.timeText}>{rowData.get("settlementTimeStr")}</Text>
<Text style={styles.statusText}>{status}</Text>
<Text style={styles.statusText}>{rowData.get("settlementStatus")}</Text>
</View>
<View style={styles.lineView}/>
</View>
... ...
... ... @@ -54,8 +54,14 @@ class AllianceContainer extends Component {
this._onEndReached = this._onEndReached.bind(this);
AsyncStorage.getItem(AsyncStorageKey, (error, value) => {
if (error) {
return
}
if (value === null) {
AsyncStorage.setItem(AsyncStorageKey, '1', () => {
AsyncStorage.setItem(AsyncStorageKey, '1', (error) => {
if(error){
return
}
this.setState({
firstFlag: '1',
});
... ...
... ... @@ -30,6 +30,7 @@ let InitialState = Record({
isFetching: true,
error: null,
amountStr: '',
orderStatus: '',
orderCode: '',
orderTimeStr: '',
lastOrderAmountStr: '',
... ...
... ... @@ -124,6 +124,7 @@ export default function couponReducer(state = initialState, action) {
let {
amountStr,
orderCode,
orderStatus,
orderTimeStr,
lastOrderAmountStr,
productList,
... ... @@ -131,6 +132,7 @@ export default function couponReducer(state = initialState, action) {
return state.setIn(['orderDetail', 'isFetching'], false)
.setIn(['orderDetail', 'amountStr'], amountStr)
.setIn(['orderDetail', 'orderCode'], orderCode)
.setIn(['orderDetail', 'orderStatus'], orderStatus)
.setIn(['orderDetail', 'orderTimeStr'], orderTimeStr)
.setIn(['orderDetail', 'lastOrderAmountStr'], lastOrderAmountStr)
.setIn(['orderDetail', 'productList'], Immutable.fromJS(productList))
... ...