完善【转单】、【自助下单】、【选择产品】样式

app/containers/selfOrder/SelfOrderPage.js

@@ -376,9 +376,12 @@ class SelfOrderPage extends Component {
     _del = async () => {
         // 初始化录音
         this.prepareRecordingPath(this.state.audioPath)
+        let {listOptionData} = this.state
+        listOptionData[12].value = ''
         this.setState({
             currentTime: 0,
-            stop: false
+            stop: false,
+            listOptionData
         })
     }
 

app/containers/selfOrder/module/ChooseProductPage.js

@@ -26,7 +26,10 @@ import {
     safe_view,
     font_family_semibold,
     font_family_regular,
-    icon_style
+    icon_style,
+    title_text_color,
+    font_family_medium,
+    list_common_item
 } from '../../../base/BaseStyle';
 import HeadBackItem from '../../common/HeadBackItem';
 import { FooterBtnStyle } from '../../common/CellTextStyle';
@@ -351,14 +354,14 @@ class ChooseProductPage extends Component {
     // 返回搜索元素
     renderSearchItem() {
         return (
-            <View style={styles.ser_cont}>
+            <View style={list_common_item.ser_cont}>
                 <TextInput
                     placeholder={'请输入搜索关键词'}
-                    style={styles.ser_text_input}
+                    style={list_common_item.ser_text_input}
                     defaultValue={this.state.searchValue}
                     />
-                <View style={styles.ser_img_box}>
-                    <Image source={require('../../../images/search_icon.png')} style={styles.ser_img}/>
+                <View style={list_common_item.ser_img_box}>
+                    <Image source={require('../../../images/search_icon.png')} style={icon_style}/>
                 </View>
             </View>
         )
@@ -459,8 +462,8 @@ class ChooseProductPage extends Component {
     renderFooterBtnItem() {
         let { selectShowPopup } = this.state
         return (
-            <View style={styles.sub_box}>
-                <FooterBtnStyle 
+            <View style={list_common_item.sub_box}>
+                {/* <FooterBtnStyle 
                     style={styles.sub_btn_left}
                     activeOpacity={.8}
                     title={'共计已选：666'}
@@ -473,7 +476,25 @@ class ChooseProductPage extends Component {
                     title={'选好了'}
                     textStyle= {[styles.sub_btn_tit, styles.sub_btn_rig_text]}
                     onPress={() => this.handleSubmit(selectShowPopup)}
-                    />
+                    /> */}
+
+                <View style={list_common_item.sub_two_btn}>
+                    <TouchableOpacity
+                        activeOpacity={.8}
+                        style={list_common_item.lef_btn}
+                        onPress={() => this.handleSubSelected(selectShowPopup)}
+                        >
+                        <Text style={list_common_item.lef_tip}>{'共计已选：666'}</Text>
+                    </TouchableOpacity>
+                    <TouchableOpacity
+                        activeOpacity={.8}
+                        style={list_common_item.rig_btn}
+                        onPress={() => this.handleSubmit(selectShowPopup)}
+                        >
+                        <Text style={list_common_item.rig_tip}>{'选好了'}</Text>
+                    </TouchableOpacity>
+                </View>
+
                 <ProductModel
                     show={ selectShowPopup }
                     closeModal={(show) => this.handleCloseSelectModal(show)}
@@ -521,33 +542,35 @@ const styles = StyleSheet.create({
         // width: Width()
         flex: 1
     },
-    ser_cont: {
-        width: Width(),
-        backgroundColor: foundation_color,
-        position: 'relative',
-        height: 60,
-        justifyContent: 'center',
-        paddingHorizontal: 16
-    },
-    ser_img_box: {
-        position: 'absolute',
-        left: 22,
-        top: 18,
-        width: pxSize(24),
-        height: pxSize(24)
-    },
-    ser_img: {
-        width: '100%',
-        height: '100%'
-    },
-    ser_text_input: {
-        backgroundColor: '#F5F5F5',
-        height: 38,
-        paddingLeft: 30,
-        borderRadius: 10,
-        fontSize: second_text_size,
-        fontFamily: font_family_regular
-    },
+
+    // ser_cont: {
+    //     width: Width(),
+    //     backgroundColor: promary_color,
+    //     position: 'relative',
+    //     height: 60,
+    //     justifyContent: 'center',
+    //     paddingHorizontal: 16
+    // },
+    // ser_img_box: {
+    //     position: 'absolute',
+    //     left: 22,
+    //     top: 18,
+    //     width: pxSize(24),
+    //     height: pxSize(24)
+    // },
+    // // ser_img: {
+    // //     width: '100%',
+    // //     height: '100%'
+    // // },
+    // ser_text_input: {
+    //     backgroundColor: '#F5F5F5',
+    //     height: 38,
+    //     paddingLeft: 30,
+    //     borderRadius: 10,
+    //     fontSize: second_text_size,
+    //     fontFamily: font_family_regular
+    // },
+
     top_box: {
         width: Width(),
         height: 89,
@@ -679,24 +702,68 @@ const styles = StyleSheet.create({
     ri_img_check: {},
     sub_box: {
         width: Width(),
-        backgroundColor: dis_sub_color,
-        flexDirection: 'row' 
+        backgroundColor: foundation_color,
+        flexDirection: 'row',
+        shadowColor: '#E5E5E5',
+        shadowOffset: {
+            width: 1,
+            height: 2
         },
-    sub_btn_left: {
-        width: '50%',
-        backgroundColor: '#EEECEC'
+        shadowOpacity: 1,
+        elevation: 10,
+        height: 80
     },
-    sub_btn_tit: {
-        fontSize: 18
+    sub_two_btn: {
+        width: Width(),
+        flexDirection: 'row',
+        alignItems: 'center',
+        paddingHorizontal: 30,
+        paddingVertical: 14
     },
-    sub_btn_left_text: {
-        color: third_text_color
+    lef_btn: {
+        backgroundColor: '#4F4F4F',
+        width: '66%',
+        borderTopLeftRadius: 10,
+        borderBottomLeftRadius: 10,
+        height: 50
+    },
+    lef_tip: {
+        color: title_text_color,
+        lineHeight: 48,
+        paddingLeft: 20,
+        fontSize: 16,
+        fontFamily: font_family_regular
+    },
+    rig_btn: {
+        backgroundColor: promary_color,
+        width: '34%',
+        borderTopRightRadius: 10,
+        borderBottomRightRadius: 10,
+        height: 50
     },
-    sub_btn_rig: {
-        width: '50%',
-        backgroundColor: promary_color
+    rig_tip: {
+        color: title_text_color,
+        lineHeight: 48,
+        textAlign: 'center',
+        fontSize: 16,
+        fontFamily: font_family_medium
     },
-    sub_btn_rig_text: {},
+
+    // sub_btn_left: {
+    //     // width: '50%',
+    //     backgroundColor: '#EEECEC'
+    // },
+    // sub_btn_tit: {
+    //     fontSize: 18
+    // },
+    // sub_btn_left_text: {
+    //     color: third_text_color
+    // },
+    // sub_btn_rig: {
+    //     // width: '50%',
+    //     backgroundColor: promary_color
+    // },
+    // sub_btn_rig_text: {},
 
     // scroll_text_cont: {
     //     fontSize: 30,

app/containers/transOrder/TransOrderPage.js

@@ -622,9 +622,6 @@ class EquipConsuPage extends Component {
 
                         {this.renderAddPicturesItem()}
                 
-                    </ScrollView>
-                </SafeAreaView>
-                
                         <FooterBtnStyle
                             style={canSubFlag ? styles.sub_btn_pro : ''}
                             activeOpacity={canSubFlag ? .8 : 1}
@@ -633,6 +630,9 @@ class EquipConsuPage extends Component {
                             onPress={() => this.handleSubmit()}
                             />
 
+                    </ScrollView>
+                </SafeAreaView>
+
                 {/* { this.renderLodingItem() } */}
                 
             </View>