🦄 refactor:修改冲突产生的文件路径问题

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

@@ -4,7 +4,7 @@ import { memo, useCallback, useEffect, useMemo, useState, useRef } from 'react'
 import styles from './index.module.scss'
 import classnames from 'classnames'
 import BottomBtns from '@/components/BottomBtns'
-import { formatPriceDiv, formatImgUrl } from '@/common/fotmat'
+import { formatPriceDiv, formatImgUrl } from '@/common/format'
 import Taro from '@tarojs/taro'
 import Popup from '@/components/popup'
 import useCheckAuthorize from '@/use/useCheckAuthorize'

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

@@ -3,7 +3,7 @@ import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 import styles from './index.module.scss'
 import classnames from 'classnames'
 import BottomBtns from '@/components/BottomBtns'
-import { formatPriceDiv } from '@/common/fotmat'
+import { formatPriceDiv } from '@/common/format'
 import Taro from '@tarojs/taro'
 
 interface propsObj {

src/pages/order/index.tsx

@@ -21,7 +21,7 @@ import {
   GetPayCode
 } from '@/api/order'
 import PayPopup from './components/PayPopup'
-import { formatDateTime, formatHashTag, formatImgUrl, formatPriceDiv, formatWeightDiv } from '@/common/fotmat'
+import { formatDateTime, formatHashTag, formatImgUrl, formatPriceDiv, formatWeightDiv } from '@/common/format'
 
 export default () => {
   //页码和页数

src/pages/orderDetails/components/advanceOrderState/index.tsx

@@ -1,4 +1,4 @@
-import { formatImgUrl } from "@/common/fotmat";
+import { formatImgUrl } from "@/common/format";
 import { Image, Text, View } from "@tarojs/components";
 import { memo, useEffect, useMemo, useRef, useState } from "react";
 import classnames from "classnames";

src/pages/orderDetails/components/orderState/index.tsx

@@ -2,7 +2,7 @@ import { Image, Text, View } from "@tarojs/components"
 import { memo, useEffect, useMemo, useRef, useState } from "react"
 import styles  from './index.module.scss'
 import classnames from "classnames";
-import { formatDateTime, formatImgUrl } from "@/common/fotmat";
+import { formatDateTime, formatImgUrl } from "@/common/format";
 import { ORDER_STATUS, PAYMENT_METHOD } from "@/common/enum";
 import * as dayjs from 'dayjs'
 

src/pages/orderDetails/index.tsx

@@ -24,7 +24,7 @@ import {
     GetPayCode
 } from '@/api/order'
 import { alert, goLink } from '@/common/common'
-import { formatPriceDiv, formatDateTime, formatWeightDiv } from '@/common/fotmat'
+import { formatPriceDiv, formatDateTime, formatWeightDiv } from '@/common/format'
 import PayPopup from '../order/components/PayPopup'
 
 export default () => {