src/common.ts

@@ -1 +0,0 @@
-export type FixStatus = 1 | 2 | 3 | 4 | 5;

src/components/NoteCard/NoteCard.config.ts

@@ -1,3 +0,0 @@
-export default {
-  component: true,
-};

src/components/NoteCard/NoteCard.tsx

@@ -1,49 +0,0 @@
-import { View } from '@tarojs/components';
-import { Component, ReactNode } from 'react';
-import { TicketNote, StatusStr } from '@/pages/TicketDetail/TicketNote';
-import pt from '@/plain-text';
-import { timeFormat } from '@/utils';
-import { AtDivider } from 'taro-ui';
-import './NoteCard.scss';
-
-interface NoteCardProps {
-  note: TicketNote;
-}
-
-export default class NoteCard extends Component<NoteCardProps, {}> {
-  props: Readonly<NoteCardProps> = {
-    note: new TicketNote(),
-  };
-
-  render(): ReactNode {
-    var message = '';
-    const note = this.props.note;
-    const td = pt.get().ticketDetail;
-    const createMessage = td.createTicketMessage;
-    const modifyMessage = td.statusModifyMessage;
-    const prefix = td.statusModifyPrefix;
-
-    switch (note.type) {
-      case 0:
-        message = createMessage;
-        break;
-      case 1:
-        message = note.content;
-        break;
-      case 2:
-        message = prefix + modifyMessage.get(note.content as StatusStr) || '';
-        break;
-    }
-
-    return (
-      <View>
-        <View className='at-article__h2'>{note.op}</View>
-        <View className='at-article__info'>
-          {note.createdTime.format(timeFormat)}
-        </View>
-        <View className='at-article__p'>{message}</View>
-        <AtDivider />
-      </View>
-    );
-  }
-}

src/components/NoteList/NoteList.config.ts

@@ -1,3 +0,0 @@
-export default {
-  component: true,
-};

src/components/NoteList/NoteList.tsx

@@ -1,25 +0,0 @@
-import { Component, ReactNode } from 'react';
-import NoteCard from '@/components/NoteCard/NoteCard';
-import { TicketNote } from '@/pages/TicketDetail/TicketNote';
-import { View } from '@tarojs/components';
-
-interface NoteListProps {
-  noteList: Array<TicketNote>;
-}
-
-export default class NoteList extends Component<NoteListProps, {}> {
-  props: Readonly<NoteListProps> = {
-    noteList: [],
-  };
-  render(): ReactNode {
-    return (
-      <View>
-        {this.props.noteList.map((note, idx) => (
-          <View key={idx}>
-            <NoteCard note={note} />
-          </View>
-        ))}
-      </View>
-    );
-  }
-}

src/pages/TicketDetail/TicketDetail.tsx

@@ -3,27 +3,39 @@ import { View } from '@tarojs/components';
 import { getCurrentInstance } from '@tarojs/runtime';
 import Taro from '@tarojs/taro';
 import pt from '@/plain-text';
-import { AtCard, AtSteps, AtButton } from 'taro-ui';
+import { AtSteps } from 'taro-ui';
+import moment from 'moment';
 import { RequestState } from '@/service';
 import { getTicketInfo } from '@/service/ticketsInfo';
-import { FixStatus } from '@/common';
-import PageFooter from '@/components/PageFooter/PageFooter';
-import NoteList from '@/components/NoteList/NoteList';
-import { TicketNote, TicketInfo } from './TicketNote';
-
-const mapStatusStep: Map<FixStatus, 0 | 1 | 2 | 3> = new Map([
-  [1, 0],
-  [2, 1],
-  [3, 2],
-  [4, 2],
-  [5, 3],
-]);
 
 interface StepItemData {
   title: string;
 }
 
+export class TicketInfo {
+  id: number;
+  type: 0 | 1;
+  device: string;
+  deviceModel: string;
+  description: string;
+  createdTime: moment.Moment;
+  status: 1 | 2 | 3 | 4 | 5;
+}
+
+export class TicketNote {
+  id: number;
+  op: string;
+  type: 0 | 1 | 2;
+  content: string;
+  createdTime: moment.Moment;
+}
+
+function renderNote(n: TicketNote): JSX.Element {
+  return <View>{n.id}</View>;
+}
+
 interface TicketDetailState {
+  id: number;
   current: number;
   items: Array<StepItemData>;
   ticketInfo: TicketInfo;
@@ -33,6 +45,7 @@ interface TicketDetailState {
 
 export default class TicketDetail extends Component<{}, TicketDetailState> {
   state = {
+    id: 0,
     current: 0,
     items: [],
     ticketInfo: new TicketInfo(),
@@ -49,10 +62,11 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
     const id = router?.params.id as number;
     const items = pt.get().ticketDetail.stepItems;
     this.setState({
+      id: id,
       items: items,
     });
 
-    getTicketInfo(this, id);
+    getTicketInfo(this);
   }
 
   render(): ReactNode {
@@ -62,58 +76,16 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
       return <View>Request failed</View>;
     }
 
-    const status = this.state.ticketInfo.status;
-    this.setState({
-      current: mapStatusStep.get(status) || 0,
-    });
-
     return (
       <View>
-        <View className='at-article__h1'>
+        <View>{this.state.ticketInfo.deviceModel}</View>
-          {this.state.ticketInfo.device +
-            ' ' +
-            this.state.ticketInfo.deviceModel}
-        </View>
-        <View className='at-article__info'>
-          {pt.get().common.createdAtText(this.state.ticketInfo.createdTime)}
-        </View>
-        <View style={{ marginTop: 10, marginBottom: 10 }}>
-          <AtCard title={pt.get().ticketDetail.descTitle}>
-            <View className='at-article__h3'>
-              {this.state.ticketInfo.description}
-            </View>
-          </AtCard>
-        </View>
-        <View style={{ padding: 10 }}>
         <AtSteps
           items={this.state.items}
           current={this.state.current}
           onChange={() => {}}
         />
-        </View>
+        <View>TicketDetail: {this.state.id}</View>
-        <View
+        <View>{this.state.notes.map(item => renderNote(item))}</View>
-          className='at-row'
-          style={{ paddingTop: 10, paddingBottom: 10, width: '100%' }}
-        >
-          <View
-            className='at-col'
-            style={{ marginLeft: 10, paddingRight: 5, width: '50%' }}
-          >
-            <AtButton type='primary'>{pt.get().ticketDetail.tookAway}</AtButton>
-          </View>
-          <View
-            className='at-col'
-            style={{ marginRight: 10, paddingLeft: 5, width: '50%' }}
-          >
-            <AtButton type='secondary'>
-              {pt.get().ticketDetail.addNote}
-            </AtButton>
-          </View>
-        </View>
-        <View style={{ padding: 10 }}>
-          <NoteList noteList={this.state.notes} />
-        </View>
-        <PageFooter />
       </View>
     );
   }

src/pages/TicketDetail/TicketNote.ts

@@ -1,21 +0,0 @@
-import { FixStatus } from '@/common';
-
-export class TicketInfo {
-  id: number;
-  type: 0 | 1;
-  device: string;
-  deviceModel: string;
-  description: string;
-  createdTime: moment.Moment;
-  status: FixStatus;
-}
-
-export class TicketNote {
-  id: number;
-  op: string;
-  type: 0 | 1 | 2;
-  content: string;
-  createdTime: moment.Moment;
-}
-
-export type StatusStr = '1' | '2' | '3' | '4' | '5';

src/plain-text/TicketDetail.ts

@@ -2,37 +2,12 @@ interface StepItem {
   title: string;
 }
 
-type StatusStr = '1' | '2' | '3' | '4' | '5';
-
 export interface TicketDetailText {
   stepItems: Array<StepItem>;
-  createTicketMessage: string;
-  statusModifyPrefix: string;
-  statusModifyMessage: Map<StatusStr, string>;
-  descTitle: string;
-  tookAway: string;
-  addNote: string;
 }
 
 export const ticketDetailZhCn: TicketDetailText = {
-  stepItems: [
+  stepItems: [{ title: '创建成功' }, { title: '维修中' }, { title: '待取回' }],
-    { title: '创建成功' },
-    { title: '维修中' },
-    { title: '待取回' },
-    { title: '工单完成' },
-  ],
-  createTicketMessage: '创建了维修',
-  statusModifyPrefix: '将维修状态更改为：',
-  statusModifyMessage: new Map<StatusStr, string>([
-    ['1', '维修中'],
-    ['2', '2(?)'],
-    ['3', '3(?)'],
-    ['4', '维修成功待取回'],
-    ['5', '维修成功已取回'],
-  ]),
-  descTitle: '问题描述',
-  tookAway: '已取回',
-  addNote: '添加评论',
 };
 
 export const ticketDetailEnUs: TicketDetailText = {
@@ -40,18 +15,5 @@ export const ticketDetailEnUs: TicketDetailText = {
     { title: 'Ticket created' },
     { title: 'Repairing' },
     { title: 'Take home' },
-    { title: 'Finished' },
   ],
-  createTicketMessage: 'Created ticket',
-  statusModifyPrefix: 'Modified repair status to: ',
-  statusModifyMessage: new Map<StatusStr, string>([
-    ['1', 'Repairing'],
-    ['2', '2(?)'],
-    ['3', '3(?)'],
-    ['4', 'Device to be taken home'],
-    ['5', 'Ticket finished'],
-  ]),
-  descTitle: 'Problem description',
-  tookAway: 'Already took home',
-  addNote: 'Add a comment',
 };

src/plain-text/common.ts

@@ -1,17 +0,0 @@
-import { Moment } from 'moment';
-
-export interface CommonText {
-  createdAtText(time: Moment): string;
-}
-
-export const commonTextZhCn: CommonText = {
-  createdAtText(time: Moment): string {
-    return '创建于 ' + time.format('YYYY-MM-DD HH:mm');
-  },
-};
-
-export const commonTextEnUs: CommonText = {
-  createdAtText(time: Moment): string {
-    return 'Created at ' + time.format('YYYY-MM-DD HH:mm');
-  },
-};

src/plain-text/index.ts

@@ -15,10 +15,8 @@ import {
   ticketDetailEnUs,
   ticketDetailZhCn,
 } from './TicketDetail';
-import { CommonText, commonTextEnUs, commonTextZhCn } from './common';
 
 interface TextRecord {
-  common: CommonText;
   pageFooter: PageFooterText;
   mainPage: MainPageText;
   userPage: UserPageText;
@@ -35,7 +33,6 @@ interface TextRecord {
 }
 
 const textZhCn: TextRecord = {
-  common: commonTextZhCn,
   pageFooter: pageFooterZhCn,
   mainPage: mainPageZhCn,
   userPage: userPageZhCn,
@@ -52,7 +49,6 @@ const textZhCn: TextRecord = {
 };
 
 const textEnUs: TextRecord = {
-  common: commonTextEnUs,
   pageFooter: pageFooterEnUs,
   mainPage: mainPageEnUs,
   userPage: userPageEnUs,

src/service/index.ts

@@ -1,15 +1,5 @@
 import process from 'process';
 
-/**
- * State machine for request
- *
- * @example
- *
- * let former = this.state.rs;
- * this.setState({
- *   rs: former.trans(true),
- * })
- */
 export class RequestState {
   loading: boolean;
   success: boolean;
@@ -17,16 +7,6 @@ export class RequestState {
     this.loading = true;
     this.success = false;
   }
-
-  trans(success: boolean): RequestState {
-    if (this.loading) {
-      this.loading = false;
-      this.success = success;
-    } else {
-      console.error('calling trans on not loading state');
-    }
-    return this;
-  }
 }
 
 /**

src/service/ticketsInfo.ts

@@ -1,22 +1,26 @@
-import TicketDetail from '@/pages/TicketDetail/TicketDetail';
+import TicketDetail, {
-import { TicketInfo, TicketNote } from '@/pages/TicketDetail/TicketNote';
+  TicketInfo,
+  TicketNote,
+} from '@/pages/TicketDetail/TicketDetail';
 import Taro from '@tarojs/taro';
 import moment from 'moment';
 import { getUrl } from '.';
 
-export function getTicketInfo(that: TicketDetail, id: number) {
+export function getTicketInfo(that: TicketDetail) {
   Taro.request({
     url: getUrl('/tickets/info'),
     method: 'GET',
     data: {
-      id: id,
+      id: that.state.id,
     },
   })
     .then(res => {
-      let former = that.state.rs;
       if (!res.data.success) {
         that.setState({
-          rs: former.trans(false),
+          rs: {
+            loading: false,
+            success: false,
+          },
         });
       } else {
         const data = res.data.data;
@@ -26,7 +30,7 @@ export function getTicketInfo(that: TicketDetail, id: number) {
           device: data.device,
           deviceModel: data.deviceModel,
           description: data.description,
-          createdTime: moment(data.createdTime as string),
+          createdTime: moment(),
           status: data.status,
         };
         const notes: Array<TicketNote> = [];
@@ -36,21 +40,26 @@ export function getTicketInfo(that: TicketDetail, id: number) {
             op: item.op,
             type: item.type,
             content: item.content,
-            createdTime: moment(item.createdTime as string),
+            createdTime: moment(),
           });
         });
         that.setState({
           ticketInfo: ticketDetail,
           notes: notes,
-          rs: former.trans(true),
+          rs: {
+            loading: false,
+            success: true,
+          },
         });
       }
     })
     .catch(reason => {
-      let former = that.state.rs;
       that.setState({
-        rs: former.trans(false),
+        rs: {
+          loading: false,
+          success: false,
+        },
       });
-      console.error(reason);
+      console.log(reason);
     });
 }

src/utils/index.ts

@@ -1,3 +0,0 @@
-import * as Time from './time';
-
-export const timeFormat = Time.timeFormat;

src/utils/time.ts

@@ -1 +0,0 @@
-export const timeFormat = 'YYYY-MM-DD HH:mm';