提示

app/containers/common/SubSuccPage.js

@@ -6,7 +6,8 @@ import {
     Text,
     Image,
     TouchableOpacity,
-    Clipboard
+    Clipboard,
+    ScrollView
 } from 'react-native';
 import HeadBackItem from './HeadBackItem';
 import {
@@ -67,32 +68,34 @@ class SubSuccPage extends Component {
                     backgroundColor={promary_color}
                     barStyle = 'light-content'
                     />
-                <SafeAreaView style={safe_view}>
+                <View style={safe_view}>
                     <HeadBackItem title={title} navigation={navigation} />
-                    <View style={styles.succ_inner}>
-                        <View style={styles.img_box}>
-                            <Image source={require('../../images/cor_green.png')} style={styles.img_icon}/>
+                    <ScrollView style={safe_view}>
+                        <View style={styles.succ_inner}>
+                            <View style={styles.img_box}>
+                                <Image source={require('../../images/cor_green.png')} style={styles.img_icon}/>
+                            </View>
+                            <Text style={styles.succ_title}>{'提交成功'}</Text>
+                            {
+                                state.orderVal ?
+                                    <Text style={styles.succ_text}>{'订单号：'} { state.orderVal }</Text>
+                                    : null
+                            }
+                            {
+                                !!warnTip && <View><Text style={styles.warn_tip} numberOfLines={50}>{warnTip}</Text></View>
+                            }
+                            <TouchableOpacity
+                                activeOpacity={.9}
+                                style={styles.succ_btn}
+                                onPress={() => this.handleSubmit()}
+                                >
+                                    <Text style={styles.btn_text}>
+                                        { state.orderVal ? '复制订单号并返回主页' : '返回主页'}
+                                    </Text>
+                            </TouchableOpacity>
                         </View>
-                        <Text style={styles.succ_title}>{'提交成功'}</Text>
-                        {
-                            state.orderVal ?
-                                <Text style={styles.succ_text}>{'订单号：'} { state.orderVal }</Text>
-                                : null
-                        }
-                        {
-                            !!warnTip && <Text style={styles.warn_tip}>{warnTip}</Text>
-                        }
-                        <TouchableOpacity
-                            activeOpacity={.9}
-                            style={styles.succ_btn}
-                            onPress={() => this.handleSubmit()}
-                            >
-                                <Text style={styles.btn_text}>
-                                    { state.orderVal ? '复制订单号并返回主页' : '返回主页'}
-                                </Text>
-                        </TouchableOpacity>
-                    </View>
-                </SafeAreaView>
+                    </ScrollView>
+                </View>
 
             </View>
          );
@@ -134,7 +137,8 @@ const styles = StyleSheet.create({
         paddingLeft: 20,
         paddingRight: 20,
         paddingBottom: 20,
-        color: '#fdbe34'
+        color: '#fdbe34',
+        lineHeight: 22
     },
     succ_btn: {
         backgroundColor: promary_color,

app/containers/equipConsu/EquipConsuPage.js

@@ -53,7 +53,7 @@ class EquipConsuPage extends Component {
                 },
                 {
                     "id": "4",
-                    title: '消耗时间',
+                    title: '手术时间',
                     name: '请选择',
                     value: '',
                     dateValue: new Date()
@@ -499,7 +499,7 @@ class EquipConsuPage extends Component {
                 let tempName = `${collect_number}-${surgery_name}-${item.doctor_name ? (item.doctor_name + '-') : ''}${create_time}`
                 obj.name = tempName,
                 obj.value = item.collect_number
-                obj.userEnteredPrice = item.userEnteredPrice || 'Y'
+                obj.userEnteredPrice = item.user_entered_price || 'Y'
                 resultArr.push(obj)
             })
             tempOption = [...resultArr]
@@ -849,7 +849,8 @@ class EquipConsuPage extends Component {
                 listOptionData[3].name = tempName
                 listOptionData[3].value = surgery_collect_headers[0].collect_number
                 that.setState({
-                    listOptionData
+                    listOptionData,
+                    userEnteredPrice: surgery_collect_headers[0].user_entered_price || 'Y'
                 }, () => {
                     that.getCurOrderDetail()
                     this.autoSetDoctorAndFollower()
@@ -942,7 +943,7 @@ class EquipConsuPage extends Component {
         let that = this
         this.setState({
             listOptionData: listOptionData.map((item, index) => {
-                if(item.title === '消耗时间') {
+                if(item.title === '手术时间') {
                     item.name = date
                     item.value = date
                     item.dateValue = formatStrForDate(date)
@@ -1346,7 +1347,7 @@ class EquipConsuPage extends Component {
             let { state: { params: { title } } } = this.props.navigation
             this.props.navigation.navigate('SubSuccPage', { // 现在没返回订单号
                 title: `${title} - 下单成功`,
-                get_price_error_list: equipOrderOption.get_price_error_list
+                warnTip: equipOrderOption.get_price_error_list
             })
         }
     }