diff --git a/src/assets/icons/MemberPage/clock.svg b/src/assets/icons/MainPage/offduty.svg similarity index 100% rename from src/assets/icons/MemberPage/clock.svg rename to src/assets/icons/MainPage/offduty.svg diff --git a/src/assets/icons/MyTickets/clock.svg b/src/assets/icons/MyTickets/clock.svg deleted file mode 100644 index b79ea85..0000000 --- a/src/assets/icons/MyTickets/clock.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/MyTickets/fail.svg b/src/assets/icons/MyTickets/fail.svg deleted file mode 100644 index 08e6e87..0000000 --- a/src/assets/icons/MyTickets/fail.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/MyTickets/finished.svg b/src/assets/icons/MyTickets/finished.svg deleted file mode 100644 index ba97e48..0000000 --- a/src/assets/icons/MyTickets/finished.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/MyTickets/repair.svg b/src/assets/icons/MyTickets/repair.svg deleted file mode 100644 index b3a5f19..0000000 --- a/src/assets/icons/MyTickets/repair.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/MyTickets/tick.svg b/src/assets/icons/MyTickets/tick.svg deleted file mode 100644 index 36e2555..0000000 --- a/src/assets/icons/MyTickets/tick.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/TicketState/create.svg b/src/assets/icons/TicketState/create.svg new file mode 100644 index 0000000..aa95346 --- /dev/null +++ b/src/assets/icons/TicketState/create.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/TicketState/fail.svg b/src/assets/icons/TicketState/fail.svg new file mode 100644 index 0000000..b5e23b1 --- /dev/null +++ b/src/assets/icons/TicketState/fail.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/TicketState/refuse.svg b/src/assets/icons/TicketState/refuse.svg new file mode 100644 index 0000000..0fb2cc8 --- /dev/null +++ b/src/assets/icons/TicketState/refuse.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/TicketState/repair.svg b/src/assets/icons/TicketState/repair.svg new file mode 100644 index 0000000..7c27041 --- /dev/null +++ b/src/assets/icons/TicketState/repair.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/TicketState/retrieve.svg b/src/assets/icons/TicketState/retrieve.svg new file mode 100644 index 0000000..3d665df --- /dev/null +++ b/src/assets/icons/TicketState/retrieve.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/TicketState/success.svg b/src/assets/icons/TicketState/success.svg new file mode 100644 index 0000000..b1ad036 --- /dev/null +++ b/src/assets/icons/TicketState/success.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/TicketListItem/TicketListItem.tsx b/src/components/TicketListItem/TicketListItem.tsx index da5cf70..e6fb12f 100644 --- a/src/components/TicketListItem/TicketListItem.tsx +++ b/src/components/TicketListItem/TicketListItem.tsx @@ -1,9 +1,10 @@ import { AtListItem } from 'taro-ui'; -import repair from '@/assets/icons/MyTickets/repair.svg'; -import finished from '@/assets/icons/MyTickets/finished.svg'; -import tick from '@/assets/icons/MyTickets/tick.svg'; -import fail from '@/assets/icons/MyTickets/fail.svg'; -import clock from '@/assets/icons/MyTickets/clock.svg'; +import create from '@/assets/icons/TicketState/create.svg'; +import repair from '@/assets/icons/TicketState/repair.svg'; +import success from '@/assets/icons/TicketState/success.svg'; +import fail from '@/assets/icons/TicketState/fail.svg'; +import refuse from '@/assets/icons/TicketState/refuse.svg'; +import retrieve from '@/assets/icons/TicketState/retrieve.svg'; import pt from '@/plain-text'; import Taro from '@tarojs/taro'; import { FixStatus } from '@/common'; @@ -29,14 +30,14 @@ export class TicketListItem { this.status = status; this.createAt = createAt; this.iconMap = new Map([ - [0, repair], + [0, create], [1, repair], - [2, clock], - [3, finished], - [4, clock], - [5, tick], - [6, clock], - [7, fail], + [2, refuse], + [3, retrieve], + [4, success], + [5, retrieve], + [6, fail], + [7, retrieve], ]); } diff --git a/src/pages/index/DutyInfo.tsx b/src/pages/index/DutyInfo.tsx index 6cf0e47..b907ac8 100644 --- a/src/pages/index/DutyInfo.tsx +++ b/src/pages/index/DutyInfo.tsx @@ -4,7 +4,7 @@ import { AtTimeline } from 'taro-ui'; import pt from '@/plain-text'; import tick from '@/assets/icons/MainPage/tick.svg'; import cross from '@/assets/icons/MainPage/cross.svg'; -import clock from '@/assets/icons/MemberPage/clock.svg'; +import clock from '@/assets/icons/MainPage/offduty.svg'; import wechatUser from '@/wechat'; export class DutyData {