Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit 07e2cc1e by wong.peiyi
Options

提示

parent c66a8dd1
Inline Side-by-side
Showing with 15 additions and 10 deletions
app/containers/common/SubSuccPage.js
...@@ -6,7 +6,8 @@ import { ...@@ -6,7 +6,8 @@ import {
Text, Text,
Image, Image,
TouchableOpacity, TouchableOpacity,
Clipboard Clipboard,
ScrollView
} from 'react-native'; } from 'react-native';
import HeadBackItem from './HeadBackItem'; import HeadBackItem from './HeadBackItem';
import { import {
...@@ -67,8 +68,9 @@ class SubSuccPage extends Component { ...@@ -67,8 +68,9 @@ class SubSuccPage extends Component {
backgroundColor={promary_color} backgroundColor={promary_color}
barStyle = 'light-content' barStyle = 'light-content'
/> />
<SafeAreaView style={safe_view}> <View style={safe_view}>
<HeadBackItem title={title} navigation={navigation} /> <HeadBackItem title={title} navigation={navigation} />
<ScrollView style={safe_view}>
<View style={styles.succ_inner}> <View style={styles.succ_inner}>
<View style={styles.img_box}> <View style={styles.img_box}>
<Image source={require('../../images/cor_green.png')} style={styles.img_icon}/> <Image source={require('../../images/cor_green.png')} style={styles.img_icon}/>
...@@ -80,7 +82,7 @@ class SubSuccPage extends Component { ...@@ -80,7 +82,7 @@ class SubSuccPage extends Component {
: null : null
} }
{ {
!!warnTip && <Text style={styles.warn_tip}>{warnTip}</Text> !!warnTip && <View><Text style={styles.warn_tip} numberOfLines={50}>{warnTip}</Text></View>
} }
<TouchableOpacity <TouchableOpacity
activeOpacity={.9} activeOpacity={.9}
...@@ -92,7 +94,8 @@ class SubSuccPage extends Component { ...@@ -92,7 +94,8 @@ class SubSuccPage extends Component {
</Text> </Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
</SafeAreaView> </ScrollView>
</View>
</View> </View>
); );
...@@ -134,7 +137,8 @@ const styles = StyleSheet.create({ ...@@ -134,7 +137,8 @@ const styles = StyleSheet.create({
paddingLeft: 20, paddingLeft: 20,
paddingRight: 20, paddingRight: 20,
paddingBottom: 20, paddingBottom: 20,
color: '#fdbe34' color: '#fdbe34',
lineHeight: 22
}, },
succ_btn: { succ_btn: {
backgroundColor: promary_color, backgroundColor: promary_color,
......
app/containers/equipConsu/EquipConsuPage.js
...@@ -53,7 +53,7 @@ class EquipConsuPage extends Component { ...@@ -53,7 +53,7 @@ class EquipConsuPage extends Component {
}, },
{ {
"id": "4", "id": "4",
title: '消耗时间', title: '手术时间',
name: '请选择', name: '请选择',
value: '', value: '',
dateValue: new Date() dateValue: new Date()
...@@ -499,7 +499,7 @@ class EquipConsuPage extends Component { ...@@ -499,7 +499,7 @@ class EquipConsuPage extends Component {
let tempName = `${collect_number}-${surgery_name}-${item.doctor_name ? (item.doctor_name + '-') : ''}${create_time}` let tempName = `${collect_number}-${surgery_name}-${item.doctor_name ? (item.doctor_name + '-') : ''}${create_time}`
obj.name = tempName, obj.name = tempName,
obj.value = item.collect_number obj.value = item.collect_number
obj.userEnteredPrice = item.userEnteredPrice || 'Y' obj.userEnteredPrice = item.user_entered_price || 'Y'
resultArr.push(obj) resultArr.push(obj)
}) })
tempOption = [...resultArr] tempOption = [...resultArr]
...@@ -849,7 +849,8 @@ class EquipConsuPage extends Component { ...@@ -849,7 +849,8 @@ class EquipConsuPage extends Component {
listOptionData[3].name = tempName listOptionData[3].name = tempName
listOptionData[3].value = surgery_collect_headers[0].collect_number listOptionData[3].value = surgery_collect_headers[0].collect_number
that.setState({ that.setState({
listOptionData listOptionData,
userEnteredPrice: surgery_collect_headers[0].user_entered_price || 'Y'
}, () => { }, () => {
that.getCurOrderDetail() that.getCurOrderDetail()
this.autoSetDoctorAndFollower() this.autoSetDoctorAndFollower()
...@@ -942,7 +943,7 @@ class EquipConsuPage extends Component { ...@@ -942,7 +943,7 @@ class EquipConsuPage extends Component {
let that = this let that = this
this.setState({ this.setState({
listOptionData: listOptionData.map((item, index) => { listOptionData: listOptionData.map((item, index) => {
if(item.title === '消耗时间') { if(item.title === '手术时间') {
item.name = date item.name = date
item.value = date item.value = date
item.dateValue = formatStrForDate(date) item.dateValue = formatStrForDate(date)
...@@ -1346,7 +1347,7 @@ class EquipConsuPage extends Component { ...@@ -1346,7 +1347,7 @@ class EquipConsuPage extends Component {
let { state: { params: { title } } } = this.props.navigation let { state: { params: { title } } } = this.props.navigation
this.props.navigation.navigate('SubSuccPage', { // 现在没返回订单号 this.props.navigation.navigate('SubSuccPage', { // 现在没返回订单号
title: `${title} - 下单成功`, title: `${title} - 下单成功`,
get_price_error_list: equipOrderOption.get_price_error_list warnTip: equipOrderOption.get_price_error_list
}) })
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment