Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit 744e4c61 by Denglingling
Options

完善自助下单

parent 881468b9
Expand all
Inline Side-by-side
Showing with 69 additions and 90 deletions
app/containers/common/ProductModel.js
import React, { Component } from 'react'; import React, { Component } from 'react';
import { View, Text, StyleSheet, SafeAreaView, Modal, ScrollView, TouchableOpacity, FlatList, Image } from 'react-native'; import { View, Text, StyleSheet, SafeAreaView, Modal, ScrollView, TouchableOpacity, FlatList, Image } from 'react-native';
import { pxHeight, foundation_color, promary_color, second_text_color, first_text_color, Width, pxSize, safe_view, font_family_medium, font_family_light, list_common_item, third_text_size, icon_style, point_color, title_text_color, second_text_size } from '../../base/BaseStyle'; import { pxHeight, foundation_color, promary_color, second_text_color, first_text_color, Width, pxSize, safe_view, font_family_medium, font_family_light, list_common_item, third_text_size, icon_style, point_color, title_text_color, second_text_size, font_family_semibold, font_family_regular } from '../../base/BaseStyle';
import ChooseCardList from '../common/listDataComponent/ChooseCardList'; import ChooseCardList from '../common/listDataComponent/ChooseCardList';
import PicTitDetaiCalcu from '../common/listDataComponent/PicTitDetaiCalcu'; import PicTitDetaiCalcu from '../common/listDataComponent/PicTitDetaiCalcu';
import _ from "lodash"; import _ from "lodash";
...@@ -554,8 +554,22 @@ class ProductModel extends Component { ...@@ -554,8 +554,22 @@ class ProductModel extends Component {
handleClearRubbish() { handleClearRubbish() {
let { orginOptionList, topProcOptionList } = this.state let { orginOptionList, topProcOptionList } = this.state
// this.refs.ClearAllModel.show('清空当前所有数据') // this.refs.ClearAllModel.show('清空当前所有数据')
// console.log('this--', this) console.log('this--', this)
this.modelClearAllCB(true) // this.modelClearAllCB(true)
let that = this
topProcOptionList.map(function(top_item) {
top_item[LocalVariable.SELECTED_QUQNTITY] = 0
top_item[LocalVariable.SELECTED_DATA_ARR] = []
})
that.props.changeCallBack(topProcOptionList)
that.setState({
topProcOptionList: topProcOptionList
})
setTimeout(() => {
that.closeModal()
}, 300)
} }
// 清空当前 // 清空当前
...@@ -578,7 +592,7 @@ class ProductModel extends Component { ...@@ -578,7 +592,7 @@ class ProductModel extends Component {
this.props.changeCallBack(topProcOptionList) this.props.changeCallBack(topProcOptionList)
console.log('topProcOptionList=====', allCountQuantity) // console.log('topProcOptionList=====', allCountQuantity)
this.setState({ this.setState({
topProcOptionList: topProcOptionList topProcOptionList: topProcOptionList
...@@ -591,6 +605,7 @@ class ProductModel extends Component { ...@@ -591,6 +605,7 @@ class ProductModel extends Component {
// 清空所有回调 // 清空所有回调
modelClearAllCB(clear_flag){ modelClearAllCB(clear_flag){
console.log('clear_flag===', clear_flag) console.log('clear_flag===', clear_flag)
console.log('clear_flag===', this)
let { orginOptionList, topProcOptionList } = this.state let { orginOptionList, topProcOptionList } = this.state
let that = this let that = this
if(clear_flag){ if(clear_flag){
...@@ -598,8 +613,6 @@ class ProductModel extends Component { ...@@ -598,8 +613,6 @@ class ProductModel extends Component {
top_item[LocalVariable.SELECTED_QUQNTITY] = 0 top_item[LocalVariable.SELECTED_QUQNTITY] = 0
top_item[LocalVariable.SELECTED_DATA_ARR] = [] top_item[LocalVariable.SELECTED_DATA_ARR] = []
}) })
console.log('清空',this)
that.props.changeCallBack(topProcOptionList) that.props.changeCallBack(topProcOptionList)
that.setState({ that.setState({
...@@ -736,20 +749,7 @@ class ProductModel extends Component { ...@@ -736,20 +749,7 @@ class ProductModel extends Component {
}) })
} }
console.log('底部🉐️=====', localBottomContData) // console.log('底部🉐️=====', localBottomContData)
// localBottomContData = [{
// supplier_short_name: "嘉思特华剑医疗器材（天津）有限公司", // 测试
// supplier_code: "SU00000369", // 测试
// [LocalVariable.CHILDREN_LINE_NAME]: localBottomContData
// },{
// supplier_short_name: "天津正天医疗器械有限公司", // 测试
// supplier_code: "SU00000360", // 测试
// [LocalVariable.CHILDREN_LINE_NAME]: localBottomContData
// },{
// supplier_short_name: "常州奥斯迈医疗器械有限公司", // 测试
// supplier_code: "SU00000390", // 测试
// [LocalVariable.CHILDREN_LINE_NAME]: localBottomContData
// }]
return ( return (
<View style={styles.edit_cont}> <View style={styles.edit_cont}>
...@@ -777,9 +777,15 @@ class ProductModel extends Component { ...@@ -777,9 +777,15 @@ class ProductModel extends Component {
let curListMaxNum = '' let curListMaxNum = ''
if (topActiveIndex === 0) { if (topActiveIndex === 0) {
curTit = 'superTit' curTit = 'superTit'
curTipOne = 'superTip' curTipStr = 'superTipStr'
curTipOne = 'superTipOne'
curTipTwo = 'superTip'
// curTipOne = 'superTip'
curTxtTit='套包名' curTxtTit='套包名'
curTipOneTit = '详情' // curTipOneTit = '详情'
curTipStrTit = '客户'
curTipOneTit = '主治医生'
curTipTwoTit = '详情'
} else if(topActiveIndex === 1){ } else if(topActiveIndex === 1){
curTit = 'item_name' curTit = 'item_name'
curTipStr = 'general_name' curTipStr = 'general_name'
...@@ -827,7 +833,6 @@ class ProductModel extends Component { ...@@ -827,7 +833,6 @@ class ProductModel extends Component {
// let cur_icon = '' // let cur_icon = ''
// cur_icon = { uri: global_domain_config + '/jeecg-boot/sys/common/view/' + cur_supplier_icon[0] } // cur_icon = { uri: global_domain_config + '/jeecg-boot/sys/common/view/' + cur_supplier_icon[0] }
let bttom_options = [] let bttom_options = []
if (item[LocalVariable.CHILDREN_LINE_NAME]) { if (item[LocalVariable.CHILDREN_LINE_NAME]) {
if (item.category_code === LocalVariable.SURGICAL_TEMPLATE) { if (item.category_code === LocalVariable.SURGICAL_TEMPLATE) {
...@@ -841,9 +846,7 @@ class ProductModel extends Component { ...@@ -841,9 +846,7 @@ class ProductModel extends Component {
bttom_options = item[LocalVariable.CHILDREN_LINE_NAME] bttom_options = item[LocalVariable.CHILDREN_LINE_NAME]
} }
} }
// console.log('哈👌===', bttom_options)
console.log('哈👌===', bttom_options)
return ( return (
<TouchableOpacity <TouchableOpacity
...@@ -1108,6 +1111,8 @@ const styles = StyleSheet.create({ ...@@ -1108,6 +1111,8 @@ const styles = StyleSheet.create({
}, },
col_shpp_tit: { col_shpp_tit: {
fontSize: 12, fontSize: 12,
fontFamily: font_family_regular,
color: first_text_color
}, },
col_shpp_clear: {}, col_shpp_clear: {},
list_icon: { list_icon: {
...@@ -1140,7 +1145,8 @@ const styles = StyleSheet.create({ ...@@ -1140,7 +1145,8 @@ const styles = StyleSheet.create({
}, },
rb_icon_txt: { rb_icon_txt: {
fontSize: 12, fontSize: 12,
fontFamily: font_family_light, fontFamily: font_family_regular,
color: second_text_color,
paddingLeft: 4 paddingLeft: 4
}, },
fo_btn_lef: { fo_btn_lef: {
......
app/containers/common/listDataComponent/PicTitDetaiCalcu.js
...@@ -124,9 +124,6 @@ class PicTitDetaiCalcu extends Component { ...@@ -124,9 +124,6 @@ class PicTitDetaiCalcu extends Component {
} }
// console.log('cur_photos--', cur_photos) // console.log('cur_photos--', cur_photos)
console.log('cur_photos--', tipTextOneTit)
console.log('cur_photos--', listItem)
console.log('cur_photos--', tipTextOne)
return ( return (
<View style={[styles.ri_inner, listStyleBox]}> <View style={[styles.ri_inner, listStyleBox]}>
......
app/containers/common/listDataComponent/PictureZoom.js
...@@ -48,7 +48,7 @@ class PictureZoom extends Component { ...@@ -48,7 +48,7 @@ class PictureZoom extends Component {
Image.prefetch(that.state.curImgUrl.uri).then((result) => { Image.prefetch(that.state.curImgUrl.uri).then((result) => {
// console.log('缓存图片:',result) // console.log('缓存图片:',result)
}).catch((error) => { }).catch((error) => {
console.log('缓存图片--err:', error) // console.log('缓存图片--err:', error)
that.setState({ that.setState({
curImgUrl: require('../../../images/not_img.png'), curImgUrl: require('../../../images/not_img.png'),
curImgFail: false curImgFail: false
...@@ -59,7 +59,7 @@ class PictureZoom extends Component { ...@@ -59,7 +59,7 @@ class PictureZoom extends Component {
} }
componentWillReceiveProps(nextProps){ componentWillReceiveProps(nextProps){
console.log('改变', nextProps) // console.log('改变', nextProps)
// let { listImageUrls, listImageIndex } = this.nextProps // let { listImageUrls, listImageIndex } = this.nextProps
let { listImageUrls, listImageIndex } = this.props let { listImageUrls, listImageIndex } = this.props
let { curImgUrl, curImgFail } = this.state let { curImgUrl, curImgFail } = this.state
...@@ -143,55 +143,6 @@ class PictureZoom extends Component { ...@@ -143,55 +143,6 @@ class PictureZoom extends Component {
// curImgFail: false // curImgFail: false
// }) // })
// } // }
// if(curImgUrl.uri){
// Image.prefetch(curImgUrl.uri).then((result) => {
// console.log('lw---lh:',result)
// console.log('curImgUrl==:',curImgUrl)
// }).catch((error) => {
// console.log('lw---lh--err:',error)
// // curImgUrl = require('../../../images/not_img.png')
// // curImgFail = false
// that.setState({
// curImgUrl: require('../../../images/not_img.png'),
// curImgFail: false
// }, () => {
// console.log('curImgUrl==:',curImgUrl, curImgFail)
// })
// })
// }
// let canShow = true
// let cur_defalut = { uri: listImageUrls[listImageIndex].url }
// if (!listImageUrls[listImageIndex].url) {
// cur_defalut = require('../../../images/not_img.png')
// canShow = false
// }
// if(cur_defalut.uri){
// Image.prefetch(cur_defalut.uri).then((result) => {
// console.log('lw---lh:',result)
// console.log('cur_defalut==:',cur_defalut)
// }).catch((error) => {
// console.log('lw---lh--err:',error)
// cur_defalut = require('../../../images/not_img.png')
// canShow = false
// console.log('cur_defalut==:',cur_defalut, canShow)
// })
// // Image.getSize(cur_defalut.uri, (width, height) => {
// // console.log('lw---lh:',width, height)
// // },err => {
// // console.log('lw---lh--!!==err:',err)
// // cur_defalut = require('../../../images/not_img.png')
// // canShow = false
// // })
// }
return ( return (
<View style={[styles.container]}> <View style={[styles.container]}>
...@@ -201,11 +152,12 @@ class PictureZoom extends Component { ...@@ -201,11 +152,12 @@ class PictureZoom extends Component {
onPress={curImgUrl.uri ? () => this.handleShowZoomPic(true) : null} onPress={curImgUrl.uri ? () => this.handleShowZoomPic(true) : null}
> >
<ImageBackground <ImageBackground
source={require('../../../images/not_img.png')} source={curImgUrl.uri ? null : require('../../../images/not_img.png')}
style={icon_style}> style={[styles.img_bg_box]}
>
<Image <Image
source={curImgUrl} source={curImgUrl}
style={icon_style} style={[icon_style, styles.img_bg]}
resizeMode="cover" resizeMode="cover"
defaultSource={require('../../../images/not_img.png')} /> defaultSource={require('../../../images/not_img.png')} />
</ImageBackground> </ImageBackground>
...@@ -274,6 +226,14 @@ const styles = StyleSheet.create({ ...@@ -274,6 +226,14 @@ const styles = StyleSheet.create({
fontSize: second_text_size, fontSize: second_text_size,
color: 'white', color: 'white',
fontFamily: font_family_medium fontFamily: font_family_medium
},
img_bg_box: {
resizeMode: 'cover',
width: '90%',
height: '90%'
},
img_bg: {
// backgroundColor: 'rgba(255,255,255,1)'
} }
}) })
......
app/containers/deviceInfo/DeviceInfoPage.js
...@@ -7,7 +7,8 @@ import { ...@@ -7,7 +7,8 @@ import {
icon_style, icon_style,
pxSize, pxSize,
foundation_color, foundation_color,
font_family_regular font_family_regular,
first_text_color
} from '../../base/BaseStyle'; } from '../../base/BaseStyle';
import StatusBarView from '../common/StatusBarView'; import StatusBarView from '../common/StatusBarView';
import HeadBackItem from '../common/HeadBackItem'; import HeadBackItem from '../common/HeadBackItem';
...@@ -400,7 +401,8 @@ const styles = StyleSheet.create({ ...@@ -400,7 +401,8 @@ const styles = StyleSheet.create({
}, },
btn_item_txt: { btn_item_txt: {
fontSize: 12, fontSize: 12,
fontFamily: font_family_regular fontFamily: font_family_regular,
color: first_text_color
} }
}) })
......
app/containers/selfOrder/module/ProductRightStyle.js
...@@ -109,16 +109,24 @@ class ProductRightStyle extends Component { ...@@ -109,16 +109,24 @@ class ProductRightStyle extends Component {
let superTip = '' let superTip = ''
childData.map((chDa, chInd) => { childData.map((chDa, chInd) => {
let splitStr = ' / ' let splitStr = ' / '
if (chInd === childData.length - 1) { // if (chInd === childData.length - 1) {
// splitStr = ''
// }
if(!superTip){
splitStr = '' splitStr = ''
} }
superTip += `${chDa.category_name}x${chDa[LocalVariable.SELECTED_QUQNTITY]}${splitStr}` if(chDa[LocalVariable.SELECTED_QUQNTITY] > 0){
superTip += `${splitStr}${chDa.category_name}x${chDa[LocalVariable.SELECTED_QUQNTITY]}`
}
// superTip += `${chDa.category_name}x${chDa[LocalVariable.SELECTED_QUQNTITY]}${splitStr}`
}) })
let curObj = { let curObj = {
superId: rsdItem['template_number'], superId: rsdItem['template_number'],
superIndex: rsdIndex, superIndex: rsdIndex,
superTit: rsdItem['template_name'], superTit: rsdItem['template_name'],
superImg: rsdItem['photos'], superImg: rsdItem['photos'],
superTipStr: rsdItem['customer_name'],
superTipOne: rsdItem['doctor_name'],
superTip: superTip, superTip: superTip,
version: 0, version: 0,
lineOptions: childData, lineOptions: childData,
...@@ -293,6 +301,7 @@ class ProductRightStyle extends Component { ...@@ -293,6 +301,7 @@ class ProductRightStyle extends Component {
plusCallBack={curPlusCallBack} plusCallBack={curPlusCallBack}
reduceCallBack={curReduceCallBack} reduceCallBack={curReduceCallBack}
listMaxNum={curListMaxNum} listMaxNum={curListMaxNum}
listStyleImg={styles.rig_icon}
/> />
</SafeAreaView> </SafeAreaView>
) )
...@@ -491,7 +500,8 @@ const styles = StyleSheet.create({ ...@@ -491,7 +500,8 @@ const styles = StyleSheet.create({
width: Width() - 80, width: Width() - 80,
backgroundColor: foundation_color, backgroundColor: foundation_color,
height: '100%', height: '100%',
paddingHorizontal: 20 paddingHorizontal: 20,
paddingLeft: 10
}, },
cont_right_scroll_cont: {}, cont_right_scroll_cont: {},
cont_right_list: {}, cont_right_list: {},
...@@ -523,7 +533,11 @@ const styles = StyleSheet.create({ ...@@ -523,7 +533,11 @@ const styles = StyleSheet.create({
marginBottom: 10 marginBottom: 10
}, },
cont_thr_list: {}, cont_thr_list: {},
thr_container: {} thr_container: {},
rig_icon: {
width: pxSize(68),
height: pxSize(68)
}
}) })
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
......
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