Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit 3f74230a by Denglingling
Options

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

parent de4dcb5c
Inline Side-by-side
Showing with 128 additions and 58 deletions
app/containers/selfOrder/SelfOrderPage.js
...@@ -376,9 +376,12 @@ class SelfOrderPage extends Component { ...@@ -376,9 +376,12 @@ class SelfOrderPage extends Component {
_del = async () => { _del = async () => {
// 初始化录音 // 初始化录音
this.prepareRecordingPath(this.state.audioPath) this.prepareRecordingPath(this.state.audioPath)
let {listOptionData} = this.state
listOptionData[12].value = ''
this.setState({ this.setState({
currentTime: 0, currentTime: 0,
stop: false stop: false,
listOptionData
}) })
} }
......
app/containers/selfOrder/module/ChooseProductPage.js
...@@ -26,7 +26,10 @@ import { ...@@ -26,7 +26,10 @@ import {
safe_view, safe_view,
font_family_semibold, font_family_semibold,
font_family_regular, font_family_regular,
icon_style icon_style,
title_text_color,
font_family_medium,
list_common_item
} from '../../../base/BaseStyle'; } from '../../../base/BaseStyle';
import HeadBackItem from '../../common/HeadBackItem'; import HeadBackItem from '../../common/HeadBackItem';
import { FooterBtnStyle } from '../../common/CellTextStyle'; import { FooterBtnStyle } from '../../common/CellTextStyle';
...@@ -351,14 +354,14 @@ class ChooseProductPage extends Component { ...@@ -351,14 +354,14 @@ class ChooseProductPage extends Component {
// 返回搜索元素 // 返回搜索元素
renderSearchItem() { renderSearchItem() {
return ( return (
<View style={styles.ser_cont}> <View style={list_common_item.ser_cont}>
<TextInput <TextInput
placeholder={'请输入搜索关键词'} placeholder={'请输入搜索关键词'}
style={styles.ser_text_input} style={list_common_item.ser_text_input}
defaultValue={this.state.searchValue} defaultValue={this.state.searchValue}
/> />
<View style={styles.ser_img_box}> <View style={list_common_item.ser_img_box}>
<Image source={require('../../../images/search_icon.png')} style={styles.ser_img}/> <Image source={require('../../../images/search_icon.png')} style={icon_style}/>
</View> </View>
</View> </View>
) )
...@@ -459,8 +462,8 @@ class ChooseProductPage extends Component { ...@@ -459,8 +462,8 @@ class ChooseProductPage extends Component {
renderFooterBtnItem() { renderFooterBtnItem() {
let { selectShowPopup } = this.state let { selectShowPopup } = this.state
return ( return (
<View style={styles.sub_box}> <View style={list_common_item.sub_box}>
<FooterBtnStyle {/* <FooterBtnStyle
style={styles.sub_btn_left} style={styles.sub_btn_left}
activeOpacity={.8} activeOpacity={.8}
title={'共计已选：666'} title={'共计已选：666'}
...@@ -473,7 +476,25 @@ class ChooseProductPage extends Component { ...@@ -473,7 +476,25 @@ class ChooseProductPage extends Component {
title={'选好了'} title={'选好了'}
textStyle= {[styles.sub_btn_tit, styles.sub_btn_rig_text]} textStyle= {[styles.sub_btn_tit, styles.sub_btn_rig_text]}
onPress={() => this.handleSubmit(selectShowPopup)} 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 <ProductModel
show={ selectShowPopup } show={ selectShowPopup }
closeModal={(show) => this.handleCloseSelectModal(show)} closeModal={(show) => this.handleCloseSelectModal(show)}
...@@ -521,33 +542,35 @@ const styles = StyleSheet.create({ ...@@ -521,33 +542,35 @@ const styles = StyleSheet.create({
// width: Width() // width: Width()
flex: 1 flex: 1
}, },
ser_cont: {
width: Width(), // ser_cont: {
backgroundColor: foundation_color, // width: Width(),
position: 'relative', // backgroundColor: promary_color,
height: 60, // position: 'relative',
justifyContent: 'center', // height: 60,
paddingHorizontal: 16 // justifyContent: 'center',
}, // paddingHorizontal: 16
ser_img_box: { // },
position: 'absolute', // ser_img_box: {
left: 22, // position: 'absolute',
top: 18, // left: 22,
width: pxSize(24), // top: 18,
height: pxSize(24) // width: pxSize(24),
}, // height: pxSize(24)
ser_img: { // },
width: '100%', // // ser_img: {
height: '100%' // // width: '100%',
}, // // height: '100%'
ser_text_input: { // // },
backgroundColor: '#F5F5F5', // ser_text_input: {
height: 38, // backgroundColor: '#F5F5F5',
paddingLeft: 30, // height: 38,
borderRadius: 10, // paddingLeft: 30,
fontSize: second_text_size, // borderRadius: 10,
fontFamily: font_family_regular // fontSize: second_text_size,
}, // fontFamily: font_family_regular
// },
top_box: { top_box: {
width: Width(), width: Width(),
height: 89, height: 89,
...@@ -679,24 +702,68 @@ const styles = StyleSheet.create({ ...@@ -679,24 +702,68 @@ const styles = StyleSheet.create({
ri_img_check: {}, ri_img_check: {},
sub_box: { sub_box: {
width: Width(), width: Width(),
backgroundColor: dis_sub_color, backgroundColor: foundation_color,
flexDirection: 'row' flexDirection: 'row',
}, shadowColor: '#E5E5E5',
sub_btn_left: { shadowOffset: {
width: '50%', width: 1,
backgroundColor: '#EEECEC' height: 2
},
shadowOpacity: 1,
elevation: 10,
height: 80
},
sub_two_btn: {
width: Width(),
flexDirection: 'row',
alignItems: 'center',
paddingHorizontal: 30,
paddingVertical: 14
}, },
sub_btn_tit: { lef_btn: {
fontSize: 18 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
}, },
sub_btn_left_text: { rig_btn: {
color: third_text_color backgroundColor: promary_color,
width: '34%',
borderTopRightRadius: 10,
borderBottomRightRadius: 10,
height: 50
}, },
sub_btn_rig: { rig_tip: {
width: '50%', color: title_text_color,
backgroundColor: promary_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: { // scroll_text_cont: {
// fontSize: 30, // fontSize: 30,
......
app/containers/transOrder/TransOrderPage.js
...@@ -621,17 +621,17 @@ class EquipConsuPage extends Component { ...@@ -621,17 +621,17 @@ class EquipConsuPage extends Component {
{this.renderConsumablesDetailsItem()} {this.renderConsumablesDetailsItem()}
{this.renderAddPicturesItem()} {this.renderAddPicturesItem()}
<FooterBtnStyle
style={canSubFlag ? styles.sub_btn_pro : ''}
activeOpacity={canSubFlag ? .8 : 1}
title={'生成订单'}
textStyle= {styles.sub_btn}
onPress={() => this.handleSubmit()}
/>
</ScrollView> </ScrollView>
</SafeAreaView> </SafeAreaView>
<FooterBtnStyle
style={canSubFlag ? styles.sub_btn_pro : ''}
activeOpacity={canSubFlag ? .8 : 1}
title={'生成订单'}
textStyle= {styles.sub_btn}
onPress={() => this.handleSubmit()}
/>
{/* { this.renderLodingItem() } */} {/* { this.renderLodingItem() } */}
......
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