✨ feat(预览码单对接):

This commit is contained in:
2023-01-11 11:18:16 +08:00
parent 65462bd077
commit af03e5fdd3
12 changed files with 105 additions and 22 deletions
+2 -1
View File
@@ -133,6 +133,8 @@ Readonly<AtCalendarBodyState>
true,
)
console.log('nowList:::', selectedDate)
const nextList: Calendar.ListInfo<Calendar.Item> = this.generateFunc(
dayjsDate.add(1, 'month').valueOf(),
selectedDate,
@@ -259,7 +261,6 @@ Readonly<AtCalendarBodyState>
public render(): JSX.Element {
const { isSwiper } = this.props
const { isAnimate, offsetSize, listGroup } = this.state
if (!isSwiper) {
return (
<View
+1
View File
@@ -159,6 +159,7 @@ Readonly<AtCalendarState>
end = start
}
console.log('generateDateValue:::', generateDateValue)
return {
generateDate: generateDateValue,
selectedDate: this.getSelectedDate(start, end),
@@ -34,7 +34,6 @@ export default class AtCalendarList extends React.Component<Props> {
public render(): JSX.Element | null {
const { list } = this.props
if (!list || list.length === 0) { return null }
return (
<View className="at-calendar__list flex">
{list.map((item: Calendar.Item) => (
+5 -5
View File
@@ -1,5 +1,5 @@
import { View } from '@tarojs/components'
import { memo, useState } from 'react'
import { memo, useMemo, useState } from 'react'
import dayjs from 'dayjs'
import NormalButton from '../normalButton'
import styles from './index.module.scss'
@@ -34,6 +34,9 @@ const TimePicker = (props: Props) => {
console.log('e===>', e)
setTime(e)
}
const currentDate = useMemo(() => {
return (!start && !end) ? null : { start, end }
}, [props])
// 由于小程序的bug,部分ios和安卓显示时间的时候会有问题,原因是格式化时有`-`这个横杠
return (
<>
@@ -41,10 +44,7 @@ const TimePicker = (props: Props) => {
<AtCalendar
isMultiSelect
format="YYYY-MM-DD 00:00:00"
currentDate={{
start,
end,
}}
currentDate={currentDate}
onSelectDate={e => handTime(e)}
/>
</View>
+13 -2
View File
@@ -23,6 +23,7 @@ export default (props: Props) => {
// 手机号
const userPhone = (addressInfo) => {
if (addressInfo.purchaser_phone) { return addressInfo.purchaser_phone }
return addressInfo?.shipment_mode == 2 ? props.orderObj.target_user_phone : props.orderObj.take_goods_phone
}
@@ -41,6 +42,11 @@ export default (props: Props) => {
return addressInfo?.shipment_mode == 2 ? props?.orderObj.target_user_name : ''
}
// 显示隐藏
const showStatus = (state: boolean) => {
return (state !== false && state !== true) ? true : state
}
// 预览图片
const showImage = (e) => {
e.stopPropagation()
@@ -92,6 +98,7 @@ export default (props: Props) => {
client: props.orderObj.purchaser_name, // 客户名称
phone: userPhone(props.orderObj), // 收货手机号码
order_total_length: (props.orderObj.total_number / 100).toString(), // 订单布匹长度
order_total_num: `${props.orderObj.total_number}`,
order_total_price: formatPriceDiv(props.orderObj.bill_total_sale_price).toString(), // 订单价格
qrcode: `${PAY_H5_CODE_URL}?key=${props.orderObj.md5_key}`, // 跳转链接
order_total_weight: formatWeightDiv(props.orderObj.total_weight || props.orderObj.total_estimate_weight).toString(), // 订单布匹重量
@@ -104,8 +111,12 @@ export default (props: Props) => {
show_deduction_amount: false,
show_sale_price: props.orderObj.is_display_price,
show_barcode: true, // 条形码
show_qrcode: true,
show_barcode: showStatus(props.orderObj.show_barcode), // 条形码
show_qrcode: showStatus(props.orderObj.show_qrcode),
show_pay_type: showStatus(props.orderObj.show_pay_type), // 是否显示结算方式
show_order_no: showStatus(props.orderObj.show_order_no), // 是否显示订单号
show_shipment_mode: showStatus(props.orderObj.show_shipment_mode), // 是否显示发货方式
}
const res = await fetchData(query)
if (res.data) {