xuan/TestRestructureWechatLymarketDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

商城测试版v8

Browse Source
This commit is contained in:
czm 2022-07-26 11:00:54 +08:00
parent 2468f40c45
commit b4e5d9e01a
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pages/order/components/scanPay/index.tsx
View File

@ -35,7 +35,6 @@ export default memo(({show = true, onClose, company, orderInfo}:Param) => {
useEffect(() => { useEffect(() => {
if(orderInfo) { if(orderInfo) {
console.log('orderInfo::',orderInfo)
let lists:ListParam[] = [] let lists:ListParam[] = []
orderInfo.product_list?.map(pitem => { orderInfo.product_list?.map(pitem => {
pitem?.product_colors?.map(citem => { pitem?.product_colors?.map(citem => {
@ -75,7 +74,18 @@ export default memo(({show = true, onClose, company, orderInfo}:Param) => {
qrcode:"", //跳转链接 qrcode:"", //跳转链接
order_total_weight: formatWeightDiv(orderInfo.total_weight||orderInfo.total_estimate_weight).toString(), //订单布匹重量 order_total_weight: formatWeightDiv(orderInfo.total_weight||orderInfo.total_estimate_weight).toString(), //订单布匹重量
list: lists , list: lists ,
show_qrcode: true //是否显示码单 show_qrcode: true, //是否显示码单
estimate_amount: orderInfo.estimate_amount,
show_estimate_amount: orderInfo.estimate_amount > 0,
total_sale_price: orderInfo.total_sale_price,
show_total_sale_price: orderInfo.total_sale_price > 0,
total_weight_error_discount: orderInfo.total_weight_error_discount,
show_total_weight_error_discount: orderInfo.total_weight_error_discount > 0,
actual_amount: orderInfo.actual_amount,
show_actual_amount: orderInfo.actual_amount > 0,
wait_pay_amount: orderInfo.wait_pay_amount,
show_wait_pay_amount: orderInfo.wait_pay_amount > 0
})) }))
} }
}, [orderInfo]) }, [orderInfo])

13
src/pages/order/components/scanPayCheck/index.tsx
View File

@ -78,7 +78,18 @@ export default memo(({show = true, onClose, company, orderInfo}:Param) => {
order_total_num: (orderInfo.total_number).toString(), order_total_num: (orderInfo.total_number).toString(),
qrcode:"", //跳转链接 qrcode:"", //跳转链接
order_total_weight: formatWeightDiv(orderInfo.total_weight||orderInfo.total_estimate_weight).toString(), //订单布匹重量 order_total_weight: formatWeightDiv(orderInfo.total_weight||orderInfo.total_estimate_weight).toString(), //订单布匹重量
list: lists list: lists,
estimate_amount: orderInfo.estimate_amount,
show_estimate_amount: orderInfo.estimate_amount > 0,
total_sale_price: orderInfo.total_sale_price,
show_total_sale_price: orderInfo.total_sale_price > 0,
total_weight_error_discount: orderInfo.total_weight_error_discount,
show_total_weight_error_discount: orderInfo.total_weight_error_discount > 0,
actual_amount: orderInfo.actual_amount,
show_actual_amount: orderInfo.actual_amount > 0,
wait_pay_amount: orderInfo.wait_pay_amount,
show_wait_pay_amount: orderInfo.wait_pay_amount > 0
})) }))
} }
}, [orderInfo]) }, [orderInfo])

2
src/pages/orderList/index.tsx
View File

@ -9,11 +9,11 @@ import InfiniteScroll from "@/components/infiniteScroll"
import { GetOrderListApi, OrderStatusListApi} from '@/api/order' import { GetOrderListApi, OrderStatusListApi} from '@/api/order'
import { dataLoadingStatus, getFilterData } from "@/common/util" import { dataLoadingStatus, getFilterData } from "@/common/util"
import OrderStatusList from "./components/orderStatusList" import OrderStatusList from "./components/orderStatusList"
import Payment from "../order/components/payment"
import { AddShoppingCartApi } from "@/api/shopCart" import { AddShoppingCartApi } from "@/api/shopCart"
import ShopCart from "@/components/shopCart" import ShopCart from "@/components/shopCart"
import { alert } from "@/common/common" import { alert } from "@/common/common"
import { useRouter } from "@tarojs/runtime" import { useRouter } from "@tarojs/runtime"
import Payment from "../order/components/payment"
import ApplyRefund from "../order/components/applyRefund" import ApplyRefund from "../order/components/applyRefund"
import ReturnRecord from "../order/components/returnRecord" import ReturnRecord from "../order/components/returnRecord"