mobile / YH_RNComponent · Commits

Go to a project

Authored by 孙凯
Commit 57d1aa31016aa5979c25a3eb4d53c78d1298172f 2 parents b7834a35 dbab3d4f

Merge branch 'V6.8.7' into V6.8.9

Inline Side-by-side
Showing 3 changed files with 41 additions and 9 deletions
@@ -44,12 +44,24 @@ export default class ShareViewModal extends React.Component { @@ -44,12 +44,24 @@ export default class ShareViewModal extends React.Component {
44 <Image source={unionType ? require('../images/unionShare_wx_icon.png') : require('../images/weixin.png')} style={styles.icon} /> 44 <Image source={unionType ? require('../images/unionShare_wx_icon.png') : require('../images/weixin.png')} style={styles.icon} />
45 <Text style={styles.text}>分享给好友</Text> 45 <Text style={styles.text}>分享给好友</Text>
46 </TouchableOpacity> 46 </TouchableOpacity>
47 - <TouchableOpacity activeOpacity={0.5} style={styles.button2} onPress={() => { 47 + <TouchableOpacity activeOpacity={0.5} style={styles.button1} onPress={() => {
48 this.props.showSnapshootShare && this.props.showSnapshootShare(true); 48 this.props.showSnapshootShare && this.props.showSnapshootShare(true);
49 }}> 49 }}>
50 <Image source={unionType ? require('../images/unionShare_qr_icon.png') : require('../images/pengyou.png')} style={styles.icon} /> 50 <Image source={unionType ? require('../images/unionShare_qr_icon.png') : require('../images/pengyou.png')} style={styles.icon} />
51 <Text style={styles.text}>微信快照</Text> 51 <Text style={styles.text}>微信快照</Text>
52 </TouchableOpacity> 52 </TouchableOpacity>
  53 + <TouchableOpacity activeOpacity={0.5} style={styles.button1} onPress={() => {
  54 + this.props.shareQQApp && this.props.shareQQApp();
  55 + }}>
  56 + <Image source={unionType ? require('../images/unionShare_qr_icon.png') : require('../images/pengyou.png')} style={styles.icon} />
  57 + <Text style={styles.text}>QQ</Text>
  58 + </TouchableOpacity>
  59 + <TouchableOpacity activeOpacity={0.5} style={styles.button1} onPress={() => {
  60 + this.props.shareWeiBoApp && this.props.shareWeiBoApp();
  61 + }}>
  62 + <Image source={unionType ? require('../images/unionShare_qr_icon.png') : require('../images/pengyou.png')} style={styles.icon} />
  63 + <Text style={styles.text}>微博</Text>
  64 + </TouchableOpacity>
53 </View> 65 </View>
54 <View style={styles.line}/> 66 <View style={styles.line}/>
55 <TouchableOpacity activeOpacity={0.5} style={styles.cancel} onPress={() => { 67 <TouchableOpacity activeOpacity={0.5} style={styles.cancel} onPress={() => {
@@ -93,17 +105,13 @@ let styles = StyleSheet.create({ @@ -93,17 +105,13 @@ let styles = StyleSheet.create({
93 width, 105 width,
94 height: 115*DEVICE_WIDTH_RATIO, 106 height: 115*DEVICE_WIDTH_RATIO,
95 alignItems: 'center', 107 alignItems: 'center',
  108 + justifyContent: 'center',
96 flexDirection: 'row', 109 flexDirection: 'row',
97 }, 110 },
98 button1: { 111 button1: {
99 - marginLeft: (width - 180*DEVICE_WIDTH_RATIO)/3, 112 + width: 90*DEVICE_WIDTH_RATIO,
100 alignItems: 'center', 113 alignItems: 'center',
101 }, 114 },
102 -  
103 - button2: {  
104 - marginLeft: (width - 180*DEVICE_WIDTH_RATIO)/3,  
105 - alignItems: 'center',  
106 - },  
107 icon: { 115 icon: {
108 width: 45*DEVICE_WIDTH_RATIO, 116 width: 45*DEVICE_WIDTH_RATIO,
109 height: 45*DEVICE_WIDTH_RATIO, 117 height: 45*DEVICE_WIDTH_RATIO,
@@ -48,6 +48,8 @@ class GroupPurchaseContainer extends Component { @@ -48,6 +48,8 @@ class GroupPurchaseContainer extends Component {
48 this._didTouchProduct = this._didTouchProduct.bind(this); 48 this._didTouchProduct = this._didTouchProduct.bind(this);
49 this.showShareView = this.showShareView.bind(this); 49 this.showShareView = this.showShareView.bind(this);
50 this.shareMiniApp = this.shareMiniApp.bind(this); 50 this.shareMiniApp = this.shareMiniApp.bind(this);
  51 + this.shareWeiBoApp = this.shareWeiBoApp.bind(this);
  52 + this.shareQQApp = this.shareQQApp.bind(this);
51 this.showSnapshootShare = this.showSnapshootShare.bind(this); 53 this.showSnapshootShare = this.showSnapshootShare.bind(this);
52 this.shareSnapshootAction = this.shareSnapshootAction.bind(this); 54 this.shareSnapshootAction = this.shareSnapshootAction.bind(this);
53 this.jumpToMinePurchaseOrder = this.jumpToMinePurchaseOrder.bind(this); 55 this.jumpToMinePurchaseOrder = this.jumpToMinePurchaseOrder.bind(this);
@@ -148,6 +150,16 @@ class GroupPurchaseContainer extends Component { @@ -148,6 +150,16 @@ class GroupPurchaseContainer extends Component {
148 ReactNative.NativeModules.YH_CommonHelper.shareWXMiniProgram(param); 150 ReactNative.NativeModules.YH_CommonHelper.shareWXMiniProgram(param);
149 } 151 }
150 152
  153 + shareWeiBoApp() {
  154 + console.log('shareWeiBoApp');
  155 + this.props.actions.showShareView(false);
  156 + }
  157 +
  158 + shareQQApp() {
  159 + console.log('shareQQApp');
  160 + this.props.actions.showShareView(false);
  161 + }
  162 +
151 showSnapshootShare(show){ 163 showSnapshootShare(show){
152 this.props.actions.showShareView(false); 164 this.props.actions.showShareView(false);
153 this.props.actions.showSnapshootShare(show); 165 this.props.actions.showSnapshootShare(show);
@@ -184,7 +196,7 @@ class GroupPurchaseContainer extends Component { @@ -184,7 +196,7 @@ class GroupPurchaseContainer extends Component {
184 196
185 return ( 197 return (
186 <View style={styles.container}> 198 <View style={styles.container}>
187 - <ShareViewModal show={showShareView} unionType={unionType} showShareView={this.showShareView} shareMiniApp={this.shareMiniApp} showSnapshootShare={this.showSnapshootShare}/> 199 + <ShareViewModal show={showShareView} unionType={unionType} showShareView={this.showShareView} shareMiniApp={this.shareMiniApp} shareWeiBoApp={this.shareWeiBoApp} shareQQApp={this.shareQQApp} showSnapshootShare={this.showSnapshootShare}/>
188 <ListSnapshootShare 200 <ListSnapshootShare
189 show={showSnapshootShare} 201 show={showSnapshootShare}
190 unionType={unionType} 202 unionType={unionType}
@@ -49,6 +49,8 @@ class GroupPurchaseDetailContainer extends Component { @@ -49,6 +49,8 @@ class GroupPurchaseDetailContainer extends Component {
49 this.didTouchButton = this.didTouchButton.bind(this); 49 this.didTouchButton = this.didTouchButton.bind(this);
50 this.showShareView = this.showShareView.bind(this); 50 this.showShareView = this.showShareView.bind(this);
51 this.shareMiniApp = this.shareMiniApp.bind(this); 51 this.shareMiniApp = this.shareMiniApp.bind(this);
  52 + this.shareWeiBoApp = this.shareWeiBoApp.bind(this);
  53 + this.shareQQApp = this.shareQQApp.bind(this);
52 this.showSnapshootShare = this.showSnapshootShare.bind(this); 54 this.showSnapshootShare = this.showSnapshootShare.bind(this);
53 this.shareSnapshootAction = this.shareSnapshootAction.bind(this); 55 this.shareSnapshootAction = this.shareSnapshootAction.bind(this);
54 56
@@ -184,6 +186,16 @@ class GroupPurchaseDetailContainer extends Component { @@ -184,6 +186,16 @@ class GroupPurchaseDetailContainer extends Component {
184 ReactNative.NativeModules.YH_CommonHelper.shareWXMiniProgram(param); 186 ReactNative.NativeModules.YH_CommonHelper.shareWXMiniProgram(param);
185 } 187 }
186 188
  189 + shareWeiBoApp() {
  190 + console.log('shareWeiBoApp');
  191 + this.props.actions.showShareView(false);
  192 + }
  193 +
  194 + shareQQApp() {
  195 + console.log('shareQQApp');
  196 + this.props.actions.showShareView(false);
  197 + }
  198 +
187 showSnapshootShare(show){ 199 showSnapshootShare(show){
188 this.props.actions.showShareView(false); 200 this.props.actions.showShareView(false);
189 this.props.actions.showSnapshootShare(show); 201 this.props.actions.showSnapshootShare(show);
@@ -218,7 +230,7 @@ class GroupPurchaseDetailContainer extends Component { @@ -218,7 +230,7 @@ class GroupPurchaseDetailContainer extends Component {
218 230
219 return ( 231 return (
220 <View style={styles.container}> 232 <View style={styles.container}>
221 - <ShareViewModal show={showShareView} unionType={unionType} showShareView={this.showShareView} shareMiniApp={this.shareMiniApp} showSnapshootShare={this.showSnapshootShare}/> 233 + <ShareViewModal show={showShareView} unionType={unionType} showShareView={this.showShareView} shareMiniApp={this.shareMiniApp} shareWeiBoApp={this.shareWeiBoApp} shareQQApp={this.shareQQApp} showSnapshootShare={this.showSnapshootShare}/>
222 <SnapshootShare 234 <SnapshootShare
223 show={showSnapshootShare} 235 show={showSnapshootShare}
224 unionType={unionType} 236 unionType={unionType}