Authored by 孙凯

Merge branch 'V6.8.7' into V6.8.9

... ... @@ -44,12 +44,24 @@ export default class ShareViewModal extends React.Component {
<Image source={unionType ? require('../images/unionShare_wx_icon.png') : require('../images/weixin.png')} style={styles.icon} />
<Text style={styles.text}>分享给好友</Text>
</TouchableOpacity>
<TouchableOpacity activeOpacity={0.5} style={styles.button2} onPress={() => {
<TouchableOpacity activeOpacity={0.5} style={styles.button1} onPress={() => {
this.props.showSnapshootShare && this.props.showSnapshootShare(true);
}}>
<Image source={unionType ? require('../images/unionShare_qr_icon.png') : require('../images/pengyou.png')} style={styles.icon} />
<Text style={styles.text}>微信快照</Text>
</TouchableOpacity>
<TouchableOpacity activeOpacity={0.5} style={styles.button1} onPress={() => {
this.props.shareQQApp && this.props.shareQQApp();
}}>
<Image source={unionType ? require('../images/unionShare_qr_icon.png') : require('../images/pengyou.png')} style={styles.icon} />
<Text style={styles.text}>QQ</Text>
</TouchableOpacity>
<TouchableOpacity activeOpacity={0.5} style={styles.button1} onPress={() => {
this.props.shareWeiBoApp && this.props.shareWeiBoApp();
}}>
<Image source={unionType ? require('../images/unionShare_qr_icon.png') : require('../images/pengyou.png')} style={styles.icon} />
<Text style={styles.text}>微博</Text>
</TouchableOpacity>
</View>
<View style={styles.line}/>
<TouchableOpacity activeOpacity={0.5} style={styles.cancel} onPress={() => {
... ... @@ -93,17 +105,13 @@ let styles = StyleSheet.create({
width,
height: 115*DEVICE_WIDTH_RATIO,
alignItems: 'center',
justifyContent: 'center',
flexDirection: 'row',
},
button1: {
marginLeft: (width - 180*DEVICE_WIDTH_RATIO)/3,
width: 90*DEVICE_WIDTH_RATIO,
alignItems: 'center',
},
button2: {
marginLeft: (width - 180*DEVICE_WIDTH_RATIO)/3,
alignItems: 'center',
},
icon: {
width: 45*DEVICE_WIDTH_RATIO,
height: 45*DEVICE_WIDTH_RATIO,
... ...
... ... @@ -48,6 +48,8 @@ class GroupPurchaseContainer extends Component {
this._didTouchProduct = this._didTouchProduct.bind(this);
this.showShareView = this.showShareView.bind(this);
this.shareMiniApp = this.shareMiniApp.bind(this);
this.shareWeiBoApp = this.shareWeiBoApp.bind(this);
this.shareQQApp = this.shareQQApp.bind(this);
this.showSnapshootShare = this.showSnapshootShare.bind(this);
this.shareSnapshootAction = this.shareSnapshootAction.bind(this);
this.jumpToMinePurchaseOrder = this.jumpToMinePurchaseOrder.bind(this);
... ... @@ -148,6 +150,16 @@ class GroupPurchaseContainer extends Component {
ReactNative.NativeModules.YH_CommonHelper.shareWXMiniProgram(param);
}
shareWeiBoApp() {
console.log('shareWeiBoApp');
this.props.actions.showShareView(false);
}
shareQQApp() {
console.log('shareQQApp');
this.props.actions.showShareView(false);
}
showSnapshootShare(show){
this.props.actions.showShareView(false);
this.props.actions.showSnapshootShare(show);
... ... @@ -184,7 +196,7 @@ class GroupPurchaseContainer extends Component {
return (
<View style={styles.container}>
<ShareViewModal show={showShareView} unionType={unionType} showShareView={this.showShareView} shareMiniApp={this.shareMiniApp} showSnapshootShare={this.showSnapshootShare}/>
<ShareViewModal show={showShareView} unionType={unionType} showShareView={this.showShareView} shareMiniApp={this.shareMiniApp} shareWeiBoApp={this.shareWeiBoApp} shareQQApp={this.shareQQApp} showSnapshootShare={this.showSnapshootShare}/>
<ListSnapshootShare
show={showSnapshootShare}
unionType={unionType}
... ...
... ... @@ -49,6 +49,8 @@ class GroupPurchaseDetailContainer extends Component {
this.didTouchButton = this.didTouchButton.bind(this);
this.showShareView = this.showShareView.bind(this);
this.shareMiniApp = this.shareMiniApp.bind(this);
this.shareWeiBoApp = this.shareWeiBoApp.bind(this);
this.shareQQApp = this.shareQQApp.bind(this);
this.showSnapshootShare = this.showSnapshootShare.bind(this);
this.shareSnapshootAction = this.shareSnapshootAction.bind(this);
... ... @@ -184,6 +186,16 @@ class GroupPurchaseDetailContainer extends Component {
ReactNative.NativeModules.YH_CommonHelper.shareWXMiniProgram(param);
}
shareWeiBoApp() {
console.log('shareWeiBoApp');
this.props.actions.showShareView(false);
}
shareQQApp() {
console.log('shareQQApp');
this.props.actions.showShareView(false);
}
showSnapshootShare(show){
this.props.actions.showShareView(false);
this.props.actions.showSnapshootShare(show);
... ... @@ -218,7 +230,7 @@ class GroupPurchaseDetailContainer extends Component {
return (
<View style={styles.container}>
<ShareViewModal show={showShareView} unionType={unionType} showShareView={this.showShareView} shareMiniApp={this.shareMiniApp} showSnapshootShare={this.showSnapshootShare}/>
<ShareViewModal show={showShareView} unionType={unionType} showShareView={this.showShareView} shareMiniApp={this.shareMiniApp} shareWeiBoApp={this.shareWeiBoApp} shareQQApp={this.shareQQApp} showSnapshootShare={this.showSnapshootShare}/>
<SnapshootShare
show={showSnapshootShare}
unionType={unionType}
... ...