Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit 34cfcc5e by Denglingling
Options

增加忽略文件，删除多余注释； 

(cherry picked from commit 8784c5cf)
parent 87b4391d
Inline Side-by-side
Showing with 59 additions and 225 deletions
.gitignore
......@@ -54,3 +54,4 @@ buck-out/
# Bundle artifact
*.jsbundle
package-lock.json
app/Router.js
......@@ -4,8 +4,6 @@ import {
Animated
} from 'react-native';
import { createStackNavigator, createAppContainer} from 'react-navigation';
// import { createAppContainer} from 'react-navigation';
// import { createStackNavigator } from 'react-navigation-stack';
import LoginPage from './containers/login/LoginPage';
import HomePage from './containers/home/HomePage';
import SelfOrderPage from './containers/selfOrder/SelfOrderPage';
......
app/action/LoginAction.js
......@@ -87,7 +87,6 @@ export function autoLogin(params) {
let {global_domain_config} = getState().login
PostRequest(global_domain_config, '/access_token/password/search?app_code=MOBILE', params).then((res) => {
if(res.error_code === 0){
// console.warn('auto------',res);
if(res.functions && res.functions.length) {
dispatch(autoLoginSuccess(res));
} else {
......@@ -96,7 +95,7 @@ export function autoLogin(params) {
}
// dispatch(autoLoginSuccess(res))
}else {
console.warn(res.error_msg);
console.log(res.error_msg);
show(res.error_msg);
dispatch(autoLoginFailure())
}
......
app/containers/common/BarCodePage.js
......@@ -10,41 +10,29 @@ import {
} from 'react-native';
import {
title_text_color,
Height,
Width,
safe_view,
promary_color
} from '../../base/BaseStyle';
import { show } from '../../utils/Utils';
import { RNCamera } from 'react-native-camera';
import StatusBarView from './StatusBarView';
import HeadBackItem from './HeadBackItem';
/** 二维码扫码页面 */
class BarCodePage extends Component {
constructor(props) {
super(props);
this.state = {
transCode:'', // 条码
// typeCode: '', // 条码类型
showCode: true,
// animate: new Animated.Value(0), // 二维坐标{x:0,y:0}
animateCode: new Animated.Value((Width() - 200) / 2,(Height() - 340) / 2),
// 中间横线动画初始值
moveAnim: new Animated.Value(-2)
moveAnim: new Animated.Value(-2) // 中间横线动画初始值
}
}
componentDidMount() {
// InteractionManager.runAfterInteractions(() => {
// this.startAnimation()
// })
// console.log('进入-------', this.state.showCode)
this.startAnimation();
}
/** 扫描框动画*/
// 扫描框动画
startAnimation = () => {
this.state.moveAnim.setValue(-2);
Animated.sequence([
......@@ -74,7 +62,6 @@ class BarCodePage extends Component {
const { navigate } = that.props.navigation;
let { typeName, supPage } = that.props.navigation.state.params
//扫码后的操作
console.log('data===========---------=====', data)
if(data) {
let barCodeData = {
typeName: typeName,
......@@ -101,10 +88,10 @@ class BarCodePage extends Component {
ref={ref => {
this.camera = ref;
}}
autoFocus={RNCamera.Constants.AutoFocus.on}/*自动对焦*/
autoFocus={RNCamera.Constants.AutoFocus.on} /*自动对焦*/
style={[styles.rnca_preview]}
type={RNCamera.Constants.Type.back}/*切换前后摄像头 front前back后*/
flashMode={RNCamera.Constants.FlashMode.off}/*相机闪光模式*/
type={RNCamera.Constants.Type.back} /*切换前后摄像头 front前back后*/
flashMode={RNCamera.Constants.FlashMode.off} /*相机闪光模式*/
onBarCodeRead={this.onBarCodeRead}
>
<View style={styles.anima_top_box} />
......
app/containers/common/CellTextStyle.js
......@@ -13,7 +13,6 @@ import {
dis_sub_color,
title_text_color,
second_text_size,
font_family_medium,
font_family_semibold,
font_family_regular
} from '../../base/BaseStyle';
......
app/containers/common/DateModel.js
......@@ -17,22 +17,20 @@ import {
promary_color
} from '../../base/BaseStyle';
import DatePicker from 'react-native-date-picker';
// import { changeDateFormat } from '../../utils/Utils';
import moment from 'moment';
/** 日期弹窗 */
class DateModel extends Component {
constructor(props) {
super(props);
this.state = {
isVisible: this.props.show,
// entityList: this.props.entityList
currentDate: this.props.date,
date_mode: 'datetime'
}
}
componentWillReceiveProps(nextProps) {
// console.warn('------show--------------',nextProps.show, this.state.isVisible )
let {isVisible, currentDate, date_mode} = this.state
if (isVisible != nextProps.show) {
this.setState({
......@@ -40,8 +38,12 @@ class DateModel extends Component {
});
}
if (currentDate != nextProps.date) {
let supDate = nextProps.date
if(typeof supDate === "string") {
supDate = new Date(supDate)
}
this.setState({
currentDate: nextProps.date
currentDate: supDate
});
}
if (date_mode != nextProps.date_mode) {
......@@ -59,15 +61,12 @@ class DateModel extends Component {
}
subCancel() {
// console.warn('取消')
this.handleCloseModal()
}
subSure(date) {
// console.warn('确认',date, date instanceof Date)
let {date_mode} = this.state
if(date instanceof Date) {
// date = changeDateFormat(date, 'yyyy-MM-dd hh:mm')
switch(date_mode) {
case 'datetime':
date = moment(date).format("YYYY-MM-DD HH:mm");
......@@ -80,16 +79,11 @@ class DateModel extends Component {
break;
}
}
// console.warn('确认 ---callback',date)
this.props.callback(date)
this.handleCloseModal()
}
currentDateChange(date) {
// let formatDate = changeDateFormat(date, 'yyyy-MM-dd hh:mm')
// console.warn('date',date)
// console.warn(formatDate)
this.setState({
currentDate: date
});
......@@ -123,7 +117,6 @@ class DateModel extends Component {
onDateChange={(date) => this.currentDateChange(date)}
locale="zh"
mode={date_mode}
// style={{height:100}}
/>
</View>
</View>
......@@ -133,10 +126,7 @@ class DateModel extends Component {
}
render() {
return (
// <View style={styles.dia_container}>
// <Text style={styles.dis_cont}>遮照层</Text>
// </View>
return (
<View style={styles.dia_container}>
<Modal
transparent={true}
......@@ -158,14 +148,7 @@ class DateModel extends Component {
const styles = StyleSheet.create({
dia_container: {
flex: 1,
// position: 'absolute',
// top: 0,
// left: 0,
// right: 0,
// backgroundColor: '#ccc',
// width: Width(),
// height: Height()
flex: 1
},
dis_cont: {
width: '80%',
......@@ -181,10 +164,7 @@ const styles = StyleSheet.create({
flex: 1,
flexDirection: 'column',
justifyContent: 'center',
position: 'relative',
// marginTop: 12,
// marginBottom: 12,
// height: pxHeight(420)
position: 'relative'
},
modal_style: {
position: "absolute",
......@@ -197,7 +177,6 @@ const styles = StyleSheet.create({
borderTopLeftRadius: 12,
borderTopRightRadius: 12,
maxHeight: pxHeight(480)
// maxHeight: '100%'
},
item: {
width: Width(),
......@@ -217,8 +196,6 @@ const styles = StyleSheet.create({
scro_box: {
paddingVertical: 30,
paddingTop: 10
// paddingTop: 42,
// alignItems: 'center'
},
box_btn: {
flex: 1,
......@@ -230,14 +207,10 @@ const styles = StyleSheet.create({
borderBottomWidth: 1
},
btn_sty: {
// backgroundColor: '#ccc',
width: '50%',
height: 42
},
btn_sty_left: {
// borderRightWidth: 1,
// borderRightColor: '#FF0000'
},
btn_sty_left: {},
btn_text: {
fontFamily: font_family_regular,
fontSize: 16,
......@@ -256,18 +229,7 @@ const styles = StyleSheet.create({
],
alignItems: 'center'
},
item_scroll: {
// height: '80%',
// marginTop: 30,
// paddingBottom: 30
},
// cancel: {
// width: Width(),
// height: 30,
// marginTop: 12,
// alignItems: 'center',
// backgroundColor: '#ffffff'
// },
item_scroll: {}
})
export default DateModel;
\ No newline at end of file
app/containers/common/DialogModel.js
......@@ -16,7 +16,7 @@ import {
safe_view
} from '../../base/BaseStyle';
// 选择器弹窗
/** 选择器弹窗 */
class DialogModel extends Component {
constructor(props) {
super(props);
......
app/containers/common/ErrorTipModel.js
......@@ -11,6 +11,7 @@ import {
font_family_regular
} from '../../base/BaseStyle';
/** 弹窗的错误提示 */
class ErrorTipModel extends Component {
constructor(props) {
super(props);
......
app/containers/common/LodingModel.js
......@@ -12,6 +12,7 @@ import {
promary_color
} from '../../base/BaseStyle';
/** 加载中 */
class LodingModel extends Component {
constructor(props) {
super(props);
......
app/containers/common/ProductModel.js
......@@ -115,14 +115,14 @@ class ProductModel extends Component {
// 共计已选 点击
handleCloseSelected() {
console.warn('共计已选：666--model')
console.log('共计已选：666--model')
this.closeModal()
this.props.closeSelected(false)
}
// 选好了 点击
handleCloseSubmit() {
console.warn('选好了--model')
console.log('选好了--model')
this.closeModal()
this.props.closeSubmit(false)
}
......
app/containers/common/SubSuccPage.js
......@@ -47,7 +47,6 @@ class SubSuccPage extends Component {
Clipboard.setString(orderVal)
// 获取复制的值
let str = await Clipboard.getString()
console.warn(str)
show('复制成功')
}
// 返回首页
......@@ -117,7 +116,6 @@ const styles = StyleSheet.create({
succ_title: {
fontSize: 17,
fontFamily: font_family_medium,
// fontWeight: 'bold',
color: first_text_color,
paddingTop: 8,
paddingBottom: 20
......
app/containers/common/ZoomPictureModel.js
......@@ -11,6 +11,7 @@ import {
} from '../../base/BaseStyle';
import ImageViewer from 'react-native-image-zoom-viewer';
/** 放大图片弹窗 */
class ZoomPictureModel extends Component {
constructor(props) {
super(props);
......@@ -71,9 +72,6 @@ class ZoomPictureModel extends Component {
render() {
let { isShowImage, zoomImages, currShowImgIndex } = this.state
console.log('==currShowImgIndex======',isShowImage, zoomImages, currShowImgIndex)
return (
<View style={styles.container}>
<Modal
......
app/containers/equipConsu/module/FillUnitPricePage.js
......@@ -32,30 +32,6 @@ class FillUnitPricePage extends Component {
// sale_price: 90890,
// local_add_price: 90890,
// select: true
// },{
// "id": "3",
// item_name: '人工髋关节假体-JS-HB ||| T4',
// specification: '3g,Ytg-DG-SZGT',
// serial_number: '2001202001001774',
// sale_price: 90890,
// local_add_price: 90890,
// select: true
// },{
// "id": "4",
// item_name: '人工髋关节假体-JS-HB ||| T5',
// specification: '3g,Ytg-DG-SZGT',
// serial_number: '2001202001001774',
// sale_price: 90890,
// local_add_price: 90890,
// select: true
// },{
// "id": "5",
// item_name: '人工髋关节假体-JS-HB ||| T6',
// specification: '3g,Ytg-DG-SZGT',
// serial_number: '2001202001001774',
// sale_price: 90890,
// local_add_price: 90890,
// select: true
// }
]
}
......@@ -68,7 +44,6 @@ class FillUnitPricePage extends Component {
// 获取选择的数据
getLocalSelectedData() {
let {localSelectOption} = this.props.navigation.state.params
// console.log('-------localSelectOption--------', localSelectOption)
this.setState({
unitPriceOption: localSelectOption
})
......@@ -76,7 +51,6 @@ class FillUnitPricePage extends Component {
// 每一个元素输入单价
handleItemPriceInput(text, index) {
// console.warn('单价------input:', text, index, typeof Number(text))
let {unitPriceOption} = this.state
unitPriceOption[index].local_add_price = Number(text)
this.setState({
......@@ -86,7 +60,6 @@ class FillUnitPricePage extends Component {
// 确定单价 点击
handleSubmit() {
// console.warn('确定单价------check:')
let {unitPriceOption} = this.state
let canSubFlag = true
let {props} = this
......@@ -102,7 +75,6 @@ class FillUnitPricePage extends Component {
this.setState({
unitPriceOption
})
// console.log('unitPriceOption====', unitPriceOption)
// 存储于store中，并跳转
props.getSubdetailOption(unitPriceOption)
props.navigation.navigate('EquipConsuPage', { title: '器械消耗' })
......@@ -129,7 +101,6 @@ class FillUnitPricePage extends Component {
// 返回每一列元素
renderSubListItem(item, index) {
// console.log('item, index---',item, index)
let price = ''
if(item.local_add_price) {
price = String(item.local_add_price)
......@@ -195,9 +166,7 @@ class FillUnitPricePage extends Component {
<SafeAreaView style={safe_view}>
<HeadBackItem title={title} navigation={navigation} />
<View style={styles.cu_dl_main}>
{ this.renderContItem() }
</View>
{this.renderFooterBtnItem()}
</SafeAreaView>
......@@ -269,11 +238,7 @@ const styles = StyleSheet.create({
})
const mapStateToProps = (state) => {
return {
// userInfo: state.login.userInfo,
// token: state.login.token,
// loginState: state.login.loginState
}
return {}
}
const mapDispatchToProps = (dispatch) => {
......
app/containers/historicalOrder/HistoricalOrderPage.js
......@@ -69,22 +69,11 @@ class HistoricalOrderPage extends Component {
// local_his_name: '髋关节手术', // 手术名称：surgery_name 结单标识：settled_flag (可能为空)
// local_his_time: '2020/05/18 10:25', // 手术时间：surgery_date 消耗时间：consume_date
// local_his_status: '待出库' // 状态：header_status 是否消耗：consumed_flag（返回的error_code：0/空）
// },{
// local_his_number: '202005182012033',
// local_his_name: '髋关节手术',
// local_his_time: '2020/05/18 10:25',
// local_his_status: '待审核'
// },{
// local_his_number: '202005182012033',
// local_his_name: '髋关节手术',
// local_his_time: '2020/05/18 10:25',
// local_his_status: '待审核'
// }
],
isShowSelect: false, // 显示/隐藏 筛选内容
borrowStatus: ['待审核','待出库','待还货','其他'],
consumeStatus: ['待审核','已消耗'],
// transferStatus: ['已提交','已完成'],
transferStatus: ['已输入', '已审批', '已驳回', '已提交', '已取消'],
searchBorrowStatus: [ // 【借货】对应的状态值
"ENTERED,SUBMITTED",
......@@ -97,8 +86,6 @@ class HistoricalOrderPage extends Component {
"Y"
],
searchTransStatus: [ // 【转单】对应的状态值
// "N",
// "Y"
"ENTERED", "APPROVED", "REJECTED", "SUBMITTED", "CANCELED"
],
whetherCallClick: false, // 是否调用筛选弹窗的查询
......
app/containers/selfOrder/module/ChooseProductPage.js
......@@ -85,7 +85,7 @@ class ChooseProductPage extends Component {
stencilData: [],
leftOptionList: [
{
title: '手术模版',
title: '手术模板',
iconImg: require('../../../images/surg_temp.png'),
stencilData: [{
"id": "0",
......@@ -129,7 +129,7 @@ class ChooseProductPage extends Component {
tip2: '描述信息',
select: false
}
], // 模版数据
], // 模板数据
},
{
title: '螺钉盒',
......@@ -176,7 +176,7 @@ class ChooseProductPage extends Component {
tip2: '描述信息',
select: false
}
], // 模版数据
], // 模板数据
},
{
title: '器械包',
......@@ -223,7 +223,7 @@ class ChooseProductPage extends Component {
tip2: '描述信息',
select: false
}
], // 模版数据
], // 模板数据
},
{
title: '辅助工具',
......@@ -270,7 +270,7 @@ class ChooseProductPage extends Component {
tip2: '描述信息',
select: false
}
], // 模版数据
], // 模板数据
},
{
title: '人工髋关节假体'
......@@ -316,7 +316,7 @@ class ChooseProductPage extends Component {
// 左侧标题点击
handleLeftNav(item, index) {
console.warn('手术模版--', index, item)
console.warn('手术模板--', index, item)
let {leftOptionList} = this.state
this.setState({
leftActiveIndex: index,
......
app/containers/selfOrder/module/ProductRightStyle.js
......@@ -81,9 +81,9 @@ class ProductRightStyle extends Component {
// tip2: '描述信息',
// select: false
// }
// ], // 模版数据
stencilData: this.props.superStencilData, // 模版数据
selectItem : [], // 当前选中模版
// ], // 模板数据
stencilData: this.props.superStencilData, // 模板数据
selectItem : [], // 当前选中模板
toolShowPopup: false, // 螺钉盒等三个弹窗显示
otherListData : [{ // 人工髋关节假体等数据 -- 大类
"id": "0",
......@@ -197,7 +197,7 @@ class ProductRightStyle extends Component {
}
}
// 点击模版选中
// 点击模板选中
handleItemStencil(item, index) {
console.warn('xuanze', index, item)
let { stencilData, selectItem } = this.state
......@@ -225,13 +225,13 @@ class ProductRightStyle extends Component {
// console.warn(`选中了${JSON.stringify(this.state.selectItem)}`)
}
// 跳转到编辑模版
// 跳转到编辑模板
enterEditStencilPage(item, index) {
let { superIndex } = this.props
console.warn('dianji---跳转', superIndex, index, item)
if(superIndex == 0) {
this.props.navigation.navigate('EditStencilPage', {title: '选择产品 - 编辑模版'})
this.props.navigation.navigate('EditStencilPage', {title: '选择产品 - 编辑模板'})
} else if ( superIndex > 0 && superIndex < 4) {
this.handleIsShowDialog()
} else {
......@@ -281,7 +281,7 @@ class ProductRightStyle extends Component {
})
}
// 返回模版每一列
// 返回模板每一列
renderStencilItem(item, index) {
let { toolShowPopup } = this.state
return (
......@@ -338,7 +338,7 @@ class ProductRightStyle extends Component {
)
}
// 返回模版元素
// 返回模板元素
renderStencilStyle() {
return(
<View style={styles.stencil_cont}>
......@@ -377,7 +377,7 @@ class ProductRightStyle extends Component {
)
}
// 返回模版等四个以外的每一列 -- 小类
// 返回模板等四个以外的每一列 -- 小类
renderThridItem(item, index) {
return (
<SafeAreaView style={styles.thr_container}>
......@@ -419,7 +419,7 @@ class ProductRightStyle extends Component {
)
}
// 返回模版等四个以外的动态元素 -- 小类
// 返回模板等四个以外的动态元素 -- 小类
renderThridStyle() {
return(
<View style={styles.stencil_cont}>
......@@ -446,7 +446,7 @@ class ProductRightStyle extends Component {
)
}
// 返回模版等四个以外的每一列 -- 大类
// 返回模板等四个以外的每一列 -- 大类
renderOtherListItem(item, index) {
return (
<SafeAreaView style={styles.oth_container}>
......@@ -468,7 +468,7 @@ class ProductRightStyle extends Component {
)
}
// 返回模版等四个以外的动态元素
// 返回模板等四个以外的动态元素
renderOtherStyle() {
return(
<View style={styles.stencil_cont}>
......
app/containers/selfOrder/module/mock/index.js
export const leftOptionList = [
{
title: '手术模版',
title: '手术模板',
iconImg: require('../../../images/surg_temp.png'),
stencilData: [{
"id": "0",
......@@ -44,7 +44,7 @@ export const leftOptionList = [
tip2: '描述信息',
select: false
}
], // 模版数据
], // 模板数据
},
{
title: '螺钉盒',
......@@ -91,7 +91,7 @@ export const leftOptionList = [
tip2: '描述信息',
select: false
}
], // 模版数据
], // 模板数据
},
{
title: '器械包',
......@@ -138,7 +138,7 @@ export const leftOptionList = [
tip2: '描述信息',
select: false
}
], // 模版数据
], // 模板数据
},
{
title: '辅助工具',
......@@ -185,7 +185,7 @@ export const leftOptionList = [
tip2: '描述信息',
select: false
}
], // 模版数据
], // 模板数据
},
{
title: '人工髋关节假体'
......
app/containers/transOrder/module/TransDetailsModel.js
......@@ -45,49 +45,14 @@ class TransDetailsModel extends Component {
],
topActiveIndex: 0,
contOptionData: [ // 底部产品内容
{
"id": "0",
item_name: '人工髋关节假体-JS-HB ||| T',
specification: '3g,Ytg-DG-SZGT',
surgery_collect_number: "SC20200529000010",
serial_number: '2001202001001771',
select: false
},{
"id": "1",
item_name: '人工髋关节假体-JS-HB ||| T2',
specification: '3g,Ytg-DG-SZGT',
surgery_collect_number: "SC20200529000010",
serial_number: '2001202001001772',
select: false
},{
"id": "2",
item_name: '人工髋关节假体-JS-HB ||| T3',
specification: '3g,Ytg-DG-SZGT',
surgery_collect_number: "SC20200529000010",
serial_number: '2001202001001773',
select: true
},{
"id": "3",
item_name: '人工髋关节假体-JS-HB ||| T4',
specification: '3g,Ytg-DG-SZGT',
surgery_collect_number: "SC20200529000010",
serial_number: '2001202001001774',
select: true
},{
"id": "4",
item_name: '人工髋关节假体-JS-HB ||| T5',
specification: '3g,Ytg-DG-SZGT',
surgery_collect_number: "SC20200529000010",
serial_number: '2001202001001775',
select: true
},{
"id": "5",
item_name: '人工髋关节假体-JS-HB ||| T6',
specification: '3g,Ytg-DG-SZGT',
surgery_collect_number: "SC20200529000010",
serial_number: '2001202001001776',
select: true
}
// {
// "id": "0",
// item_name: '人工髋关节假体-JS-HB ||| T',
// specification: '3g,Ytg-DG-SZGT',
// surgery_collect_number: "SC20200529000010",
// serial_number: '2001202001001771',
// select: false
// },
]
}
}
......@@ -103,18 +68,13 @@ class TransDetailsModel extends Component {
// 已选 点击
handleCloseSelected() {
// console.warn('已选：666--model')
let {contOptionData} = this.state
this.props.callback(contOptionData)
this.closeModal()
// this.props.closeSelected(false)
}
// 确定耗材 点击
handleCloseSubmit() {
// console.warn('确定耗材--model')
this.closeModal()
this.props.closeSubmit(false)
}
......@@ -132,7 +92,6 @@ class TransDetailsModel extends Component {
* @param {number} index 当前角标
*/
handleDelItemClick(item, index) {
// console.log('-----删除-----', item, index)
let { contOptionData } = this.state
contOptionData.splice(index, 1)
this.setState({
......@@ -167,8 +126,6 @@ class TransDetailsModel extends Component {
>
<View style={[
styles.top_inner,
// (index == 1 || index == 2) ? styles.se_thr_width : '',
// index == 3 ? styles.four_width : '',
index == topActiveIndex ? styles.top_inner_act : ''
]}>
<Text style={[styles.top_tit, index == topActiveIndex ? styles.top_tit_act : '']}>
......@@ -267,7 +224,6 @@ class TransDetailsModel extends Component {
<View style={styles.scro_box}>
{this.renderTopProItem()}
{this.renderContItem()}
{/* {this.renderFooterBtnItem()} */}
</View>
{this.renderFooterBtnItem()}
</View>
......@@ -322,28 +278,12 @@ const styles = StyleSheet.create({
borderTopRightRadius: 12,
height: pxHeight(580)
},
// item: {
// width: Width(),
// height: 40,
// paddingLeft: 20,
// paddingRight: 20,
// alignItems: 'center'
// },
// itemText: {
// fontSize: 16,
// color: third_text_color
// },
// curr_item: {
// color: first_text_color,
// fontWeight: 'bold'
// },
scro_box: {
flex: 1
},
top_box: {
width: Width(),
paddingHorizontal: 20
// backgroundColor: foundation_color,
},
top_scroll_cont: {
paddingBottom: 4,
......@@ -381,7 +321,6 @@ const styles = StyleSheet.create({
fontWeight: 'bold'
},
edit_cont: {
// height: pxHeight(430)
flex: 1
},
edit_scroll_cont: {
......
app/utils/Utils.js
......@@ -91,7 +91,6 @@ export const changeDateFormat = (time, format) => {
// 格式化 2020-04-23 17:41 为日期
export const formatStrForDate = (str) => {
console.warn('str---', str)
if(str === '' || !str) {
return
}
......@@ -107,7 +106,6 @@ export const formatStrForDate = (str) => {
'minute': hsArr[1]
}
date = new Date(dateObj['year'], dateObj['month'], dateObj['day'], dateObj['hour'], dateObj['minute'])
console.warn('----date---', date)
return date
}
......
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