diff --git a/src/common/constant.js b/src/common/constant.js index 89c5570..154f53c 100644 --- a/src/common/constant.js +++ b/src/common/constant.js @@ -4,13 +4,13 @@ // 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.30:40001/lymarket` // 发 // export const BASE_URL = `http://192.168.1.9:40001/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.15:50001/lymarket` // 杰 // CDN diff --git a/src/common/fotmat.js b/src/common/fotmat.js index 6fac0e2..f66140e 100644 --- a/src/common/fotmat.js +++ b/src/common/fotmat.js @@ -139,10 +139,11 @@ export const toDecimal2 = (x) => { /** * 格式化图片路径 * @param {*} url + * @status true|false * @returns */ -export const formatImgUrl = (url, suffix="!w200") => { - return url?url + suffix:IMG_CND_Prefix +'/mall/no_img.png' +export const formatImgUrl = (url, status = false ,suffix="!w200") => { + return url? (status?IMG_CND_Prefix:'') +url + suffix:IMG_CND_Prefix +'/mall/no_img.png' } /** diff --git a/src/pages/order/components/advanceOrderState/index.module.scss b/src/pages/order/components/advanceOrderState/index.module.scss index e69de29..86e995e 100644 --- a/src/pages/order/components/advanceOrderState/index.module.scss +++ b/src/pages/order/components/advanceOrderState/index.module.scss @@ -0,0 +1,48 @@ + +.advance_main{ + width:100%; + height: 238px; + background-color: #007AFF; + border-radius: 20px; + display: flex; + align-items: center; + font-size: 24px; + color: #dddddd; + position: relative; + .time_con{ + padding-left: 30px; + .times{ + margin-bottom: 25px; + display: flex; + align-items: center; + .text{ + margin-right: 15px; + } + .num{ + width: 46px; + height: 50px; + background: #0063ce; + border-radius: 10px; + line-height: 50px; + text-align: center; + font-weight: 700; + color: #fff; + } + .separate{ + padding: 0 10px; + } + } + + } + .cardIcon{ + width: 238px; + height: 178px; + position: absolute; + right: 0; + bottom: 0; + .image{ + width:100%; + height: 100%; + } + } +} \ No newline at end of file diff --git a/src/pages/order/components/advanceOrderState/index.tsx b/src/pages/order/components/advanceOrderState/index.tsx index a60698b..45faaf1 100644 --- a/src/pages/order/components/advanceOrderState/index.tsx +++ b/src/pages/order/components/advanceOrderState/index.tsx @@ -1,4 +1,5 @@ -import { Text, View } from "@tarojs/components"; +import { formatImgUrl } from "@/common/fotmat"; +import { Image, Text, View } from "@tarojs/components"; import { memo } from "react"; import styles from './index.module.scss' @@ -6,11 +7,19 @@ export default memo(() => { return ( - - + + + 23 + : + 58 + : + 55 支付关闭,订单自动取消 + + + ) }) \ No newline at end of file diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx index 7c678e1..d76edd3 100644 --- a/src/pages/order/index.tsx +++ b/src/pages/order/index.tsx @@ -17,6 +17,7 @@ import Taro, { useDidShow, usePullDownRefresh, useRouter } from "@tarojs/taro"; import classnames from "classnames"; import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import AddressInfoDetail from "./components/addressInfoDetail"; +import AdvanceOrderState from "./components/advanceOrderState"; import ApplyRefund from "./components/applyRefund"; import KindList from "./components/kindList"; import OrderState from "./components/orderState"; @@ -250,6 +251,7 @@ import styles from './index.module.scss' return ( + {/* */}