diff --git a/src/components/afterOrderBtns/index.tsx b/src/components/afterOrderBtns/index.tsx
index 04f6940..09f2832 100644
--- a/src/components/afterOrderBtns/index.tsx
+++ b/src/components/afterOrderBtns/index.tsx
@@ -52,13 +52,13 @@ export default memo(({ orderInfo, onClick, fixedBottom = true }: Param) => {
return false
},
},
- {
- id: 4,
- label: '质检结果',
- validatarFunc: (orderInfo) => {
- return orderInfo?.is_quality_check
- },
- },
+ // {
+ // id: 4,
+ // label: '质检结果',
+ // validatarFunc: (orderInfo) => {
+ // return orderInfo?.is_quality_check
+ // },
+ // },
{
id: 5,
label: '上传物流',
diff --git a/src/components/moveBtn/index.tsx b/src/components/moveBtn/index.tsx
index 4ece3b6..68ec6d6 100644
--- a/src/components/moveBtn/index.tsx
+++ b/src/components/moveBtn/index.tsx
@@ -1,5 +1,5 @@
import { MovableArea, MovableView, View } from '@tarojs/components'
-import Taro, { useReady } from '@tarojs/taro'
+import Taro, { useDidShow, useReady, useRouter } from '@tarojs/taro'
import { ReactElement, useEffect, useLayoutEffect, useRef, useState } from 'react'
import classnames from 'classnames'
import styles from './index.module.scss'
@@ -28,9 +28,9 @@ export default ({ children = null, onClick }: param) => {
setShowMoveBtn(true)
})
- useEffect(() => {
+ useDidShow(() => {
getShopCount()
- }, [])
+ })
const dragEnd = (e) => {}
diff --git a/src/components/shopCart/index copy.tsx b/src/components/shopCart/index copy.tsx
index f78ef33..85d6b74 100644
--- a/src/components/shopCart/index copy.tsx
+++ b/src/components/shopCart/index copy.tsx
@@ -374,7 +374,9 @@ export default ({ show = false, onClose, intoStatus = 'shop', default_sale_mode
{!loading && list?.length == 0 && (
暂未选择商品
- 去选购
+ goLink('/pages/index/index')}>
+ 去选购
+
)}
diff --git a/src/components/shopCart/index.tsx b/src/components/shopCart/index.tsx
index efb48f9..e90659f 100644
--- a/src/components/shopCart/index.tsx
+++ b/src/components/shopCart/index.tsx
@@ -341,7 +341,9 @@ export default ({ show = false, onClose, intoStatus = 'shop', default_sale_mode
{!loading && listData?.length == 0 && (
暂未选择商品
- 去选购
+ goLink('/pages/index/index', null, 'switchTab')}>
+ 去选购
+
)}
diff --git a/src/pages/details/components/orderCount/index.tsx b/src/pages/details/components/orderCount/index.tsx
index 62b3597..4b44d6e 100644
--- a/src/pages/details/components/orderCount/index.tsx
+++ b/src/pages/details/components/orderCount/index.tsx
@@ -40,9 +40,8 @@ export default memo(({ show = false, onClose, title = '', productId = 0 }: param
//重置数据
useEffect(() => {
- const newList = initList(list)
- setList([...newList])
condition.current.code_or_name = null
+ getColorList()
setSearchShow(false)
}, [selectIndex])
diff --git a/src/pages/order/components/scanPay/index.tsx b/src/pages/order/components/scanPay/index.tsx
index a0c5d39..ccad5a1 100644
--- a/src/pages/order/components/scanPay/index.tsx
+++ b/src/pages/order/components/scanPay/index.tsx
@@ -5,7 +5,7 @@ import styles from './index.module.scss'
import Popup from '@/components/popup'
import Taro from '@tarojs/taro'
import { alert } from '@/common/common'
-import { formatDateTime, formatHashTag, formatImgUrl, formatPriceDiv, formatWeightDiv } from '@/common/fotmat'
+import { formatDateTime, formatHashTag, formatImgUrl, formatPriceDiv, formatRemoveHashTag, formatWeightDiv } from '@/common/fotmat'
import useCheckAuthorize from '@/use/useCheckAuthorize'
import { GetPayCode } from '@/api/onlinePay'
import LoadingCard from '@/components/loadingCard'
@@ -39,9 +39,9 @@ export default memo(({ show = true, onClose, company, orderInfo }: Param) => {
orderInfo.product_list?.map((pitem) => {
pitem?.product_colors?.map((citem) => {
lists.push({
- product_code: formatHashTag(pitem.code, '', 'name')!,
+ product_code: formatRemoveHashTag(pitem.code),
product_name: pitem.name,
- product_color_code: formatHashTag(citem.code)!,
+ product_color_code: formatRemoveHashTag(citem.code)!,
product_color_name: citem.name,
num: citem.roll.toString(),
length: (citem.length / 100).toString(),
diff --git a/src/pages/salesAfter/components/kindList/index.tsx b/src/pages/salesAfter/components/kindList/index.tsx
index 9f9d2de..c813a0b 100644
--- a/src/pages/salesAfter/components/kindList/index.tsx
+++ b/src/pages/salesAfter/components/kindList/index.tsx
@@ -1,202 +1,236 @@
-import { AFTER_ORDER_STATUS, ORDER_STATUS, REFUND_STATUS } from "@/common/enum"
-import { formatHashTag, formatPriceDiv, formatWeightDiv } from "@/common/fotmat"
-import EstimatedAmount from "@/components/estimatedAmount"
-import LabAndImg from "@/components/LabAndImg"
-import { Text, View } from "@tarojs/components"
-import { memo, useCallback, useMemo } from "react"
-import classnames from "classnames";
-import styles from './index.module.scss'
+import { AFTER_ORDER_STATUS, ORDER_STATUS, REFUND_STATUS } from '@/common/enum'
+import { formatHashTag, formatPriceDiv, formatWeightDiv } from '@/common/fotmat'
+import EstimatedAmount from '@/components/estimatedAmount'
+import LabAndImg from '@/components/LabAndImg'
+import { Text, View } from '@tarojs/components'
+import { memo, useCallback, useMemo } from 'react'
+import classnames from 'classnames'
+import styles from './index.module.scss'
type OrderParam = {
- estimate_amount: number, //预估金额
- list: any[],
- product_list: any[],
- quality_check_pass_product: any[],
- sale_mode: number,
- sale_mode_name: string,
- unit: string,
- total_colors: number,
- total_fabrics: number,
- total_number: number,
- stage: number, //订单状态
- type: 1|2, //1退货， 2退款
- refund_type: number, //退款状态
- total_sale_price: number, //销售金额
- total_should_collect_money: number, //应收金额
- total_weight_error_discount: number, //空差优惠
- the_previous_status: number, //取消订单时的订单状态
- actual_amount: number //实付金额
- quality_check_pass_colors: number, //验布后的颜色总数
- quality_check_pass_fabrics: number, //验布后的面料数量
- quality_check_pass_number: number, //验布后的总数量
- is_quality_check: true|false, //是否质检过
+ estimate_amount: number //预估金额
+ list: any[]
+ product_list: any[]
+ quality_check_pass_product: any[]
+ sale_mode: number
+ sale_mode_name: string
+ unit: string
+ total_colors: number
+ total_fabrics: number
+ total_number: number
+ stage: number //订单状态
+ type: 1 | 2 //1退货， 2退款
+ refund_type: number //退款状态
+ total_sale_price: number //销售金额
+ total_should_collect_money: number //应收金额
+ total_weight_error_discount: number //空差优惠
+ the_previous_status: number //取消订单时的订单状态
+ actual_amount: number //实付金额
+ quality_check_pass_colors: number //验布后的颜色总数
+ quality_check_pass_fabrics: number //验布后的面料数量
+ quality_check_pass_number: number //验布后的总数量
+ is_quality_check: true | false //是否质检过
}
type Param = {
- order: OrderParam,
- comfirm?: boolean //是否是确认订单页面使用
+ order: OrderParam
+ comfirm?: boolean //是否是确认订单页面使用
}
-export default memo(({order, comfirm = false}:Param) => {
+export default memo(({ order, comfirm = false }: Param) => {
+ //售后单状态枚举
+ const {
+ ReturnStageApplying, // 申请中
+ ReturnStageWaitCheck, // 退货中
+ ReturnStageChecked, // 待验布
+ ReturnStageReturned, // 已退款
+ ReturnStageCancel, // 已取消
+ ReturnStageQualityCheckPendingRefund, // 已验布
+ ReturnStageServiceOrderPendingRefund, // 待退款
+ ReturnStageRejected, // 已拒绝
+ } = AFTER_ORDER_STATUS
- //售后单状态枚举
- const {
- ReturnStageApplying, // 申请中
- ReturnStageWaitCheck, // 退货中
- ReturnStageChecked, // 待验布
- ReturnStageReturned, // 已退款
- ReturnStageCancel, // 已取消
- ReturnStageQualityCheckPendingRefund, // 已验布
- ReturnStageServiceOrderPendingRefund, // 待退款
- ReturnStageRejected, // 已拒绝
- } = AFTER_ORDER_STATUS
-
- //金额列表枚举
- const priceList = [
- {
- id:5,
- value: [ReturnStageReturned.value],
- label:'合计金额',
- field: 'total_refund_amount',
- message: '按原单价*退货重量的金额',
-
- },
- {
- id:1,
- value: [ReturnStageReturned.value],
- label:'扣款金额',
- field: 'other_deduction_amount',
- message: '本次售后扣款金额'
- },
- {
- id:3,
- value: [ReturnStageReturned.value],
- label:'退款金额',
- field: 'refund_amount',
- message: '本次售后应退款金额'
- },
- {
- id:4,
- value: [ReturnStageReturned.value],
- label:'退款去向',
- field: 'refund_flow_name',
- message: '本次售后退款金额去向'
- },
- ]
+ //金额列表枚举
+ const priceList = [
+ {
+ id: 5,
+ value: [ReturnStageReturned.value],
+ label: '合计金额',
+ field: 'total_refund_amount',
+ message: '按原单价*退货重量的金额',
+ },
+ {
+ id: 1,
+ value: [ReturnStageReturned.value],
+ label: '扣款金额',
+ field: 'other_deduction_amount',
+ message: '本次售后扣款金额',
+ },
+ {
+ id: 3,
+ value: [ReturnStageReturned.value],
+ label: '退款金额',
+ field: 'refund_amount',
+ message: '本次售后应退款金额',
+ },
+ {
+ id: 4,
+ value: [ReturnStageReturned.value],
+ label: '退款去向',
+ field: 'refund_flow_name',
+ message: '本次售后退款金额去向',
+ },
+ ]
- //是否显示价格
- const showPrice = useCallback((priceInfo) => {
- return priceInfo.value.includes(order?.stage)
- }, [order])
+ //是否显示价格
+ const showPrice = useCallback(
+ (priceInfo) => {
+ return priceInfo.value.includes(order?.stage)
+ },
+ [order],
+ )
- const priceConDom = useMemo(() => {
- if(!order) return
- return (
- <>
- {
- priceList.map(item => {
- return <>{showPrice(item)&&}
- })
- }
-
- )
- }, [order])
-
- //对应数量
- const formatCount = useCallback((item) => {
- return order?.sale_mode == 0? item.roll : Number(item.length / 100)
- }, [order])
-
- //对应单价
- const standardPrice = useCallback(price => {
- return formatPriceDiv(price).toLocaleString() + '/' + (order?.sale_mode == 1?'m':'kg')
- }, [order])
-
- //数量格式
- const numText = useMemo(() => {
- if(order) {
- if(!order?.is_quality_check) {
- let total_number = order?.sale_mode == 0?order?.total_number:(order?.total_number/100)
- return `${order?.total_fabrics} 种面料，${order?.total_colors} 种颜色，共 ${total_number} ${order?.unit}`
- } else {
- let total_number = order?.sale_mode == 0?order?.quality_check_pass_number:(order?.quality_check_pass_number/100)
- return `${order?.quality_check_pass_fabrics} 种面料，${order?.quality_check_pass_colors} 种颜色，共 ${total_number} ${order?.unit}`
- }
- }
- }, [order])
-
- //获取面料数组
- const list = useMemo(() => {
- return order?.is_quality_check?order?.quality_check_pass_product:order?.product_list
- }, [order])
-
- //整理颜色
- const labAndRgbAndUrl = useCallback((item) => {
- return {lab:{...item?.lab}, rgb:{...item?.rgb}, texturl_url: item?.texturl_url}
- }, [])
-
- //单价显示判断
- const sale_price_show = useMemo(() => {
- return order?.stage != ReturnStageServiceOrderPendingRefund.value && order?.stage != ReturnStageQualityCheckPendingRefund.value
- }, [order])
-
- //销售价格
- const formatPrice = useCallback((colorItem) => {
- return (ReturnStageReturned.value == order?.stage) && ¥{formatPriceDiv(colorItem.estimate_amount, 100 , true)}
- }, [order])
-
+ const priceConDom = useMemo(() => {
+ if (!order) return
return (
-
- {list?.length > 0 &&
- {order?.type == 1?'退货信息':'退款信息'}
- {
- list?.map(item => {
- return
-
- {order.sale_mode_name}
- {formatHashTag(item.code, item.name)}
- 共{item?.product_colors?.length}种
-
-
- {item?.product_colors?.map(colorItem => {
- return
-
-
-
-
-
- {colorItem.code + ' ' + colorItem.name}
-
- {sale_price_show&&¥{standardPrice(colorItem.sale_price)}}
- {(order?.stage == ReturnStageReturned.value)&&总重{formatWeightDiv(colorItem.estimate_weight)}kg}
-
-
-
- ×{formatCount(colorItem)}{order.unit}
- {formatPrice(colorItem)}
-
-
-
- })}
-
-
- })
- }
- 合计{numText}
-
- {priceConDom}
-
-
- }
- {
- (list?.length <=0 && order?.is_quality_check) &&
- 质检情况
-
-
- 没有质检通过的商品，无法退款
-
-
- }
-
+ <>
+ {priceList.map((item) => {
+ return (
+ <>
+ {showPrice(item) && (
+
+ )}
+
+ )
+ })}
+
)
-})
\ No newline at end of file
+ }, [order])
+
+ //对应数量
+ const formatCount = useCallback(
+ (item) => {
+ return order?.sale_mode == 0 ? item.roll : Number(item.length / 100)
+ },
+ [order],
+ )
+
+ //对应单价
+ const standardPrice = useCallback(
+ (price) => {
+ return formatPriceDiv(price).toLocaleString() + '/' + (order?.sale_mode == 1 ? 'm' : 'kg')
+ },
+ [order],
+ )
+
+ //数量格式
+ const numText = useMemo(() => {
+ if (order) {
+ if (!order?.is_quality_check) {
+ let total_number = order?.sale_mode == 0 ? order?.total_number : order?.total_number / 100
+ return `${order?.total_fabrics} 种面料，${order?.total_colors} 种颜色，共 ${total_number} ${order?.unit}`
+ } else {
+ let total_number = order?.sale_mode == 0 ? order?.quality_check_pass_number : order?.quality_check_pass_number / 100
+ return `${order?.quality_check_pass_fabrics} 种面料，${order?.quality_check_pass_colors} 种颜色，共 ${total_number} ${order?.unit}`
+ }
+ }
+ }, [order])
+
+ //获取面料数组
+ const list = useMemo(() => {
+ return order?.is_quality_check ? order?.quality_check_pass_product : order?.product_list
+ }, [order])
+
+ //整理颜色
+ const labAndRgbAndUrl = useCallback((item) => {
+ return { lab: { ...item?.lab }, rgb: { ...item?.rgb }, texturl_url: item?.texturl_url }
+ }, [])
+
+ //单价显示判断
+ const sale_price_show = useMemo(() => {
+ return order?.stage != ReturnStageServiceOrderPendingRefund.value && order?.stage != ReturnStageQualityCheckPendingRefund.value
+ }, [order])
+
+ //销售价格
+ const formatPrice = useCallback(
+ (colorItem) => {
+ return (
+ ReturnStageReturned.value == order?.stage && (
+
+ ¥
+ {formatPriceDiv(colorItem.estimate_amount, 100, true)}
+
+ )
+ )
+ },
+ [order],
+ )
+
+ return (
+
+ {list?.length > 0 && (
+
+ {order?.type == 1 ? '退货信息' : '退款信息'}
+ {list?.map((item) => {
+ return (
+
+
+ {order.sale_mode_name}
+ {formatHashTag(item.code, item.name)}
+ 共{item?.product_colors?.length}种
+
+
+ {item?.product_colors?.map((colorItem) => {
+ return (
+
+
+
+
+
+
+ {colorItem.code + ' ' + colorItem.name}
+
+ {sale_price_show && ¥{standardPrice(colorItem.sale_price)}}
+ {order?.stage == ReturnStageReturned.value && 总重{formatWeightDiv(colorItem.estimate_weight)}kg}
+
+
+
+
+ ×{formatCount(colorItem)}
+ {order.unit}
+
+ {formatPrice(colorItem)}
+
+
+
+ )
+ })}
+
+
+ )
+ })}
+
+ 合计
+ {numText}
+
+ {priceConDom}
+
+ )}
+ {list?.length <= 0 && order?.is_quality_check && (
+
+ 质检情况
+
+
+ 没有质检通过的商品，无法退款
+
+
+ )}
+
+ )
+})
diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx
index 3ceaa50..996cc5c 100644
--- a/src/pages/user/index.tsx
+++ b/src/pages/user/index.tsx
@@ -38,34 +38,42 @@ export default () => {
getAdminUserInfo()
Apiassets()
})
+
+ //临时注释
+ // const checkGo = async () => {
+ // if (adminUserInfo?.authentication_status !== 4) {
+ // let res = await Taro.showModal({
+ // title: '提示',
+ // content: '你暂未开通授信，目前仅支持线下申请，开通后可使用账期采购。',
+ // cancelText: '稍后认证',
+ // confirmText: '联系客服',
+ // })
+ // if (res.confirm) {
+ // Taro.showModal({
+ // content: '联系电话:0757-8270 6695',
+ // cancelText: '取消',
+ // confirmText: '拨打',
+ // success: function (res) {
+ // if (res.confirm) {
+ // Taro.makePhoneCall({
+ // phoneNumber: '(0757)82706695',
+ // })
+ // }
+ // },
+ // })
+ // }
+ // } else {
+ // Taro.navigateTo({
+ // url: '/pages/creditLine/index',
+ // })
+ // }
+ // }
const checkGo = async () => {
- if (adminUserInfo?.authentication_status !== 4) {
- let res = await Taro.showModal({
- title: '提示',
- content: '你暂未开通授信，目前仅支持线下申请，开通后可使用账期采购。',
- cancelText: '稍后认证',
- confirmText: '联系客服',
- })
- if (res.confirm) {
- Taro.showModal({
- content: '联系电话:0757-8270 6695',
- cancelText: '取消',
- confirmText: '拨打',
- success: function (res) {
- if (res.confirm) {
- Taro.makePhoneCall({
- phoneNumber: '(0757)82706695',
- })
- }
- },
- })
- }
- } else {
- Taro.navigateTo({
- url: '/pages/creditLine/index',
- })
- }
+ Taro.navigateTo({
+ url: '/pages/creditLine/index',
+ })
}
+
return (