Authored by 张文文

佣金订单数链接修改&邀请人名称缩短和省略

@@ -25,7 +25,7 @@ export default class InvitedFriends extends Component { @@ -25,7 +25,7 @@ export default class InvitedFriends extends Component {
25 <View style={styles.rowView}> 25 <View style={styles.rowView}>
26 26
27 <View style={styles.rowItemStyle}> 27 <View style={styles.rowItemStyle}>
28 - <Text style={styles.rowTextStyle}>{rowData.get("name")}</Text> 28 + <Text style={styles.nameItemStyle} numberOfLines={1}>{rowData.get("name")}</Text>
29 </View> 29 </View>
30 30
31 <View style={styles.rowItemStyle}> 31 <View style={styles.rowItemStyle}>
@@ -161,6 +161,13 @@ const styles = StyleSheet.create({ @@ -161,6 +161,13 @@ const styles = StyleSheet.create({
161 alignItems: 'center', 161 alignItems: 'center',
162 paddingVertical: 15, 162 paddingVertical: 15,
163 }, 163 },
  164 + nameItemStyle: {
  165 + width: width/4-25,
  166 + fontFamily: 'PingFang-SC-Regular',
  167 + fontSize: 11,
  168 + color: '#444444',
  169 + textAlign: 'center',
  170 + },
164 rowTextStyle: { 171 rowTextStyle: {
165 fontFamily: 'PingFang-SC-Regular', 172 fontFamily: 'PingFang-SC-Regular',
166 fontSize: 11, 173 fontSize: 11,
@@ -46,7 +46,7 @@ export default class Mine extends Component { @@ -46,7 +46,7 @@ export default class Mine extends Component {
46 let fansShow = this.props.shareTotalInfo.shareTotalInfoData.showFans; 46 let fansShow = this.props.shareTotalInfo.shareTotalInfoData.showFans;
47 let fansShowStyle = fansShow ? {width: width, height: 50, backgroundColor: '#FFFFFF', flexDirection: 'row', 47 let fansShowStyle = fansShow ? {width: width, height: 50, backgroundColor: '#FFFFFF', flexDirection: 'row',
48 paddingLeft: 15, alignItems: 'center', justifyContent: 'space-between'} : {height: 0, width: 0}; 48 paddingLeft: 15, alignItems: 'center', justifyContent: 'space-between'} : {height: 0, width: 0};
49 - let spaceShowStyle = fansShow ? {height: 10, backgroundColor: '#f0f0f0'} : {height: 0}; 49 + let lineShowStyle = fansShow ? {height: 1.0, backgroundColor: '#f0f0f0'} : {height: 0};
50 50
51 //邀请好友数空值判断 51 //邀请好友数空值判断
52 let invitesAmount = this.props.shareTotalInfo.shareTotalInfoData.inviteNum; 52 let invitesAmount = this.props.shareTotalInfo.shareTotalInfoData.inviteNum;
@@ -82,7 +82,7 @@ export default class Mine extends Component { @@ -82,7 +82,7 @@ export default class Mine extends Component {
82 </View> 82 </View>
83 </TouchableOpacity> 83 </TouchableOpacity>
84 84
85 - <View style={spaceShowStyle}/> 85 + <View style={lineShowStyle}/>
86 86
87 <TouchableOpacity activeOpacity={1} style={fansShowStyle} onPress={() => { 87 <TouchableOpacity activeOpacity={1} style={fansShowStyle} onPress={() => {
88 88
@@ -110,16 +110,15 @@ export default class Mine extends Component { @@ -110,16 +110,15 @@ export default class Mine extends Component {
110 <MineCell 110 <MineCell
111 resource={rowData.get('data')} 111 resource={rowData.get('data')}
112 resourceJumpWithUrl={this.props.resourceJumpWithUrl} 112 resourceJumpWithUrl={this.props.resourceJumpWithUrl}
113 - styles={styles}  
114 - /> 113 + styles={styles} />
115 ); 114 );
116 } else if (templatename === 'newSingleImage' && rowData) { 115 } else if (templatename === 'newSingleImage' && rowData) {
117 console.log(rowData.toJS()); 116 console.log(rowData.toJS());
118 return ( 117 return (
119 <SingleImage 118 <SingleImage
120 data={rowData} 119 data={rowData}
121 - resourceJumpWithUrl={this.props.resourceJumpWithUrl}  
122 - />) 120 + resourceJumpWithUrl={this.props.resourceJumpWithUrl} />
  121 + )
123 } else { 122 } else {
124 return null 123 return null
125 } 124 }
@@ -53,29 +53,43 @@ export default class Statistics extends Component { @@ -53,29 +53,43 @@ export default class Statistics extends Component {
53 </TouchableOpacity> 53 </TouchableOpacity>
54 54
55 </View> 55 </View>
  56 +
56 <View style={styles.lineView}/> 57 <View style={styles.lineView}/>
57 58
  59 +
  60 + <View style={styles.statisticsView}>
  61 +
  62 +
58 <TouchableOpacity activeOpacity={1} style={styles.container} onPress={() => { 63 <TouchableOpacity activeOpacity={1} style={styles.container} onPress={() => {
59 - let url = `http://m.yohobuy.com?openby:yohobuy={"action":"go.minealliance","params":{"title":"全部佣金","type":"orderIncome"}}`; 64 + let url = `http://m.yohobuy.com?openby:yohobuy={"action":"go.minealliance","params":{"title":"预估佣金","type":"estimateDetails","time_type":${currentTab}, "tab_type":"1"}}`;
60 this.props.resourceJumpWithUrl && this.props.resourceJumpWithUrl(url); 65 this.props.resourceJumpWithUrl && this.props.resourceJumpWithUrl(url);
61 }} > 66 }} >
62 67
63 - <View style={styles.statisticsView}>  
64 <View style={{width: width / 2, paddingLeft: 30, marginTop: -10}}> 68 <View style={{width: width / 2, paddingLeft: 30, marginTop: -10}}>
65 <Text style={styles.numberText}>{statisticsInfo.orderNum}</Text> 69 <Text style={styles.numberText}>{statisticsInfo.orderNum}</Text>
66 <Text style={styles.tipsText}>订单数</Text> 70 <Text style={styles.tipsText}>订单数</Text>
67 </View> 71 </View>
  72 +
  73 + </TouchableOpacity>
  74 +
  75 +
68 <View style={styles.spaceView}/> 76 <View style={styles.spaceView}/>
  77 +
  78 + <TouchableOpacity activeOpacity={1} style={styles.container} onPress={() => {
  79 + let url = `http://m.yohobuy.com?openby:yohobuy={"action":"go.minealliance","params":{"title":"全部佣金","type":"orderIncome"}}`;
  80 + this.props.resourceJumpWithUrl && this.props.resourceJumpWithUrl(url);
  81 + }} >
69 <View style={{width: width / 2, paddingLeft: 30, marginTop: -10}}> 82 <View style={{width: width / 2, paddingLeft: 30, marginTop: -10}}>
70 <Text style={styles.numberText}>{statisticsInfo.clickNum}</Text> 83 <Text style={styles.numberText}>{statisticsInfo.clickNum}</Text>
71 <Text style={styles.tipsText}>点击数</Text> 84 <Text style={styles.tipsText}>点击数</Text>
72 </View> 85 </View>
73 - </View>  
74 86
75 </TouchableOpacity> 87 </TouchableOpacity>
76 88
  89 + </View>
77 90
78 <View style={styles.lineView}/> 91 <View style={styles.lineView}/>
  92 +
79 </View> 93 </View>
80 ); 94 );
81 } 95 }