xuan/TestRestructureWechatLymarketDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/order/components/PayPopup/index.tsx
View File

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

2
src/pages/order/components/itemList/index.tsx
View File

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

2
src/pages/order/index.tsx
View File

@ -21,7 +21,7 @@ import {
GetPayCode GetPayCode
} from '@/api/order' } from '@/api/order'
import PayPopup from './components/PayPopup' 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 () => { export default () => {
//页码和页数 //页码和页数

2
src/pages/orderDetails/components/advanceOrderState/index.tsx
View File

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

2
src/pages/orderDetails/components/orderState/index.tsx
View File

@ -2,7 +2,7 @@ import { Image, Text, View } from "@tarojs/components"
import { memo, useEffect, useMemo, useRef, useState } from "react" import { memo, useEffect, useMemo, useRef, useState } from "react"
import styles from './index.module.scss' import styles from './index.module.scss'
import classnames from "classnames"; 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 { ORDER_STATUS, PAYMENT_METHOD } from "@/common/enum";
import * as dayjs from 'dayjs' import * as dayjs from 'dayjs'

2
src/pages/orderDetails/index.tsx
View File

@ -24,7 +24,7 @@ import {
GetPayCode GetPayCode
} from '@/api/order' } from '@/api/order'
import { alert, goLink } from '@/common/common' 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' import PayPopup from '../order/components/PayPopup'
export default () => { export default () => {