change mytickets mock; add ignore for eslint error: unused state for statusToBe in ticketdetail

.env.prod

@@ -1,2 +1,2 @@
 TARO_APP_ID="wx636eb7cf2b84f305"
-TARO_APP_API=""
+TARO_APP_API="https://ate.zjueva.net"

.prettierrc

@@ -5,7 +5,7 @@
   "semi": true,
   "singleQuote": true,
   "proseWrap": "preserve",
-  "arrowParens": "avoid",
+  "arrowParens": "always",
   "bracketSpacing": true,
   "jsxSingleQuote": true,
   "endOfLine": "auto"

README.md

@@ -10,25 +10,25 @@
 
 1.  能看到现在维修状况：有几台正在维修，有几个人值班（空闲状态）
 2.  能看到自己机器的维修情况：维修进度、评论等
-    1.  使用手机号确定id
+    1.  使用手机号查询工单
 
 ## 互动
 
-1.  提醒：当修好之后会向你发送信息，提醒来取
+1.  提醒：当修好（工单状态改变为待取回）之后会向你发送信息，提醒来取
-2.  线上答疑：协会成员登录账号，看到机主提出的问题可以回答（暂定由值班组长管理）
+2.  线上答疑：协会成员登录账号（通过 EVA Auth 授权），看到机主提出的问题可以回答（暂定由值班组长管理）
     1.  公开答疑仅回复能不能修，更复杂的问题推荐其来204
     2.  当自己的机器正在维修时，可以与维修人员交流进度和问题等
-    3.  （暂定）答疑功能使用预填写工单、工单的评论实现
+    3.  答疑功能使用预填写工单的评论实现
 
 ## 信息展示
 
-1.  展示协会值班时间（现在是否在值班），若不在值班显示预计值班时间、不值班的原因等
+1.  展示协会值班时间（现在是否在值班），若不在值班显示预计值班时间、不值班的原因
 2.  展示维修流程，包括注意事项等
     1.  戴尔、Surface等不拆
     2.  数据备份提醒
     3.  不收礼物
     4.  不要在204饮食
-3.  （备选）其他语言本地化
+3.  其他语言本地化
 
 ## 面向协会成员
 
@@ -42,13 +42,13 @@
 
 ## 对接
 
-1.  与EVA统一身份认证对接
+1.  与 EVA 统一身份认证对接
     1.  协会成员登录入口
     2.  个人信息同步
-2.  与Oreo对接
+2.  与 Oreo 对接
-    1.  维修工单列表查看
+    1.  维修工单列表查看：七天内未取回的工单
-    2.  将预填写工单加入Oreo
+    2.  将预填写工单加入 Oreo
-3.  防恶意行为
+3.  防恶意行为（尚未设置）
     1.  工单填写间隔限制为【1】分钟
     2.  一个人一天最多能创建【10】个预填写工单
     3.  黑名单机制
@@ -58,18 +58,32 @@
 ## 主页
 
 1.  信息显示
+    1. 不显示是哪一班，只显示今日值班时间
 2.  （协会成员）相关信息
 3.  提醒事项
 4.  如何联系到协会
 
 ## 维修
 
-1.  （面向机主）预填写工单
+1.  预填写工单
-2.  维修进度提示
+2.  正在进行工单的展示
-3.  （面向协会成员）维修列表
+
+## 成员
+
+1. 最近七天内未取回的工单列表
+2. 值班组长上传本班相关信息
+3. 现在自己是否要值班（值班时间显示）
+4. 提醒事项
+
 
 ## 我的
 
-1.  更改手机号等个人信息（手机号可以填写多个）
+1.  更改手机号、姓名（手机号暂时只能填写一个）
 2.  （备选）修改用户名、头像
 3.  设置真名（可帮助预填写工单）
+
+# 主席团管理页面
+
+1. 值班表导入、更新
+2. 成员权限管理
+3. 特殊维修时间（如学园维修）、值班信息更新

doc/api.md

@@ -34,9 +34,9 @@
 
 ## 主页面
 
-### 值班信息 `GET /dutyinfo`
+### 值班信息 `GET /duty/info`
 
-#### 当前在值班
+#### 当前在值班（正常值班时间）
 
 data:
 
@@ -44,7 +44,29 @@ data:
 {
   "isInDuty": true,
   "inDutyCnt": 3,
-  "currentDuty": "2"
+  "currentDuty": "1",
+  "place": "",            // 只有当 currentDuty 为 others 时，place 和 值班时间 才不为空
+  "otherDutyStart": "",
+  "otherDutyEnd": "",
+  "offDutyReason": "",
+  "dutyRecoverTime": ""
+}
+```
+
+#### 当前在值班（其他值班时间）
+
+data:
+
+```json
+{
+  "isInDuty": true,
+  "inDutyCnt": 3,
+  "currentDuty": "others",
+  "place": "蓝田",            // 只有当 currentDuty 为 others 时，place 才不为空
+  "otherDutyStart": "2024-03-07T11:52:48.523303",   // Timestamp
+  "otherDutyEnd": "2024-03-07T13:52:48.523303",
+  "offDutyReason": "",
+  "dutyRecoverTime": ""
 }
 ```
 
@@ -55,11 +77,54 @@ data:
 ```json
 {
   "isInDuty": false,
+  "inDutyCnt": 0,
+  "currentDuty": "0",          // '0' 代表正常值班时间下班，'others' 代表其他值班时间下班
+  "place": "",
+  "otherDutyStart": "",
+  "otherDutyEnd": "",
   "offDutyReason": "学园维修",
   "dutyRecoverTime": "下周一"
 }
 ```
 
+## 账号登陆
+
+### 微信小程序登陆 `POST /login` OK
+
+- Request
+
+```json
+{
+  "code": "wechat_login_code"
+}
+```
+
+- Response
+
+```json
+{
+  "success": true,
+  "token": "your_token"
+}
+```
+
+### 检查 token 是否登陆 `GET /checklogin?token={token}` OK
+
+```json
+{
+  "islogin": true
+}
+```
+
+- Response
+
+```json
+{
+  "success": true,
+  "token": "your_token"
+}
+```
+
 ## 用户页面
 
 ### 个人信息 `GET /user/info`
@@ -141,17 +206,6 @@ data (same as oreo):
 
 ## 工单详情
 
-### 创建评论 `POST /tickets/newcomment/{id}`
-
-Request
-
-```json
-{
-  "content": "这是一条评论",
-  "token": "token_test"
-}
-```
-
 ### 创建工单 `POST /tickets/create`
 
 Request
@@ -169,7 +223,104 @@ Request
 }
 ```
 
-### 工单信息 `GET /tickets/info/{id}`
+### 添加评论 `POST /tickets/addnote`
+
+Request
+
+```json
+{
+  "token": "token_test",
+  "id": "id",
+  "content" : "为什么 PD 不能充电呢？"
+}
+```
+
+### 加入 Oreo `POST /tickets/addtooreo`
+
+Request
+
+```json
+{
+  "token": "token_test",
+  "id": 4234
+}
+```
+
+### 认领工单 `POST /tickets/pick`
+
+Request
+
+```json
+{
+  "token": "token_test",
+  "id": 4234
+}
+```
+
+### 更新工单状态 `POST /tickets/update`
+
+Request
+
+```json
+{
+  "token": "token_test",
+  "id": "id",
+  "status": 3
+}
+```
+
+### 确认已取回 `POST /tickets/retrieve`
+
+Request
+
+```json
+{
+  "token": "token_test",
+  "id": "id"
+}
+```
+
+### 获取七天内未完成工单 `GET /tickets/uncompleted`
+
+Request
+
+```json
+{
+  "token": "token_test",
+  "pageId": 1,
+  "count": 10,
+  "queryType": 0
+}
+```
+
+### 获取所有预填写工单 `GET /tickets/list`
+
+Request
+
+```json
+{
+  "token": "token_test",
+  "pageId": 1,
+  "count": 10,
+  "queryType": 0
+}
+```
+
+### 查询预填写工单 `GET /tickets/search`
+
+Request
+
+```json
+{
+  "token": "token_test",
+  "values": "test",
+  "pageId": 1,
+  "count": 10,
+  "queryType": 0
+}
+```
+
+### 工单信息 `GET /tickets/info?id={id}`
 
 data (same as oreo):
 
@@ -224,3 +375,65 @@ data (same as oreo):
   "picked": false
 }
 ```
+
+## 成员相关
+
+### 成员登录 `POST /member/login`
+
+Request
+
+```json
+{
+  "token": "token_test",
+  "code": "code_test",
+}
+```
+这里的 code 是来源于小程序扫描统一身份认证生成的二维码
+
+### 检查 token 是否登陆 `GET /member/checklogin?token={token}` OK
+
+data
+
+```json
+{
+    "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png",
+    "name": "宇航员",
+    "phone": "13311451419",
+}
+```
+
+### 成员登出 `POST /member/logout`
+
+Request
+
+```json
+{
+  "token": "token_test"
+}
+```
+
+### 成员值班信息 `GET /member/duty/info`
+
+#### 当前在值班
+
+data:
+
+```json
+{
+  "isInDuty": true,
+  "inDutyCnt": 3,
+  "currentDuty": "2"
+}
+```
+
+#### 当前未值班
+
+data:
+
+```json
+{
+  "isInDuty": false,
+  "offDutyReason": "学园维修",
+  "dutyRecoverTime": "下周一"
+}
+```

mock/api.ts

@@ -1,54 +1,138 @@
 import mytickets from './mytickets.json';
 import ticketInfo from './ticketInfo.json';
+import uncompleted from './uncompleted.json';
+import ticketsList from './ticketsList.json';
+import ticketsSearch from './ticketSearch.json';
 
 export default {
-  'GET /dutyinfo': {
+  'GET /ping': {
+    success: true,
+    data: {
+      msg: 'pong',
+    },
+  },
+  'GET /duty/info': {
     success: true,
     data: {
-      token: 'token_test',
       isInDuty: true,
       inDutyCnt: 3,
-      currentDuty: '2',
+      currentDuty: 'others',
+      otherDutyStart: '2024-03-07T09:30:48.523303',
+      otherDutyEnd: '2024-03-07T13:30:48.523303',
+      place: '蓝田',
+      offDutyReason: '',
+      dutyRecoverTime: '',
     },
   },
   'GET /user/info': {
     success: true,
     data: {
-      token: 'token_test',
       name: '马保国',
       phone: 13333333333,
     },
   },
   'POST /user/update': {
+    success: true,
     data: {},
   },
   'GET /user/locale/get': {
     success: true,
     data: {
-      lang: 'en_US',
+      lang: 'zh_CN',
     },
   },
   'POST /user/locale/update': {
+    success: true,
     data: {},
   },
   'POST /report': {
+    success: true,
     data: {},
   },
   'GET /user/mytickets': {
     success: true,
     data: mytickets,
   },
-  'GET /tickets/info/': {
+  'GET /tickets/info': {
     success: true,
     data: ticketInfo,
   },
-  'POST /tickets/newcomment': {
+  'POST /tickets/addnote': {
+    success: true,
     data: {},
   },
   'POST /tickets/create': {
+    success: true,
+    data: {},
+  },
+  'POST /tickets/addtooreo': {
+    success: true,
+    data: {},
+  },
+  'POST /tickets/pick': {
+    success: true,
+    data: {},
+  },
+  'POST /tickets/update': {
+    success: true,
+    data: {},
+  },
+  'POST /tickets/retrieve': {
+    success: true,
     data: {},
   },
   'POST /member/login': {
-    data: {},
+    success: true,
+    data: {
+      avatar:
+        'https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png',
+      name: '宇航员',
+      phone: '13311451419',
+    },
+  },
+  'GET /tickets/uncompleted': {
+    success: true,
+    data: uncompleted,
+  },
+  'GET /tickets/list': {
+    success: true,
+    data: ticketsList,
+  },
+  'GET /tickets/search': {
+    success: true,
+    data: ticketsSearch,
+  },
+  'POST /member/logout': {
+    success: true,
+  },
+  'POST /member/checklogin': {
+    success: true,
+    data: {
+      avatar:
+        'https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png',
+      name: '宇航员',
+      phone: '13311451419',
+    },
+  },
+  'GET /member/duty/info': {
+    success: true,
+    data: {
+      isInDuty: true,
+      inDutyCnt: 6,
+      currentDuty: '3',
+      place: '204',
+    },
+  },
+  'POST /login': {
+    success: true,
+    data: {
+      token: '__token_test_zjueva1984__',
+    },
+  },
+  'GET /checklogin': {
+    success: true,
+    data: {
+      islogin: false,
+    },
   },
 };

mock/mytickets.json

@@ -3,13 +3,24 @@
     {
       "id": 6830,
       "type": 1,
-      "status": 5,
+      "status": 3,
       "device": "主机",
       "deviceModel": "技嘉",
       "owner": "武技栏",
       "phone": "18888888888",
       "createdTime": "2024-03-06T19:49:27.043865",
       "isConfirmed": false
+    },
+    {
+      "id": 6831,
+      "type": 1,
+      "status": 2,
+      "device": "ROG",
+      "deviceModel": "幻 14",
+      "owner": "晓洋",
+      "phone": "18888888887",
+      "createdTime": "2024-03-06T19:49:27.043865",
+      "isConfirmed": false
     }
   ]
 }

mock/ticketInfo.json

@@ -1,18 +1,18 @@
 {
-  "id": 6847,
+  "id": 6830,
   "type": 1,
   "device": "华硕",
   "deviceModel": "灵耀X14",
   "owner": "唐姐姐",
   "phone": "15555555555",
   "description": "清灰",
-  "workers": [],
+  "workers": ["宇航员"],
   "createdTime": "2024-03-07T19:52:48.523303",
-  "status": 5,
+  "status": 4,
   "isConfirmed": false,
   "notes": [
     {
-      "avatar": "https://....jpg",
+      "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png",
       "id": 21368,
       "op": "宇航员",
       "type": 0,
@@ -20,7 +20,7 @@
       "createdTime": "2024-03-07T19:52:48.523305"
     },
     {
-      "avatar": "https://....jpg",
+      "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png",
       "id": 21370,
       "op": "宇航员",
       "type": 2,
@@ -28,7 +28,7 @@
       "createdTime": "2024-03-07T19:58:27.838816"
     },
     {
-      "avatar": "https://....jpg",
+      "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png",
       "id": 21373,
       "op": "宇航员",
       "type": 2,
@@ -36,7 +36,7 @@
       "createdTime": "2024-03-07T20:28:12.070707"
     },
     {
-      "avatar": "https://....jpg",
+      "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png",
       "id": 21374,
       "op": "宇航员",
       "type": 2,

mock/ticketSearch.json

@@ -0,0 +1,119 @@
+{
+    "pageIndex": 1,
+    "pageCount": 20,
+    "size": 10,
+    "queryType": 0,
+    "data": [
+      {
+        "id": 6830,
+        "type": 1,
+        "status": 2,
+        "device": "主机",
+        "deviceModel": "马嘉祺",
+        "owner": "马嘉祺",
+        "phone": "18888888888",
+        "createdTime": "2024-03-06T19:49:27.043865",
+        "isConfirmed": false
+      },
+      {
+        "id": 6831,
+        "type": 0,
+        "status": 0,
+        "device": "小米",
+        "deviceModel": "丁晨曦",
+        "owner": "丁晨曦",
+        "phone": "18888888887",
+        "createdTime": "2024-03-06T11:45:14.043865",
+        "isConfirmed": false
+      },
+      {
+        "id": 6832,
+        "type": 1,
+        "status": 1,
+        "device": "华硕",
+        "deviceModel": "宋亚轩",
+        "owner": "宋亚轩",
+        "phone": "18888888886",
+        "createdTime": "2024-03-06T19:48:27.043865",
+        "isConfirmed": false
+      },
+      {
+        "id": 6833,
+        "type": 1,
+        "status": 3,
+        "device": "联想",
+        "deviceModel": "刘耀文",
+        "owner": "刘耀文",
+        "phone": "18888888885",
+        "createdTime": "2024-03-06T14:49:27.043865",
+        "isConfirmed": false
+      },
+      {
+        "id": 6834,
+        "type": 1,
+        "status": 4,
+        "device": "ROG",
+        "deviceModel": "张震远",
+        "owner": "张震远",
+        "phone": "18888888884",
+        "createdTime": "2024-03-06T19:49:17.043865",
+        "isConfirmed": false
+      },
+      {
+        "id": 6835,
+        "type": 1,
+        "status": 5,
+        "device": "荣耀",
+        "deviceModel": "言好像",
+        "owner": "言好像",
+        "phone": "18888888883",
+        "createdTime": "2024-03-06T19:39:27.043865",
+        "isConfirmed": false
+      },
+      {
+        "id": 6836,
+        "type": 1,
+        "status": 6,
+        "device": "ROG",
+        "deviceModel": "何君琳",
+        "owner": "何君琳",
+        "phone": "18888888882",
+        "createdTime": "2024-03-06T09:49:27.043865",
+        "isConfirmed": false
+      },
+      {
+        "id": 6837,
+        "type": 1,
+        "status": 7,
+        "device": "EVA",
+        "deviceModel": "Echo",
+        "owner": "Echo",
+        "phone": "18888888881",
+        "createdTime": "2024-03-16T19:49:27.043865",
+        "isConfirmed": false
+      },
+      {
+        "id": 6838,
+        "type": 0,
+        "status": 2,
+        "device": "罗技",
+        "deviceModel": "SB",
+        "owner": "SB",
+        "phone": "18888888880",
+        "createdTime": "2024-04-06T19:49:27.043865",
+        "isConfirmed": false
+      },
+      {
+        "id": 6839,
+        "type": 0,
+        "status": 3,
+        "device": "HAL",
+        "deviceModel": "CNM",
+        "owner": "CNM",
+        "phone": "18888888877",
+        "createdTime": "2024-03-09T19:49:27.043865",
+        "isConfirmed": false
+      }
+    ]
+  }
+  

mock/ticketsList.json

@@ -0,0 +1,97 @@
+{
+    "pageIndex": 1,
+    "pageCount": 24,
+    "size": 8,
+    "queryType": 0,
+    "data": [
+      {
+        "id": 6830,
+        "type": 1,
+        "status": 2,
+        "device": "主机",
+        "deviceModel": "技嘉",
+        "owner": "武技栏",
+        "phone": "18888888888",
+        "createdTime": "2024-03-06T19:49:27.043865",
+        "isConfirmed": false
+      },
+      {
+        "id": 6831,
+        "type": 0,
+        "status": 0,
+        "device": "小米",
+        "deviceModel": "电风扇",
+        "owner": "丁真",
+        "phone": "18888888887",
+        "createdTime": "2024-03-06T11:45:14.043865",
+        "isConfirmed": false
+      },
+      {
+        "id": 6832,
+        "type": 1,
+        "status": 1,
+        "device": "华硕",
+        "deviceModel": "天选 3",
+        "owner": "西西弗",
+        "phone": "18888888886",
+        "createdTime": "2024-03-06T19:48:27.043865",
+        "isConfirmed": false
+      },
+      {
+        "id": 6833,
+        "type": 1,
+        "status": 3,
+        "device": "联想",
+        "deviceModel": "ThinkPad X1 Carbon",
+        "owner": "宇航员",
+        "phone": "18888888885",
+        "createdTime": "2024-03-06T14:49:27.043865",
+        "isConfirmed": false
+      },
+      {
+        "id": 6834,
+        "type": 1,
+        "status": 4,
+        "device": "ROG",
+        "deviceModel": "魔霸 7 Plus",
+        "owner": "约书亚",
+        "phone": "18888888884",
+        "createdTime": "2024-03-06T19:49:17.043865",
+        "isConfirmed": false
+      },
+      {
+        "id": 6835,
+        "type": 1,
+        "status": 5,
+        "device": "荣耀",
+        "deviceModel": "触屏笔记本",
+        "owner": "玉米",
+        "phone": "18888888883",
+        "createdTime": "2024-03-06T19:39:27.043865",
+        "isConfirmed": false
+      },
+      {
+        "id": 6836,
+        "type": 1,
+        "status": 6,
+        "device": "ROG",
+        "deviceModel": "幻 14",
+        "owner": "晓洋",
+        "phone": "18888888882",
+        "createdTime": "2024-03-06T09:49:27.043865",
+        "isConfirmed": false
+      },
+      {
+        "id": 6839,
+        "type": 0,
+        "status": 7,
+        "device": "HAL",
+        "deviceModel": "卡比手办",
+        "owner": "蘑菇云",
+        "phone": "18888888877",
+        "createdTime": "2024-03-09T19:49:27.043865",
+        "isConfirmed": false
+      }
+    ]
+  }
+  

mock/uncompleted.json

@@ -0,0 +1,15 @@
+{
+  "list": [
+    {
+      "id": 6832,
+      "type": 1,
+      "status": 2,
+      "device": "ROG",
+      "deviceModel": "幻 14 2022",
+      "owner": "晓洋",
+      "phone": "18888888887",
+      "createdTime": "2024-03-07T11:45:14.191981",
+      "isConfirmed": false
+    }
+  ]
+}

src/app.config.ts

@@ -2,7 +2,6 @@ export default defineAppConfig({
   pages: [
     'pages/index/index',
     'pages/repair/repair',
-    'pages/member/member',
     'pages/user/user',
     'pages/user/myTicket/myTicket',
     'pages/user/inform/inform',
@@ -10,6 +9,8 @@ export default defineAppConfig({
     'pages/user/report/report',
     'pages/user/member/member',
     'pages/TicketDetail/TicketDetail',
+    'pages/TicketList/TicketList',
+    'pages/404/404',
   ],
   window: {
     backgroundTextStyle: 'light',
@@ -28,10 +29,6 @@ export default defineAppConfig({
         pagePath: 'pages/repair/repair',
         text: '维修',
       },
-      {
-        pagePath: 'pages/member/member',
-        text: '管理',
-      },
       {
         pagePath: 'pages/user/user',
         text: '我的',

src/app.ts

@@ -1,28 +1,14 @@
 import { PropsWithChildren } from 'react';
-import Taro, { useLaunch } from '@tarojs/taro';
+import { useLaunch } from '@tarojs/taro';
-import { getUrl } from '@/service';
-import pt from '@/plain-text';
 import 'taro-ui/dist/style/index.scss';
 import './app.scss';
+import { pingAte } from './service/pingAte';
 
 function App({ children }: PropsWithChildren<any>) {
   useLaunch(() => {
     console.log('App launched.');
-    Taro.request({
+    pingAte();
-      url: getUrl('/user/locale/get'),
-      method: 'GET',
-      data: {
-        token: 'token_test',
-      },
-    }).then(res => {
-      console.log(res.data);
-      pt.setLang(res.data.data.lang);
-      Taro.reLaunch({
-        url: '/pages/index/index',
-      });
-    });
   });
-
   // children 是将要会渲染的页面
   return children;
 }

src/assets/icons/MainPage/clock.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1710991023487" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12657" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24"><path d="M512 42.666667q95.658667 0 182.485333 37.162667t149.674667 100.010667 100.010667 149.674667 37.162667 182.485333-37.162667 182.485333-100.010667 149.674667-149.674667 100.010667-182.485333 37.162667-182.485333-37.162667-149.674667-100.010667-100.010667-149.674667-37.162667-182.485333 37.162667-182.485333 100.010667-149.674667 149.674667-100.010667 182.485333-37.162667zM512 128q-77.994667 0-149.162667 30.506667t-122.496 81.834667-81.834667 122.496-30.506667 149.162667 30.506667 149.162667 81.834667 122.496 122.496 81.834667 149.162667 30.506667 149.162667-30.506667 122.496-81.834667 81.834667-122.496 30.506667-149.162667-30.506667-149.162667-81.834667-122.496-122.496-81.834667-149.162667-30.506667zM512 213.333333q17.664 0 30.165333 12.501333t12.501333 30.165333l0 238.336 115.669333 115.328q12.330667 12.330667 12.330667 30.336t-12.330667 30.336-30.336 12.330667-30.336-12.330667l-128-128q-12.330667-12.330667-12.330667-30.336l0-256q0-17.664 12.501333-30.165333t30.165333-12.501333z" fill="#E69966" p-id="12658"></path></svg>

src/assets/icons/MainPage/offduty.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1710604932901" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4288" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24"><path d="M512 121.6c217.6 0 390.4 172.8 390.4 390.4S729.6 902.4 512 902.4 121.6 729.6 121.6 512 294.4 121.6 512 121.6m0-89.6C246.4 32 32 249.6 32 512s217.6 480 480 480 480-217.6 480-480S774.4 32 512 32z" p-id="4289"></path><path d="M675.2 512H508.8V284.8c0-25.6-19.2-41.6-41.6-41.6H464c-25.6 0-41.6 19.2-41.6 41.6v272c0 25.6 19.2 41.6 41.6 41.6h214.4c25.6 0 44.8-22.4 44.8-44.8s-22.4-41.6-48-41.6z" p-id="4290"></path></svg>

src/assets/icons/MyTickets/fail.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1709907392895" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9700" width="48" height="48" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M512 32C246.4 32 32 246.4 32 512s214.4 480 480 480 480-214.4 480-480S777.6 32 512 32z m160 566.4c19.2 19.2 19.2 51.2 0 73.6-19.2 19.2-51.2 19.2-73.6 0L512 585.6 425.6 672c-19.2 19.2-51.2 19.2-73.6 0-19.2-19.2-19.2-51.2 0-73.6l86.4-86.4-86.4-86.4c-19.2-19.2-19.2-51.2 0-73.6 19.2-19.2 51.2-19.2 73.6 0l86.4 86.4 86.4-86.4c19.2-19.2 51.2-19.2 73.6 0 19.2 19.2 19.2 51.2 0 73.6L585.6 512l86.4 86.4z" p-id="9701" fill="#d4237a"></path></svg>

src/assets/icons/MyTickets/finished.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1709907148592" class="icon" viewBox="0 0 1410 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4262" width="66.09375" height="48" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M385.420696 906.172765L1004.039509 20.583293a47.214703 47.214703 0 0 1 44.414648-20.276253c18.634842 1.448304 31.766129 10.524341 39.297309 27.035004a49.049221 49.049221 0 0 1-3.76559 49.145774L435.242346 1001.278045a49.531989 49.531989 0 0 1-31.669576 20.276253 44.800863 44.800863 0 0 1-36.207594-8.207055L18.806738 752.362906a48.469899 48.469899 0 0 1-18.05552-31.669576 47.311256 47.311256 0 0 1 9.076037-36.207594 44.028434 44.028434 0 0 1 31.669575-18.924502 49.918203 49.918203 0 0 1 36.207594 9.848465l307.716272 230.763066z m686.495982-461.622685a47.021595 47.021595 0 0 1-34.75929-13.517502 47.021595 47.021595 0 0 1-13.517502-34.75929c0-14.096823 4.441465-25.683253 13.517502-34.75929a47.021595 47.021595 0 0 1 34.75929-13.517502h289.660752c14.096823 0 25.5867 4.441465 34.75929 13.517502 8.979483 9.076037 13.517502 20.662467 13.517502 34.75929a47.021595 47.021595 0 0 1-13.517502 34.75929 47.021595 47.021595 0 0 1-34.75929 13.517502h-289.660752z m-193.107168 289.660752a47.021595 47.021595 0 0 1-34.75929-13.517502 47.021595 47.021595 0 0 1-13.517502-34.75929c0-14.096823 4.441465-25.683253 13.517502-34.75929a47.021595 47.021595 0 0 1 34.75929-13.517502h482.76792c14.096823 0 25.5867 4.441465 34.75929 13.517502 8.979483 9.076037 13.517502 20.662467 13.517502 34.75929a47.021595 47.021595 0 0 1-13.517502 34.75929 47.021595 47.021595 0 0 1-34.75929 13.517502h-482.76792z m-193.107168 289.660752a47.021595 47.021595 0 0 1-34.75929-13.517502 47.021595 47.021595 0 0 1-13.517502-34.75929c0-14.096823 4.441465-25.683253 13.517502-34.75929a47.021595 47.021595 0 0 1 34.75929-13.517502h675.875088c14.096823 0 25.5867 4.441465 34.75929 13.517502 8.979483 9.076037 13.517502 20.662467 13.517502 34.75929a47.021595 47.021595 0 0 1-13.517502 34.75929 47.021595 47.021595 0 0 1-34.75929 13.517502h-675.875088z" p-id="4263" fill="#8a8a8a"></path></svg>

src/assets/icons/MyTickets/repair.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1709907302076" class="icon" viewBox="0 0 1026 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7483" width="48.09375" height="48" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M123.252 739.482L406.85 455.885l-60.34-60.34-287.64 287.64c-30.893 30.894-31.708 80.946-0.814 111.84l177.279 177.278c30.863 30.864 80.945 30.08 111.84-0.814l287.609-287.61-60.34-60.34-283.597 283.597-167.654-167.654z" p-id="7484" fill="#8a8a8a"></path><path d="M717.75 223.245l65.107-65.348 122.58 121.374-62.331 62.572-109.064 44.56a81.444 81.444 0 0 0-27.274 18.404L562.013 553.183l61.064 59.616 144.122-147.742 109.034-44.531a80.337 80.337 0 0 0 26.67-17.8l123.364-123.848-243.863-241.45L656.686 163.69c-7.452 7.452-13.365 16.382-17.408 26.097l-44.56 107.616-136.972 137.574 60.46 60.22 137.605-138.209c7.482-7.482 13.366-16.382 17.438-26.127l44.47-107.646z" p-id="7485" fill="#8a8a8a"></path><path d="M351.156 295.623L746.713 691.18q30.17 30.17 0 60.34t-60.34 0L290.816 355.962q-30.17-30.17 0-60.34t60.34 0zM222.24 728.35a42.667 42.667 0 0 1 60.31 1.055l24.739 25.584a42.667 42.667 0 0 1-61.366 59.254l-24.74-25.644a42.624 42.624 0 0 1 1.027-60.28z" p-id="7486" fill="#8a8a8a"></path></svg>

src/assets/icons/MyTickets/tick.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1709907338992" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8608" width="48" height="48" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M832 0H192C85.952 0 0 86.016 0 192v640a192 192 0 0 0 192 192h640a192 192 0 0 0 192-192V192c0-105.984-85.952-192-192-192z m64 832c0 35.392-28.608 64-64 64H192a64 64 0 0 1-64-64V192c0-35.328 28.672-64 64-64h640a64 64 0 0 1 64 64v640zM669.376 330.88L443.136 557.12l-90.56-90.496c-24.96-25.024-65.472-25.024-90.496 0s-25.024 65.536 0 90.496l135.808 135.744a63.936 63.936 0 0 0 90.496 0l271.488-271.488c25.024-25.024 25.024-65.472 0-90.496s-65.472-25.024-90.496 0z" p-id="8609" fill="#12c53d"></path></svg>

src/assets/icons/RepairPage/repair.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1710232513408" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4296" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24"><path d="M816.672 937.344c-8.192 0-16.384-3.136-22.624-9.376l-213.952-213.952c-12.512-12.512-12.512-32.736 0-45.248s32.736-12.512 45.248 0l191.328 191.328 33.408-33.376-190.848-190.848c-12.512-12.512-12.512-32.736 0-45.248s32.736-12.512 45.248 0l213.472 213.472c6.016 6.016 9.376 14.112 9.376 22.624s-3.36 16.64-9.376 22.624l-78.656 78.624C833.024 934.208 824.832 937.344 816.672 937.344z" fill="#5C636E" p-id="4297"></path><path d="M590.752 128c0-0.032 0-0.064 0-0.064 1.472-4.16 2.048-8.352 1.792-12.512 0 0 0 0 0 0 0 0-0.032-0.064-0.032-0.096-0.256-4.128-1.312-8.096-3.104-11.776-0.352-0.704-0.896-1.248-1.28-1.92-1.632-2.848-3.456-5.472-5.952-7.712-0.928-0.864-2.08-1.376-3.136-2.112-1.92-1.376-3.616-3.008-5.888-3.968-0.608-0.256-1.248-0.384-1.888-0.608-0.032 0-0.064-0.032-0.096-0.032-114.144-46.624-243.808-20.704-331.072 66.592C239.328 154.528 239.04 155.584 238.336 156.416 237.472 157.12 236.448 157.408 235.648 158.208L73.664 319.552c-6.016 6.016-9.408 14.144-9.408 22.656s3.36 16.64 9.376 22.656l98.304 98.304c6.016 6.016 14.144 9.376 22.624 9.376s16.64-3.36 22.624-9.376l56.032-56.032 68.192 68.224c6.24 6.24 14.432 9.376 22.624 9.376s16.384-3.136 22.624-9.376c12.512-12.48 12.512-32.736 0-45.248l-90.816-90.848c-12.512-12.512-32.736-12.512-45.248 0L194.56 395.296l-52.992-53.024 139.264-138.72c0.832-0.8 1.12-1.888 1.824-2.752 0.864-0.704 1.92-0.992 2.72-1.824 40-39.936 91.296-63.072 144.864-68.768-2.208 1.664-4.384 3.392-6.56 5.12-8.96 6.784-17.632 14.016-25.664 22.048-0.544 0.544-0.736 1.248-1.216 1.824-19.232 19.36-35.936 41.024-49.568 64.512-2.464 4.224-4.768 8.448-7.008 12.736l0.416 0.224c-12.288 24.64-12.288 53.664 0.48 78.144 1.536 2.944 3.52 5.504 5.76 7.744 0.768 0.96 1.088 2.112 1.984 2.976l70.432 70.464c6.24 6.24 14.432 9.376 22.624 9.376s16.384-3.136 22.624-9.376c12.512-12.48 12.512-32.736 0-45.248l-67.072-67.072c-2.624-6.112-2.688-13.024 0.448-18.976 0.16-0.288 0.128-0.608 0.256-0.896 1.44-2.656 2.848-5.344 4.384-7.968 11.008-18.944 24.48-36.448 40.064-52.032 4.096-4.096 8.608-7.648 12.96-11.456 30.144-25.28 67.232-40.864 106.816-43.136 0.576-0.032 1.056-0.352 1.632-0.416 3.616-0.384 7.104-1.184 10.368-2.72 0.512-0.256 0.896-0.64 1.376-0.896 3.168-1.696 6.048-3.776 8.512-6.496 0.256-0.288 0.384-0.64 0.608-0.928 2.08-2.464 4.128-4.928 5.44-8.064C590.624 129.12 590.528 128.544 590.752 128z" fill="#5C636E" p-id="4298"></path><path d="M289.536 960.032c-28.384 0-56.928-6.368-82.624-18.432-9.408-4.448-16.096-13.184-17.888-23.456-1.792-10.24 1.504-20.736 8.896-28.128l88.064-88.096-33.056-33.024-87.52 87.488c-7.424 7.424-18.048 10.848-28.384 8.832-10.336-1.888-19.104-8.704-23.392-18.304-32.736-72.64-17.088-159.072 38.944-215.104 50.048-50.08 126.048-68.384 193.952-47.04l238.688-238.72c-21.28-67.712-3.648-143.264 47.04-193.952 36.128-36.16 84.256-56.064 135.456-56.064 27.264 0 54.816 5.92 79.648 17.12 9.568 4.32 16.448 13.056 18.304 23.392 1.92 10.336-1.408 20.96-8.832 28.384l-88.8 88.8 33.024 33.056 89.376-89.344c7.392-7.392 17.92-10.72 28.128-8.896 10.272 1.792 19.04 8.48 23.456 17.888 34.496 73.376 19.424 160.96-37.536 217.92-36.096 36.096-84.128 56-135.296 56-20.704 0-41.536-3.392-61.216-9.952l-237.12 237.12c22.688 68.48 5.44 145.024-46.048 196.544C388.736 940.16 340.672 960.032 289.536 960.032zM282.592 895.84c36.352 2.112 71.36-11.392 96.992-37.024 37.952-37.952 47.936-96.384 24.864-145.408-5.76-12.224-3.232-26.72 6.336-36.256l266.816-266.848c9.536-9.536 24.032-12.032 36.256-6.336 47.936 22.56 108 12.544 145.408-24.864 25.952-25.92 38.784-61.408 36.992-96.96l-72.576 72.544c-6.016 6.016-14.112 9.376-22.624 9.376l0 0c-8.512 0-16.64-3.36-22.624-9.376L700.16 276.416c-12.512-12.512-12.512-32.736 0-45.248l71.04-71.04c-35.072-0.896-68.8 12.384-93.696 37.28-37.92 37.92-48.064 94.272-25.856 143.552 5.44 12.128 2.848 26.368-6.56 35.776l-267.936 267.968c-9.376 9.376-23.648 11.936-35.776 6.56-47.68-21.504-106.624-11.104-143.584 25.856-25.504 25.536-38.464 59.392-37.408 93.856l69.92-69.92c12.512-12.512 32.736-12.512 45.248 0l78.304 78.272c6.016 6.016 9.376 14.112 9.376 22.624 0 8.48-3.36 16.64-9.376 22.624L282.592 895.84z" fill="#5C636E" p-id="4299"></path></svg>

src/assets/icons/TicketState/create.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1711724022815" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7442" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 85.333333c235.648 0 426.666667 191.061333 426.666667 426.666667s-191.018667 426.666667-426.666667 426.666667S85.333333 747.605333 85.333333 512 276.352 85.333333 512 85.333333z m0 71.125334c-196.053333 0-355.541333 159.488-355.541333 355.541333 0 196.053333 159.488 355.541333 355.541333 355.541333 196.053333 0 355.541333-159.488 355.541333-355.541333 0-196.053333-159.488-355.541333-355.541333-355.541333zM480 256a32 32 0 0 1 31.701333 27.648L512 288V512h138.666667a32 32 0 0 1 4.352 63.701333l-4.352 0.298667h-170.666667a32 32 0 0 1-31.701333-27.648l-0.298667-4.352v-256a32 32 0 0 1 32-32z" fill="#bfbfbf" p-id="7443"></path></svg>

src/assets/icons/TicketState/fail.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1711724082044" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8459" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M572.341333 512l268.490667-268.501333a42.666667 42.666667 0 0 0-59.274667-61.376c-0.362667 0.341333-0.704 0.693333-1.056 1.045333L512 451.658667 243.509333 183.168a42.666667 42.666667 0 0 0-60.341333 60.330667L451.669333 512 183.168 780.501333a42.666667 42.666667 0 0 0 59.669333 61.002667l0.672-0.672L512 572.341333l268.501333 268.490667C788.832 849.162667 799.754667 853.333333 810.666667 853.333333s21.845333-4.170667 30.165333-12.501333a42.666667 42.666667 0 0 0 0-60.330667L572.341333 512z" p-id="8460" fill="#d81e06"></path></svg>

src/assets/icons/TicketState/refuse.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1711724278042" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11057" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M756.821333 256C691.541333 203.264 601.472 170.666667 512 170.666667a341.333333 341.333333 0 1 0 341.333333 341.333333 42.666667 42.666667 0 0 1 85.333334 0c0 235.648-191.018667 426.666667-426.666667 426.666667S85.333333 747.648 85.333333 512 276.352 85.333333 512 85.333333c108.757333 0 217.898667 39.082667 298.666667 104.490667V128a42.666667 42.666667 0 0 1 85.333333 0v170.666667a42.666667 42.666667 0 0 1-42.666667 42.666666h-170.666666a42.666667 42.666667 0 0 1 0-85.333333h74.154666z" p-id="11058" fill="#f0d323"></path></svg>

src/assets/icons/TicketState/repair.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1711724571236" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15667" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M223.579432 955.45963a24.234651 24.234651 0 0 1-3.071998-1.979732 508.995927 508.995927 0 0 1-184.319877-185.616943 34.133311 34.133311 0 0 1 12.561058-46.557836 33.655444 33.655444 0 0 1 46.694369 12.561058 440.25144 440.25144 0 0 0 159.880427 160.767893 15.223457 15.223457 0 0 1 2.525865 1.365333c12.424525 6.826662 24.917317 13.653324 37.751441 19.455987A443.733038 443.733038 0 0 0 701.582313 127.726848l-4.64213-2.662398-4.369064-2.389332H692.16152a444.347437 444.347437 0 0 0-423.867451 0l-1.365333 0.682666-3.618131 1.979732-5.188263 2.935465A440.114907 440.114907 0 0 0 95.852584 290.406206a33.723711 33.723711 0 0 1-46.694369 12.561059 34.133311 34.133311 0 0 1-12.561058-46.694369A512.477525 512.477525 0 0 1 695.233517 47.854901a0.682666 0.682666 0 0 0 0.546133 0c1.365332 0.682666 2.525865 1.365332 3.891198 1.843199a511.658326 511.658326 0 0 1-1.365333 925.35405l-1.228799 0.682666-3.618131 1.570132a505.71913 505.71913 0 0 1-176.947082 45.329037 492.065805 492.065805 0 0 1-37.614908 1.433599 507.835395 507.835395 0 0 1-255.317163-68.607954z" fill="#bfbfbf" p-id="15668"></path><path d="M539.176022 288.358208a231.492112 231.492112 0 0 1 163.498557 283.169944 34.133311 34.133311 0 0 1-41.847439 24.098118 34.133311 34.133311 0 0 1-24.098117-41.779173A162.952425 162.952425 0 1 0 437.117423 669.012887a34.133311 34.133311 0 0 1 24.098117 41.847439 34.133311 34.133311 0 0 1-41.779172 24.098117 231.219046 231.219046 0 1 1 119.739654-446.600235z" fill="#bfbfbf" p-id="15669"></path></svg>

src/assets/icons/TicketState/retrieve.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1711723813811" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4236" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M800 288a47.84 47.84 0 0 0-33.936 14.064L432 636.112 257.936 462.064a48 48 0 1 0-67.872 67.872l208 208c8.688 8.688 20.688 14.064 33.936 14.064s25.248-5.376 33.936-14.064l368-368A48 48 0 0 0 800 288z" fill="#bfbfbf" p-id="4237"></path></svg>

src/assets/icons/TicketState/success.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1711724195931" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9893" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M800 288a47.84 47.84 0 0 0-33.936 14.064L432 636.112 257.936 462.064a48 48 0 1 0-67.872 67.872l208 208c8.688 8.688 20.688 14.064 33.936 14.064s25.248-5.376 33.936-14.064l368-368A48 48 0 0 0 800 288z" fill="#14ca20" p-id="9894"></path></svg>

src/assets/icons/Toast/error.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1711521868832" class="icon" viewBox="0 0 1025 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1603" xmlns:xlink="http://www.w3.org/1999/xlink" width="200.1953125" height="200"><path d="M982.668821 313.74918c-25.810101-60.752236-62.714-115.373446-109.685763-162.346233-46.972787-46.971763-101.593997-83.875662-162.346233-109.685763C647.666853 14.966132 580.925912 1.401699 512.268258 1.401699S376.868639 14.966132 313.898667 41.717184c-60.752236 25.810101-115.373446 62.714-162.346233 109.685763-46.971763 46.972787-83.875662 101.593997-109.685763 162.346233C15.115619 376.719151 1.551186 443.460092 1.551186 512.118771S15.115619 647.517366 41.866671 710.487337c25.810101 60.75326 62.714 115.37447 109.685763 162.346233 46.971763 46.972787 101.592974 83.876686 162.346233 109.685763 62.969971 26.752076 129.710912 40.316509 198.369591 40.316509s135.398595-13.564433 198.368567-40.316509c60.75326-25.809077 115.37447-62.712976 162.346233-109.685763 46.972787-46.971763 83.876686-101.592974 109.685763-162.346233 26.752076-62.969971 40.316509-129.710912 40.316509-198.368567S1009.419873 376.719151 982.668821 313.74918zM937.435615 691.271058c-23.333323 54.923257-56.71096 104.317532-99.204249 146.811845-42.494313 42.493289-91.888588 75.870926-146.811845 99.204249-56.8584 24.155503-117.133505 36.403219-179.152287 36.403219-62.018782 0-122.293887-12.247716-179.152287-36.403219-54.923257-23.333323-104.317532-56.71096-146.810821-99.204249-42.493289-42.494313-75.870926-91.888588-99.204249-146.811845C62.944374 634.412658 50.697682 574.136529 50.697682 512.118771c0-62.018782 12.247716-122.293887 36.403219-179.152287 23.333323-54.923257 56.709936-104.317532 99.204249-146.810821s91.888588-75.870926 146.810821-99.204249c56.8584-24.155503 117.133505-36.403219 179.152287-36.403219 62.017758 0 122.292863 12.247716 179.152287 36.403219 54.923257 23.333323 104.317532 56.709936 146.810821 99.204249 42.494313 42.493289 75.870926 91.888588 99.205273 146.810821 24.155503 56.8584 36.403219 117.134529 36.403219 179.152287S961.591118 634.412658 937.435615 691.271058z" fill="#ffffff" p-id="1604"></path><path d="M704.62457 319.769626c-9.997216-9.996192-26.203273-9.996192-36.199466 0L512.382933 475.810773 356.341786 319.769626c-9.996192-9.996192-26.204297-9.996192-36.199466 0-9.996192 9.996192-9.996192 26.203273 0 36.199466l156.041147 156.041147L320.14232 668.05241c-9.996192 9.997216-9.996192 26.204297 0 36.199466 4.997584 4.998608 11.549426 7.496888 18.100245 7.496888s13.101637-2.49828 18.100245-7.496888l156.041147-156.041147L668.424081 704.251876c4.998608 4.998608 11.548403 7.496888 18.100245 7.496888s13.101637-2.49828 18.100245-7.496888c9.996192-9.996192 9.996192-26.203273 0-36.199466L548.583423 512.011263l156.041147-156.041147C714.620762 345.973923 714.620762 329.765818 704.62457 319.769626z" fill="#ffffff" p-id="1605"></path></svg>

src/assets/icons/UserPage/clock.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1710991023487" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12657" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24"><path d="M512 42.666667q95.658667 0 182.485333 37.162667t149.674667 100.010667 100.010667 149.674667 37.162667 182.485333-37.162667 182.485333-100.010667 149.674667-149.674667 100.010667-182.485333 37.162667-182.485333-37.162667-149.674667-100.010667-100.010667-149.674667-37.162667-182.485333 37.162667-182.485333 100.010667-149.674667 149.674667-100.010667 182.485333-37.162667zM512 128q-77.994667 0-149.162667 30.506667t-122.496 81.834667-81.834667 122.496-30.506667 149.162667 30.506667 149.162667 81.834667 122.496 122.496 81.834667 149.162667 30.506667 149.162667-30.506667 122.496-81.834667 81.834667-122.496 30.506667-149.162667-30.506667-149.162667-81.834667-122.496-122.496-81.834667-149.162667-30.506667zM512 213.333333q17.664 0 30.165333 12.501333t12.501333 30.165333l0 238.336 115.669333 115.328q12.330667 12.330667 12.330667 30.336t-12.330667 30.336-30.336 12.330667-30.336-12.330667l-128-128q-12.330667-12.330667-12.330667-30.336l0-256q0-17.664 12.501333-30.165333t30.165333-12.501333z" fill="#E69966" p-id="12658"></path></svg>

src/assets/icons/UserPage/message.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1710991348108" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="26534" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24"><path d="M512 512m-48 0a48 48 0 1 0 96 0 48 48 0 1 0-96 0Z" p-id="26535" fill="#9ACD32"></path><path d="M712 512m-48 0a48 48 0 1 0 96 0 48 48 0 1 0-96 0Z" p-id="26536" fill="#9ACD32"></path><path d="M312 512m-48 0a48 48 0 1 0 96 0 48 48 0 1 0-96 0Z" p-id="26537" fill="#9ACD32"></path><path d="M925.2 338.4c-22.6-53.7-55-101.9-96.3-143.3-41.3-41.3-89.5-73.8-143.3-96.3C630.6 75.7 572.2 64 512 64h-2c-60.6 0.3-119.3 12.3-174.5 35.9-53.3 22.8-101.1 55.2-142 96.5-40.9 41.3-73 89.3-95.2 142.8-23 55.4-34.6 114.3-34.3 174.9 0.3 69.4 16.9 138.3 48 199.9v152c0 25.4 20.6 46 46 46h152.1c61.6 31.1 130.5 47.7 199.9 48h2.1c59.9 0 118-11.6 172.7-34.3 53.5-22.3 101.6-54.3 142.8-95.2 41.3-40.9 73.8-88.7 96.5-142 23.6-55.2 35.6-113.9 35.9-174.5 0.3-60.9-11.5-120-34.8-175.6z m-151.1 438C704 845.8 611 884 512 884h-1.7c-60.3-0.3-120.2-15.3-173.1-43.5l-8.4-4.5H188V695.2l-4.5-8.4C155.3 633.9 140.3 574 140 513.7c-0.4-99.7 37.7-193.3 107.6-263.8 69.8-70.5 163.1-109.5 262.8-109.9h1.7c50 0 98.5 9.7 144.2 28.9 44.6 18.7 84.6 45.6 119 80 34.3 34.3 61.3 74.4 80 119 19.4 46.2 29.1 95.2 28.9 145.8-0.6 99.6-39.7 192.9-110.1 262.7z" p-id="26538" fill="#9ACD32"></path></svg>

src/assets/icons/UserPage/user.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1710990953433" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11565" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24"><path d="M510 64.4c-246.5 0-447.6 200-447.6 447.6 0 246.5 200 447.6 447.6 447.6 246.5 0 447.6-200 447.6-447.6 0-246.5-200.1-447.6-447.6-447.6z m0 831.9c-212.3 0-384.3-172-384.3-384.3s172-384.3 384.3-384.3 384.3 172 384.3 384.3-172 384.3-384.3 384.3z m229.1-181.2c-18.4-70.4-67.9-125.5-131.2-153.6 48-30.6 79.6-84.2 79.6-144.9 0-94.9-77.1-172-172-172s-172 77.1-172 172c0 61.2 31.6 114.8 79.6 144.9-63.8 27.6-113.3 83.2-131.7 153.6-4.1 16.3 5.6 33.2 21.9 37.3 2.6 0.5 5.1 1 7.7 1 13.8 0 26-9.2 29.6-23 19.4-75 87.3-127.1 164.3-127.1S660 655.4 679.4 730.4c4.1 16.3 20.9 26 37.3 21.9 16.8-4 27-20.9 22.4-37.2zM515.6 305.8c61.2 0 110.7 49.5 110.7 110.7s-49.5 110.7-110.7 110.7-110.7-49.5-110.7-110.7 49.5-110.7 110.7-110.7z" p-id="11566" fill="#78A4FA"></path></svg>

src/common.ts

@@ -0,0 +1,11 @@
+export type FixStatus = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7;
+
+export const defaultAvatar =
+  'https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png';
+
+export const tmplIds = ['hbblqs928F2kd1s0IR_pDIAjYrNscUmz6tv6NZKsctM'];
+
+export type Info = {
+  phone: string;
+  name: string;
+};

src/components/DetailFramework/DetailFramework.config.ts

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

src/components/DetailFramework/DetailFramework.tsx

@@ -0,0 +1,189 @@
+import { View } from '@tarojs/components';
+import { Component, ReactNode } from 'react';
+import Taro from '@tarojs/taro';
+import {
+  ShowElements,
+  TicketInfo,
+  TicketNote,
+} from '@/pages/TicketDetail/TicketNote';
+import pt from '@/plain-text';
+import { RequestState } from '@/service';
+import { getTicketInfo } from '@/service/ticketsInfo';
+import { AtActivityIndicator, AtCard, AtSteps, AtToast } from 'taro-ui';
+import NoteList from '../NoteList/NoteList';
+
+interface StepItemData {
+  title: string;
+}
+
+interface DetailFrameworkState {
+  current: number;
+  items: Array<StepItemData>;
+  ticketInfo: TicketInfo;
+  notes: Array<TicketNote>;
+  rs: RequestState;
+}
+
+interface DetailFrameworkProps {
+  middleButton: JSX.Element;
+  id: number;
+  isInfoShow: { [key: string]: boolean };
+}
+
+export default class DetailFramework extends Component<
+  DetailFrameworkProps,
+  DetailFrameworkState
+> {
+  state = {
+    current: 0,
+    items: [],
+    ticketInfo: new TicketInfo(),
+    notes: [new TicketNote()],
+    rs: new RequestState(),
+  };
+
+  componentDidMount(): void {
+    const navBar = pt.get().navBar;
+    Taro.setNavigationBarTitle({
+      title: navBar.ticketDetail,
+    });
+    getTicketInfo(this, this.props.id);
+  }
+
+  props: Readonly<DetailFrameworkProps> = {
+    middleButton: <View></View>,
+    id: 0,
+    isInfoShow: {
+      device: true,
+      createdTime: true,
+      description: true,
+      current: true,
+      notelist: true,
+      showAllNotes: true,
+      info: true,
+    },
+  };
+
+  render(): ReactNode {
+    if (this.state.rs.loading) {
+      return (
+        <AtActivityIndicator
+          mode='center'
+          content={pt.get().actIndicator.loading}
+        ></AtActivityIndicator>
+      );
+    }
+    if (!this.state.rs.success) {
+      return (
+        <AtToast
+          isOpened
+          text={pt.get().toast.error}
+          icon='close-circle'
+        ></AtToast>
+      );
+    }
+
+    const elements: ShowElements = {
+      device: this.props.isInfoShow['device'] ? (
+        <View className='at-article__h1'>
+          {this.state.ticketInfo.device +
+            ' ' +
+            this.state.ticketInfo.deviceModel}
+        </View>
+      ) : (
+        <View></View>
+      ),
+      createdTime: this.props.isInfoShow['createdTime'] ? (
+        <View className='at-article__info'>
+          {pt.get().common.createdAtText(this.state.ticketInfo.createdTime)}
+        </View>
+      ) : (
+        <View></View>
+      ),
+      description: this.props.isInfoShow['description'] ? (
+        <View
+          style={{
+            paddingTop: '20rpx',
+            paddingBottom: '20rpx',
+            width: '94%',
+            marginLeft: '3%',
+          }}
+        >
+          <AtCard isFull title={pt.get().ticketDetail.desc.title}>
+            <View className='at-article__h3'>
+              {this.state.ticketInfo.description}
+            </View>
+          </AtCard>
+        </View>
+      ) : (
+        <View></View>
+      ),
+      info: this.props.isInfoShow['info'] ? (
+        <View
+          style={{
+            paddingTop: '20rpx',
+            paddingBottom: '20rpx',
+            width: '94%',
+            marginLeft: '3%',
+          }}
+        >
+          <AtCard
+            isFull
+            title={pt.get().ticketDetail.info.title}
+            extra={pt.get().ticketDetail.info.extra}
+            extraStyle={{ fontSize: '32rpx', marginRight: '40rpx' }}
+          >
+            <View style={{ display: 'flex' }}>
+              <View className='at-article__h3'>
+                {this.state.ticketInfo.info.name}
+              </View>
+              <View style={{ marginLeft: 'auto' }} className='at-article__h3'>
+                {this.state.ticketInfo.info.phone}
+              </View>
+            </View>
+          </AtCard>
+        </View>
+      ) : (
+        <View></View>
+      ),
+      current: this.props.isInfoShow['current'] ? (
+        <View style={{ padding: '20rpx' }}>
+          <AtSteps
+            items={this.state.items}
+            current={this.state.current}
+            onChange={() => {}}
+          />
+        </View>
+      ) : (
+        <View></View>
+      ),
+      notelist: this.props.isInfoShow['notelist'] ? (
+        this.props.isInfoShow['showAllNotes'] ? (
+          <View style={{ padding: '20rpx' }}>
+            <NoteList noteList={this.state.notes} />
+          </View>
+        ) : (
+          <View style={{ padding: '20rpx' }}>
+            <NoteList
+              noteList={[this.state.notes[this.state.notes.length - 1]]}
+            />
+          </View>
+        )
+      ) : (
+        <View></View>
+      ),
+    };
+
+    return (
+      <View>
+        {elements.device}
+        {elements.createdTime}
+        {elements.description}
+        {elements.info}
+        {elements.current}
+        {this.props.middleButton}
+        {elements.notelist}
+      </View>
+    );
+  }
+}

src/components/NoteCard/NoteCard.config.ts

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

src/components/NoteCard/NoteCard.tsx

@@ -0,0 +1,63 @@
+import { Image, 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 './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.comment.createTicketMessage;
+    const modifyMessage = td.statusModifyMessage;
+    const prefix = td.comment.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 className='at-row at-row__align--center'>
+        <View className='at-col at-col-1 at-col--auto'>
+          <Image
+            style='width: 70rpx; height: 70rpx; border-radius: 35px;'
+            src={note.avatar}
+            mode='aspectFit'
+          />
+        </View>
+        <View
+          className='at-col at-col--wrap'
+          style={{
+            marginTop: '40rpx',
+            marginBottom: '40rpx',
+            wordBreak: 'normal',
+          }}
+        >
+          <View className='at-article__p'>{note.op}</View>
+          <View className='at-article__info'>
+            {note.createdTime.format(timeFormat)}
+          </View>
+          <View className='at-article__h3'>{message}</View>
+        </View>
+      </View>
+    );
+  }
+}

src/components/NoteList/NoteList.config.ts

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

src/components/NoteList/NoteList.tsx

@@ -0,0 +1,32 @@
+import { Component, ReactNode } from 'react';
+import NoteCard from '@/components/NoteCard/NoteCard';
+import { TicketNote } from '@/pages/TicketDetail/TicketNote';
+import { View } from '@tarojs/components';
+import { AtDivider } from 'taro-ui';
+import pt from '@/plain-text';
+
+interface NoteListProps {
+  noteList: Array<TicketNote>;
+}
+
+export default class NoteList extends Component<NoteListProps, {}> {
+  props: Readonly<NoteListProps> = {
+    noteList: [],
+  };
+  render(): ReactNode {
+    return (
+      <View>
+        <AtDivider
+          fontColor='#CCC'
+          content={pt.get().ticketDetail.divider}
+          height={20}
+        />
+        {this.props.noteList.map((note, idx) => (
+          <View key={idx}>
+            <NoteCard note={note} />
+          </View>
+        ))}
+      </View>
+    );
+  }
+}

src/components/PageFooter/PageFooter.tsx

@@ -3,8 +3,8 @@ import { AtDivider } from 'taro-ui';
 import pt from '@/plain-text';
 
 export default () => {
-  const blankHeightUpper = 15;
+  const blankHeightUpper = '30rpx';
-  const blankHeightLower = 110;
+  const blankHeightLower = '220rpx';
   return (
     <View>
       <View style={{ height: blankHeightUpper }}></View>
@@ -16,7 +16,7 @@ export default () => {
         />
       </View>
       <View className='at-row at-row__justify--center'>
-        <Text style='color:#dddddd;'>© 2024 EVA Tech</Text>
+        <Text style='color:#dddddd; fontSize:32rpx'>© 2024 EVA Tech</Text>
       </View>
       <View style={{ height: blankHeightLower }}></View>
     </View>

src/components/TicketListItem/TicketListItem.config.ts

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

src/components/TicketListItem/TicketListItem.tsx

@@ -0,0 +1,61 @@
+import { AtListItem } from 'taro-ui';
+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';
+
+export class TicketListItem {
+  id: number;
+  brand: string;
+  model: string;
+  status: FixStatus;
+  createAt: moment.Moment;
+  iconMap: Map<FixStatus, string>;
+
+  constructor(
+    id: number,
+    brand: string,
+    model: string,
+    status: FixStatus,
+    createAt: moment.Moment,
+  ) {
+    this.id = id;
+    this.brand = brand;
+    this.model = model;
+    this.status = status;
+    this.createAt = createAt;
+    this.iconMap = new Map<FixStatus, string>([
+      [0, create],
+      [1, repair],
+      [2, refuse],
+      [3, retrieve],
+      [4, success],
+      [5, retrieve],
+      [6, fail],
+      [7, retrieve],
+    ]);
+  }
+
+  render(): JSX.Element {
+    const tl = pt.get().ticketList;
+    return (
+      <AtListItem
+        title={this.brand + ' ' + this.model}
+        note={tl.createdAt(this.createAt.format('YYYY-MM-DD HH:mm'))}
+        extraText={tl.statusMap.get(this.status)}
+        arrow='right'
+        thumb={this.iconMap.get(this.status)}
+        onClick={() => {
+          Taro.navigateTo({
+            url: '/pages/TicketDetail/TicketDetail?id=' + this.id,
+          });
+        }}
+      />
+    );
+  }
+}

src/custom-tab-bar/index.tsx

@@ -6,65 +6,62 @@ import wechatUser from '@/wechat';
 import 'taro-ui/dist/style/index.scss';
 import './index.scss';
 
-const navList: Array<Taro.TabBarItem> = [
+const navList: () => Array<Taro.TabBarItem> = () => {
-  {
+  return [
-    pagePath: '/pages/index/index',
+    {
-    text: pt.get().tabBar.indexText,
+      pagePath: '/pages/index/index',
-  },
+      text: pt.get().tabBar.indexText,
-  {
+    },
-    pagePath: '/pages/repair/repair',
+    {
-    text: pt.get().tabBar.repairText,
+      pagePath: '/pages/repair/repair',
-  },
+      text: pt.get().tabBar.repairText,
-  {
+    },
-    pagePath: '/pages/member/member',
+    {
-    text: pt.get().tabBar.memberText,
+      pagePath: '/pages/user/user',
-  },
+      text: pt.get().tabBar.userText,
-  {
+    },
-    pagePath: '/pages/user/user',
+  ];
-    text: pt.get().tabBar.userText,
+};
-  },
+
-];
+const tabList = () => {
+  return wechatUser.getAccess()
+    ? [
+        {
+          title: pt.get().tabBar.memberText,
+          iconType: 'sketch',
+        },
+        {
+          title: pt.get().tabBar.repairText,
+          iconType: 'settings',
+        },
+        {
+          title: pt.get().tabBar.userText,
+          iconType: 'user',
+        },
+      ]
+    : [
+        {
+          title: pt.get().tabBar.indexText,
+          iconType: 'home',
+        },
+        {
+          title: pt.get().tabBar.repairText,
+          iconType: 'settings',
+        },
+        {
+          title: pt.get().tabBar.userText,
+          iconType: 'user',
+        },
+      ];
+};
 
 export default class Index extends Component {
   state = {
     selected: 0,
-    tabList: wechatUser.getAccess()
-      ? [
-          {
-            title: pt.get().tabBar.indexText,
-            iconType: 'home',
-          },
-          {
-            title: pt.get().tabBar.repairText,
-            iconType: 'settings',
-          },
-          {
-            title: pt.get().tabBar.memberText,
-            iconType: 'sketch',
-          },
-          {
-            title: pt.get().tabBar.userText,
-            iconType: 'user',
-          },
-        ]
-      : [
-          {
-            title: pt.get().tabBar.indexText,
-            iconType: 'home',
-          },
-          {
-            title: pt.get().tabBar.repairText,
-            iconType: 'settings',
-          },
-          {
-            title: pt.get().tabBar.userText,
-            iconType: 'user',
-          },
-        ],
   };
 
   handleClick(idx: number) {
-    this.switchTab(idx, navList[idx].pagePath);
+    this.switchTab(idx, navList()[idx].pagePath);
   }
 
   switchTab(idx: number, url: string) {
@@ -82,7 +79,7 @@ export default class Index extends Component {
     return (
       <AtTabBar
         fixed
-        tabList={this.state.tabList}
+        tabList={tabList()}
         onClick={this.handleClick.bind(this)}
         current={this.state.selected}
       />

src/pages/404/404.tsx

@@ -0,0 +1,35 @@
+import { Component, ReactNode } from 'react';
+import { View } from '@tarojs/components';
+import Taro from '@tarojs/taro';
+import pt from '@/plain-text';
+import PageFooter from '@/components/PageFooter/PageFooter';
+import './404.scss';
+
+export default class NotFoundPage extends Component {
+  componentDidMount(): void {
+    Taro.setNavigationBarTitle({
+      title: pt.get().navBar.notFound,
+    });
+  }
+  render(): ReactNode {
+    return (
+      <View>
+        <View
+          className='page-title'
+          style={{ marginTop: '150rpx', marginBottom: '240rpx' }}
+        >
+          <View className='at-article__h1' style={{ fontWeight: 'bold' }}>
+            {pt.get().notFound.title.ZhCn}
+          </View>
+          <View className='at-article__h2'>{pt.get().notFound.desc.ZhCn}</View>
+          <View style={{ height: '150rpx' }}></View>
+          <View className='at-article__h1' style={{ fontWeight: 'bold' }}>
+            {pt.get().notFound.title.EnUs}
+          </View>
+          <View className='at-article__h2'>{pt.get().notFound.desc.EnUs}</View>
+        </View>
+        <PageFooter />
+      </View>
+    );
+  }
+}

src/pages/TicketDetail/TicketDetail.tsx

@@ -1,25 +1,731 @@
 import { Component, ReactNode } from 'react';
 import { View } from '@tarojs/components';
 import { getCurrentInstance } from '@tarojs/runtime';
-import Taro from '@tarojs/taro';
 import pt from '@/plain-text';
+import {
+  AtActionSheet,
+  AtActionSheetItem,
+  AtButton,
+  AtCheckbox,
+  AtFloatLayout,
+  AtForm,
+  AtMessage,
+  AtModal,
+  AtTextarea,
+} from 'taro-ui';
+import DetailFramework from '@/components/DetailFramework/DetailFramework';
+import PageFooter from '@/components/PageFooter/PageFooter';
+import { submitComment } from '@/service/submitComment';
+import Taro from '@tarojs/taro';
+import wechatUser from '@/wechat';
+import { addToOreo } from '@/service/addToOreo';
+import { pickTicket } from '@/service/pickTicket';
+import { retrieve } from '@/service/retrieve';
+import { changeStatus } from '@/service/changeStatus';
+import { getDisable } from '@/service/getDisable';
+import { StatusStr } from './TicketNote';
 
-export default class TicketDetail extends Component {
+const submitInterval = 5000;
-  state = {
+
-    id: 0,
+interface TicketDetailState {
+  id: number;
+  isMember: boolean;
+  show: {
+    modal: {
+      oreo: boolean;
+      retrieve: boolean;
+      pick: boolean;
+    };
+    layout: {
+      comment: boolean;
+      reminder: boolean;
+    };
+    actionSheet: {
+      status: boolean;
+    };
   };
+  comment: string;
+  isLoading: {
+    oreo: boolean;
+    pick: boolean;
+    retrieve: boolean;
+    comment: boolean;
+    status: boolean;
+    reminder: boolean;
+  };
+  isDisable: {
+    oreo: boolean;
+    pick: boolean;
+    retrieve: boolean;
+    comment: boolean;
+    status: boolean;
+    reminder: boolean;
+  };
+  isDisable_main: {
+    oreo: boolean;
+    pick: boolean;
+    retrieve: boolean;
+    comment: boolean;
+  };
+  reminderList: Array<number>;
+  statusToBe: number;
+}
+
+export default class TicketDetail extends Component<{}, TicketDetailState> {
+  state: Readonly<TicketDetailState> = {
+    id: 0,
+    isMember: false,
+    show: {
+      modal: {
+        oreo: false,
+        retrieve: false,
+        pick: false,
+      },
+      layout: {
+        comment: false,
+        reminder: false,
+      },
+      actionSheet: {
+        status: false,
+      },
+    },
+    comment: '',
+    isLoading: {
+      oreo: false,
+      pick: false,
+      retrieve: false,
+      comment: false,
+      status: false,
+      reminder: false,
+    },
+    isDisable: {
+      oreo: false,
+      pick: false,
+      retrieve: false,
+      comment: false,
+      status: false,
+      reminder: false,
+    },
+    isDisable_main: {
+      oreo: false,
+      pick: false,
+      retrieve: false,
+      comment: false,
+    },
+    reminderList: [],
+    // eslint-disable-next-line react/no-unused-state
+    statusToBe: 0,
+  };
+
   componentDidMount(): void {
-    const navBar = pt.get().navBar;
-    Taro.setNavigationBarTitle({
-      title: navBar.ticketDetail,
-    });
     const { router } = getCurrentInstance();
-    const id = router?.params.id;
+    const id = router?.params.id as number;
     this.setState({
       id: id,
+      isMember: wechatUser.getAccess(),
+    });
+    getDisable(this, id);
+  }
+
+  onAddToOreo(): void {
+    this.setState({
+      show: {
+        ...this.state.show,
+        modal: {
+          ...this.state.show.modal,
+          oreo: true,
+        },
+      },
     });
   }
+
+  onAddComment(): void {
+    this.setState({
+      show: {
+        ...this.state.show,
+        layout: {
+          ...this.state.show.layout,
+          comment: true,
+        },
+      },
+    });
+  }
+
+  onRetrieved(): void {
+    this.setState({
+      show: {
+        ...this.state.show,
+        modal: {
+          ...this.state.show.modal,
+          retrieve: true,
+        },
+      },
+    });
+  }
+
+  onPick(): void {
+    this.setState({
+      show: {
+        ...this.state.show,
+        modal: {
+          ...this.state.show.modal,
+          pick: true,
+        },
+      },
+    });
+  }
+
+  onChangeStatus(): void {
+    this.setState({
+      show: {
+        ...this.state.show,
+        actionSheet: {
+          ...this.state.show.actionSheet,
+          status: true,
+        },
+      },
+    });
+  }
+
+  handleOreoCancel(): void {
+    this.setState({
+      show: {
+        ...this.state.show,
+        modal: {
+          ...this.state.show.modal,
+          oreo: false,
+        },
+      },
+    });
+  }
+
+  handleCommentCancel(): void {
+    this.setState({
+      show: {
+        ...this.state.show,
+        layout: {
+          ...this.state.show.layout,
+          comment: false,
+        },
+      },
+    });
+  }
+
+  handleReminderCancel(): void {
+    this.setState({
+      show: {
+        ...this.state.show,
+        layout: {
+          ...this.state.show.layout,
+          reminder: false,
+        },
+      },
+    });
+  }
+
+  handleRetrieveCancel(): void {
+    this.setState({
+      show: {
+        ...this.state.show,
+        modal: {
+          ...this.state.show.modal,
+          retrieve: false,
+        },
+      },
+    });
+  }
+
+  handleStatusCancel(): void {
+    this.setState({
+      show: {
+        ...this.state.show,
+        actionSheet: {
+          ...this.state.show.actionSheet,
+          status: false,
+        },
+      },
+    });
+  }
+
+  handlePickCancel(): void {
+    this.setState({
+      show: {
+        ...this.state.show,
+        modal: {
+          ...this.state.show.modal,
+          pick: false,
+        },
+      },
+    });
+  }
+
+  handleOreoConfirm(): void {
+    this.setState({
+      isDisable: {
+        ...this.state.isDisable,
+        oreo: true,
+      },
+      show: {
+        ...this.state.show,
+        modal: {
+          ...this.state.show.modal,
+          oreo: false,
+        },
+      },
+    });
+    addToOreo(this);
+    setTimeout(() => {
+      this.setState({
+        isDisable: {
+          ...this.state.isDisable,
+          oreo: false,
+        },
+      });
+    }, submitInterval);
+    return;
+  }
+
+  handleRetrieveConfirm(): void {
+    this.setState({
+      isDisable: {
+        ...this.state.isDisable,
+        retrieve: true,
+      },
+      show: {
+        ...this.state.show,
+        modal: {
+          ...this.state.show.modal,
+          retrieve: false,
+        },
+      },
+    });
+    retrieve(this);
+    setTimeout(() => {
+      this.setState({
+        isDisable: {
+          ...this.state.isDisable,
+          retrieve: false,
+        },
+      });
+    }, submitInterval);
+    return;
+  }
+
+  handlePickConfirm(): void {
+    this.setState({
+      isDisable: {
+        ...this.state.isDisable,
+        pick: true,
+      },
+      show: {
+        ...this.state.show,
+        modal: {
+          ...this.state.show.modal,
+          pick: false,
+        },
+      },
+    });
+    pickTicket(this);
+    setTimeout(() => {
+      this.setState({
+        isDisable: {
+          ...this.state.isDisable,
+          pick: false,
+        },
+      });
+    }, submitInterval);
+    return;
+  }
+
+  handleStatusChange(status: number): void {
+    if (status == 3 || status == 5 || status == 7) {
+      this.setState({
+        isDisable: {
+          ...this.state.isDisable,
+          status: true,
+        },
+        show: {
+          ...this.state.show,
+          actionSheet: {
+            ...this.state.show.actionSheet,
+            status: false,
+          },
+          layout: {
+            ...this.state.show.layout,
+            reminder: true,
+          },
+        },
+        // eslint-disable-next-line react/no-unused-state
+        statusToBe: status,
+      });
+    } else {
+      this.setState({
+        isDisable: {
+          ...this.state.isDisable,
+          status: true,
+        },
+        show: {
+          ...this.state.show,
+          actionSheet: {
+            ...this.state.show.actionSheet,
+            status: false,
+          },
+        },
+      });
+      changeStatus(this);
+    }
+    setTimeout(() => {
+      this.setState({
+        isDisable: {
+          ...this.state.isDisable,
+          status: false,
+        },
+      });
+    }, submitInterval);
+    return;
+  }
+
+  handleCommentChange(comment: string) {
+    this.setState({
+      comment: comment,
+    });
+    return comment;
+  }
+
+  onCommentSubmit() {
+    this.setState({
+      isDisable: {
+        ...this.state.isDisable,
+        comment: true,
+      },
+      show: {
+        ...this.state.show,
+        layout: {
+          ...this.state.show.layout,
+          comment: false,
+        },
+      },
+    });
+    if (this.state.comment == '') {
+      Taro.atMessage({
+        message: pt.get().button.submitText.blank,
+        type: 'error',
+      });
+      setTimeout(() => {
+        this.setState({
+          isDisable: {
+            ...this.state.isDisable,
+            comment: false,
+          },
+        });
+      }, submitInterval);
+      return;
+    }
+    submitComment(this);
+    setTimeout(() => {
+      this.setState({
+        isDisable: {
+          ...this.state.isDisable,
+          comment: false,
+        },
+      });
+    }, submitInterval);
+  }
+
+  handleReminderChange(reminderList: Array<number>) {
+    this.setState({
+      reminderList: reminderList,
+    });
+    return reminderList;
+  }
+
+  onReminderSubmit() {
+    if (
+      this.state.reminderList.includes(1) &&
+      this.state.reminderList.includes(3)
+    ) {
+      this.setState({
+        isDisable: {
+          ...this.state.isDisable,
+          reminder: true,
+        },
+        show: {
+          ...this.state.show,
+          layout: {
+            ...this.state.show.layout,
+            reminder: false,
+          },
+        },
+      });
+      changeStatus(this);
+    } else {
+      this.setState({
+        isDisable: {
+          ...this.state.isDisable,
+          reminder: true,
+        },
+      });
+      Taro.atMessage({
+        message: pt.get().ticketDetail.reminder.error,
+        type: 'error',
+      });
+    }
+    setTimeout(() => {
+      this.setState({
+        isDisable: {
+          ...this.state.isDisable,
+          reminder: false,
+        },
+      });
+    }, submitInterval);
+  }
+
+  reminderOption = [
+    {
+      value: 0,
+      label: pt.get().ticketDetail.reminder.r0,
+    },
+    {
+      value: 1,
+      label: pt.get().ticketDetail.reminder.r1,
+    },
+    {
+      value: 2,
+      label: pt.get().ticketDetail.reminder.r2,
+    },
+    {
+      value: 3,
+      label: pt.get().ticketDetail.reminder.r3,
+    },
+  ];
+
   render(): ReactNode {
-    return <View>TicketDetail: {this.state.id}</View>;
+    const middleButton = this.state.isMember ? (
+      <View>
+        <View
+          className='at-row'
+          style={{ paddingTop: '20rpx', paddingBottom: '20rpx', width: '100%' }}
+        >
+          <View
+            className='at-col'
+            style={{ marginLeft: '20rpx', paddingRight: '10rpx', width: '50%' }}
+          >
+            <AtButton
+              loading={this.state.isLoading.pick}
+              disabled={
+                this.state.isDisable.pick || this.state.isDisable_main.pick
+              }
+              type='secondary'
+              onClick={this.onPick.bind(this)}
+            >
+              {pt.get().ticketDetail.button.pick}
+            </AtButton>
+          </View>
+          <View
+            className='at-col'
+            style={{ marginLeft: '20rpx', paddingRight: '10rpx', width: '50%' }}
+          >
+            <AtButton
+              loading={this.state.isLoading.oreo}
+              disabled={
+                this.state.isDisable.oreo || this.state.isDisable_main.oreo
+              }
+              type='primary'
+              onClick={this.onAddToOreo.bind(this)}
+            >
+              {pt.get().ticketDetail.button.addToOreo}
+            </AtButton>
+          </View>
+        </View>
+        <View
+          className='at-row'
+          style={{ paddingTop: '20rpx', paddingBottom: '40rpx', width: '100%' }}
+        >
+          <View
+            className='at-col'
+            style={{ marginLeft: '20rpx', paddingRight: '10rpx', width: '50%' }}
+          >
+            <AtButton
+              loading={this.state.isLoading.status}
+              disabled={this.state.isDisable.status}
+              type='primary'
+              onClick={this.onChangeStatus.bind(this)}
+            >
+              {pt.get().ticketDetail.button.status}
+            </AtButton>
+          </View>
+          <View
+            className='at-col'
+            style={{ marginLeft: '20rpx', paddingRight: '10rpx', width: '50%' }}
+          >
+            <AtButton
+              disabled={
+                this.state.isDisable.comment ||
+                this.state.isDisable_main.comment
+              }
+              loading={this.state.isLoading.comment}
+              type='secondary'
+              onClick={this.onAddComment.bind(this)}
+            >
+              {pt.get().ticketDetail.button.addNote}
+            </AtButton>
+          </View>
+        </View>
+      </View>
+    ) : (
+      <View
+        className='at-row'
+        style={{ paddingTop: '20rpx', paddingBottom: '40rpx', width: '100%' }}
+      >
+        <View
+          className='at-col'
+          style={{ marginLeft: '20rpx', paddingRight: '10rpx', width: '50%' }}
+        >
+          <AtButton
+            loading={this.state.isLoading.retrieve}
+            disabled={
+              this.state.isDisable.retrieve ||
+              this.state.isDisable_main.retrieve
+            }
+            type='primary'
+            onClick={this.onRetrieved.bind(this)}
+          >
+            {pt.get().ticketDetail.button.tookAway}
+          </AtButton>
+        </View>
+        <View
+          className='at-col'
+          style={{ marginRight: '20rpx', paddingLeft: '10rpx', width: '50%' }}
+        >
+          <AtButton
+            disabled={
+              this.state.isDisable.comment || this.state.isDisable_main.comment
+            }
+            loading={this.state.isLoading.comment}
+            type='secondary'
+            onClick={this.onAddComment.bind(this)}
+          >
+            {pt.get().ticketDetail.button.addNote}
+          </AtButton>
+        </View>
+      </View>
+    );
+
+    const actionSheetItemList: Array<StatusStr> = [
+      '0',
+      '1',
+      '2',
+      '3',
+      '4',
+      '5',
+      '6',
+      '7',
+    ];
+
+    const sheetItemsRenderer = actionSheetItemList.map((item, idx) => (
+      <AtActionSheetItem
+        key={idx}
+        onClick={this.handleStatusChange.bind(this, idx)}
+      >
+        {pt.get().ticketDetail.statusModifyMessage.get(item)}
+      </AtActionSheetItem>
+    ));
+
+    const isInfoShow = {
+      device: true,
+      createdTime: true,
+      description: true,
+      info: wechatUser.getAccess() ? true : false,
+      current: true,
+      notelist: true,
+      showAllNotes: true,
+    };
+
+    return (
+      <View>
+        <AtMessage />
+        <AtModal
+          isOpened={this.state.show.modal.oreo}
+          title={pt.get().modal.addToOreo.title}
+          cancelText={pt.get().modal.cancel}
+          confirmText={pt.get().modal.confirm}
+          onCancel={this.handleOreoCancel.bind(this)}
+          onConfirm={this.handleOreoConfirm.bind(this)}
+          content={pt.get().modal.addToOreo.content}
+        />
+        <AtModal
+          isOpened={this.state.show.modal.retrieve}
+          title={pt.get().modal.retrieve.title}
+          cancelText={pt.get().modal.cancel}
+          confirmText={pt.get().modal.confirm}
+          onCancel={this.handleRetrieveCancel.bind(this)}
+          onConfirm={this.handleRetrieveConfirm.bind(this)}
+          content={pt.get().modal.retrieve.content}
+        />
+        <AtModal
+          isOpened={this.state.show.modal.pick}
+          title={pt.get().modal.pick.title}
+          cancelText={pt.get().modal.cancel}
+          confirmText={pt.get().modal.confirm}
+          onCancel={this.handlePickCancel.bind(this)}
+          onConfirm={this.handlePickConfirm.bind(this)}
+          content={pt.get().modal.pick.content}
+        />
+        <AtFloatLayout
+          isOpened={this.state.show.layout.comment}
+          title={pt.get().ticketDetail.comment.title}
+          onClose={this.handleCommentCancel.bind(this)}
+        >
+          <AtForm onSubmit={this.onCommentSubmit.bind(this)}>
+            <AtTextarea
+              value={this.state.comment}
+              onChange={this.handleCommentChange.bind(this)}
+              maxLength={200}
+              height='400rpx'
+              placeholder={pt.get().ticketDetail.comment.placeholder}
+            />
+            <AtButton formType='submit' type='primary'>
+              {pt.get().button.buttonText.submit}
+            </AtButton>
+          </AtForm>
+        </AtFloatLayout>
+        <AtFloatLayout
+          isOpened={this.state.show.layout.reminder}
+          title={pt.get().ticketDetail.reminder.title}
+          onClose={this.handleReminderCancel.bind(this)}
+        >
+          <AtForm onSubmit={this.onReminderSubmit.bind(this)}>
+            <AtCheckbox
+              options={this.reminderOption}
+              selectedList={this.state.reminderList}
+              onChange={this.handleReminderChange.bind(this)}
+            />
+            <AtButton
+              loading={this.state.isLoading.reminder}
+              formType='submit'
+              type='primary'
+              disabled={this.state.isDisable.reminder}
+            >
+              {pt.get().button.buttonText.submit}
+            </AtButton>
+          </AtForm>
+        </AtFloatLayout>
+        <AtActionSheet
+          isOpened={this.state.show.actionSheet.status}
+          cancelText={pt.get().ticketDetail.status.cancel}
+          title={pt.get().ticketDetail.status.title}
+          onCancel={this.handleStatusCancel.bind(this)}
+          onClose={this.handleStatusCancel.bind(this)}
+        >
+          {sheetItemsRenderer}
+        </AtActionSheet>
+        <DetailFramework
+          middleButton={middleButton}
+          id={this.state.id}
+          isInfoShow={isInfoShow}
+        />
+        <PageFooter />
+      </View>
+    );
   }
 }

src/pages/TicketDetail/TicketNote.ts

@@ -0,0 +1,33 @@
+import { FixStatus, Info } from '@/common';
+
+export class TicketInfo {
+  id: number;
+  type: 0 | 1;
+  device: string;
+  deviceModel: string;
+  description: string;
+  createdTime: moment.Moment;
+  status: FixStatus;
+  info: Info;
+  workers: string[];
+}
+
+export class TicketNote {
+  avatar: string;
+  id: number;
+  op: string;
+  type: 0 | 1 | 2;
+  content: string;
+  createdTime: moment.Moment;
+}
+
+export class ShowElements {
+  device: JSX.Element;
+  createdTime: JSX.Element;
+  description: JSX.Element;
+  info: JSX.Element;
+  current: JSX.Element;
+  notelist: JSX.Element;
+}
+
+export type StatusStr = '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7';

src/pages/TicketList/TicketList.config.ts

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  usingComponents: {},
+});

src/pages/TicketList/TicketList.tsx

@@ -0,0 +1,109 @@
+import { Component, ReactNode } from 'react';
+import { View } from '@tarojs/components';
+import {
+  AtActivityIndicator,
+  AtList,
+  AtPagination,
+  AtSearchBar,
+  AtToast,
+} from 'taro-ui';
+import Taro from '@tarojs/taro';
+import moment from 'moment';
+import pt from '@/plain-text';
+import PageFooter from '@/components/PageFooter/PageFooter';
+import { RequestState } from '@/service';
+import { getTicketList, searchTicketList } from '@/service/ticketList';
+import { TicketListItem } from '@/components/TicketListItem/TicketListItem';
+import './TicketList.scss';
+
+interface TicketListState {
+  fixList: Array<TicketListItem>;
+  rs: RequestState;
+  currentPage: number;
+  totalPage: number;
+  pageSize: number;
+  search: string;
+}
+
+export default class TicketListPage extends Component<{}, TicketListState> {
+  state = {
+    fixList: [new TicketListItem(0, '', '', 1, moment())],
+    rs: new RequestState(),
+    currentPage: 1,
+    totalPage: 1,
+    pageSize: 8,
+    search: '',
+  };
+
+  componentDidMount(): void {
+    Taro.setNavigationBarTitle({
+      title: pt.get().navBar.ticketList,
+    });
+    getTicketList(this);
+  }
+
+  onPageChange(): void {
+    this.setState({
+      rs: new RequestState(),
+    });
+    getTicketList(this);
+  }
+
+  onSearchChange(search): void {
+    this.setState({
+      search: search,
+    });
+    return search;
+  }
+
+  onActionClick(): void {
+    this.setState({
+      rs: new RequestState(),
+    });
+    searchTicketList(this);
+  }
+
+  render(): ReactNode {
+    if (this.state.rs.loading) {
+      return (
+        <AtActivityIndicator
+          mode='center'
+          content={pt.get().actIndicator.loading}
+        ></AtActivityIndicator>
+      );
+    }
+    if (!this.state.rs.success) {
+      return (
+        <AtToast
+          isOpened
+          text={pt.get().toast.error}
+          icon='close-circle'
+        ></AtToast>
+      );
+    }
+    const fixListRenderer = this.state.fixList.map((item) => item.render());
+    return (
+      <View>
+        <View style={{ marginTop: '20rpx', marginBottom: '20rpx' }}>
+          <AtSearchBar
+            actionName={pt.get().ticketList.search}
+            value={this.state.search}
+            onChange={this.onSearchChange.bind(this)}
+            onActionClick={this.onActionClick.bind(this)}
+          />
+        </View>
+        <AtList>{fixListRenderer}</AtList>
+        <View style={{ marginTop: '40rpx' }}>
+          <AtPagination
+            icon
+            total={this.state.totalPage}
+            pageSize={this.state.pageSize}
+            current={this.state.currentPage}
+            onPageChange={this.onPageChange.bind(this)}
+          ></AtPagination>
+        </View>
+        <PageFooter />
+      </View>
+    );
+  }
+}

src/pages/index/DutyInfo.tsx

@@ -4,55 +4,66 @@ 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/MainPage/offduty.svg';
+import wechatUser from '@/wechat';
+import moment from 'moment';
 
 export class DutyData {
   constructor() {
     this.isInDuty = false;
     this.inDutyCnt = 3;
-    this.currentDuty = '2';
+    this.currentDuty = '1';
-    this.offDutyReason = '学园维修';
+    this.otherDutyStart = '2024-03-07T13:30:48.523303';
-    this.dutyRecoverTime = '下周一';
+    this.otherDutyEnd = '2024-03-07T16:00:48.523303';
+    this.dutyRecoverTime = '明天 13：30';
+    this.place = '东三-204';
   }
 
   isInDuty: boolean;
-  inDutyCnt: number;
+  inDutyCnt?: number;
-  currentDuty: 'off' | '1' | '2' | '3';
+  currentDuty?: '0' | '1' | '2' | '3' | 'others';
-  offDutyReason: string; // from backend
+  otherDutyStart?: string;
-  dutyRecoverTime: string; // from backend
+  otherDutyEnd?: string;
+  offDutyReason?: string;
+  dutyRecoverTime?: string;
+  place: string;
 }
 
 class Card extends Component {
   props = {
     isInDuty: false,
+    place: '东三-204',
   };
   render(): ReactNode {
     const inDuty = this.props.isInDuty;
+    const place = this.props.place;
     const dc = pt.get().mainPage.dutyCard;
     const title = inDuty ? dc.inDuty.title : dc.offDuty.title;
-    const iconsrc = inDuty ? tick : cross;
+    const iconsrc = inDuty ? tick : wechatUser.getAccess() ? clock : cross;
     return (
       <View>
         <View
           style={{
             display: 'flex',
             alignItems: 'center',
-            marginBottom: 20,
+            marginBottom: '40rpx',
           }}
         >
           <Image
             src={iconsrc}
             style={{
-              width: 24,
+              width: '48rpx',
-              height: 24,
+              height: '48rpx',
             }}
           />
           <View
             style={{
-              marginLeft: 10,
+              marginLeft: '20rpx',
-              fontSize: 36,
+              fontSize: '60rpx',
+              fontWeight: 'bold',
             }}
           >
-            {title}
+            {'[' + place + '] ' + title}
           </View>
         </View>
       </View>
@@ -61,6 +72,11 @@ class Card extends Component {
 }
 
 export class DutyInfo extends Component {
+  state: {
+    isLoading: false;
+    isDisable: false;
+  };
+
   props = {
     data: new DutyData(),
   };
@@ -70,11 +86,21 @@ export class DutyInfo extends Component {
     const od = pt.get().mainPage.dutyCard.offDuty;
     return (
       <View>
-        <Card isInDuty={data.isInDuty} />
+        <Card isInDuty={data.isInDuty} place={data.place} />
         <AtTimeline
           items={[
-            { title: od.reason(data.offDutyReason) },
+            {
-            { title: od.recoverTime(data.dutyRecoverTime) },
+              title:
+                data.currentDuty == '0'
+                  ? pt.get().mainPage.normal.reason
+                  : od.reason(data.offDutyReason as string),
+            },
+            {
+              title:
+                data.currentDuty == '0'
+                  ? pt.get().mainPage.normal.recoverTime
+                  : od.recoverTime(data.dutyRecoverTime as string),
+            },
           ]}
         />
       </View>
@@ -86,11 +112,19 @@ export class DutyInfo extends Component {
     const id = pt.get().mainPage.dutyCard.inDuty;
     return (
       <View>
-        <Card isInDuty={data.isInDuty} />
+        <Card isInDuty={data.isInDuty} place={data.place} />
         <AtTimeline
           items={[
-            { title: id.currentDutyText(data.currentDuty) },
+            {
-            { title: id.inDutyCnt(data.inDutyCnt) },
+              title:
+                data.currentDuty == 'others'
+                  ? id.currentDutyText('others') +
+                    moment(data.otherDutyStart).format('H:mm') +
+                    ' - ' +
+                    moment(data.otherDutyEnd).format('H:mm')
+                  : id.currentDutyText(data.currentDuty || '0'),
+            },
+            { title: id.inDutyCnt(data.inDutyCnt as number) },
           ]}
         />
       </View>

src/pages/index/StepTipsInfo.tsx

@@ -2,12 +2,19 @@ import { Component, ReactNode } from 'react';
 import { View } from '@tarojs/components';
 import { AtTimeline } from 'taro-ui';
 import pt from '@/plain-text';
+import wechatUser from '@/wechat';
 
 export class StepInfo extends Component {
   render(): ReactNode {
     return (
       <View>
-        <AtTimeline items={pt.get().mainPage.stepList}></AtTimeline>
+        <AtTimeline
+          items={
+            wechatUser.getAccess()
+              ? pt.get().memberPage.stepList
+              : pt.get().mainPage.stepList
+          }
+        ></AtTimeline>
       </View>
     );
   }
@@ -17,7 +24,13 @@ export class TipsInfo extends Component {
   render(): ReactNode {
     return (
       <View>
-        <AtTimeline items={pt.get().mainPage.tipsList}></AtTimeline>
+        <AtTimeline
+          items={
+            wechatUser.getAccess()
+              ? pt.get().memberPage.tipsList
+              : pt.get().mainPage.tipsList
+          }
+        ></AtTimeline>
       </View>
     );
   }

src/pages/index/TitleCard.tsx

@@ -1,14 +1,35 @@
 import React from 'react';
-import { View } from '@tarojs/components';
+import { View, Image } from '@tarojs/components';
 import pt from '@/plain-text';
+import wechatUser from '@/wechat';
+
+const logo = 'https://wiki.zjueva.net/images/evalogo_hd.png';
 
 export default class TitleCard extends React.Component {
   render(): React.ReactNode {
     const mainPage = pt.get().mainPage;
+    const memberPage = pt.get().memberPage;
     return (
-      <View className='page-title'>
+      <View className='at-row at-row__align--center'>
-        <View className='at-article__h1'>{mainPage.mainTitleLine}</View>
+        <View className='at-col at-col-1 at-col--auto'>
-        <View className='at-article__h2'>{mainPage.subTitleLine}</View>
+          <Image
+            style='width: 100rpx; height: 100rpx; margin-left: 30rpx;'
+            src={wechatUser.getAccess() ? wechatUser.getInfo().avatar : logo}
+            mode='aspectFit'
+          />
+        </View>
+        <View className='page-title'>
+          <View className='at-article__h1' style={{ fontWeight: 'bold' }}>
+            {wechatUser.getAccess()
+              ? memberPage.titleLine.main.index + wechatUser.getInfo().name
+              : mainPage.titleLine.main}
+          </View>
+          <View className='at-article__h2'>
+            {wechatUser.getAccess()
+              ? memberPage.titleLine.sub.index
+              : mainPage.titleLine.sub}
+          </View>
+        </View>
       </View>
     );
   }

src/pages/index/index.tsx

@@ -1,16 +1,35 @@
 import { View } from '@tarojs/components';
 import { Component, ReactNode } from 'react';
 import Taro from '@tarojs/taro';
-import { AtCard, AtAccordion } from 'taro-ui';
+import {
+  AtCard,
+  AtAccordion,
+  AtInputNumber,
+  AtButton,
+  AtList,
+  AtListItem,
+  AtActivityIndicator,
+  AtToast,
+} from 'taro-ui';
+import clockIcon from '@/assets/icons/MainPage/clock.svg';
 import type CustomTabBar from '@/custom-tab-bar';
 import PageFooter from '@/components/PageFooter/PageFooter';
 import pt from '@/plain-text';
-import { getUrl } from '@/service';
+import { getDutyInfo } from '@/service/dutyInfo';
+import { RequestState } from '@/service';
+import moment from 'moment';
+import wechatUser from '@/wechat';
+import { getMemberDutyInfo } from '@/service/memberDutyInfo';
+import { getUncompletedTicketList } from '@/service/uncompletedTicket';
+import { changeDutyCnt } from '@/service/changeDutyCount';
+import { TicketListItem } from '@/components/TicketListItem/TicketListItem';
 import './index.scss';
 import TitleCard from './TitleCard';
 import { DutyInfo, DutyData } from './DutyInfo';
 import { StepInfo, TipsInfo } from './StepTipsInfo';
 
+const submitInterval = 5000;
+
 class CardContent {
   title: string;
   note: string;
@@ -20,7 +39,7 @@ class CardContent {
 
 function mainPageCard(c: CardContent): JSX.Element {
   return (
-    <View style={{ marginTop: 10 }}>
+    <View style={{ marginTop: '20rpx', marginBottom: '40rpx' }}>
       <AtCard note={c.note} extra={c.extra} title={c.title}>
         {c.content()}
       </AtCard>
@@ -56,67 +75,77 @@ class ExpandItem extends Component {
   }
 }
 
-export default class Index extends Component {
+interface MainPageState {
+  fixList: Array<TicketListItem>;
+  rs: RequestState;
+  dutyData: DutyData;
+  inDutyCnt: number;
+  dutyInfoCard: CardContent;
+  stepInfoCard: CardContent;
+  tipsInfoCard: CardContent;
+  isLoading: boolean;
+  isDisable: boolean;
+}
+
+export default class MainPage extends Component<{}, MainPageState> {
   state = {
     dutyData: new DutyData(),
+    inDutyCnt: 0,
     dutyInfoCard: {
-      title: pt.get().mainPage.cardTitle.dutyInfo,
+      title: '',
-      note: 'Tips',
+      note: '',
-      extra: '额外信息',
+      extra: '',
-      content: () => <DutyInfo data={this.state.dutyData} />,
+      content: () => <></>,
     },
     stepInfoCard: {
-      title: pt.get().mainPage.cardTitle.stepInfo,
+      title: '',
-      note: 'Tips 请在20:30以前取走自己的物品哦',
+      note: '',
-      extra: '额外信息',
+      extra: '',
-      content: () => <StepInfo />,
+      content: () => <></>,
     },
     tipsInfoCard: {
-      title: pt.get().mainPage.cardTitle.tipsInfo,
+      title: '',
-      note: 'Tips',
+      note: '',
-      extra: '额外信息',
+      extra: '',
-      content: () => <TipsInfo />,
+      content: () => <></>,
     },
+    fixList: [new TicketListItem(0, '', '', 1, moment())],
+    rs: new RequestState(),
+    isLoading: false,
+    isDisable: false,
   };
 
   componentDidMount(): void {
-    Taro.request({
+    const ptPage = wechatUser.getAccess() ? 'memberPage' : 'mainPage';
-      url: getUrl('/dutyinfo'),
+    this.setState({
-      method: 'GET',
+      dutyData: new DutyData(),
-      data: {
+      inDutyCnt: 0,
-        token: 'token_test',
+      dutyInfoCard: {
+        title: pt.get()[ptPage].cardTitle.dutyInfo,
+        note: pt.get()[ptPage].cardTips.dutyInfo,
+        extra: pt.get()[ptPage].extraInfo.dutyInfo,
+        content: () => <DutyInfo data={this.state.dutyData} />,
       },
-    })
+      stepInfoCard: {
-      .then(res => {
+        title: pt.get()[ptPage].cardTitle.stepInfo,
-        const data = res.data.data;
+        note: pt.get()[ptPage].cardTips.stepInfo,
-        if (data.isInDuty) {
+        extra: pt.get()[ptPage].extraInfo.dutyInfo,
-          this.setState({
+        content: () => <StepInfo />,
-            dutyData: {
+      },
-              isInDuty: data.isInDuty,
+      tipsInfoCard: {
-              inDutyCnt: data.inDutyCnt,
+        title: pt.get()[ptPage].cardTitle.tipsInfo,
-              currentDuty: data.currentDuty,
+        note: pt.get()[ptPage].cardTips.tipsInfo,
-            },
+        extra: pt.get()[ptPage].extraInfo.dutyInfo,
-          });
+        content: () => <TipsInfo />,
-        } else {
+      },
-          this.setState({
+    });
-            dutyData: {
+
-              isInDuty: data.isInDuty,
+    if (wechatUser.getAccess()) {
-              offDutyReason: data.offDutyReason,
+      getMemberDutyInfo(this);
-              dutyRecoverTime: data.dutyRecoverTime,
+      getUncompletedTicketList(this);
-            },
+    } else {
-          });
+      getDutyInfo(this);
-        }
+    }
-      })
-      .catch(err => {
-        console.log(err);
-        this.setState({
-          dutyData: {
-            isInDuty: false,
-            offDutyReason: '获取失败！Network Error!',
-            dutyRecoverTime: '获取失败！Network Error!',
-          },
-        });
-      });
   }
 
   // 以下是TabBar相关
@@ -127,20 +156,138 @@ export default class Index extends Component {
   }
   // 以上是TabBar相关
 
+  handleCnt(inDutyCnt: number) {
+    this.setState({
+      inDutyCnt: inDutyCnt,
+    });
+    return inDutyCnt;
+  }
+
+  onChangeCnt() {
+    this.setState({
+      isDisable: true,
+    });
+    changeDutyCnt(this);
+    setTimeout(() => {
+      this.setState({
+        isDisable: false,
+      });
+    }, submitInterval);
+  }
+
+  ticketListPage() {
+    Taro.navigateTo({
+      url: '/pages/TicketList/TicketList',
+    });
+  }
+
   render(): ReactNode {
     const mainPage = pt.get().mainPage;
+    const memberPage = pt.get().memberPage;
+    if (this.state.rs.loading) {
+      return (
+        <AtActivityIndicator
+          mode='center'
+          content={pt.get().actIndicator.loading}
+        ></AtActivityIndicator>
+      );
+    }
+    if (!this.state.rs.success) {
+      return (
+        <AtToast
+          isOpened
+          text={pt.get().toast.error}
+          icon='close-circle'
+        ></AtToast>
+      );
+    }
+    const fixListRenderer = this.state.fixList.map((item) => item.render());
     return (
       <View>
         <TitleCard />
-        <View style={{ marginTop: 30 }}>
+        <View style={{ width: '94%', marginLeft: '3%' }}>
-          {mainPageCard(this.state.dutyInfoCard)}
+          <View style={{ marginTop: '60rpx' }}>
-          {mainPageCard(this.state.tipsInfoCard)}
+            {mainPageCard(this.state.dutyInfoCard)}
-          <ExpandItem
+            {mainPageCard(this.state.tipsInfoCard)}
-            title={mainPage.expandTitle.stepInfo}
+            {wechatUser.getAccess() && this.state.dutyData.isInDuty ? (
-            content={mainPageCard(this.state.stepInfoCard)}
+              <ExpandItem
-          />
+                title={memberPage.expandTitle.admin}
+                content={
+                  <View
+                    style={{
+                      display: 'flex',
+                      alignItems: 'center',
+                      marginBottom: '40rpx',
+                    }}
+                  >
+                    <View
+                      className='.at-article__h3'
+                      style={{
+                        marginTop: '40rpx',
+                      }}
+                    >
+                      {pt.get().memberPage.dutyCount.text}
+                    </View>
+                    <View
+                      style={{
+                        marginTop: '40rpx',
+                      }}
+                    >
+                      <AtInputNumber
+                        type='number'
+                        min={0}
+                        max={10}
+                        step={1}
+                        value={this.state.inDutyCnt}
+                        onChange={this.handleCnt.bind(this)}
+                      />
+                    </View>
+                    <View style={{ marginLeft: 'auto', marginTop: '40rpx' }}>
+                      <AtButton
+                        type='secondary'
+                        size='small'
+                        loading={this.state.isLoading}
+                        disabled={this.state.isDisable}
+                        onClick={this.onChangeCnt.bind(this)}
+                      >
+                        {pt.get().memberPage.dutyCount.button}
+                      </AtButton>
+                    </View>
+                  </View>
+                }
+              />
+            ) : (
+              <View></View>
+            )}
+            <ExpandItem
+              title={mainPage.expandTitle.stepInfo}
+              content={mainPageCard(this.state.stepInfoCard)}
+            />
+          </View>
+          {wechatUser.getAccess() ? (
+            <View style={{ marginTop: '40rpx' }}>
+              <View
+                className='at-article__h3'
+                style={{ marginBottom: '20rpx', fontWeight: 'bold' }}
+              >
+                {memberPage.ticketList.hint}
+              </View>
+              <AtList>{fixListRenderer}</AtList>
+              <AtList>
+                <AtListItem
+                  title={pt.get().memberPage.ticketList.title}
+                  note={pt.get().memberPage.ticketList.note}
+                  arrow='right'
+                  thumb={clockIcon}
+                  onClick={this.ticketListPage}
+                />
+              </AtList>
+            </View>
+          ) : (
+            <View></View>
+          )}
+          <PageFooter />
         </View>
-        <PageFooter />
       </View>
     );
   }

src/pages/member/member.tsx

@@ -1,23 +0,0 @@
-import { View, Text } from '@tarojs/components';
-import { Component, ReactNode } from 'react';
-import Taro from '@tarojs/taro';
-import type CustomTabBar from '../../custom-tab-bar';
-import './member.scss';
-
-export default class MemberPage extends Component {
-  // 以下是TabBar相关
-  pageCtx = Taro.getCurrentInstance().page;
-  componentDidShow() {
-    const tabbar = Taro.getTabBar<CustomTabBar>(this.pageCtx);
-    tabbar?.setSelected(2);
-  }
-  // 以上是TabBar相关
-
-  render(): ReactNode {
-    return (
-      <View>
-        <Text>Member Page</Text>
-      </View>
-    );
-  }
-}

src/pages/repair/repair.tsx

@@ -1,10 +1,76 @@
-import { View, Text } from '@tarojs/components';
+import { View } from '@tarojs/components';
 import { Component, ReactNode } from 'react';
 import Taro from '@tarojs/taro';
-import type CustomTabBar from '../../custom-tab-bar';
+import {
+  AtForm,
+  AtInput,
+  AtButton,
+  AtCheckbox,
+  AtCard,
+  AtSegmentedControl,
+  AtMessage,
+} from 'taro-ui';
+import pt from '@/plain-text';
+import PageFooter from '@/components/PageFooter/PageFooter';
+import { submitTicket } from '@/service/submitTicket';
+import type CustomTabBar from '@/custom-tab-bar';
+import repairLogo from '@/assets/icons/RepairPage/repair.svg';
+import DetailFramework from '@/components/DetailFramework/DetailFramework';
+import { getCurrentTicket } from '@/service/currentTicket';
+import { randomInt } from '@/utils/random';
+import wechatUser from '@/wechat';
 import './repair.scss';
 
-export default class RepairPage extends Component {
+interface RepairPageState {
+  type: 0 | 1;
+  device: string;
+  deviceModel: string;
+  owner: string;
+  phone: string;
+  description: string;
+  isLoading: boolean;
+  isDisable: boolean;
+  checkedList: Array<number>;
+  currentTicketsIdName: Array<Map<number, string>>;
+}
+
+const submitInterval = 5000;
+
+const middleButton = <View></View>;
+
+const isInfoShow = {
+  device: false,
+  createdTime: true,
+  description: false,
+  current: true,
+  notelist: true,
+  showAllNotes: false,
+};
+
+export default class RepairPage extends Component<{}, RepairPageState> {
+  state = {
+    type: 1 as 0 | 1,
+    device: '',
+    deviceModel: '',
+    owner: wechatUser.getInfo().name,
+    phone: wechatUser.getInfo().phone,
+    description: '',
+    isLoading: false,
+    isDisable: true,
+    checkedList: [0],
+    currentTicketsIdName: [] as Array<Map<number, string>>,
+  };
+
+  componentDidMount(): void {
+    getCurrentTicket(this);
+
+    setTimeout(() => {
+      this.setState({
+        isDisable: false,
+      });
+    }, submitInterval);
+  }
+
   // 以下是TabBar相关
   pageCtx = Taro.getCurrentInstance().page;
   componentDidShow() {
@@ -13,10 +79,245 @@ export default class RepairPage extends Component {
   }
   // 以上是TabBar相关
 
+  handleTypeChange(type: 0 | 1) {
+    this.setState({
+      type: type,
+    });
+    return type;
+  }
+
+  handleDeviceChange(device: string) {
+    this.setState({
+      device: device,
+    });
+    return device;
+  }
+
+  handleDeviceModelChange(deviceModel: string) {
+    this.setState({
+      deviceModel: deviceModel,
+    });
+    return deviceModel;
+  }
+
+  handleOwnerChange(owner: string) {
+    this.setState({
+      owner: owner,
+    });
+    return owner;
+  }
+
+  handlePhoneChange(phone: string) {
+    this.setState({
+      phone: phone,
+    });
+    return phone;
+  }
+
+  handleDescriptionChange(description: string) {
+    this.setState({
+      description: description,
+    });
+    return description;
+  }
+
+  checkboxOption = [
+    {
+      value: 0,
+      label: pt.get().repairPage.checkboxText.none,
+    },
+    {
+      value: 1,
+      label: pt.get().repairPage.checkboxText.usbDisk,
+    },
+    {
+      value: 2,
+      label: pt.get().repairPage.checkboxText.mouseOrReceiver,
+    },
+    {
+      value: 3,
+      label: pt.get().repairPage.checkboxText.powerAdapter,
+    },
+    {
+      value: 4,
+      label: pt.get().repairPage.checkboxText.others.label,
+      desc: pt.get().repairPage.checkboxText.others.desc,
+    },
+  ];
+
+  handleCheckboxChange(checkedList: Array<number>) {
+    this.setState({
+      checkedList: checkedList,
+    });
+    return checkedList;
+  }
+
+  onSubmit() {
+    this.setState({
+      isDisable: true,
+    });
+    if (
+      this.state.description == '' ||
+      this.state.device == '' ||
+      this.state.deviceModel == '' ||
+      this.state.owner == '' ||
+      this.state.phone == '' ||
+      this.state.checkedList.length === 0
+    ) {
+      Taro.atMessage({
+        message: pt.get().button.submitText.blank,
+        type: 'error',
+      });
+      setTimeout(() => {
+        this.setState({
+          isDisable: false,
+        });
+      }, submitInterval);
+      return;
+    }
+    submitTicket(this);
+    setTimeout(() => {
+      this.setState({
+        isDisable: false,
+      });
+    }, submitInterval);
+  }
+
   render(): ReactNode {
-    return (
+    const hasContinuingticket = this.state.currentTicketsIdName.length !== 0;
+    const ticketsRenderer = hasContinuingticket ? (
       <View>
-        <Text>Repair Page</Text>
+        <View
+          className='at-article__h3'
+          style={{ marginBottom: '20rpx', fontWeight: 'bold' }}
+        >
+          {pt.get().repairPage.currentTicket.hint}
+        </View>
+        {this.state.currentTicketsIdName.map((pair, idx) => (
+          <AtCard
+            key={idx}
+            title={pair.values().next().value} //pair.keys().next().value == ticket['device'] + ' ' + ticket['deviceModel']
+            extra={pt.get().repairPage.currentTicket.extra}
+            onClick={() => {
+              Taro.navigateTo({
+                url:
+                  '/pages/TicketDetail/TicketDetail?id=' +
+                  pair.keys().next().value,
+              });
+            }}
+            note={
+              pt.get().tips.tipsText[
+                randomInt(0, pt.get().tips.tipsText.length - 1)
+              ]
+            }
+          >
+            <DetailFramework
+              id={pair.keys().next().value} //pair.keys().next().value == id
+              isInfoShow={isInfoShow}
+              middleButton={middleButton}
+            />
+          </AtCard>
+        ))}
+      </View>
+    ) : (
+      <View
+        className='at-article__h3'
+        style={{ marginBottom: '20rpx', fontWeight: 'bold' }}
+      >
+        {pt.get().repairPage.currentTicket.nohint}
+      </View>
+    );
+    return (
+      <View style={{ width: '94%', marginLeft: '3%' }}>
+        <AtMessage />
+        <View
+          style={{
+            marginTop: '20rpx',
+            marginBottom: '40rpx',
+          }}
+        >
+          {ticketsRenderer}
+        </View>
+        <AtCard
+          note={pt.get().repairPage.cardText.note}
+          title={pt.get().repairPage.cardText.title}
+          thumb={repairLogo}
+        >
+          <AtForm onSubmit={this.onSubmit.bind(this)}>
+            <AtSegmentedControl
+              values={[
+                pt.get().repairPage.typeText.appliance,
+                pt.get().repairPage.typeText.computer,
+              ]}
+              onClick={this.handleTypeChange.bind(this)}
+              current={this.state.type}
+            />
+            <AtInput
+              clear
+              required
+              name='device'
+              title={pt.get().repairPage.deviceText.title}
+              type='text'
+              placeholder={pt.get().repairPage.deviceText.placeholder}
+              value={this.state.device}
+              onChange={this.handleDeviceChange.bind(this)}
+            />
+            <AtInput
+              clear
+              required
+              name='deviceModel'
+              title={pt.get().repairPage.deviceModelText.title}
+              type='text'
+              placeholder={pt.get().repairPage.deviceModelText.placeholder}
+              value={this.state.deviceModel}
+              onChange={this.handleDeviceModelChange.bind(this)}
+            />
+            <AtInput
+              clear
+              required
+              name='owner'
+              title={pt.get().repairPage.ownerText.title}
+              type='text'
+              placeholder={pt.get().repairPage.ownerText.placeholder}
+              value={this.state.owner}
+              onChange={this.handleOwnerChange.bind(this)}
+            />
+            <AtInput
+              clear
+              required
+              name='phone'
+              title={pt.get().repairPage.phoneText.title}
+              type='number'
+              placeholder={pt.get().repairPage.phoneText.placeholder}
+              value={this.state.phone}
+              onChange={this.handlePhoneChange.bind(this)}
+            />
+            <AtInput
+              clear
+              required
+              name='description'
+              title={pt.get().repairPage.descriptionText.title}
+              type='text'
+              placeholder={pt.get().repairPage.descriptionText.placeholder}
+              value={this.state.description}
+              onChange={this.handleDescriptionChange.bind(this)}
+            />
+            <AtCheckbox
+              options={this.checkboxOption}
+              selectedList={this.state.checkedList}
+              onChange={this.handleCheckboxChange.bind(this)}
+            />
+            <AtButton
+              loading={this.state.isLoading}
+              formType='submit'
+              type='primary'
+              disabled={this.state.isDisable}
+            >
+              {pt.get().button.buttonText.submit}
+            </AtButton>
+          </AtForm>
+        </AtCard>
+        <PageFooter />
       </View>
     );
   }

src/pages/user/about/about.tsx

@@ -1,16 +1,83 @@
 import { Component, ReactNode } from 'react';
-import { View } from '@tarojs/components';
+import { Image, View } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 import pt from '@/plain-text';
+import PageFooter from '@/components/PageFooter/PageFooter';
 import './about.scss';
 
-export default class SettingsPage extends Component {
+export default class AboutPage extends Component {
   componentDidMount(): void {
     Taro.setNavigationBarTitle({
       title: pt.get().navBar.user.about,
     });
   }
   render(): ReactNode {
-    return <View></View>;
+    return (
+      <View>
+        <View
+          style={{
+            marginTop: '200rpx',
+            marginBottom: '60rpx',
+          }}
+          className='at-row at-row__align--start'
+        >
+          <View className='at-col at-col-1 at-col--auto'>
+            <Image
+              style='width: 240rpx; height: 240rpx; margin-left: 60rpx; margin-right: 30rpx; margin-top: 30rpx; border-radius: 120rpx'
+              src='https://wiki.zjueva.net/images/1/10/%E5%A4%B4%E5%83%8F.jpg?20240319171222'
+              mode='aspectFit'
+            />
+          </View>
+          <View
+            className='at-article at-col at-col--wrap'
+            style={{ wordBreak: 'normal' }}
+          >
+            <View className='at-article__h1'>
+              {pt.get().aboutPage.dean.nickname}
+            </View>
+            <View className='at-article__h3'>
+              {pt.get().aboutPage.dean.username}
+            </View>
+            <View className='at-article__p'>
+              {pt.get().aboutPage.dean.status}
+            </View>
+            <View className='at-article__info'>
+              {pt.get().aboutPage.dean.note}
+            </View>
+          </View>
+        </View>
+        <View
+          style={{ marginTop: '100rpx', marginBottom: '60rpx' }}
+          className='at-row at-row__align--start'
+        >
+          <View className='at-col at-col-1 at-col--auto'>
+            <Image
+              style='width: 240rpx; height: 240rpx; margin-left: 60rpx; margin-right: 30rpx; margin-top: 30rpx; border-radius: 120rpx'
+              src='https://static.fracher21.top/head.jpg'
+              mode='aspectFit'
+            />
+          </View>
+          <View
+            className='at-article at-col at-col--wrap'
+            style={{ wordBreak: 'normal' }}
+          >
+            <View className='at-article__h1'>
+              {pt.get().aboutPage.fracher.nickname}
+            </View>
+            <View className='at-article__h3'>
+              {pt.get().aboutPage.fracher.username}
+            </View>
+            <View className='at-article__p'>
+              {pt.get().aboutPage.fracher.status}
+            </View>
+            <View className='at-article__info'>
+              {pt.get().aboutPage.fracher.note}
+            </View>
+          </View>
+        </View>
+        <View style={{ height: '200rpx' }}></View>
+        <PageFooter />
+      </View>
+    );
   }
 }

src/pages/user/inform/inform.tsx

@@ -1,17 +1,18 @@
 import { Component, ReactNode } from 'react';
 import { AtForm, AtInput, AtButton, AtMessage } from 'taro-ui';
 import { View } from '@tarojs/components';
-import { getUrl } from '@/service';
 import Taro from '@tarojs/taro';
 import pt from '@/plain-text';
+import { updateUserInfo } from '@/service/userData';
+import wechatUser from '@/wechat';
 import './inform.scss';
 
 const submitInterval = 5000;
 
 export default class InformPage extends Component {
   state = {
-    phone: '',
+    phone: wechatUser.getInfo().phone,
-    name: '',
+    name: wechatUser.getInfo().name,
     isLoading: false,
     isDisable: false,
   };
@@ -36,36 +37,21 @@ export default class InformPage extends Component {
   }
   onSubmit() {
     this.setState({
-      isLoading: true,
       isDisable: true,
     });
-    console.log(this.state.name, this.state.phone);
+    if (this.state.name == '' || this.state.phone == '') {
-    Taro.request({
+      Taro.atMessage({
-      url: getUrl('/user/update'),
+        message: pt.get().button.submitText.blank,
-      method: 'POST',
+        type: 'error',
-      data: {
-        token: 'token_test',
-        name: this.state.name,
-        phone: this.state.phone,
-      },
-    })
-      .then(res => {
-        console.log(res.data);
-        Taro.atMessage({
-          message: pt.get().button.submitText.success,
-          type: 'success',
-        });
-      })
-      .catch(err => {
-        console.log(err);
-        Taro.atMessage({
-          message: pt.get().button.submitText.error + err.toString(),
-          type: 'error',
-        });
       });
-    this.setState({
+      setTimeout(() => {
-      isLoading: false,
+        this.setState({
-    });
+          isDisable: false,
+        });
+      }, submitInterval);
+      return;
+    }
+    updateUserInfo(this);
     setTimeout(() => {
       this.setState({
         isDisable: false,
@@ -75,7 +61,7 @@ export default class InformPage extends Component {
 
   render(): ReactNode {
     return (
-      <View>
+      <View style={{ marginTop: '30rpx', width: '94%', marginLeft: '3%' }}>
         <AtForm onSubmit={this.onSubmit.bind(this)}>
           <AtMessage />
           <AtInput
@@ -98,14 +84,16 @@ export default class InformPage extends Component {
             value={this.state.name}
             onChange={this.handleChangeName.bind(this)}
           />
-          <AtButton
+          <View style={{ marginTop: '30rpx' }}>
-            loading={this.state.isLoading}
+            <AtButton
-            formType='submit'
+              loading={this.state.isLoading}
-            type='primary'
+              formType='submit'
-            disabled={this.state.isDisable}
+              type='primary'
-          >
+              disabled={this.state.isDisable}
-            {pt.get().button.buttonText.submit}
+            >
-          </AtButton>
+              {pt.get().button.buttonText.submit}
+            </AtButton>
+          </View>
         </AtForm>
       </View>
     );

src/pages/user/member/member.tsx

@@ -1,108 +1,85 @@
 import { Component, ReactNode } from 'react';
-import { AtForm, AtInput, AtButton, AtMessage } from 'taro-ui';
+import { AtButton, AtMessage } from 'taro-ui';
-import { getUrl } from '@/service';
 import Taro from '@tarojs/taro';
 import pt from '@/plain-text';
+import { memberLogin, memberLogout } from '@/service/memberLogin';
+import wechatUser from '@/wechat';
+import { View } from '@tarojs/components';
 import './member.scss';
 
-const loginInterval = 5000;
+const logInterval = 5000;
 
-export default class MemberPage extends Component {
+export default class UserMemberPage extends Component {
   state = {
-    stuid: '',
-    passwd: '',
     isLoading: false,
     isDisable: false,
   };
   componentDidMount(): void {
     Taro.setNavigationBarTitle({
-      title: pt.get().navBar.user.member,
+      title: pt.get().navBar.user.memberLogin,
     });
   }
-  handleChangeStuid(stuid: string) {
+
+  onLogin() {
     this.setState({
-      stuid: stuid,
-    });
-    return stuid;
-  }
-  handleChangePasswd(passwd: string) {
-    this.setState({
-      passwd: passwd,
-    });
-    return passwd;
-  }
-  onSubmit() {
-    this.setState({
-      isLoading: true,
       isDisable: true,
     });
-    console.log([this.state.stuid, this.state.passwd]);
+    memberLogin(this);
-    Taro.request({
-      url: getUrl('/member/login'),
-      method: 'POST',
-      data: {
-        token: 'token_test',
-        name: this.state.stuid,
-        passwd: this.state.passwd,
-      },
-    })
-      .then(res => {
-        console.log(res.data);
-        Taro.atMessage({
-          message: pt.get().button.loginText.success,
-          type: 'success',
-        });
-      })
-      .catch(err => {
-        console.log(err);
-        Taro.atMessage({
-          message: pt.get().button.loginText.error + err.toString(),
-          type: 'error',
-        });
-      });
-    this.setState({
-      isLoading: false,
-    });
     setTimeout(() => {
       this.setState({
         isDisable: false,
       });
-    }, loginInterval);
+    }, logInterval);
+  }
+
+  onLogout() {
+    this.setState({
+      isDisable: true,
+    });
+    memberLogout(this);
+    setTimeout(() => {
+      this.setState({
+        isDisable: false,
+      });
+    }, logInterval);
   }
 
   render(): ReactNode {
-    return (
+    return !wechatUser.getAccess() ? (
-      <AtForm onSubmit={this.onSubmit.bind(this)}>
+      <View style={{ marginTop: '30rpx', width: '94%', marginLeft: '3%' }}>
         <AtMessage />
-        <AtInput
+        <View className='page-title' style={{ marginBottom: '40rpx' }}>
-          required
+          <View className='at-article__h1' style={{ fontWeight: 'bold' }}>
-          name='stuid'
+            {pt.get().memberPage.titleLine.main.login}
-          title={pt.get().memberPage.stuidText.title}
+          </View>
-          type='number'
+          <View className='at-article__h2'>
-          clear
+            {pt.get().memberPage.titleLine.sub.login}
-          placeholder={pt.get().memberPage.stuidText.placeholder}
+          </View>
-          value={this.state.stuid}
+        </View>
-          onChange={this.handleChangeStuid.bind(this)}
-        />
-        <AtInput
-          clear
-          required
-          name='name'
-          title={pt.get().memberPage.passwdText.title}
-          type='password'
-          placeholder={pt.get().memberPage.passwdText.placeholder}
-          value={this.state.passwd}
-          onChange={this.handleChangePasswd.bind(this)}
-        />
         <AtButton
           loading={this.state.isLoading}
-          formType='submit'
           type='primary'
           disabled={this.state.isDisable}
+          onClick={this.onLogin.bind(this)}
         >
-          {pt.get().button.buttonText.login}
+          {pt.get().button.memberText.auth}
         </AtButton>
-      </AtForm>
+      </View>
+    ) : (
+      <View style={{ marginTop: '30rpx', width: '94%', marginLeft: '3%' }}>
+        <AtMessage />
+        <View className='page-title' style={{ marginBottom: '40rpx' }}>
+          <View className='at-article__h1' style={{ fontWeight: 'bold' }}>
+            {pt.get().memberPage.titleLine.main.logout}
+          </View>
+          <View className='at-article__h2'>
+            {pt.get().memberPage.titleLine.sub.logout}
+          </View>
+        </View>
+        <AtButton type='primary' onClick={this.onLogout.bind(this)}>
+          {pt.get().button.buttonText.logout}
+        </AtButton>
+      </View>
     );
   }
 }

src/pages/user/myTicket/myTicket.tsx

@@ -1,124 +1,51 @@
 import { Component, ReactNode } from 'react';
 import { View } from '@tarojs/components';
-import { AtList, AtListItem } from 'taro-ui';
+import { AtActivityIndicator, AtList, AtToast } from 'taro-ui';
 import Taro from '@tarojs/taro';
 import moment from 'moment';
-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 pt from '@/plain-text';
-import { getUrl } from '@/service';
+import { RequestState } from '@/service';
+import { getMyTicketList } from '@/service/myTicket';
+import { TicketListItem } from '@/components/TicketListItem/TicketListItem';
 import './myTicket.scss';
 
-type FixStatus = 1 | 2 | 3 | 4 | 5;
+interface MyTicketState {
-
+  fixList: Array<TicketListItem>;
-class TicketListItem {
+  rs: RequestState;
-  id: number;
-  brand: string;
-  model: string;
-  status: FixStatus;
-  createAt: moment.Moment;
-  iconMap: Map<FixStatus, string>;
-
-  constructor(
-    id: number,
-    brand: string,
-    model: string,
-    status: FixStatus,
-    createAt: moment.Moment,
-  ) {
-    this.id = id;
-    this.brand = brand;
-    this.model = model;
-    this.status = status;
-    this.createAt = createAt;
-    this.iconMap = new Map<FixStatus, string>([
-      [1, repair],
-      [2, repair],
-      [3, finished],
-      [4, tick],
-      [5, fail],
-    ]);
-  }
-
-  render(): JSX.Element {
-    const tl = pt.get().ticketList;
-    return (
-      <AtListItem
-        title={this.brand + ' ' + this.model}
-        note={tl.createdAt(this.createAt.format('YYYY-MM-DD HH:mm'))}
-        extraText={tl.statusMap.get(this.status)}
-        arrow='right'
-        thumb={this.iconMap.get(this.status)}
-        onClick={() => {
-          Taro.navigateTo({
-            url: '/pages/TicketDetail/TicketDetail?id=' + this.id,
-          });
-        }}
-      />
-    );
-  }
 }
 
-export default class SettingsPage extends Component {
+export default class MyTicketPage extends Component<{}, MyTicketState> {
   state = {
-    loading: true,
-    success: false,
     fixList: [new TicketListItem(0, '', '', 1, moment())],
+    rs: new RequestState(),
   };
 
   componentDidMount(): void {
     Taro.setNavigationBarTitle({
       title: pt.get().navBar.user.myTicket,
     });
-    Taro.request({
+    getMyTicketList(this);
-      url: getUrl('/user/mytickets'),
-      method: 'GET',
-      data: {
-        token: 'token_test',
-      },
-    })
-      .then(res => {
-        if (!res.data.success) {
-          this.setState({
-            loading: false,
-            success: false,
-          });
-          return;
-        }
-        this.setState({
-          loading: false,
-          success: true,
-          fixList: res.data.data.list.map(
-            item =>
-              new TicketListItem(
-                item.id,
-                item.device,
-                item.deviceModel,
-                item.status,
-                moment(),
-              ),
-          ),
-        });
-      })
-      .catch(reason => {
-        this.setState({
-          loading: false,
-          success: false,
-        });
-        console.log(reason);
-      });
   }
 
   render(): ReactNode {
-    if (this.state.loading) {
+    if (this.state.rs.loading) {
-      return <View>loading</View>;
+      return (
+        <AtActivityIndicator
+          mode='center'
+          content={pt.get().actIndicator.loading}
+        ></AtActivityIndicator>
+      );
     }
-    if (!this.state.success) {
+    if (!this.state.rs.success) {
-      return <View>Failed</View>;
+      return (
+        <AtToast
+          isOpened
+          text={pt.get().toast.error}
+          icon='close-circle'
+        ></AtToast>
+      );
     }
-    const fixListRenderer = this.state.fixList.map(item => item.render());
+    const fixListRenderer = this.state.fixList.map((item) => item.render());
     return (
       <View>
         <AtList>{fixListRenderer}</AtList>

src/pages/user/report/report.tsx

@@ -1,13 +1,14 @@
 import { AtTextarea, AtButton, AtForm, AtMessage } from 'taro-ui';
 import { Component, ReactNode } from 'react';
-import { getUrl } from '@/service';
 import Taro from '@tarojs/taro';
 import pt from '@/plain-text';
+import { reportMessage } from '@/service/report';
+import { View } from '@tarojs/components';
 import './report.scss';
 
 const submitInterval = 5000;
 
-export default class SettingsPage extends Component {
+export default class ReportPage extends Component {
   state = {
     report: '',
     isLoading: false,
@@ -27,35 +28,21 @@ export default class SettingsPage extends Component {
   }
   onSubmit() {
     this.setState({
-      isLoading: true,
       isDisable: true,
     });
-    console.log(this.state.report);
+    if (this.state.report == '') {
-    Taro.request({
+      Taro.atMessage({
-      url: getUrl('/report'),
+        message: pt.get().button.submitText.blank,
-      method: 'POST',
+        type: 'error',
-      data: {
-        token: 'token_test',
-        report: this.state.report,
-      },
-    })
-      .then(res => {
-        console.log(res.data);
-        Taro.atMessage({
-          message: pt.get().button.submitText.success,
-          type: 'success',
-        });
-      })
-      .catch(err => {
-        console.log(err);
-        Taro.atMessage({
-          message: pt.get().button.submitText.error + err.toString(),
-          type: 'error',
-        });
       });
-    this.setState({
+      setTimeout(() => {
-      isLoading: false,
+        this.setState({
-    });
+          isDisable: false,
+        });
+      }, submitInterval);
+      return;
+    }
+    reportMessage(this);
     setTimeout(() => {
       this.setState({
         isDisable: false,
@@ -69,29 +56,53 @@ export default class SettingsPage extends Component {
   }
   render(): ReactNode {
     return (
-      <AtForm
+      <View style={{ marginTop: '30rpx', width: '94%', marginLeft: '3%' }}>
-        onSubmit={this.onSubmit.bind(this)}
+        <AtForm
-        onReset={this.onReset.bind(this)}
+          onSubmit={this.onSubmit.bind(this)}
-      >
+          onReset={this.onReset.bind(this)}
-        <AtMessage />
-        <AtTextarea
-          value={this.state.report}
-          onChange={this.handleChange.bind(this)}
-          maxLength={200}
-          placeholder={pt.get().reportPage.placeHolderText}
-        />
-        <AtButton
-          loading={this.state.isLoading}
-          formType='submit'
-          type='primary'
-          disabled={this.state.isDisable}
         >
-          {pt.get().button.buttonText.submit}
+          <AtMessage />
-        </AtButton>
+          <AtTextarea
-        <AtButton formType='reset' type='secondary'>
+            value={this.state.report}
-          {pt.get().button.buttonText.reset}
+            onChange={this.handleChange.bind(this)}
-        </AtButton>
+            maxLength={200}
-      </AtForm>
+            placeholder={pt.get().reportPage.placeHolderText}
+          />
+          <View className='at-row'>
+            <View
+              className='at-col'
+              style={{
+                marginTop: '30rpx',
+                marginRight: '10rpx',
+                marginLeft: '10rpx',
+                width: '50%',
+              }}
+            >
+              <AtButton formType='reset' type='secondary'>
+                {pt.get().button.buttonText.reset}
+              </AtButton>
+            </View>
+            <View
+              className='at-col'
+              style={{
+                marginTop: '30rpx',
+                marginRight: '10rpx',
+                marginLeft: '10rpx',
+                width: '50%',
+              }}
+            >
+              <AtButton
+                loading={this.state.isLoading}
+                formType='submit'
+                type='primary'
+                disabled={this.state.isDisable}
+              >
+                {pt.get().button.buttonText.submit}
+              </AtButton>
+            </View>
+          </View>
+        </AtForm>
+      </View>
     );
   }
 }

src/pages/user/user.tsx

@@ -1,17 +1,19 @@
 import { AtList, AtListItem, AtToast } from 'taro-ui';
 import { Component, ReactNode } from 'react';
 import { View, Picker, Image, Text } from '@tarojs/components';
-import { getUrl } from '@/service';
 import Taro from '@tarojs/taro';
 import type CustomTabBar from '@/custom-tab-bar';
 import PageFooter from '@/components/PageFooter/PageFooter';
-import aboutIcon from '@/assets/icons/AboutPage/about.svg';
+import aboutIcon from '@/assets/icons/UserPage/about.svg';
+import userIcon from '@/assets/icons/UserPage/user.svg';
+import clockIcon from '@/assets/icons/UserPage/clock.svg';
+import messageIcon from '@/assets/icons/UserPage/message.svg';
 import pt, { Lang } from '@/plain-text';
+import { setLocaleData } from '@/service/localeData';
 import wechatUser from '@/wechat';
-import logo from '@/assets/images/UserPage/logo.png';
 import './user.scss';
 
-const listLangInterval = 20;
+const logo = 'https://wiki.zjueva.net/images/evalogo_hd.png';
 const memberClickTimes = 7;
 
 export default class UserPage extends Component {
@@ -24,14 +26,13 @@ export default class UserPage extends Component {
     clicks: memberClickTimes,
     isToastOpen: false,
     toastText: '',
-    haveAccess: wechatUser.getAccess(),
   };
 
   // 以下是TabBar相关
   pageCtx = Taro.getCurrentInstance().page;
   componentDidShow() {
     const tabbar = Taro.getTabBar<CustomTabBar>(this.pageCtx);
-    tabbar?.setSelected(this.state.haveAccess ? 3 : 2);
+    tabbar?.setSelected(2);
   }
   // 以上是TabBar相关
 
@@ -42,9 +43,9 @@ export default class UserPage extends Component {
     if (this.state.clicks < 3) {
       this.setState({
         toastText:
-          pt.get().userPage.memberEntry.front +
+          pt.get().userPage.memberEntry.prefix +
           (this.state.clicks + 1).toString() + // React State's feature
-          pt.get().userPage.memberEntry.behind,
+          pt.get().userPage.memberEntry.affix,
         isToastOpen: true,
       });
       if (this.state.clicks == 0) {
@@ -70,16 +71,7 @@ export default class UserPage extends Component {
     });
     let currentLang = this.showLangDict[this.state.selector[e.detail.value]];
     pt.setLang(currentLang);
-    Taro.request({
+    setLocaleData(currentLang);
-      url: getUrl('/user/locale/update'),
-      method: 'POST',
-      data: {
-        token: 'token_test',
-        lang: currentLang,
-      },
-    }).then(res => {
-      console.log(res.data);
-    });
     Taro.reLaunch({
       url: '/pages/user/user',
     });
@@ -114,12 +106,13 @@ export default class UserPage extends Component {
       <View>
         <View
           className='at-row at-row__justify--center at-row__align--end'
-          style='height:110px;'
+          style='height:220rpx;'
         >
           <Image
             onTap={this.onTapImage}
-            style='width: 100px;height: 100px;'
+            style='width: 200rpx;height: 200rpx;'
             src={logo}
+            mode='aspectFit'
           />
         </View>
         <AtToast
@@ -128,31 +121,36 @@ export default class UserPage extends Component {
         ></AtToast>
         <View
           className='at-row at-row__justify--center at-row__align--center'
-          style='height:60px;color:#696969;'
+          style='height:120rpx;color:#696969;'
         >
-          <Text> EVA Notify v1.0.0</Text>
+          <Text style={{ fontSize: '32rpx' }}> EVA Eta v1.0.2</Text>
         </View>
         <AtList>
           <AtListItem
             title={pt.get().userPage.ticketColumn.title}
             note={pt.get().userPage.ticketColumn.note}
             arrow='right'
-            iconInfo={{ color: '#E69966', value: 'clock' }}
+            thumb={clockIcon}
             onClick={this.myTicketPage}
           />
-          <AtListItem
+          {wechatUser.getAccess() ? (
-            title={pt.get().userPage.infoColumn.title}
+            <View></View>
-            note={pt.get().userPage.infoColumn.note}
+          ) : (
-            arrow='right'
+            <AtListItem
-            iconInfo={{ color: '#78A4FA', value: 'user' }}
+              title={pt.get().userPage.infoColumn.title}
-            onClick={this.informPage}
+              note={pt.get().userPage.infoColumn.note}
-          />
+              arrow='right'
+              thumb={userIcon}
+              onClick={this.informPage}
+            />
+          )}
+
           <AtListItem
             title={pt.get().userPage.reportColumn.title}
             note={pt.get().userPage.reportColumn.note}
             extraText=''
             arrow='right'
-            iconInfo={{ color: '#9ACD32', value: 'message' }}
+            thumb={messageIcon}
             onClick={this.reportPage}
           />
           <AtListItem
@@ -163,7 +161,7 @@ export default class UserPage extends Component {
             thumb={aboutIcon}
             onClick={this.aboutPage}
           />
-          <View style={{ height: listLangInterval }}></View>
+          <View style={{ height: '40rpx' }}></View>
           <Picker
             mode='selector'
             range={this.state.selector}

src/plain-text/404.ts

@@ -0,0 +1,21 @@
+export interface NotFoundText {
+  title: {
+    ZhCn: string;
+    EnUs: string;
+  };
+  desc: {
+    ZhCn: string;
+    EnUs: string;
+  };
+}
+
+export const notFound: NotFoundText = {
+  title: {
+    ZhCn: '啊哦...请求出错了...',
+    EnUs: 'Oops...Network Error...',
+  },
+  desc: {
+    ZhCn: '请确保处于校网环境后，点击右上角 "...-重新进入小程序"！',
+    EnUs: 'Please make sure you\'re in ZJU\'s school network environment and then click on the top right corner "... - re-enter the applet"!',
+  },
+};

src/plain-text/AboutPage.ts

@@ -1,5 +1,44 @@
-export interface AboutPageText {}
+export interface AboutPageText {
+  dean: {
+    nickname: string;
+    username: string;
+    status: string;
+    note: string;
+  };
+  fracher: {
+    nickname: string;
+    username: string;
+    status: string;
+    note: string;
+  };
+}
 
-export const aboutPageZhCn: AboutPageText = {};
+export const aboutPageZhCn: AboutPageText = {
+  dean: {
+    nickname: '晓洋',
+    username: '@ Dawn_Ocean',
+    status: 'Eta & Tea 总设计',
+    note: '摸鱼与开发叠加态',
+  },
+  fracher: {
+    nickname: '宇航员',
+    username: '@ FrozenArcher',
+    status: 'Ate 总设计, 项目合作贡献者',
+    note: 'React 真是太有意思了',
+  },
+};
 
-export const aboutPageEnUs: AboutPageText = {};
+export const aboutPageEnUs: AboutPageText = {
+  dean: {
+    nickname: 'Dean Ma',
+    username: '@ Dawn_Ocean',
+    status: "Eta & Tea's General Designer",
+    note: 'Struggling between developing & laziness',
+  },
+  fracher: {
+    nickname: 'Fracher',
+    username: '@ FrozenArcher',
+    status: "Ate's General Designer, Project's Contributor",
+    note: 'React is so fun',
+  },
+};

src/plain-text/ActIndicator.ts

@@ -0,0 +1,11 @@
+export interface ActIndicatorText {
+  loading: string;
+}
+
+export const actIndicatorZhCn: ActIndicatorText = {
+  loading: '加载中...',
+};
+
+export const actIndicatorEnUs: ActIndicatorText = {
+  loading: 'Loading...',
+};

src/plain-text/Button.ts

@@ -3,14 +3,24 @@ export interface ButtonText {
     submit: string;
     reset: string;
     login: string;
+    logout: string;
   };
   submitText: {
     success: string;
     error: string;
+    blank: string;
+  };
+  memberText: {
+    auth: string;
   };
   loginText: {
     success: string;
     error: string;
+    fail: string;
+  };
+  logoutText: {
+    success: string;
+    error: string;
   };
 }
 
@@ -19,14 +29,24 @@ export const buttonZhCn: ButtonText = {
     submit: '提交',
     reset: '清空',
     login: '登录',
+    logout: '登出',
   },
   submitText: {
     success: '提交成功',
     error: '提交失败：',
+    blank: '请填写完整！',
+  },
+  memberText: {
+    auth: '协会统一身份认证登录',
   },
   loginText: {
     success: '登录成功',
     error: '登录失败',
+    fail: '请检查用户名或密码！',
+  },
+  logoutText: {
+    success: '登出成功',
+    error: '登出失败',
   },
 };
 
@@ -35,13 +55,23 @@ export const buttonEnUs: ButtonText = {
     submit: 'Submit',
     reset: 'Reset',
     login: 'Login',
+    logout: 'Logout',
   },
   submitText: {
     success: 'Success',
     error: 'Error: ',
+    blank: 'Please fill in the blanks!',
+  },
+  memberText: {
+    auth: 'EVA Auth Login Entry',
   },
   loginText: {
-    success: '登录成功',
+    success: 'Login Success',
-    error: '登录失败',
+    error: 'Login Failed',
+    fail: 'Please check username or password!',
+  },
+  logoutText: {
+    success: 'Logout Success',
+    error: 'Logout Failed',
   },
 };

src/plain-text/InformPage.ts

@@ -23,10 +23,10 @@ export const informPageZhCn: InformPageText = {
 export const informPageEnUs: InformPageText = {
   phoneText: {
     title: 'Phone',
-    placeholder: '便于查询工单',
+    placeholder: 'Used for querying tickets',
   },
   nameText: {
     title: 'Real Name',
-    placeholder: '必填，与工单绑定',
+    placeholder: '(Required) Bounded to your ticket',
   },
 };

src/plain-text/MainPage.ts

@@ -1,11 +1,27 @@
 export interface MainPageText {
-  mainTitleLine: string;
+  normal: {
-  subTitleLine: string;
+    recoverTime: string;
+    reason: string;
+  };
+  titleLine: {
+    main: string;
+    sub: string;
+  };
   cardTitle: {
     dutyInfo: string;
     stepInfo: string;
     tipsInfo: string;
   };
+  cardTips: {
+    dutyInfo: string;
+    stepInfo: string;
+    tipsInfo: string;
+  };
+  extraInfo: {
+    dutyInfo: string;
+    stepInfo: string;
+    tipsInfo: string;
+  };
   expandTitle: {
     stepInfo: string;
     tipsInfo: string;
@@ -21,47 +37,63 @@ export interface MainPageText {
     };
     inDuty: {
       title: string;
-      currentDutyText: (c: 'off' | '1' | '2' | '3') => string;
+      currentDutyText: (c: '0' | '1' | '2' | '3' | 'others') => string;
       inDutyCnt: (n: number) => string;
     };
   };
 }
 
 export const mainPageZhCn: MainPageText = {
-  mainTitleLine: '您好，这里是E志者协会',
+  normal: {
-  subTitleLine: '维修请至【东三-204】实验室',
+    recoverTime: '明天 13:30',
+    reason: '正常下班',
+  },
+  titleLine: {
+    main: '您好，这里是E志者协会',
+    sub: '维修请至【东三-204】实验室',
+  },
   cardTitle: {
-    dutyInfo: '204值班情况',
+    dutyInfo: '值班情况',
     stepInfo: '维修步骤',
     tipsInfo: '注意事项',
   },
+  cardTips: {
+    dutyInfo: '提示：可以先前往【维修】页面在线上预填写工单！',
+    stepInfo: '提示：请在 20:30 之前取走自己的物品哦！',
+    tipsInfo: '',
+  },
+  extraInfo: {
+    dutyInfo: '',
+    stepInfo: '',
+    tipsInfo: '',
+  },
   expandTitle: {
     stepInfo: '查看维修步骤',
     tipsInfo: '查看注意事项',
   },
   stepList: [
     { title: '线上填写工单' },
-    { title: '去`东三-204`实验室维修电脑' },
+    { title: '去【东三-204】实验室维修电脑' },
     { title: '等待电脑维修' },
     { title: '维修结束，取回电脑' },
   ],
   tipsList: [
-    { title: '戴尔、Surface、外星人、苹果电脑不能拆机哦~' },
+    { title: '戴尔/外星人、Surface、苹果电脑不能拆哦~' },
     { title: '数据无价，请随时做好数据备份哦~' },
-    { title: '204也是实验室，请遵守实验室纪律，请勿饮食~' },
+    { title: '204 也是实验室，请勿在内饮食~' },
-    { title: '我们是志愿服务，不收任何礼物哦~' },
+    { title: '我们是志愿服务，不收取任何礼物哦~' },
   ],
   dutyCard: {
     offDuty: {
       title: '未值班',
-      reason: s => '值班停止原因：' + s,
+      reason: (s) => '值班停止原因：' + s,
-      recoverTime: t => '恢复值班时间：' + t,
+      recoverTime: (t) => '恢复值班时间：' + t,
     },
     inDuty: {
       title: '值班中',
-      currentDutyText: c => {
+      currentDutyText: (c) => {
         switch (c) {
-          case 'off':
+          case '0':
             return '当前未值班';
           case '1':
             return '第一班 13:30-16:00';
@@ -69,58 +101,78 @@ export const mainPageZhCn: MainPageText = {
             return '第二班 16:00-18:00';
           case '3':
             return '第三班 18:00-20:30';
+          case 'others':
+            return '当班 ';
         }
       },
-      inDutyCnt: n => '当前值班人数：' + n,
+      inDutyCnt: (n) => '当前值班人数：' + n,
     },
   },
 };
 
 export const mainPageEnUs: MainPageText = {
-  mainTitleLine: '您好，这里是E志者协会',
+  normal: {
-  subTitleLine: '维修请至【东三-204】实验室',
+    recoverTime: 'Tomorrow 13:30',
+    reason: 'Normal shift',
+  },
+  titleLine: {
+    main: 'Hi! This is EVA.',
+    sub: 'For maintenance, please go to [204 Lab, E3 building]',
+  },
   cardTitle: {
-    dutyInfo: '204值班情况',
+    dutyInfo: 'Duty Situation',
-    stepInfo: '维修步骤',
+    stepInfo: 'Maintenance Steps',
-    tipsInfo: '注意事项',
+    tipsInfo: 'Tips',
+  },
+  cardTips: {
+    dutyInfo: 'Tips: Please go to [Repair] and filling out tickets online.',
+    stepInfo: 'Tips: Please retrieve your devices before 20:30!',
+    tipsInfo: '',
   },
   expandTitle: {
-    stepInfo: '查看维修步骤',
+    stepInfo: 'Check for maintenance steps',
-    tipsInfo: '查看注意事项',
+    tipsInfo: 'Check for tips',
+  },
+  extraInfo: {
+    dutyInfo: '',
+    stepInfo: '',
+    tipsInfo: '',
   },
   stepList: [
-    { title: '线上填写工单' },
+    { title: 'Filling out tickets online' },
-    { title: '去`东三-204`实验室维修电脑' },
+    { title: 'Go to [204 Lab, E3 building] for maintenance' },
-    { title: '等待电脑维修' },
+    { title: 'Waiting for the device maintenance' },
-    { title: '维修结束，取回电脑' },
+    { title: 'The maintenance is over, retrieve the device' },
   ],
   tipsList: [
-    { title: '戴尔、Surface、外星人、苹果电脑不能拆机哦~' },
+    { title: 'Dell/Alienware, Surface, Apple cannot be dissassembled.' },
-    { title: '数据无价，请随时做好数据备份哦~' },
+    { title: 'Data is priceless, please backup your data at any time!' },
-    { title: '204也是实验室，请遵守实验室纪律，请勿饮食~' },
+    { title: '204 is also a laboratory. Do not eat inside.' },
-    { title: '我们是志愿服务，不收任何礼物哦~' },
+    { title: 'We are volunteers and do not take any gifts.' },
   ],
   dutyCard: {
     offDuty: {
-      title: '未值班',
+      title: 'Off Duty',
-      reason: s => '值班停止原因：' + s,
+      reason: (s) => 'Reason for cessation of duty: ' + s,
-      recoverTime: t => '恢复值班时间：' + t,
+      recoverTime: (t) => 'Resumption of duty: ' + t,
     },
     inDuty: {
-      title: '值班中',
+      title: 'On Duty',
-      currentDutyText: c => {
+      currentDutyText: (c) => {
         switch (c) {
-          case 'off':
+          case '0':
-            return '当前未值班';
+            return 'Normal Shift';
           case '1':
-            return '第一班 13:30-16:00';
+            return '1st Shift 13:30-16:00';
           case '2':
-            return '第二班 16:00-18:00';
+            return '2nd Shift 16:00-18:00';
           case '3':
-            return '第三班 18:00-20:30';
+            return '3rd Shift 18:00-20:30';
+          case 'others':
+            return 'Current Shift ';
         }
       },
-      inDutyCnt: n => '当前值班人数：' + n,
+      inDutyCnt: (n) => 'EVA members on duty: ' + n,
     },
   },
 };

src/plain-text/MemberPage.ts

@@ -1,4 +1,25 @@
 export interface MemberPageText {
+  titleLine: {
+    main: {
+      index: string;
+      login: string;
+      logout: string;
+    };
+    sub: {
+      index: string;
+      login: string;
+      logout: string;
+    };
+  };
+  cardTitle: {
+    dutyInfo: string;
+    stepInfo: string;
+    tipsInfo: string;
+  };
+  dutyCount: {
+    button: string;
+    text: string;
+  };
   stuidText: {
     title: string;
     placeholder: string;
@@ -7,9 +28,64 @@ export interface MemberPageText {
     title: string;
     placeholder: string;
   };
+  dutyCard: {
+    offDuty: {
+      title: string;
+      reason: (s: string) => string;
+      recoverTime: (t: string) => string;
+    };
+    inDuty: {
+      title: string;
+      currentDutyText: (c: 'off' | '1' | '2' | '3' | 'others') => string;
+      inDutyCnt: (n: number) => string;
+    };
+  };
+  expandTitle: {
+    stepInfo: string;
+    tipsInfo: string;
+    admin: string;
+  };
+  cardTips: {
+    dutyInfo: string;
+    stepInfo: string;
+    tipsInfo: string;
+  };
+  extraInfo: {
+    dutyInfo: string;
+    stepInfo: string;
+    tipsInfo: string;
+  };
+  stepList: Array<{ title: string }>;
+  tipsList: Array<{ title: string }>;
+  ticketList: {
+    hint: string;
+    title: string;
+    note: string;
+  };
 }
 
 export const memberPageZhCn: MemberPageText = {
+  titleLine: {
+    main: {
+      index: '您好，',
+      login: '协会成员登录入口',
+      logout: '协会成员登出',
+    },
+    sub: {
+      index: '祝你满绩每一天',
+      login: '请使用 EVA 统一身份认证，登录后点击下方按钮以扫描二维码',
+      logout: '登出后须扫码重新登录！',
+    },
+  },
+  cardTitle: {
+    dutyInfo: '值班情况',
+    stepInfo: '维修步骤',
+    tipsInfo: '注意事项',
+  },
+  dutyCount: {
+    button: '更新',
+    text: '当前值班人数：',
+  },
   stuidText: {
     title: '学号',
     placeholder: '与统一身份认证学号一致',
@@ -18,15 +94,155 @@ export const memberPageZhCn: MemberPageText = {
     title: '密码',
     placeholder: '与 EVA 统一身份认证一致',
   },
+  dutyCard: {
+    offDuty: {
+      title: '空闲',
+      reason: (s) => '未值班原因：' + s,
+      recoverTime: (t) => '恢复值班时间：' + t,
+    },
+    inDuty: {
+      title: '值班中',
+      currentDutyText: (c) => {
+        switch (c) {
+          case 'off':
+            return '当前未值班';
+          case '1':
+            return '第一班 13:30-16:00';
+          case '2':
+            return '第二班 16:00-18:00';
+          case '3':
+            return '第三班 18:00-20:30';
+          case 'others':
+            return '其他值班时间，见通知';
+        }
+      },
+      inDutyCnt: (n) => '当前值班人数：' + n,
+    },
+  },
+  expandTitle: {
+    stepInfo: '查看维修步骤',
+    tipsInfo: '查看注意事项',
+    admin: '组长管理入口',
+  },
+  cardTips: {
+    dutyInfo: '提示：如果有事不能值班，请及时请假！',
+    stepInfo: '提示：维修完成请清点机主物品！',
+    tipsInfo: '',
+  },
+  extraInfo: {
+    dutyInfo: '',
+    stepInfo: '',
+    tipsInfo: '',
+  },
+  stepList: [
+    { title: '机主线上填写工单，审核接取维修后加入 Oreo' },
+    { title: '进行维修工作，认领工单，通过小程序与机主交流' },
+    { title: '维修结束，清点机主物品，待机主取回' },
+    { title: '机主取回机器确认无误后，修改工单状态' },
+  ],
+  tipsList: [
+    { title: '戴尔/外星人、Surface、苹果电脑不能拆机' },
+    { title: '数据无价，请提醒机主随时做好数据备份' },
+    { title: '离开 204 前清点好维修物资！' },
+    { title: '螺丝上了吗？电源排线插了吗？' },
+  ],
+  ticketList: {
+    hint: '七日内未完成工单',
+    title: '预填写工单列表',
+    note: '在这里查看所有的预填写工单！',
+  },
 };
 
 export const memberPageEnUs: MemberPageText = {
+  titleLine: {
+    main: {
+      index: 'Hi! ',
+      login: 'EVA Member Entry',
+      logout: 'EVA Member Logout',
+    },
+    sub: {
+      index: 'Have a great day!',
+      login:
+        'Please use EVA Auth, log in and click the button below to scan the QR code',
+      logout: 'After logging out, scan the code again to log back in!',
+    },
+  },
+  cardTitle: {
+    dutyInfo: 'Duty Situation',
+    stepInfo: 'Maintenance Steps',
+    tipsInfo: 'Tips',
+  },
+  dutyCount: {
+    button: 'Update',
+    text: 'The duty count: ',
+  },
   stuidText: {
     title: 'Student ID',
-    placeholder: '与统一身份认证学号一致',
+    placeholder: 'Consistent with EVA Auth',
   },
   passwdText: {
     title: 'Password',
-    placeholder: '与 EVA 统一身份认证一致',
+    placeholder: 'Consistent with EVA Auth',
+  },
+  dutyCard: {
+    offDuty: {
+      title: 'Off Duty',
+      reason: (s) => 'Off duty reason: ' + s,
+      recoverTime: (t) => 'Resumption of duty: ' + t,
+    },
+    inDuty: {
+      title: 'On Duty',
+      currentDutyText: (c) => {
+        switch (c) {
+          case 'off':
+            return 'Currently not on duty';
+          case '1':
+            return '1st Shift 13:30-16:00';
+          case '2':
+            return '2nd Shift 16:00-18:00';
+          case '3':
+            return '3rd Shift 18:00-20:30';
+          case 'others':
+            return 'Other duty hours, see notice';
+        }
+      },
+      inDutyCnt: (n) => 'EVA members on duty: ' + n,
+    },
+  },
+  expandTitle: {
+    stepInfo: 'Check for maintenance steps',
+    tipsInfo: 'Check for tips',
+    admin: 'Entry for admin',
+  },
+  cardTips: {
+    dutyInfo:
+      "Tips: If you can't be on duty, please ask for an excused absence!",
+    stepInfo: "Tips: Inventory owner's belongings after maintenance!",
+    tipsInfo: '',
+  },
+  extraInfo: {
+    dutyInfo: '',
+    stepInfo: '',
+    tipsInfo: '',
+  },
+  stepList: [
+    { title: 'The owner fills out ticket online. Add it to Oreo after audit.' },
+    { title: 'Repair, pick the ticket, and communicate with the owner online' },
+    {
+      title:
+        "Maintenance completed, inventory owner's belongings and await retrieving",
+    },
+    { title: 'Modify the work order status after the owner retrieves.' },
+  ],
+  tipsList: [
+    { title: 'Dell/Alienware, Surface, Apple cannot be dissassembled.' },
+    { title: 'Please remind the owner to backup data at any time!' },
+    { title: '204 is a laboratory. Do not eat inside.' },
+    { title: 'Are the screws on? Is the power cable plugged in?' },
+  ],
+  ticketList: {
+    hint: 'Uncompleted tickets in 7 days',
+    title: 'Pre-filling ticket list',
+    note: 'Browse for all pre-filling tickets here!',
   },
 };

src/plain-text/Modal.ts

@@ -0,0 +1,52 @@
+export interface ModalText {
+  pick: {
+    title: string;
+    content: string;
+  };
+  addToOreo: {
+    title: string;
+    content: string;
+  };
+  retrieve: {
+    title: string;
+    content: string;
+  };
+  cancel: string;
+  confirm: string;
+}
+
+export const modalZhCn: ModalText = {
+  pick: {
+    title: '认领此工单',
+    content: '工单可多人认领！认领后将无法撤销！',
+  },
+  addToOreo: {
+    title: '将工单加入 Oreo',
+    content: '确认加入 Oreo？加入后将无法撤回！',
+  },
+  retrieve: {
+    title: '机器取回确认',
+    content: '确认该机器已取回？取回后工单完成，将无法添加评论！',
+  },
+  cancel: '取消',
+  confirm: '确认',
+};
+
+export const modalEnUs: ModalText = {
+  pick: {
+    title: 'Pick this ticket',
+    content:
+      'Tickets can be claimed by multiple members! Once claimed, it will not be able to be revoked!',
+  },
+  addToOreo: {
+    title: 'Add ticket to Oreo',
+    content: 'Once Confirmed, the change will be irrevocably!',
+  },
+  retrieve: {
+    title: 'Confirm the retrieving',
+    content:
+      'Once Confirmed, the ticket will be closed and cannot add any comment!',
+  },
+  cancel: 'Cancel',
+  confirm: 'Confirm',
+};

src/plain-text/NavBarTitle.ts

@@ -1,32 +1,41 @@
 export interface NavBarTitle {
+  notFound: string;
   ticketDetail: string;
+  ticketList: string;
   user: {
     myTicket: string;
     report: string;
-    member: string;
+    memberLogin: string;
     inform: string;
     about: string;
+    member: string;
   };
 }
 
-export const navBarTitleZhCh: NavBarTitle = {
+export const navBarTitleZhCn: NavBarTitle = {
+  notFound: '连接失败',
   ticketDetail: '工单详情',
+  ticketList: '所有工单',
   user: {
     myTicket: '我的工单',
     report: '意见反馈',
     inform: '我的信息',
     about: '关于我们',
-    member: '协会成员登录',
+    memberLogin: '协会成员登录',
+    member: '协会成员',
   },
 };
 
 export const navBarTitleEnUs: NavBarTitle = {
+  notFound: 'Failed',
   ticketDetail: 'Ticket Detail',
+  ticketList: 'All Tickets',
   user: {
     myTicket: 'My Tickets',
     report: 'Report',
     inform: 'Information',
     about: 'About us',
-    member: 'Member login',
+    memberLogin: 'Member login',
+    member: 'Member Page',
   },
 };

src/plain-text/RepairPage.ts

@@ -0,0 +1,146 @@
+export interface RepairPageText {
+  currentTicket: {
+    errorMessage: string;
+    title: string;
+    note: string;
+    extra: string;
+    hint: string;
+    nohint: string;
+  };
+  typeText: {
+    computer: string;
+    appliance: string;
+  };
+  deviceText: {
+    title: string;
+    placeholder: string;
+  };
+  deviceModelText: {
+    title: string;
+    placeholder: string;
+  };
+  ownerText: {
+    title: string;
+    placeholder: string;
+  };
+  phoneText: {
+    title: string;
+    placeholder: string;
+  };
+  descriptionText: {
+    title: string;
+    placeholder: string;
+  };
+  checkboxText: {
+    none: string;
+    usbDisk: string;
+    mouseOrReceiver: string;
+    powerAdapter: string;
+    others: {
+      label: string;
+      desc: string;
+    };
+  };
+  cardText: {
+    note: string;
+    title: string;
+  };
+}
+
+export const repairPageZhCn: RepairPageText = {
+  currentTicket: {
+    errorMessage: '未获取到工单！',
+    title: '',
+    note: '',
+    extra: '详细信息',
+    hint: '我正在进行的工单',
+    nohint: '暂无进行中的工单',
+  },
+  typeText: {
+    computer: '电脑',
+    appliance: '电器',
+  },
+  deviceText: {
+    title: '设备品牌',
+    placeholder: '如：ROG',
+  },
+  deviceModelText: {
+    title: '设备型号',
+    placeholder: '如：幻 14 2022',
+  },
+  ownerText: {
+    title: '机主姓名',
+    placeholder: '如：晓洋',
+  },
+  phoneText: {
+    title: '联系方式',
+    placeholder: '如：18888888888',
+  },
+  descriptionText: {
+    title: '问题描述',
+    placeholder: '如：无法登入校内网站',
+  },
+  checkboxText: {
+    none: '无附件',
+    usbDisk: 'U 盘',
+    mouseOrReceiver: '鼠标/接收器',
+    powerAdapter: '电源适配器',
+    others: {
+      label: '其他',
+      desc: '请于评论中详述',
+    },
+  },
+  cardText: {
+    note: '工单描述请尽量简短哦！',
+    title: '预填写工单',
+  },
+};
+
+export const repairPageEnUs: RepairPageText = {
+  currentTicket: {
+    errorMessage: 'Cannot get the ticket!',
+    title: '',
+    note: '',
+    extra: 'Details',
+    hint: 'My continuing tickets',
+    nohint: 'No continuing tickets',
+  },
+  typeText: {
+    computer: 'Computer',
+    appliance: 'Appliance',
+  },
+  deviceText: {
+    title: 'Brand',
+    placeholder: 'e.g. ROG',
+  },
+  deviceModelText: {
+    title: 'Device Model',
+    placeholder: 'e.g. Zephyrus G14 2022',
+  },
+  ownerText: {
+    title: 'Name',
+    placeholder: 'e.g. Dean Ma',
+  },
+  phoneText: {
+    title: 'Tel',
+    placeholder: 'e.g. 18888888888',
+  },
+  descriptionText: {
+    title: 'Problem Description',
+    placeholder: 'e.g. ZJUWLAN inaccessable',
+  },
+  checkboxText: {
+    none: 'None',
+    usbDisk: 'USB Disk',
+    mouseOrReceiver: 'Mouse/Receiver',
+    powerAdapter: 'Power Adapter',
+    others: {
+      label: 'Others',
+      desc: 'Please elaborate in the comments',
+    },
+  },
+  cardText: {
+    note: 'Please keep the ticket description as short as possible',
+    title: 'Pre-filling working tickets',
+  },
+};

src/plain-text/ReportPage.ts

@@ -9,5 +9,5 @@ export const reportPageZhCn: ReportPageText = {
 
 export const reportPageEnUs: ReportPageText = {
   placeHolderText:
-    '无论是有关于小程序的建议，还是关于E志者协会的建议，都可以提出来哦！',
+    'Feel free to post your suggestions about the weapp or about us!',
 };

src/plain-text/TicketDetail.ts

@@ -0,0 +1,148 @@
+interface StepItem {
+  title: string;
+}
+
+type StatusStr = '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7';
+
+export interface TicketDetailText {
+  stepItems: Array<StepItem>;
+  statusModifyMessage: Map<StatusStr, string>;
+  desc: {
+    title: string;
+  };
+  divider: string;
+  info: {
+    title: string;
+    extra: string;
+  };
+  button: {
+    tookAway: string;
+    addToOreo: string;
+    addNote: string;
+    pick: string;
+    status: string;
+  };
+  reminder: {
+    title: string;
+    error: string;
+    r0: string;
+    r1: string;
+    r2: string;
+    r3: string;
+  };
+  comment: {
+    title: string;
+    placeholder: string;
+    createTicketMessage: string;
+    statusModifyPrefix: string;
+  };
+  status: {
+    title: string;
+    cancel: string;
+  };
+}
+
+export const ticketDetailZhCn: TicketDetailText = {
+  stepItems: [
+    { title: '创建成功' },
+    { title: '维修中' },
+    { title: '待取回' },
+    { title: '工单完成' },
+  ],
+  statusModifyMessage: new Map<StatusStr, string>([
+    ['0', '已创建/交接中'],
+    ['1', '维修中'],
+    ['2', '劝退待取回'],
+    ['3', '劝退已取回'],
+    ['4', '维修成功待取回'],
+    ['5', '维修成功已取回'],
+    ['6', '维修翻车待取回'],
+    ['7', '维修翻车已取回'],
+  ]),
+  desc: {
+    title: '问题描述',
+  },
+  info: {
+    title: '机主姓名',
+    extra: '联系方式',
+  },
+  divider: '评论 / 状态',
+  button: {
+    tookAway: '我已取回',
+    addToOreo: '加入 Oreo',
+    addNote: '添加评论',
+    pick: '认领',
+    status: '改变状态',
+  },
+  comment: {
+    title: '添加评论',
+    placeholder: '可以在这里交流机器情况、维修进度、提出问题~',
+    createTicketMessage: '创建了维修',
+    statusModifyPrefix: '将维修状态改为：',
+  },
+  reminder: {
+    title: '注意事项！',
+    error: '请重新确认机器状况！',
+    r0: '是否进行维修？',
+    r1: '螺丝是否装回？排线是否插好？',
+    r2: '维修后机器是否已正常运行？',
+    r3: '随机附件是否已经归还？',
+  },
+  status: {
+    title: '请选择要改变成为的状态',
+    cancel: '取消',
+  },
+};
+
+export const ticketDetailEnUs: TicketDetailText = {
+  stepItems: [
+    { title: 'Created' },
+    { title: 'Repairing' },
+    { title: 'Finished' },
+    { title: 'Retrieved' },
+  ],
+  statusModifyMessage: new Map<StatusStr, string>([
+    ['0', 'Created / Handovering'],
+    ['1', 'Repairing'],
+    ['2', 'Pending Retrieval (Refused)'],
+    ['3', 'Retrieved (Refused)'],
+    ['4', 'Pending Retrieval (Finished)'],
+    ['5', 'Retrieved (Finished)'],
+    ['6', 'Pending Retrieval (Failed)'],
+    ['7', 'Retrieved (Failed)'],
+  ]),
+  desc: {
+    title: 'Description',
+  },
+  info: {
+    title: 'Name',
+    extra: 'Contact',
+  },
+  divider: 'Comment / Status',
+  button: {
+    tookAway: 'Already retrieved',
+    addToOreo: 'Add to Oreo',
+    addNote: 'Comment',
+    pick: 'Pick',
+    status: 'Change status',
+  },
+  comment: {
+    title: 'Add comment',
+    placeholder:
+      'You can exchange information the device, the progress of repairs, and ask questions here.',
+    createTicketMessage: 'Created ticket',
+    statusModifyPrefix: 'Modified repair status to: ',
+  },
+  reminder: {
+    title: 'Reminder',
+    error: 'Please re-confirm the status of the device!',
+    r0: 'Is the maintenance performed?',
+    r1: 'Are the srews on? Is the power cable plugged in?',
+    r2: 'Did the device operate well after maintenance?',
+    r3: 'Are the attachments reverted?',
+  },
+  status: {
+    title: 'Please select the status you want to modify to',
+    cancel: 'Cancel',
+  },
+};

src/plain-text/TicketList.ts

@@ -1,32 +1,41 @@
-type FixStatus = 1 | 2 | 3 | 4 | 5;
+import { FixStatus } from '@/common';
 
 export interface TicketListText {
   createdAt(time: string): string;
   statusMap: Map<FixStatus, string>;
+  search: string;
 }
 
 export const ticketListZhCn: TicketListText = {
-  createdAt: time => {
+  createdAt: (time) => {
     return '创建于' + ' ' + time;
   },
   statusMap: new Map([
-    [1, '创建成功'],
+    [0, '已创建/交接中'],
-    [2, '维修中'],
+    [1, '维修中'],
-    [3, '待取回'],
+    [2, '劝退待取回'],
-    [4, '已取回'],
+    [3, '劝退已取回'],
-    [5, '已取回'],
+    [4, '维修成功待取回'],
+    [5, '维修成功已取回'],
+    [6, '维修翻车待取回'],
+    [7, '维修翻车已取回'],
   ]),
+  search: '搜索',
 };
 
 export const ticketListEnUs: TicketListText = {
-  createdAt: time => {
+  createdAt: (time) => {
-    return '创建于' + ' ' + time;
+    return 'Created at' + ' ' + time;
   },
   statusMap: new Map([
-    [1, '创建成功'],
+    [0, 'Created / Handovering'],
-    [2, '维修中'],
+    [1, 'Repairing'],
-    [3, '待取回'],
+    [2, 'Pending Retrieval (Refused)'],
-    [4, '已取回'],
+    [3, 'Retrieved (Refused)'],
-    [5, '已取回'],
+    [4, 'Pending Retrieval (Finished)'],
+    [5, 'Retrieved (Finished)'],
+    [6, 'Pending Retrieval (Failed)'],
+    [7, 'Retrieved (Failed)'],
   ]),
+  search: 'search',
 };

src/plain-text/Tips.ts

@@ -0,0 +1,25 @@
+export interface TipsText {
+  tipsText: Array<string>;
+}
+
+export const tipsZhCn: TipsText = {
+  tipsText: [
+    '提示：请在 20:30 之前取走自己的物品哦！',
+    '提示：戴尔/外星人、Surface、苹果电脑不能拆机哦~',
+    '提示：数据无价，请随时做好数据备份哦~',
+    '提示：204 也是实验室，请勿在内饮食~',
+    '提示：我们是志愿服务，不收取任何礼物哦~',
+    '提示：无论是有关于小程序的建议，还是关于E志者协会的建议，都可以在【意见反馈】处提出来哦！',
+  ],
+};
+
+export const tipsEnUs: TipsText = {
+  tipsText: [
+    'Tips: Please retrieve your devices before 20:30!',
+    'Tips: Dell/Alienware, Surface, Apple cannot be dissassembled.',
+    'Tips: Data is priceless, please backup your data at any time!',
+    'Tips: 204 is also a laboratory. Do not eat inside.',
+    'Tips: We are volunteers and do not take any gifts.',
+    'Tips: Feel free to post your suggestions about the weapp or about us at [Account-Report]!',
+  ],
+};

src/plain-text/Toast.ts

@@ -0,0 +1,11 @@
+export interface ToastText {
+  error: string;
+}
+
+export const toastZhCn: ToastText = {
+  error: '获取失败',
+};
+
+export const toastEnUs: ToastText = {
+  error: 'Request Failed',
+};

src/plain-text/UserPage.ts

@@ -1,7 +1,7 @@
 export interface UserPageText {
   memberEntry: {
-    front: string;
+    prefix: string;
-    behind: string;
+    affix: string;
   };
   ticketColumn: {
     title: string;
@@ -27,8 +27,8 @@ export interface UserPageText {
 
 export const userPageZhCn: UserPageText = {
   memberEntry: {
-    front: '再点击 ',
+    prefix: '再点击 ',
-    behind: ' 次以进入协会成员登录页面',
+    affix: ' 次以进入协会成员登录页面',
   },
   ticketColumn: {
     title: '我的工单',
@@ -54,27 +54,27 @@ export const userPageZhCn: UserPageText = {
 
 export const userPageEnUs: UserPageText = {
   memberEntry: {
-    front: '再点击 ',
+    prefix: 'Click ',
-    behind: ' 次以进入协会成员登录页面',
+    affix: ' more times to enter member login page',
   },
   ticketColumn: {
-    title: '我的工单',
+    title: 'My Tickets',
-    note: '在这里查看历史工单！',
+    note: 'View the history of your tickets here!',
   },
   infoColumn: {
-    title: '我的信息',
+    title: 'My Information',
-    note: '能帮助亦可更好地找到你哦！',
+    note: 'It will help us contact you!',
   },
   settingsColumn: {
     title: 'Settings',
-    note: '在这里配置小程序',
+    note: 'Configure the applet here!',
   },
   reportColumn: {
-    title: '意见反馈',
+    title: 'Report',
-    note: '有什么想说的都可以告诉亦可哦！',
+    note: 'Let us know if you have any suggestions!',
   },
   aboutColumn: {
-    title: '关于我们',
+    title: 'About Us',
-    note: '查看开发者信息',
+    note: 'View developer information.',
   },
 };

src/plain-text/common.ts

@@ -0,0 +1,17 @@
+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

@@ -8,9 +8,26 @@ import { AboutPageText, aboutPageEnUs, aboutPageZhCn } from './AboutPage';
 import { ButtonText, buttonEnUs, buttonZhCn } from './Button';
 import { MemberPageText, memberPageEnUs, memberPageZhCn } from './MemberPage';
 import { TicketListText, ticketListEnUs, ticketListZhCn } from './TicketList';
-import { NavBarTitle, navBarTitleEnUs, navBarTitleZhCh } from './NavBarTitle';
+import { NavBarTitle, navBarTitleEnUs, navBarTitleZhCn } from './NavBarTitle';
+import { RepairPageText, repairPageEnUs, repairPageZhCn } from './RepairPage';
+import {
+  TicketDetailText,
+  ticketDetailEnUs,
+  ticketDetailZhCn,
+} from './TicketDetail';
+import { CommonText, commonTextEnUs, commonTextZhCn } from './common';
+import { TipsText, tipsEnUs, tipsZhCn } from './Tips';
+import { ModalText, modalEnUs, modalZhCn } from './Modal';
+import { ToastText, toastEnUs, toastZhCn } from './Toast';
+import {
+  ActIndicatorText,
+  actIndicatorEnUs,
+  actIndicatorZhCn,
+} from './ActIndicator';
+import { NotFoundText, notFound } from './404';
 
 interface TextRecord {
+  common: CommonText;
   pageFooter: PageFooterText;
   mainPage: MainPageText;
   userPage: UserPageText;
@@ -22,9 +39,17 @@ interface TextRecord {
   memberPage: MemberPageText;
   ticketList: TicketListText;
   navBar: NavBarTitle;
+  repairPage: RepairPageText;
+  ticketDetail: TicketDetailText;
+  tips: TipsText;
+  modal: ModalText;
+  toast: ToastText;
+  actIndicator: ActIndicatorText;
+  notFound: NotFoundText;
 }
 
 const textZhCn: TextRecord = {
+  common: commonTextZhCn,
   pageFooter: pageFooterZhCn,
   mainPage: mainPageZhCn,
   userPage: userPageZhCn,
@@ -35,10 +60,18 @@ const textZhCn: TextRecord = {
   button: buttonZhCn,
   memberPage: memberPageZhCn,
   ticketList: ticketListZhCn,
-  navBar: navBarTitleZhCh,
+  navBar: navBarTitleZhCn,
+  repairPage: repairPageZhCn,
+  ticketDetail: ticketDetailZhCn,
+  tips: tipsZhCn,
+  modal: modalZhCn,
+  toast: toastZhCn,
+  actIndicator: actIndicatorZhCn,
+  notFound: notFound,
 };
 
 const textEnUs: TextRecord = {
+  common: commonTextEnUs,
   pageFooter: pageFooterEnUs,
   mainPage: mainPageEnUs,
   userPage: userPageEnUs,
@@ -50,6 +83,13 @@ const textEnUs: TextRecord = {
   memberPage: memberPageEnUs,
   ticketList: ticketListEnUs,
   navBar: navBarTitleEnUs,
+  repairPage: repairPageEnUs,
+  ticketDetail: ticketDetailEnUs,
+  tips: tipsEnUs,
+  modal: modalEnUs,
+  toast: toastEnUs,
+  actIndicator: actIndicatorEnUs,
+  notFound: notFound,
 };
 
 // type Lang = 'zh_CN' | 'en_US' | ...;

src/service/addToOreo.ts

@@ -0,0 +1,48 @@
+import TicketDetail from '@/pages/TicketDetail/TicketDetail';
+import Taro from '@tarojs/taro';
+import pt from '@/plain-text';
+import wechatUser from '@/wechat';
+import { getUrl } from '.';
+
+export function addToOreo(that: TicketDetail) {
+  that.setState({
+    isLoading: {
+      ...that.state.isLoading,
+      oreo: true,
+    },
+  });
+  Taro.request({
+    url: getUrl('/tickets/addtooreo'),
+    method: 'POST',
+    data: {
+      token: wechatUser.getToken(),
+      id: that.state.id,
+    },
+  })
+    .then((res) => {
+      console.log(res.data);
+      that.setState({
+        isLoading: {
+          ...that.state.isLoading,
+          oreo: false,
+        },
+      });
+      Taro.atMessage({
+        message: pt.get().button.submitText.success,
+        type: 'success',
+      });
+    })
+    .catch((err) => {
+      console.log(err.errMsg);
+      that.setState({
+        isLoading: {
+          ...that.state.isLoading,
+          oreo: false,
+        },
+      });
+      Taro.atMessage({
+        message: pt.get().button.submitText.error + err.errMsg,
+        type: 'error',
+      });
+    });
+}

src/service/changeDutyCount.ts

@@ -0,0 +1,46 @@
+import MainPage from '@/pages/index';
+import Taro from '@tarojs/taro';
+import pt from '@/plain-text';
+import wechatUser from '@/wechat';
+import { getUrl } from '.';
+
+const reLaunchInterval = 1000;
+
+export function changeDutyCnt(that: MainPage) {
+  that.setState({
+    isLoading: true,
+  });
+  Taro.request({
+    url: getUrl('/tickets/addtooreo'),
+    method: 'POST',
+    data: {
+      token: wechatUser.getToken(),
+      dutyCnt: that.state.inDutyCnt,
+    },
+  })
+    .then((res) => {
+      console.log(res.data);
+      that.setState({
+        isLoading: false,
+      });
+      Taro.atMessage({
+        message: pt.get().button.submitText.success,
+        type: 'success',
+      });
+      setTimeout(() => {
+        Taro.reLaunch({
+          url: '/pages/index/index',
+        });
+      }, reLaunchInterval);
+    })
+    .catch((err) => {
+      console.log(err.errMsg);
+      that.setState({
+        isLoading: false,
+      });
+      Taro.atMessage({
+        message: pt.get().button.submitText.error + err.errMsg,
+        type: 'error',
+      });
+    });
+}

src/service/changeStatus.ts

@@ -0,0 +1,56 @@
+import TicketDetail from '@/pages/TicketDetail/TicketDetail';
+import Taro from '@tarojs/taro';
+import pt from '@/plain-text';
+import wechatUser from '@/wechat';
+import { getUrl } from '.';
+
+const reLaunchInterval = 1000;
+
+export function changeStatus(that: TicketDetail) {
+  that.setState({
+    isLoading: {
+      ...that.state.isLoading,
+      status: true,
+    },
+  });
+  Taro.request({
+    url: getUrl('/tickets/update'),
+    method: 'POST',
+    data: {
+      token: wechatUser.getToken(),
+      id: that.state.id,
+      status: that.state.statusToBe,
+    },
+  })
+    .then((res) => {
+      console.log(res.data);
+      that.setState({
+        isLoading: {
+          ...that.state.isLoading,
+          status: false,
+        },
+      });
+      Taro.atMessage({
+        message: pt.get().button.submitText.success,
+        type: 'success',
+      });
+      setTimeout(() => {
+        Taro.reLaunch({
+          url: '/pages/TicketDetail/TicketDetail?id=' + that.state.id,
+        });
+      }, reLaunchInterval);
+    })
+    .catch((err) => {
+      console.log(err.errMsg);
+      that.setState({
+        isLoading: {
+          ...that.state.isLoading,
+          status: false,
+        },
+      });
+      Taro.atMessage({
+        message: pt.get().button.submitText.error + err.errMsg,
+        type: 'error',
+      });
+    });
+}

src/service/checkLogin.ts

@@ -0,0 +1,41 @@
+import Taro from '@tarojs/taro';
+import { getUrl } from '.';
+
+export function checkLogin(callback: (success: boolean) => void) {
+  let token = checkToken();
+  if (token.length !== 0) {
+    Taro.request({
+      url: getUrl('/checklogin'),
+      method: 'GET',
+      data: {
+        token: token,
+      },
+    })
+      .then((res) => {
+        if (res.data.data.islogin) {
+          callback(true);
+        }
+        callback(false);
+      })
+      .catch((err) => {
+        console.log(err);
+        callback(false);
+      });
+  } else {
+    callback(false);
+  }
+}
+
+export function checkToken(): string {
+  try {
+    let token: string = Taro.getStorageSync('token');
+    if (token) {
+      return token;
+    } else {
+      return '';
+    }
+  } catch (err) {
+    console.log(err.errMsg);
+    return '';
+  }
+}

src/service/currentTicket.ts

@@ -0,0 +1,45 @@
+import RepairPage from '@/pages/repair/repair';
+import Taro from '@tarojs/taro';
+import { TicketListItem } from '@/components/TicketListItem/TicketListItem';
+import pt from '@/plain-text';
+import wechatUser from '@/wechat';
+import { getUrl } from '.';
+
+export function getCurrentTicket(that: RepairPage) {
+  Taro.request({
+    url: getUrl('/user/mytickets'),
+    method: 'GET',
+    data: {
+      token: wechatUser.getToken(),
+    },
+  })
+    .then((res) => {
+      const data = res.data.data;
+      let newIdNameList: Array<Map<number, string>> = [];
+      if (data.list.length !== 0) {
+        data.list.map((ticket: TicketListItem) => {
+          if (
+            ticket['status'] !== 3 &&
+            ticket['status'] !== 5 &&
+            ticket['status'] !== 7
+          ) {
+            newIdNameList.push(
+              new Map([
+                [ticket['id'], ticket['device'] + ' ' + ticket['deviceModel']],
+              ]),
+            );
+          }
+        });
+      }
+      that.setState({
+        currentTicketsIdName: newIdNameList,
+      });
+    })
+    .catch((err) => {
+      console.log(err);
+      Taro.atMessage({
+        message: pt.get().button.submitText.error + err.errMsg,
+        type: 'error',
+      });
+    });
+}

src/service/dutyInfo.ts

@@ -0,0 +1,41 @@
+import MainPage from '@/pages/index';
+import Taro from '@tarojs/taro';
+import wechatUser from '@/wechat';
+import { getUrl } from '.';
+
+export function getDutyInfo(that: MainPage) {
+  Taro.request({
+    url: getUrl('/duty/info'),
+    method: 'GET',
+    data: {
+      token: wechatUser.getToken(),
+    },
+  })
+    .then((res) => {
+      let former = that.state.rs;
+      if (!res.data.success) {
+        that.setState({
+          rs: former.trans(false),
+        });
+        return;
+      }
+      const data = res.data.data;
+      that.setState({
+        rs: former.trans(true),
+        dutyData: data,
+      });
+    })
+    .catch((err) => {
+      console.log(err.errMsg);
+      let former = that.state.rs;
+      that.setState({
+        rs: former.trans(false),
+        dutyData: {
+          isInDuty: false,
+          offDutyReason: '获取失败！Network Error!',
+          dutyRecoverTime: '获取失败！Network Error!',
+          place: '204',
+        },
+      });
+    });
+}

src/service/getDisable.ts

@@ -0,0 +1,38 @@
+import TicketDetail from '@/pages/TicketDetail/TicketDetail';
+import Taro from '@tarojs/taro';
+import wechatUser from '@/wechat';
+import { getUrl } from '.';
+
+export function getDisable(that: TicketDetail, id: number) {
+  Taro.request({
+    url: getUrl('/tickets/info'),
+    method: 'GET',
+    data: {
+      id: id,
+    },
+  })
+    .then((res) => {
+      const data = res.data.data;
+      let isDisable_main = that.state.isDisable_main;
+      if (data.status === 3 || data.status === 5 || data.status === 7) {
+        isDisable_main.retrieve = true;
+        isDisable_main.comment = true;
+      }
+      if (wechatUser.getAccess()) {
+        if (data.workers.includes(wechatUser.getInfo().name)) {
+          isDisable_main.pick = true;
+        }
+      }
+      that.setState({
+        isDisable_main: {
+          ...that.state.isDisable_main,
+          retrieve: isDisable_main.retrieve,
+          comment: isDisable_main.comment,
+          pick: isDisable_main.pick,
+        },
+      });
+    })
+    .catch((reason) => {
+      console.log(reason.errMsg);
+    });
+}

src/service/getInfo.ts

@@ -0,0 +1,47 @@
+import Taro from '@tarojs/taro';
+import wechatUser, { UserInfo } from '@/wechat';
+import { defaultAvatar } from '@/common';
+import { getUrl } from '.';
+import { getLocaleData } from './localeData';
+
+export function getInfo() {
+  Taro.request({
+    url: getUrl('/member/login'),
+    method: 'POST',
+    data: {
+      token: wechatUser.getToken(),
+    },
+  })
+    .then((res) => {
+      const data = res.data.data;
+      if (res.data.success) {
+        wechatUser.setInfo(data as UserInfo);
+        wechatUser.setAccess(true);
+      } else {
+        Taro.request({
+          url: getUrl('/user/info'),
+          method: 'GET',
+          data: {
+            token: wechatUser.getToken(),
+          },
+        })
+          .then((re) => {
+            const info = re.data.data;
+            const userInfo: UserInfo = {
+              name: info.name,
+              phone: info.phone,
+              avatar: defaultAvatar,
+            };
+            console.log(userInfo);
+            wechatUser.setInfo(userInfo);
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+      getLocaleData();
+    })
+    .catch((err) => {
+      console.log(err.errMsg);
+    });
+}

src/service/index.ts

@@ -1,5 +1,34 @@
 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;
+  constructor() {
+    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;
+  }
+}
+
 /**
  * Get URL of backend
  * @param path Relative path to base url, begins with `/`

src/service/localeData.ts

@@ -0,0 +1,33 @@
+import Taro from '@tarojs/taro';
+import pt, { Lang } from '@/plain-text';
+import wechatUser from '@/wechat';
+import { getUrl } from '.';
+
+export function setLocaleData(lang: Lang) {
+  Taro.request({
+    url: getUrl('/user/locale/update'),
+    method: 'POST',
+    data: {
+      token: wechatUser.getToken(),
+      lang: lang,
+    },
+  }).then((res) => {
+    console.log(res.data);
+  });
+}
+
+export function getLocaleData() {
+  Taro.request({
+    url: getUrl('/user/locale/get'),
+    method: 'GET',
+    data: {
+      token: wechatUser.getToken(),
+    },
+  }).then((res) => {
+    console.log(res.data);
+    pt.setLang(res.data.data.lang);
+    Taro.reLaunch({
+      url: '/pages/index/index',
+    });
+  });
+}

src/service/login.ts

@@ -0,0 +1,34 @@
+import Taro from '@tarojs/taro';
+import wechatUser from '@/wechat';
+import { getUrl } from '.';
+import { getLocaleData } from './localeData';
+
+export function loginAte() {
+  Taro.login({
+    success: function (res) {
+      if (res.code) {
+        Taro.request({
+          url: getUrl('/login'),
+          method: 'POST',
+          data: {
+            code: res.code,
+          },
+        })
+          .then((re) => {
+            const data = re.data.data;
+            Taro.setStorage({
+              key: 'token',
+              data: data.token,
+            });
+            wechatUser.setToken(data.token);
+            getLocaleData();
+          })
+          .catch((err) => {
+            console.log(err.errMsg);
+          });
+      } else {
+        console.log('Login Failed: ' + res.errMsg);
+      }
+    },
+  });
+}

src/service/memberDutyInfo.ts

@@ -0,0 +1,48 @@
+import MainPage from '@/pages/index';
+import Taro from '@tarojs/taro';
+import wechatUser from '@/wechat';
+import { getUrl } from '.';
+
+export function getMemberDutyInfo(that: MainPage) {
+  Taro.request({
+    url: getUrl('/member/duty/info'),
+    method: 'GET',
+    data: {
+      token: wechatUser.getToken(),
+    },
+  })
+    .then((res) => {
+      const data = res.data.data;
+      if (data.isInDuty) {
+        that.setState({
+          dutyData: {
+            isInDuty: data.isInDuty,
+            inDutyCnt: data.inDutyCnt,
+            currentDuty: data.currentDuty,
+            place: data.place,
+          },
+          inDutyCnt: data.inDutyCnt,
+        });
+      } else {
+        that.setState({
+          dutyData: {
+            isInDuty: data.isInDuty,
+            offDutyReason: data.offDutyReason,
+            dutyRecoverTime: data.dutyRecoverTime,
+            place: data.place,
+          },
+        });
+      }
+    })
+    .catch((err) => {
+      console.log(err.errMsg);
+      that.setState({
+        dutyData: {
+          isInDuty: false,
+          offDutyReason: '获取失败！Network Error!',
+          dutyRecoverTime: '获取失败！Network Error!',
+          place: '204',
+        },
+      });
+    });
+}

src/service/memberLogin.ts

@@ -0,0 +1,102 @@
+import UserMemberPage from '@/pages/user/member/member';
+import Taro from '@tarojs/taro';
+import pt from '@/plain-text';
+import wechatUser, { UserInfo } from '@/wechat';
+import { getUrl } from '.';
+
+export function memberLogin(that: UserMemberPage) {
+  that.setState({
+    isLoading: true,
+  });
+  Taro.scanCode({
+    onlyFromCamera: true,
+    success: (re) => {
+      Taro.request({
+        url: getUrl('/member/login'),
+        method: 'POST',
+        data: {
+          token: wechatUser.getToken(),
+          code: re.result,
+        },
+      })
+        .then((res) => {
+          console.log(res.data);
+          that.setState({
+            isLoading: false,
+          });
+          if (res.data.success) {
+            Taro.atMessage({
+              message: pt.get().button.loginText.success,
+              type: 'success',
+            });
+            wechatUser.setInfo(res.data.data as UserInfo);
+            wechatUser.setAccess(true);
+            Taro.reLaunch({
+              url: '/pages/index/index',
+            });
+          } else {
+            Taro.atMessage({
+              message: pt.get().button.loginText.fail,
+              type: 'error',
+            });
+          }
+        })
+        .catch((err) => {
+          console.log(err.errMsg);
+          that.setState({
+            isLoading: false,
+          });
+          Taro.atMessage({
+            message: pt.get().button.loginText.error + err.errMsg,
+            type: 'error',
+          });
+        });
+    },
+    fail: (err) => {
+      that.setState({
+        isLoading: false,
+      });
+      Taro.atMessage({
+        message: pt.get().button.loginText.error + err.errMsg,
+        type: 'error',
+      });
+    },
+  });
+}
+
+export function memberLogout(that: UserMemberPage) {
+  that.setState({
+    isLoading: true,
+  });
+  Taro.request({
+    url: getUrl('/member/logout'),
+    method: 'POST',
+    data: {
+      token: wechatUser.getToken(),
+    },
+  })
+    .then((res) => {
+      console.log(res.data);
+      that.setState({
+        isLoading: false,
+      });
+      Taro.atMessage({
+        message: pt.get().button.logoutText.success,
+        type: 'success',
+      });
+      wechatUser.setAccess(false);
+      Taro.reLaunch({
+        url: '/pages/index/index',
+      });
+    })
+    .catch((err) => {
+      console.log(err.errMsg);
+      that.setState({
+        isLoading: false,
+      });
+      Taro.atMessage({
+        message: pt.get().button.logoutText.error + err.errMsg,
+        type: 'error',
+      });
+    });
+}

src/service/myTicket.ts

@@ -0,0 +1,52 @@
+import MyTicketPage from '@/pages/user/myTicket/myTicket';
+import { TicketListItem } from '@/components/TicketListItem/TicketListItem';
+import Taro from '@tarojs/taro';
+import moment from 'moment';
+import { FixStatus } from '@/common';
+import wechatUser from '@/wechat';
+import { getUrl } from '.';
+
+export function getMyTicketList(that: MyTicketPage) {
+  Taro.request({
+    url: getUrl('/user/mytickets'),
+    method: 'GET',
+    data: {
+      token: wechatUser.getToken(),
+    },
+  })
+    .then((res) => {
+      let former = that.state.rs;
+      if (!res.data.success) {
+        that.setState({
+          rs: former.trans(false),
+        });
+        return;
+      }
+      that.setState({
+        rs: former.trans(true),
+        fixList: res.data.data.list.map(
+          (item: {
+            id: number;
+            device: string;
+            deviceModel: string;
+            status: FixStatus;
+            createdTime: moment.MomentInput;
+          }) =>
+            new TicketListItem(
+              item.id,
+              item.device,
+              item.deviceModel,
+              item.status,
+              moment(item.createdTime),
+            ),
+        ),
+      });
+    })
+    .catch((reason) => {
+      let former = that.state.rs;
+      that.setState({
+        rs: former.trans(false),
+      });
+      console.log(reason.errMsg);
+    });
+}

src/service/pickTicket.ts

@@ -0,0 +1,55 @@
+import TicketDetail from '@/pages/TicketDetail/TicketDetail';
+import Taro from '@tarojs/taro';
+import pt from '@/plain-text';
+import wechatUser from '@/wechat';
+import { getUrl } from '.';
+
+const reLaunchInterval = 1000;
+
+export function pickTicket(that: TicketDetail) {
+  that.setState({
+    isLoading: {
+      ...that.state.isLoading,
+      pick: true,
+    },
+  });
+  Taro.request({
+    url: getUrl('/tickets/pick'),
+    method: 'POST',
+    data: {
+      token: wechatUser.getToken(),
+      id: that.state.id,
+    },
+  })
+    .then((res) => {
+      console.log(res.data);
+      that.setState({
+        isLoading: {
+          ...that.state.isLoading,
+          pick: false,
+        },
+      });
+      Taro.atMessage({
+        message: pt.get().button.submitText.success,
+        type: 'success',
+      });
+      setTimeout(() => {
+        Taro.reLaunch({
+          url: '/pages/TicketDetail/TicketDetail?id=' + that.state.id,
+        });
+      }, reLaunchInterval);
+    })
+    .catch((err) => {
+      console.log(err.errMsg);
+      that.setState({
+        isLoading: {
+          ...that.state.isLoading,
+          pick: false,
+        },
+      });
+      Taro.atMessage({
+        message: pt.get().button.submitText.error + err.errMsg,
+        type: 'error',
+      });
+    });
+}

src/service/pingAte.ts

@@ -0,0 +1,31 @@
+import Taro from '@tarojs/taro';
+import wechatUser from '@/wechat';
+import { getUrl } from '.';
+import { checkLogin, checkToken } from './checkLogin';
+import { loginAte } from './login';
+import { getInfo } from './getInfo';
+
+export function pingAte() {
+  Taro.request({
+    url: getUrl('/ping'),
+    method: 'GET',
+    data: {},
+  })
+    .then((res) => {
+      console.log(res.data);
+      checkLogin((success) => {
+        if (success) {
+          wechatUser.setToken(checkToken());
+          getInfo();
+        } else {
+          loginAte();
+        }
+      });
+    })
+    .catch((err) => {
+      console.log(err.errMsg);
+      Taro.reLaunch({
+        url: '/pages/404/404',
+      });
+    });
+}