商城测试版v5

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

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;
+        }
+    }
+}

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 (
+            <>
+                <Text className={styles.price_text}>¥</Text>
+                <Text className={styles.price_text}>{Number(int_num).toLocaleString()}</Text>
+                <Text className={styles.price_text}>.{decimals_num}</Text>
+            </>
+        )
+    }, [number])
+    return (
+        <View className={classnames(styles.order_price_num, status==1&&styles.emphasis_num, status==2&&styles.emphasis_num_big)} >
+            {priceDom()}
+        </View>
+    )
+})

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: '申请退货'
         },
         {

src/pages/order/components/addressInfoDetail/index.tsx

@@ -176,7 +176,7 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, stat
                     </View>
                     <View style={{transform: receivingStatus==1?'translateX(0)':'translateX(100%)'}} className={classnames(styles.updateBtn_select)}></View>
                 </View>||
-                <View className={styles.logisticsBtn} onClick={onLogistics}>
+               (orderInfo?.status != SaleOrderStatusRefund.value)&&<View className={styles.logisticsBtn} onClick={onLogistics}>
                     查看物流
                 </View>}
             </View>

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 = {

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)&&<EstimatedAmount key={item.id} number={formatPriceDiv(order[item.field])} title={item.label}   />}</>
+                      return <>{showPrice(item)&&<EstimatedAmount messageTitle={item.message} key={item.id} number={formatPriceDiv(order[item.field])} title={item.label}   />}</>
                     })
                 }
             </>