diff --git a/src/common/constant.js b/src/common/constant.js
index deed9aa..346a828 100644
--- a/src/common/constant.js
+++ b/src/common/constant.js
@@ -4,14 +4,14 @@
// export const BASE_URL = `http://10.0.0.5:50001/lymarket`
// export const BASE_URL = `http://192.168.0.89:40001/lymarket`
// export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞
-// export const BASE_URL = `https://test.zzfzyc.com/lymarket` // 测试环境
+export const BASE_URL = `https://test.zzfzyc.com/lymarket` // 测试环境
// export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发
// export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发
// export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
// export const BASE_URL = `https://dev.zzfzyc.com/lymarket` // 开发环境
// export const BASE_URL = `https://www.zzfzyc.com/lymarket` // 正式环境
// export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
-export const BASE_URL = `http://192.168.1.7:50002/lymarket` // 添
+// export const BASE_URL = `http://192.168.1.7:50002/lymarket` // 添
// export const BASE_URL = `http://192.168.1.42:50001/lymarket` // 杰
// CDN
diff --git a/src/components/amountShow/index.module.scss b/src/components/amountShow/index.module.scss
new file mode 100644
index 0000000..647e203
--- /dev/null
+++ b/src/components/amountShow/index.module.scss
@@ -0,0 +1,35 @@
+.order_price_num{
+ color: $color_main;
+ font-weight: 700;
+ text{
+ &:nth-child(1) {
+ font-size: $font_size_min;
+ }
+ &:nth-child(2) {
+ font-size: $font_size;
+ }
+ &:nth-child(3) {
+ font-size: $font_size_medium;
+ }
+ }
+}
+.emphasis_num{
+ .price_text{
+ &:nth-child(2) {
+ font-size: $font_size_big;
+ }
+ }
+}
+.emphasis_num_big{
+ .price_text{
+ &:nth-child(1) {
+ font-size: $font_size_big;
+ }
+ &:nth-child(2) {
+ font-size: 60px;
+ }
+ &:nth-child(1) {
+ font-size: $font_size_big;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/components/amountShow/index.tsx b/src/components/amountShow/index.tsx
new file mode 100644
index 0000000..877f7df
--- /dev/null
+++ b/src/components/amountShow/index.tsx
@@ -0,0 +1,28 @@
+import { Text, View } from "@tarojs/components";
+import { memo, useCallback } from "react";
+import styles from './index.module.scss'
+import classnames from "classnames";
+
+type Param = {
+ number: number, //数字
+ status: 0|1|2 //0 小型,1中型,2大
+}
+export default memo(({number = 0, status = 1}:Param) => {
+ const priceDom = useCallback(() => {
+ let res = number.toFixed(2).split('.')
+ let int_num = parseInt(res[0]) + ''
+ let decimals_num = res[1]
+ return (
+ <>
+ ¥
+ {Number(int_num).toLocaleString()}
+ .{decimals_num}
+ >
+ )
+ }, [number])
+ return (
+
+ {priceDom()}
+
+ )
+})
\ No newline at end of file
diff --git a/src/components/orderBtns/index.tsx b/src/components/orderBtns/index.tsx
index d54411d..ed5af8e 100644
--- a/src/components/orderBtns/index.tsx
+++ b/src/components/orderBtns/index.tsx
@@ -73,7 +73,7 @@ export default memo(({orderInfo, onClick}:Param) => {
// },
{
id: 5,
- value: [SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusRefund.value], //申请退货按钮对应:已收货, 已退款
+ value: [SaleOrderStatusAlreadyReceipt.value], //申请退货按钮对应:已收货
label: '申请退货'
},
{
diff --git a/src/pages/order/components/addressInfoDetail/index.tsx b/src/pages/order/components/addressInfoDetail/index.tsx
index 6b9c3dd..e6573af 100644
--- a/src/pages/order/components/addressInfoDetail/index.tsx
+++ b/src/pages/order/components/addressInfoDetail/index.tsx
@@ -176,7 +176,7 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, stat
||
-
+ (orderInfo?.status != SaleOrderStatusRefund.value)&&
查看物流
}
diff --git a/src/pages/order/components/kindList/index.tsx b/src/pages/order/components/kindList/index.tsx
index ab3fd3b..861b7fb 100644
--- a/src/pages/order/components/kindList/index.tsx
+++ b/src/pages/order/components/kindList/index.tsx
@@ -1,9 +1,9 @@
import { ORDER_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, useState } from "react"
-import EstimatedAmount from "../estimatedAmount"
import styles from './index.module.scss'
type OrderParam = {
diff --git a/src/pages/salesAfter/components/kindList/index.tsx b/src/pages/salesAfter/components/kindList/index.tsx
index fda7fb8..e1e0308 100644
--- a/src/pages/salesAfter/components/kindList/index.tsx
+++ b/src/pages/salesAfter/components/kindList/index.tsx
@@ -1,9 +1,9 @@
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 EstimatedAmount from "../estimatedAmount"
import styles from './index.module.scss'
type OrderParam = {
@@ -144,7 +144,7 @@ export default memo(({order, comfirm = false}:Param) => {
<>
{
priceList.map(item => {
- return <>{showPrice(item)&&}>
+ return <>{showPrice(item)&&}>
})
}
>