Authored by 张丽霞

页面UI调整, review by redding

... ... @@ -268,7 +268,7 @@ let styles = StyleSheet.create({
},
separator: {
width: width,
height: 1.5,
height: 0.5,
backgroundColor: '#e5e5e5',
},
});
... ...
... ... @@ -35,8 +35,8 @@ export default class TimeForLostFocus extends Component {
return (
<View style={styles.rowContainer}>
<Text style={[colorStyle, {fontSize: 13}]}>{time}</Text>
<Text style={[colorStyle, {fontSize: 10}]}>{text}</Text>
<Text style={[colorStyle, {fontSize: 13, marginTop:15}]}>{time}</Text>
<Text style={[colorStyle, {fontSize: 10, marginTop:1}]}>{text}</Text>
</View>
);
}
... ... @@ -50,7 +50,6 @@ let styles = StyleSheet.create({
rowContainer: {
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
width: rowContainerWidth,
height: backgroundHeight,
backgroundColor:'white',
... ...
... ... @@ -29,10 +29,10 @@ export default class TimeForNow extends Component {
return (
<View style={styles.rowContainerFocus}>
<Text style={[colorStyle,{fontSize: 13}]}>{time} 抢购中</Text>
{tickTimeOut ? null :
<Text style={[colorStyle,{fontSize: 13, marginTop:16}]}>{time} 抢购中</Text>
{tickTimeOut ? null :
<View style={styles.tickTimeContainer}>
<Text style={colorStyle}>剩余:</Text>
<Text style={[colorStyle,{fontSize: 10}]}>剩余:</Text>
<TimeNumber text={tickHour} />
<TimeNumber text={tickMinute} />
<TimeNumber text={tickSecond} />
... ... @@ -50,12 +50,14 @@ let styles = StyleSheet.create({
rowContainerFocus: {
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
width: rowContainerFocusWidth,
height: backgroundHeight,
backgroundColor:'white',
},
tickTimeContainer: {
alignItems: 'center',
justifyContent: 'center',
flexDirection: 'row',
},
});
... ...
... ... @@ -29,8 +29,8 @@ export default class TimeForWait extends Component {
return (
<View style={styles.rowContainerFocus}>
<Text style={[colorStyle,{fontSize: 13}]}>{time} 即将开抢</Text>
{tickTimeOut ? null :
<Text style={[colorStyle,{fontSize: 13, marginTop:16}]}>{time} 即将开抢</Text>
{tickTimeOut ? null :
<View style={styles.tickTimeContainer}>
<Text style={[colorStyle, {fontSize: 10}]}>距开抢:</Text>
<TimeNumber text={tickHour} />
... ... @@ -50,12 +50,13 @@ let styles = StyleSheet.create({
rowContainerFocus: {
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
width: rowContainerFocusWidth,
height: backgroundHeight,
backgroundColor:'white',
},
tickTimeContainer: {
alignItems: 'center',
justifyContent: 'center',
flexDirection: 'row',
},
});
... ...
... ... @@ -24,6 +24,7 @@ export default class SeckillTimeListView extends Component {
this._renderSeparator = this._renderSeparator.bind(this);
this._scrollToFocusActivity = this._scrollToFocusActivity.bind(this);
this._caculateTimerState = this._caculateTimerState.bind(this);
this._searchRightNowStartActivity = this._searchRightNowStartActivity.bind(this);
this.dataSource = new ListView.DataSource({
rowHasChanged: (r1, r2) => r1.key != r2.key,
... ... @@ -47,6 +48,21 @@ export default class SeckillTimeListView extends Component {
this.listView && this.listView.scrollTo({x: scrollX, y: 0, animated: true});
}
}
_searchRightNowStartActivity() {
this.secKillProductVoList.forEach((activityItem, i) => {
if (activityItem.has('wait')) {
let nowTime = Date.parse(new Date()) / 1000 + diffTime;
let startTime = activityItem.get('startTime')/1000;
let offsetTime = startTime - nowTime;
if (offsetTime < 0) {
activityItem.focus = true;
this.curFocusActivity= activityItem;
this._scrollToFocusActivity();
this.props.onFocusToCurStartedActivity && this.props.onFocusToCurStartedActivity(activityItem);
}
}
});
}
_caculateTimerState() {
if (this.curFocusActivity.get('index') == this.secKillProductVoList.length - 1 && this.curFocusActivity.has('now')) {
... ... @@ -60,6 +76,7 @@ export default class SeckillTimeListView extends Component {
this.props.onRefresh && this.props.onRefresh();
}
} else {
let nextActivity = this.secKillProductVoList[this.curFocusActivity.get('index') + 1];
let nowTime = Date.parse(new Date()) / 1000 + diffTime;
let time = this.curFocusActivity.has('now') ? nextActivity.get('startTime')/1000: this.curFocusActivity.get('startTime') / 1000;
... ... @@ -106,6 +123,7 @@ export default class SeckillTimeListView extends Component {
return;
}
this._caculateTimerState();
this._searchRightNowStartActivity();
}.bind(this), 1000);
... ...