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

This commit is contained in:
Haiyi
2022-09-14 18:57:52 +08:00
parent 66c9a3ebe4
commit 8472f4c14b
6 changed files with 6 additions and 6 deletions
@@ -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";
@@ -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'
+1 -1
View File
@@ -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 () => {