mobile / YH_RNComponent · Commits

Go to a project

Authored by hongyong.zhao
Commit ef114c6af0b06043ca3bd50cfbc2ad5bf96a0e04 1 parent efa1f3ea

提交修改

Inline Side-by-side
Showing 15 changed files with 57 additions and 22 deletions
@@ -56,7 +56,7 @@ export default class Data extends Component { @@ -56,7 +56,7 @@ export default class Data extends Component {
56 <View style={styles.amountView}> 56 <View style={styles.amountView}>
57 <View style={styles.textView}> 57 <View style={styles.textView}>
58 <Text 58 <Text
59 - style={styles.amountText}>{this.props.settlementInfo.settlementInfoData.settlementAmount}</Text> 59 + style={styles.amountText}><Text style={{fontSize:30}}>￥</Text>{this.props.settlementInfo.settlementInfoData.settlementAmount}</Text>
60 <View style={styles.reminderView}> 60 <View style={styles.reminderView}>
61 <Image style={styles.reminderImage} source={require('../images/reminder.png')}/> 61 <Image style={styles.reminderImage} source={require('../images/reminder.png')}/>
62 <Text style={styles.reminderText}>每月15日统一打款，节假日顺延</Text> 62 <Text style={styles.reminderText}>每月15日统一打款，节假日顺延</Text>
@@ -87,9 +87,9 @@ export default class Data extends Component { @@ -87,9 +87,9 @@ export default class Data extends Component {
87 this.props.jumpWithUrl && this.props.jumpWithUrl('提现记录', 'withdrawalRecord'); 87 this.props.jumpWithUrl && this.props.jumpWithUrl('提现记录', 'withdrawalRecord');
88 }}> 88 }}>
89 <Text style={styles.hasWithDrawText}>已提现金额</Text> 89 <Text style={styles.hasWithDrawText}>已提现金额</Text>
90 - <View style={[styles.textView, {flexDirection: 'row', paddingRight: 15}]}> 90 + <View style={[styles.textView, {flexDirection: 'row', paddingRight: 15, marginTop: 5}]}>
91 <Text 91 <Text
92 - style={styles.hasWithDrawText}>{this.props.settlementInfo.settlementInfoData.historySettlementAmount}</Text> 92 + style={[styles.hasWithDrawText,{marginTop: -2}]}>￥{this.props.settlementInfo.settlementInfoData.historySettlementAmount}</Text>
93 <Image style={styles.arrowImage} source={require('../images/arrow.png')}/> 93 <Image style={styles.arrowImage} source={require('../images/arrow.png')}/>
94 </View> 94 </View>
95 </TouchableOpacity> 95 </TouchableOpacity>
@@ -110,9 +110,9 @@ export default class Data extends Component { @@ -110,9 +110,9 @@ export default class Data extends Component {
110 renderTabBar={() => <TabStatistics tabNames={tabTitles}/>} 110 renderTabBar={() => <TabStatistics tabNames={tabTitles}/>}
111 onChangeTab={(obj) => {this.props.changeTab && this.props.changeTab(obj.i + 1);}} 111 onChangeTab={(obj) => {this.props.changeTab && this.props.changeTab(obj.i + 1);}}
112 > 112 >
113 - <Statistics statisticsInfo={statisticsInfo}/>  
114 - <Statistics statisticsInfo={statisticsInfo}/>  
115 - <Statistics statisticsInfo={statisticsInfo}/> 113 + <Statistics statisticsInfo={statisticsInfo} jumpWithUrl={this.props.jumpWithUrl}/>
  114 + <Statistics statisticsInfo={statisticsInfo} jumpWithUrl={this.props.jumpWithUrl}/>
  115 + <Statistics statisticsInfo={statisticsInfo} jumpWithUrl={this.props.jumpWithUrl}/>
116 </ScrollableTabView> 116 </ScrollableTabView>
117 </ScrollView> 117 </ScrollView>
118 ); 118 );
@@ -156,7 +156,7 @@ let styles = StyleSheet.create({ @@ -156,7 +156,7 @@ let styles = StyleSheet.create({
156 width: width, 156 width: width,
157 height: 128, 157 height: 128,
158 backgroundColor: '#FFFFFF', 158 backgroundColor: '#FFFFFF',
159 - paddingTop: 28, 159 + paddingTop: 23,
160 paddingLeft: 15, 160 paddingLeft: 15,
161 paddingBottom: 25, 161 paddingBottom: 25,
162 position: 'relative' 162 position: 'relative'
@@ -166,6 +166,8 @@ let styles = StyleSheet.create({ @@ -166,6 +166,8 @@ let styles = StyleSheet.create({
166 fontFamily: 'PingFang-SC-Regular', 166 fontFamily: 'PingFang-SC-Regular',
167 fontSize: 12, 167 fontSize: 12,
168 color: '#B0B0B0', 168 color: '#B0B0B0',
  169 + marginBottom:5,
  170 +
169 }, 171 },
170 amountView: { 172 amountView: {
171 width: width, 173 width: width,
@@ -62,6 +62,12 @@ export default class Mine extends Component { @@ -62,6 +62,12 @@ export default class Mine extends Component {
62 } 62 }
63 63
64 _renderRow(rowData, sectionID, rowID) { 64 _renderRow(rowData, sectionID, rowID) {
  65 + if(!rowData || !rowData.get('data')){
  66 + return null;
  67 + }
  68 + let templatename = rowData.get('template_name');
  69 +
  70 + if (templatename === 'textNav' && rowData) {
65 return ( 71 return (
66 <MineCell 72 <MineCell
67 resource={rowData.get('data')} 73 resource={rowData.get('data')}
@@ -69,6 +75,18 @@ export default class Mine extends Component { @@ -69,6 +75,18 @@ export default class Mine extends Component {
69 styles={styles} 75 styles={styles}
70 /> 76 />
71 ); 77 );
  78 + } else if (templatename === 'newSingleImage' && rowData) {
  79 + console.log('------>mine')
  80 + console.log(rowData.toJS());
  81 + return (
  82 + <SingleImage
  83 + data={rowData.get('data')}
  84 + resourceJumpWithUrl={this.props.resourceJumpWithUrl}
  85 + />)
  86 + } else {
  87 + return null
  88 + }
  89 +
72 } 90 }
73 91
74 render() { 92 render() {
@@ -111,6 +129,8 @@ let styles = StyleSheet.create({ @@ -111,6 +129,8 @@ let styles = StyleSheet.create({
111 width: 50, 129 width: 50,
112 height: 50, 130 height: 50,
113 marginRight:10, 131 marginRight:10,
  132 + overflow: 'hidden',
  133 + borderRadius: 25,
114 }, 134 },
115 textView: { 135 textView: {
116 flexDirection: 'column', 136 flexDirection: 'column',
@@ -27,7 +27,7 @@ export default class OrderDetail extends Component { @@ -27,7 +27,7 @@ export default class OrderDetail extends Component {
27 <View style={styles.lineView}/> 27 <View style={styles.lineView}/>
28 <View style={styles.content}> 28 <View style={styles.content}>
29 <Text style={styles.contentText}>订单编号：{this.props.orderDetail.orderCode}</Text> 29 <Text style={styles.contentText}>订单编号：{this.props.orderDetail.orderCode}</Text>
30 - <Text style={styles.contentText}>下单时间：{this.props.orderDetail.orderTimeStr}</Text> 30 + <Text style={styles.contentText}>下单时间：{this.props.orderDetail.orderTimeStr.replace(/-/g,'.')}</Text>
31 <Text style={styles.contentText}>商品金额：{this.props.orderDetail.lastOrderAmountStr}</Text> 31 <Text style={styles.contentText}>商品金额：{this.props.orderDetail.lastOrderAmountStr}</Text>
32 <View style={{flexDirection: 'row'}}> 32 <View style={{flexDirection: 'row'}}>
33 <Text style={styles.contentText}>佣金金额：</Text> 33 <Text style={styles.contentText}>佣金金额：</Text>
@@ -125,7 +125,7 @@ export default class OrderIncome extends Component { @@ -125,7 +125,7 @@ export default class OrderIncome extends Component {
125 return ( 125 return (
126 <View> 126 <View>
127 <TouchableOpacity activeOpacity={1} onPress={() => { 127 <TouchableOpacity activeOpacity={1} onPress={() => {
128 - this.props.jumpWithUrl && (this.state.orderType === 1 ? this.props.jumpWithUrl('订单详情', 'orderDetail', rowData.get('orderCode')) : this.props.jumpWithUrl('收入详情', 'activityOrderDetail', rowData.get('id')) ); 128 + this.props.jumpWithUrl && (this.state.orderType === 1 ? this.props.jumpWithUrl('订单详情', 'orderDetail', rowData.get('orderCode')) : this.props.jumpWithUrl('佣金详情', 'activityOrderDetail', rowData.get('id')) );
129 }}> 129 }}>
130 <View style={styles.rowView}> 130 <View style={styles.rowView}>
131 <View style={{height: 70, paddingTop: 12, paddingBottom: 12}}> 131 <View style={{height: 70, paddingTop: 12, paddingBottom: 12}}>
@@ -105,6 +105,7 @@ const styles = StyleSheet.create({ @@ -105,6 +105,7 @@ const styles = StyleSheet.create({
105 amount: { 105 amount: {
106 fontSize: 16, 106 fontSize: 16,
107 color: '#444444', 107 color: '#444444',
  108 + fontWeight: 'bold',
108 }, 109 },
109 amountName: { 110 amountName: {
110 fontFamily: 'PingFangSC-Regular', 111 fontFamily: 'PingFangSC-Regular',
@@ -174,7 +174,7 @@ const styles = StyleSheet.create({ @@ -174,7 +174,7 @@ const styles = StyleSheet.create({
174 borderColor: '#5d5d5d' 174 borderColor: '#5d5d5d'
175 }, 175 },
176 infoContainer: { 176 infoContainer: {
177 - height: 97 * DEVICE_WIDTH_RATIO, 177 + height: 102 * DEVICE_WIDTH_RATIO,
178 paddingTop: 15 * DEVICE_WIDTH_RATIO, 178 paddingTop: 15 * DEVICE_WIDTH_RATIO,
179 paddingHorizontal: 15 * DEVICE_WIDTH_RATIO, 179 paddingHorizontal: 15 * DEVICE_WIDTH_RATIO,
180 }, 180 },
@@ -21,32 +21,36 @@ export default class Statistics extends Component { @@ -21,32 +21,36 @@ export default class Statistics extends Component {
21 render() { 21 render() {
22 let {statisticsInfo} = this.props; 22 let {statisticsInfo} = this.props;
23 return ( 23 return (
  24 + <TouchableOpacity activeOpacity={1} style={styles.container} onPress={() => {
  25 + this.props.jumpWithUrl && this.props.jumpWithUrl('全部佣金', 'orderIncome');
  26 + }} >
24 <View style={styles.container}> 27 <View style={styles.container}>
25 <View style={styles.statisticsView}> 28 <View style={styles.statisticsView}>
26 - <View style={{width: width / 2, paddingLeft: 30}}> 29 + <View style={{width: width / 2, paddingLeft: 30, marginTop: -10}}>
27 <Text style={styles.numberText}>¥{statisticsInfo.orderAmountSum}</Text> 30 <Text style={styles.numberText}>¥{statisticsInfo.orderAmountSum}</Text>
28 <Text style={styles.tipsText}>预估订单佣金</Text> 31 <Text style={styles.tipsText}>预估订单佣金</Text>
29 </View> 32 </View>
30 <View style={styles.spaceView}/> 33 <View style={styles.spaceView}/>
31 - <View style={{width: width / 2, paddingLeft: 30}}> 34 + <View style={{width: width / 2, paddingLeft: 30, marginTop: -10}}>
32 <Text style={styles.numberText}>¥{statisticsInfo.extraAmountSum}</Text> 35 <Text style={styles.numberText}>¥{statisticsInfo.extraAmountSum}</Text>
33 <Text style={styles.tipsText}>预估其他佣金</Text> 36 <Text style={styles.tipsText}>预估其他佣金</Text>
34 </View> 37 </View>
35 </View> 38 </View>
36 <View style={styles.lineView}/> 39 <View style={styles.lineView}/>
37 <View style={styles.statisticsView}> 40 <View style={styles.statisticsView}>
38 - <View style={{width: width / 2, paddingLeft: 30}}> 41 + <View style={{width: width / 2, paddingLeft: 30, marginTop: -10}}>
39 <Text style={styles.numberText}>{statisticsInfo.orderNum}</Text> 42 <Text style={styles.numberText}>{statisticsInfo.orderNum}</Text>
40 <Text style={styles.tipsText}>订单数</Text> 43 <Text style={styles.tipsText}>订单数</Text>
41 </View> 44 </View>
42 <View style={styles.spaceView}/> 45 <View style={styles.spaceView}/>
43 - <View style={{width: width / 2, paddingLeft: 30}}> 46 + <View style={{width: width / 2, paddingLeft: 30, marginTop: -10}}>
44 <Text style={styles.numberText}>{statisticsInfo.clickNum}</Text> 47 <Text style={styles.numberText}>{statisticsInfo.clickNum}</Text>
45 <Text style={styles.tipsText}>点击数</Text> 48 <Text style={styles.tipsText}>点击数</Text>
46 </View> 49 </View>
47 </View> 50 </View>
48 <View style={styles.lineView}/> 51 <View style={styles.lineView}/>
49 </View> 52 </View>
  53 + </TouchableOpacity>
50 ); 54 );
51 } 55 }
52 56
@@ -56,7 +56,7 @@ class TalentRank extends Component { @@ -56,7 +56,7 @@ class TalentRank extends Component {
56 </View> 56 </View>
57 <View style={[styles.container, styles.rightContainer]}> 57 <View style={[styles.container, styles.rightContainer]}>
58 <Text style={[styles.amountName, styles.textRight]}>排名</Text> 58 <Text style={[styles.amountName, styles.textRight]}>排名</Text>
59 - <Text style={[styles.amount, styles.textRight, styles.marginTop5]}>{rankNum && rankNum != 0 ? rankNum : '未上榜'}</Text> 59 + <Text style={[styles.amountnoRank, styles.textRight, styles.marginTop5]}>{rankNum && rankNum != 0 ? rankNum : '未上榜'}</Text>
60 </View> 60 </View>
61 </View> 61 </View>
62 <ScrollView ref="scrollView" style={styles.container} 62 <ScrollView ref="scrollView" style={styles.container}
@@ -162,7 +162,7 @@ const styles = StyleSheet.create({ @@ -162,7 +162,7 @@ const styles = StyleSheet.create({
162 lineHeight: 17, 162 lineHeight: 17,
163 }, 163 },
164 amountContainer: { 164 amountContainer: {
165 - marginTop: 5 * DEVICE_WIDTH_RATIO, 165 + marginTop: 10 * DEVICE_WIDTH_RATIO,
166 flexDirection: 'row', 166 flexDirection: 'row',
167 }, 167 },
168 amountUnit: { 168 amountUnit: {
@@ -181,6 +181,14 @@ const styles = StyleSheet.create({ @@ -181,6 +181,14 @@ const styles = StyleSheet.create({
181 includeFontPadding: false, 181 includeFontPadding: false,
182 color: '#000000', 182 color: '#000000',
183 }, 183 },
  184 + amountnoRank: {
  185 + fontSize: 20,
  186 + lineHeight: 24,
  187 + fontWeight: '500',
  188 + textAlignVertical: 'bottom',
  189 + includeFontPadding: false,
  190 + color: '#000000',
  191 + },
184 middleContainer: { 192 middleContainer: {
185 paddingTop: 14 * DEVICE_WIDTH_RATIO, 193 paddingTop: 14 * DEVICE_WIDTH_RATIO,
186 alignItems: 'center', 194 alignItems: 'center',
@@ -114,13 +114,13 @@ let styles = StyleSheet.create({ @@ -114,13 +114,13 @@ let styles = StyleSheet.create({
114 fontSize: 16, 114 fontSize: 16,
115 color: '#000000', 115 color: '#000000',
116 textAlign:'center', 116 textAlign:'center',
117 - marginTop:12, 117 + marginTop:14,
118 }, 118 },
119 bannerSubTitle: { 119 bannerSubTitle: {
120 fontSize:12, 120 fontSize:12,
121 color: '#000000', 121 color: '#000000',
122 textAlign:'center', 122 textAlign:'center',
123 - marginTop:19, 123 + marginTop:8,
124 }, 124 },
125 bannerContext: { 125 bannerContext: {
126 fontSize:9, 126 fontSize:9,
@@ -48,12 +48,12 @@ export default class ImageSingle extends React.Component { @@ -48,12 +48,12 @@ export default class ImageSingle extends React.Component {
48 if (!resource || resource.size === 0) { 48 if (!resource || resource.size === 0) {
49 return null; 49 return null;
50 } 50 }
51 -  
52 - let data = resource.get('data').toJS(); 51 + let data = resource.toJS();
53 let list = data && data.list; 52 let list = data && data.list;
54 if (!list || list.length === 0) { 53 if (!list || list.length === 0) {
55 return null; 54 return null;
56 } 55 }
  56 +
57 let sliderWidth = this.props.style && this.props.style.width ? this.props.style.width : width; 57 let sliderWidth = this.props.style && this.props.style.width ? this.props.style.width : width;
58 let ratio = data.imageWidth / width; 58 let ratio = data.imageWidth / width;
59 let sliderHeight = data.imageHeight / ratio; 59 let sliderHeight = data.imageHeight / ratio;
@@ -53,7 +53,7 @@ export default class ImageTwo extends React.Component { @@ -53,7 +53,7 @@ export default class ImageTwo extends React.Component {
53 if (!list || list.length === 0) { 53 if (!list || list.length === 0) {
54 return null; 54 return null;
55 } 55 }
56 - let sliderWidth = (width - 45) / 2; 56 + let sliderWidth = (width - 40) / 2;
57 let sliderHeight = 120 * DEVICE_WIDTH_RATIO; 57 let sliderHeight = 120 * DEVICE_WIDTH_RATIO;
58 return ( 58 return (
59 <View style={{marginLeft: 15, marginRight: 15, marginBottom: 18, flexDirection: 'row',}}> 59 <View style={{marginLeft: 15, marginRight: 15, marginBottom: 18, flexDirection: 'row',}}>
@@ -64,7 +64,7 @@ export default class ImageTwo extends React.Component { @@ -64,7 +64,7 @@ export default class ImageTwo extends React.Component {
64 key={i} 64 key={i}
65 activeOpacity={1} 65 activeOpacity={1}
66 yh_exposureData={item.yh_exposureData} 66 yh_exposureData={item.yh_exposureData}
67 - style={{width: sliderWidth, height: sliderHeight, marginRight:15}} 67 + style={{width: sliderWidth, height: sliderHeight, marginRight:10}}
68 onPress={() => { 68 onPress={() => {
69 this._handleParamsJumpWithUrl(resource.get('template_id'), resource.get('template_name'), item.url, i + 1); 69 this._handleParamsJumpWithUrl(resource.get('template_id'), resource.get('template_name'), item.url, i + 1);
70 }} 70 }}

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