mobile / YH_RNComponent · Commits

Go to a project

Authored by hongyong.zhao
Commit ef114c6af0b06043ca3bd50cfbc2ad5bf96a0e04 1 parent efa1f3ea master ... 6.8.7_message 6.9.5_msg 6.9.9_invite V0125_Date V1115_Date V1130_Date V1217_Date V1230_Date V6.10.1 V6.10.2 V6.7.9_dev V6.8.6 V6.8.7 V6.8.7_upgrades V6.8.9 V6.9.1 V6.9.2 V6.9.3 V6.9.5 V6.9.6 V6.9.6_Alliance V6.9.7 V6.9.8 V6.9.8_shoudan V6.9.9 V9.30_Date exception feature/rn_update61 gerry/v6.9.14_panicBuying gerry/v6.9.16_bugfixed v6.10.0 v6.9.10 v6.9.11 v6.9.12 v6.9.13 v6.9.14 v6.9.16 v6.9.17 v6.9.19 v6.9.20 v6.9.21 v6.9.22 v6.9.24 6.9.8 6.9.7 6.9.6 6.9.4 6.9.2 6.9.1 6.8.9 6.8.8 6.8.4 6.8.3 6.8.2 6.7.9 6.7.8 6.7.7 v6.7.5 V6.8.6 V6.8.5 V6.8.1

提交修改

Inline Side-by-side
Showing 15 changed files with 67 additions and 32 deletions
... ... @@ -56,7 +56,7 @@ export default class Data extends Component {
<View style={styles.amountView}>
<View style={styles.textView}>
<Text
style={styles.amountText}>{this.props.settlementInfo.settlementInfoData.settlementAmount}</Text>
style={styles.amountText}><Text style={{fontSize:30}}>￥</Text>{this.props.settlementInfo.settlementInfoData.settlementAmount}</Text>
<View style={styles.reminderView}>
<Image style={styles.reminderImage} source={require('../images/reminder.png')}/>
<Text style={styles.reminderText}>每月15日统一打款，节假日顺延</Text>
... ... @@ -87,9 +87,9 @@ export default class Data extends Component {
this.props.jumpWithUrl && this.props.jumpWithUrl('提现记录', 'withdrawalRecord');
}}>
<Text style={styles.hasWithDrawText}>已提现金额</Text>
<View style={[styles.textView, {flexDirection: 'row', paddingRight: 15}]}>
<View style={[styles.textView, {flexDirection: 'row', paddingRight: 15, marginTop: 5}]}>
<Text
style={styles.hasWithDrawText}>{this.props.settlementInfo.settlementInfoData.historySettlementAmount}</Text>
style={[styles.hasWithDrawText,{marginTop: -2}]}>￥{this.props.settlementInfo.settlementInfoData.historySettlementAmount}</Text>
<Image style={styles.arrowImage} source={require('../images/arrow.png')}/>
</View>
</TouchableOpacity>
... ... @@ -110,9 +110,9 @@ export default class Data extends Component {
renderTabBar={() => <TabStatistics tabNames={tabTitles}/>}
onChangeTab={(obj) => {this.props.changeTab && this.props.changeTab(obj.i + 1);}}
>
<Statistics statisticsInfo={statisticsInfo}/>
<Statistics statisticsInfo={statisticsInfo}/>
<Statistics statisticsInfo={statisticsInfo}/>
<Statistics statisticsInfo={statisticsInfo} jumpWithUrl={this.props.jumpWithUrl}/>
<Statistics statisticsInfo={statisticsInfo} jumpWithUrl={this.props.jumpWithUrl}/>
<Statistics statisticsInfo={statisticsInfo} jumpWithUrl={this.props.jumpWithUrl}/>
</ScrollableTabView>
</ScrollView>
);
... ... @@ -156,7 +156,7 @@ let styles = StyleSheet.create({
width: width,
height: 128,
backgroundColor: '#FFFFFF',
paddingTop: 28,
paddingTop: 23,
paddingLeft: 15,
paddingBottom: 25,
position: 'relative'
... ... @@ -166,6 +166,8 @@ let styles = StyleSheet.create({
fontFamily: 'PingFang-SC-Regular',
fontSize: 12,
color: '#B0B0B0',
marginBottom:5,
},
amountView: {
width: width,
... ...
... ... @@ -62,13 +62,31 @@ export default class Mine extends Component {
}
_renderRow(rowData, sectionID, rowID) {
return (
<MineCell
resource={rowData.get('data')}
resourceJumpWithUrl={this.props.resourceJumpWithUrl}
styles={styles}
/>
);
if(!rowData || !rowData.get('data')){
return null;
}
let templatename = rowData.get('template_name');
if (templatename === 'textNav' && rowData) {
return (
<MineCell
resource={rowData.get('data')}
resourceJumpWithUrl={this.props.resourceJumpWithUrl}
styles={styles}
/>
);
} else if (templatename === 'newSingleImage' && rowData) {
console.log('------>mine')
console.log(rowData.toJS());
return (
<SingleImage
data={rowData.get('data')}
resourceJumpWithUrl={this.props.resourceJumpWithUrl}
/>)
} else {
return null
}
}
render() {
... ... @@ -111,6 +129,8 @@ let styles = StyleSheet.create({
width: 50,
height: 50,
marginRight:10,
overflow: 'hidden',
borderRadius: 25,
},
textView: {
flexDirection: 'column',
... ...
... ... @@ -27,7 +27,7 @@ export default class OrderDetail extends Component {
<View style={styles.lineView}/>
<View style={styles.content}>
<Text style={styles.contentText}>订单编号：{this.props.orderDetail.orderCode}</Text>
<Text style={styles.contentText}>下单时间：{this.props.orderDetail.orderTimeStr}</Text>
<Text style={styles.contentText}>下单时间：{this.props.orderDetail.orderTimeStr.replace(/-/g,'.')}</Text>
<Text style={styles.contentText}>商品金额：{this.props.orderDetail.lastOrderAmountStr}</Text>
<View style={{flexDirection: 'row'}}>
<Text style={styles.contentText}>佣金金额：</Text>
... ...
... ... @@ -125,7 +125,7 @@ export default class OrderIncome extends Component {
return (
<View>
<TouchableOpacity activeOpacity={1} onPress={() => {
this.props.jumpWithUrl && (this.state.orderType === 1 ? this.props.jumpWithUrl('订单详情', 'orderDetail', rowData.get('orderCode')) : this.props.jumpWithUrl('收入详情', 'activityOrderDetail', rowData.get('id')) );
this.props.jumpWithUrl && (this.state.orderType === 1 ? this.props.jumpWithUrl('订单详情', 'orderDetail', rowData.get('orderCode')) : this.props.jumpWithUrl('佣金详情', 'activityOrderDetail', rowData.get('id')) );
}}>
<View style={styles.rowView}>
<View style={{height: 70, paddingTop: 12, paddingBottom: 12}}>
... ...
... ... @@ -105,6 +105,7 @@ const styles = StyleSheet.create({
amount: {
fontSize: 16,
color: '#444444',
fontWeight: 'bold',
},
amountName: {
fontFamily: 'PingFangSC-Regular',
... ...
... ... @@ -174,7 +174,7 @@ const styles = StyleSheet.create({
borderColor: '#5d5d5d'
},
infoContainer: {
height: 97 * DEVICE_WIDTH_RATIO,
height: 102 * DEVICE_WIDTH_RATIO,
paddingTop: 15 * DEVICE_WIDTH_RATIO,
paddingHorizontal: 15 * DEVICE_WIDTH_RATIO,
},
... ...
... ... @@ -21,32 +21,36 @@ export default class Statistics extends Component {
render() {
let {statisticsInfo} = this.props;
return (
<TouchableOpacity activeOpacity={1} style={styles.container} onPress={() => {
this.props.jumpWithUrl && this.props.jumpWithUrl('全部佣金', 'orderIncome');
}} >
<View style={styles.container}>
<View style={styles.statisticsView}>
<View style={{width: width / 2, paddingLeft: 30}}>
<View style={{width: width / 2, paddingLeft: 30, marginTop: -10}}>
<Text style={styles.numberText}>¥{statisticsInfo.orderAmountSum}</Text>
<Text style={styles.tipsText}>预估订单佣金</Text>
</View>
<View style={styles.spaceView}/>
<View style={{width: width / 2, paddingLeft: 30}}>
<View style={{width: width / 2, paddingLeft: 30, marginTop: -10}}>
<Text style={styles.numberText}>¥{statisticsInfo.extraAmountSum}</Text>
<Text style={styles.tipsText}>预估其他佣金</Text>
</View>
</View>
<View style={styles.lineView}/>
<View style={styles.statisticsView}>
<View style={{width: width / 2, paddingLeft: 30}}>
<View style={{width: width / 2, paddingLeft: 30, marginTop: -10}}>
<Text style={styles.numberText}>{statisticsInfo.orderNum}</Text>
<Text style={styles.tipsText}>订单数</Text>
</View>
<View style={styles.spaceView}/>
<View style={{width: width / 2, paddingLeft: 30}}>
<View style={{width: width / 2, paddingLeft: 30, marginTop: -10}}>
<Text style={styles.numberText}>{statisticsInfo.clickNum}</Text>
<Text style={styles.tipsText}>点击数</Text>
</View>
</View>
<View style={styles.lineView}/>
</View>
</TouchableOpacity>
);
}
... ...
... ... @@ -56,7 +56,7 @@ class TalentRank extends Component {
</View>
<View style={[styles.container, styles.rightContainer]}>
<Text style={[styles.amountName, styles.textRight]}>排名</Text>
<Text style={[styles.amount, styles.textRight, styles.marginTop5]}>{rankNum && rankNum != 0 ? rankNum : '未上榜'}</Text>
<Text style={[styles.amountnoRank, styles.textRight, styles.marginTop5]}>{rankNum && rankNum != 0 ? rankNum : '未上榜'}</Text>
</View>
</View>
<ScrollView ref="scrollView" style={styles.container}
... ... @@ -162,7 +162,7 @@ const styles = StyleSheet.create({
lineHeight: 17,
},
amountContainer: {
marginTop: 5 * DEVICE_WIDTH_RATIO,
marginTop: 10 * DEVICE_WIDTH_RATIO,
flexDirection: 'row',
},
amountUnit: {
... ... @@ -181,6 +181,14 @@ const styles = StyleSheet.create({
includeFontPadding: false,
color: '#000000',
},
amountnoRank: {
fontSize: 20,
lineHeight: 24,
fontWeight: '500',
textAlignVertical: 'bottom',
includeFontPadding: false,
color: '#000000',
},
middleContainer: {
paddingTop: 14 * DEVICE_WIDTH_RATIO,
alignItems: 'center',
... ...
... ... @@ -114,13 +114,13 @@ let styles = StyleSheet.create({
fontSize: 16,
color: '#000000',
textAlign:'center',
marginTop:12,
marginTop:14,
},
bannerSubTitle: {
fontSize:12,
color: '#000000',
textAlign:'center',
marginTop:19,
marginTop:8,
},
bannerContext: {
fontSize:9,
... ...
... ... @@ -48,12 +48,12 @@ export default class ImageSingle extends React.Component {
if (!resource || resource.size === 0) {
return null;
}
let data = resource.toJS();
let list = data && data.list;
if (!list || list.length === 0) {
return null;
}
let data = resource.get('data').toJS();
let list = data && data.list;
if (!list || list.length === 0) {
return null;
}
let sliderWidth = this.props.style && this.props.style.width ? this.props.style.width : width;
let ratio = data.imageWidth / width;
let sliderHeight = data.imageHeight / ratio;
... ...
... ... @@ -53,7 +53,7 @@ export default class ImageTwo extends React.Component {
if (!list || list.length === 0) {
return null;
}
let sliderWidth = (width - 45) / 2;
let sliderWidth = (width - 40) / 2;
let sliderHeight = 120 * DEVICE_WIDTH_RATIO;
return (
<View style={{marginLeft: 15, marginRight: 15, marginBottom: 18, flexDirection: 'row',}}>
... ... @@ -64,7 +64,7 @@ export default class ImageTwo extends React.Component {
key={i}
activeOpacity={1}
yh_exposureData={item.yh_exposureData}
style={{width: sliderWidth, height: sliderHeight, marginRight:15}}
style={{width: sliderWidth, height: sliderHeight, marginRight:10}}
onPress={() => {
this._handleParamsJumpWithUrl(resource.get('template_id'), resource.get('template_name'), item.url, i + 1);
}}
... ...

1.9 KB | W: | H:

2.06 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.85 KB | W: | H:

2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.75 KB | W: | H:

2.94 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin