Merge remote-tracking branch 'origin/hzp'

src/components/OrderDetailMini.js

@@ -4,7 +4,9 @@ import {FlatList, Image, Modal, ScrollView, Text, View} from 'react-native';
 import {font} from '../utils/common';
 import NP from '../utils/np';
 import {scaleSize, setSpText} from '../utils/screen';
+import Speech from '../utils/Speech';
 import ModalStyles from './Modal/styles';
+import Touch from './Touch';
 
 const mStyles = {
   ...ModalStyles,
@@ -119,6 +121,11 @@ class OrderDetailMini extends Component {
     </View>
   );
 
+  onNoBuy = async () => {
+    const {data} = await this.props.dispatch({type: 'store/noBuyGoGoGo'});
+    Speech.speak(data.msg);
+  };
+
   render() {
     const {goodsArr, faceType, ...props} = this.props;
     let totalPrice = 0; // 总价
@@ -213,6 +220,24 @@ class OrderDetailMini extends Component {
                       style={styles.emptyImg}
                     />
                   </View>
+                  <Touch onPress={() => this.onNoBuy()}>
+                    <View
+                      style={{
+                        backgroundColor:
+                          faceType === 'wxpay' ? '#24af41' : '#09a1e8',
+                        width: scaleSize(600),
+                        height: scaleSize(100),
+                        display: 'flex',
+                        justifyContent: 'center',
+                        alignContent: 'center',
+                        alignItems: 'center',
+                        borderRadius: 20,
+                      }}>
+                      <Text style={{color: '#fff', fontSize: scaleSize(44)}}>
+                        无购物出店
+                      </Text>
+                    </View>
+                  </Touch>
                 </View>
               </View>
             )}
@@ -383,6 +408,8 @@ const styles = {
     height: scaleSize(1150),
     resizeMode: 'contain',
   },
+  guardModal_button_nobuy: {},
+  callText: {},
 };
 
 export default OrderDetailMini;

src/components/TipsModal.js

@@ -57,6 +57,10 @@ class TipsModal extends Component {
         ...styles.reset,
         color: '#1b7dc7',
       };
+      styles.tryAngin = {
+        ...styles.tryAngin,
+        backgroundColor: '#1b7dc7',
+      };
     }
     return (
       <Modal styles={mStyles} {...props}>
@@ -82,6 +86,7 @@ class TipsModal extends Component {
             <View style={styles.container}>
               {qrCode && (
                 <View style={styles.qrcode}>
+                  <Text>
                     <QRCode
                       logoSize={scaleSize(80)}
                       // logoBackgroundColor="#fc4000"
@@ -89,6 +94,7 @@ class TipsModal extends Component {
                       size={scaleSize(360)}
                       value={qrCode}
                     />
+                  </Text>
                 </View>
               )}
               <Text
@@ -97,6 +103,15 @@ class TipsModal extends Component {
                 style={styles.tip}>
                 {tip}
               </Text>
+              <Touch onPress={() => console.log('1')}>
+                <View style={styles.tryAngin}>
+                  <Image
+                    source={require('../assets/shualian.png')}
+                    style={styles.tryImg}
+                  />
+                  <Text style={styles.tryText}>重新刷脸</Text>
+                </View>
+              </Touch>
             </View>
             {!qrCode && flags && (
               <View style={styles.footer}>
@@ -135,7 +150,7 @@ const styles = {
     position: 'absolute',
   },
   modal: {
-    height: '40%',
+    height: '50%',
     width: '80%',
     marginLeft: '10%',
     marginTop: '40%',
@@ -237,6 +252,23 @@ const styles = {
     fontSize: setSpText(45),
     color: '#2BA245',
   },
+  tryAngin: {
+    backgroundColor: '#24af41',
+    width: scaleSize(370),
+    height: scaleSize(100),
+    display: 'flex',
+    flexDirection: 'row',
+    justifyContent: 'center',
+    alignContent: 'center',
+    alignItems: 'center',
+    borderRadius: 20,
+  },
+  tryText: {color: '#fff', fontSize: scaleSize(38)},
+  tryImg: {
+    width: scaleSize(38),
+    height: scaleSize(38),
+    marginRight: 10,
+  },
 };
 
 export default TipsModal;