fix: mainpage avatar & layout

.env.dev

@@ -1,3 +1,4 @@
 # 配置文档参考 https://taro-docs.jd.com/docs/next/env-mode-config
 TARO_APP_ID="wx636eb7cf2b84f305"
-TARO_APP_API="http://127.0.0.1:9527"
+TARO_APP_API="https://ate.zjueva.net"
+# TARO_APP_API="http://127.0.0.1:9527"

doc/api.md

@@ -87,6 +87,23 @@ data:
 }
 ```
 
+#### 当前值班暂停
+
+data:
+
+```json
+{
+  "isInDuty": false,
+  "inDutyCnt": 0,
+  "currentDuty": "off",          // 'off' 代表当前值班暂停
+  "place": "",
+  "otherDutyStart": "",
+  "otherDutyEnd": "",
+  "offDutyReason": "考试周",
+  "dutyRecoverTime": "下周一"
+}
+```
+
 ## 账号登陆
 
 ### 微信小程序登陆 `POST /login` OK
@@ -231,7 +248,15 @@ Request
 {
   "token": "token_test",
   "id": "id",
-  "content" : "为什么 PD 不能充电呢？"
+  "content": "为什么 PD 不能充电呢？",
+}
+```
+
+Data
+
+```json
+{
+  "id": "id", // 返回的是评论的 id
 }
 ```
 
@@ -344,7 +369,8 @@ data (same as oreo):
       "op": "宇航员",
       "type": 0,
       "content": "",
-      "createdTime": "2024-03-07T19:52:48.523305"
+      "createdTime": "2024-03-07T19:52:48.523305",
+      "pic": [], // 只有当 type = 1 (评论) 时 pic 才有可能非空
     },
     {
       "avatar": "https://....jpg",
@@ -352,7 +378,8 @@ data (same as oreo):
       "op": "宇航员",
       "type": 2,
       "content": "1",
-      "createdTime": "2024-03-07T19:58:27.838816"
+      "createdTime": "2024-03-07T19:58:27.838816",
+      "pic": [], // 只有当 type = 1 (评论) 时 pic 才有可能非空
     },
     {
       "avatar": "https://....jpg",
@@ -360,7 +387,8 @@ data (same as oreo):
       "op": "宇航员",
       "type": 2,
       "content": "4",
-      "createdTime": "2024-03-07T20:28:12.070707"
+      "createdTime": "2024-03-07T20:28:12.070707",
+      "pic": [], // 只有当 type = 1 (评论) 时 pic 才有可能非空
     },
     {
       "avatar": "https://....jpg",
@@ -368,7 +396,20 @@ data (same as oreo):
       "op": "宇航员",
       "type": 2,
       "content": "5",
-      "createdTime": "2024-03-07T20:30:15.770486"
+      "createdTime": "2024-03-07T20:30:15.770486",
+      "pic": [], // 只有当 type = 1 (评论) 时 pic 才有可能非空
+    },
+    {
+      "avatar": "https://....jpg",
+      "id": 21374,
+      "op": "宇航员",
+      "type": 1,
+      "content": "清灰换硅脂",
+      "createdTime": "2024-03-07T20:30:15.780486",
+      "pic": [
+        "https://....jpg",
+        ...
+      ]
     }
   ],
   "accessories": [2],
@@ -420,9 +461,14 @@ data:
 
 ```json
 {
-  "isInDuty": true,
+  "isInDuty": true,           // 指示成员其当前是否在值班
   "inDutyCnt": 3,
-  "currentDuty": "2"
+  "currentDuty": "others",
+  "place": "蓝田",            // 只有当 currentDuty 为 others 时，place 才不为空
+  "otherDutyStart": "2024-03-07T11:52:48.523303",   // Timestamp
+  "otherDutyEnd": "2024-03-07T13:52:48.523303",
+  "offDutyReason": "",
+  "dutyRecoverTime": ""
 }
 ```
 
@@ -433,7 +479,50 @@ data:
 ```json
 {
   "isInDuty": false,
-  "offDutyReason": "学园维修",
+  "inDutyCnt": 0,
+  "currentDuty": "off",   // "0" => 正常值班下班，"others" => 其他值班下班，"off" => 值班暂停
+  "place": "",            // 只有当 currentDuty 为 others 时，place 才不为空
+  "otherDutyStart": "",
+  "otherDutyEnd": "",
+  "offDutyReason": "期中考试周",
   "dutyRecoverTime": "下周一"
 }
 ```
+
+### 成员请假 `POST /member/askleave`
+
+Request
+
+```json
+{
+  "token": "token_test",
+  "week": "1",
+  "shift": "2",
+  "reason": "家庭原因",
+  "substitute": "晓洋"  // 未找人代班则为空
+}
+```
+
+### 值班总结上传 `POST /member/conclusion`
+
+Request
+
+```json
+{
+  "token": "token_test",
+  "week": "2",
+  "shift": "3",
+  "conclusion": "周四第三班，一人请假，共收两台电脑，均劝退已取回。由上一班交接两台电脑，其中一台维修成功已取回，一台仍在维修。"
+}
+```
+
+### 修改值班人数 `POST /member/dutycnt`
+
+Request
+
+```json
+{
+  "token": "token_test",
+  "dutycnt": 5,
+}
+```

mock/api.ts

@@ -59,7 +59,9 @@ export default {
   },
   'POST /tickets/addnote': {
     success: true,
-    data: {},
+    data: {
+      id: 114,
+    },
   },
   'POST /tickets/create': {
     success: true,
@@ -118,11 +120,18 @@ export default {
     success: true,
     data: {
       isInDuty: true,
-      inDutyCnt: 6,
+      inDutyCnt: 3,
-      currentDuty: '3',
+      currentDuty: 'others',
-      place: '204',
+      otherDutyStart: '2024-03-07T09:30:48.523303',
+      otherDutyEnd: '2024-03-07T13:30:48.523303',
+      place: '蓝田',
+      offDutyReason: '',
+      dutyRecoverTime: '',
     },
   },
+  'POST /member/askleave': {
+    success: true,
+  },
   'POST /login': {
     success: true,
     data: {
@@ -132,7 +141,19 @@ export default {
   'GET /checklogin': {
     success: true,
     data: {
-      islogin: false,
+      islogin: true,
     },
   },
+  'POST /upload/pic': {
+    success: true,
+  },
+  'POST /member/conclusion': {
+    success: true,
+    data: {
+      id: 514,
+    },
+  },
+  'POST /member/dutycnt': {
+    success: true,
+  },
 };

mock/ticketInfo.json

@@ -17,7 +17,8 @@
       "op": "宇航员",
       "type": 0,
       "content": "",
-      "createdTime": "2024-03-07T19:52:48.523305"
+      "createdTime": "2024-03-07T19:52:48.523305",
+      "pic": []
     },
     {
       "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png",
@@ -25,7 +26,8 @@
       "op": "宇航员",
       "type": 2,
       "content": "1",
-      "createdTime": "2024-03-07T19:58:27.838816"
+      "createdTime": "2024-03-07T19:58:27.838816",
+      "pic": []
     },
     {
       "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png",
@@ -33,7 +35,8 @@
       "op": "宇航员",
       "type": 2,
       "content": "4",
-      "createdTime": "2024-03-07T20:28:12.070707"
+      "createdTime": "2024-03-07T20:28:12.070707",
+      "pic": []
     },
     {
       "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png",
@@ -41,7 +44,21 @@
       "op": "宇航员",
       "type": 2,
       "content": "5",
-      "createdTime": "2024-03-07T20:30:15.770486"
+      "createdTime": "2024-03-07T20:30:15.770486",
+      "pic": []
+    },
+    {
+      "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png",
+      "id": 21374,
+      "op": "宇航员",
+      "type": 1,
+      "content": "清灰换硅脂",
+      "createdTime": "2024-03-07T20:30:15.780486",
+      "pic": [
+        "https://storage.360buyimg.com/mtd/home/111543234387022.jpg",
+        "https://storage.360buyimg.com/mtd/home/221543234387016.jpg",
+        "https://storage.360buyimg.com/mtd/home/331543234387025.jpg"
+      ]
     }
   ],
   "accessories": [2],

project.config.json

@@ -9,7 +9,7 @@
     "enhance": false,
     "compileHotReLoad": false,
     "postcss": false,
-    "minified": false,
+    "minified": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],

project.private.config.json

@@ -3,7 +3,7 @@
   "projectname": "EVA-Notify",
   "setting": {
     "compileHotReLoad": true,
-    "urlCheck": false,
+    "urlCheck": true,
     "bigPackageSizeSupport": true
   }
 }

src/app.config.ts

@@ -1,5 +1,6 @@
 export default defineAppConfig({
   pages: [
+    'pages/Loading/Loading',
     'pages/index/index',
     'pages/repair/repair',
     'pages/user/user',
@@ -10,6 +11,8 @@ export default defineAppConfig({
     'pages/user/member/member',
     'pages/TicketDetail/TicketDetail',
     'pages/TicketList/TicketList',
+    'pages/AskLeave/AskLeave',
+    'pages/Conclusion/Conclusion',
     'pages/404/404',
   ],
   window: {

src/components/DetailFramework/DetailFramework.tsx

@@ -160,12 +160,13 @@ export default class DetailFramework extends Component<
       notelist: this.props.isInfoShow['notelist'] ? (
         this.props.isInfoShow['showAllNotes'] ? (
           <View style={{ padding: '20rpx' }}>
-            <NoteList noteList={this.state.notes} />
+            <NoteList noteList={this.state.notes} showPic />
           </View>
         ) : (
           <View style={{ padding: '20rpx' }}>
             <NoteList
               noteList={[this.state.notes[this.state.notes.length - 1]]}
+              showPic={false}
             />
           </View>
         )

src/components/ExpandItem/ExpandItem.config.ts

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

src/components/ExpandItem/ExpandItem.tsx

@@ -0,0 +1,31 @@
+import { View } from '@tarojs/components';
+import { Component, ReactNode } from 'react';
+import { AtAccordion } from 'taro-ui';
+
+export class ExpandItem extends Component {
+  state = {
+    open: false,
+  };
+  props = {
+    title: '',
+    content: <View></View>,
+  };
+
+  handleClick(value: boolean) {
+    this.setState({ open: value });
+  }
+
+  render(): ReactNode {
+    return (
+      <View>
+        <AtAccordion
+          open={this.state.open}
+          onClick={this.handleClick.bind(this)}
+          title={this.props.title}
+        >
+          {this.props.content}
+        </AtAccordion>
+      </View>
+    );
+  }
+}

src/components/NoteCard/NoteCard.tsx

@@ -3,19 +3,23 @@ import { Component, ReactNode } from 'react';
 import { TicketNote, StatusStr } from '@/pages/TicketDetail/TicketNote';
 import pt from '@/plain-text';
 import { timeFormat } from '@/utils';
+import Taro from '@tarojs/taro';
 import './NoteCard.scss';
 
 interface NoteCardProps {
   note: TicketNote;
+  showPic: boolean;
 }
 
 export default class NoteCard extends Component<NoteCardProps, {}> {
   props: Readonly<NoteCardProps> = {
     note: new TicketNote(),
+    showPic: true,
   };
 
   render(): ReactNode {
-    var message = '';
+    let message = '';
+    let pic: string[] = [];
     const note = this.props.note;
     const td = pt.get().ticketDetail;
     const createMessage = td.comment.createTicketMessage;
@@ -27,16 +31,47 @@ export default class NoteCard extends Component<NoteCardProps, {}> {
         message = createMessage;
         break;
       case 1:
-        message = note.content;
+        message = pt.get().ticketDetail.comment.picked;
         break;
       case 2:
         message = prefix + modifyMessage.get(note.content as StatusStr) || '';
         break;
+      case 3:
+        message = note.content;
+        pic = note.pic;
+        break;
     }
 
+    const showPicDetail = (url: string) => {
+      Taro.previewImage({
+        current: url,
+        urls: [url],
+      });
+    };
+
+    const notePicRenderer = (
+      <View>
+        <View className='at-row' style={{ marginLeft: '30rpx' }}>
+          {pic.map((url, idx) => (
+            <View className='at-col at-col-4' key={idx}>
+              <Image
+                style='width: 160rpx; height: 160rpx;'
+                src={url}
+                mode='aspectFit'
+                onClick={showPicDetail.bind(this, url)}
+              />
+            </View>
+          ))}
+        </View>
+      </View>
+    );
+
     return (
-      <View className='at-row at-row__align--center'>
+      <View className='at-row at-row__align--start'>
-        <View className='at-col at-col-1 at-col--auto'>
+        <View
+          className='at-col at-col-1 at-col--auto'
+          style={{ marginTop: '80rpx' }}
+        >
           <Image
             style='width: 70rpx; height: 70rpx; border-radius: 35px;'
             src={note.avatar}
@@ -55,7 +90,10 @@ export default class NoteCard extends Component<NoteCardProps, {}> {
           <View className='at-article__info'>
             {note.createdTime.format(timeFormat)}
           </View>
-          <View className='at-article__h3'>{message}</View>
+          <View className='at-article__h3' style={{ marginBottom: '20rpx' }}>
+            {message}
+          </View>
+          {this.props.showPic ? notePicRenderer : null}
         </View>
       </View>
     );

src/components/NoteList/NoteList.tsx

@@ -7,11 +7,13 @@ import pt from '@/plain-text';
 
 interface NoteListProps {
   noteList: Array<TicketNote>;
+  showPic: boolean;
 }
 
 export default class NoteList extends Component<NoteListProps, {}> {
   props: Readonly<NoteListProps> = {
     noteList: [],
+    showPic: true,
   };
   render(): ReactNode {
     return (
@@ -23,7 +25,7 @@ export default class NoteList extends Component<NoteListProps, {}> {
         />
         {this.props.noteList.map((note, idx) => (
           <View key={idx}>
-            <NoteCard note={note} />
+            <NoteCard note={note} showPic={this.props.showPic} />
           </View>
         ))}
       </View>

src/components/PicUploader/PicUploader.config.ts

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

src/components/PicUploader/PicUploader.tsx

@@ -0,0 +1,66 @@
+import { picUpload } from '@/service/picUpload';
+import { View } from '@tarojs/components';
+import Taro from '@tarojs/taro';
+import { Component, ReactNode } from 'react';
+import { AtImagePicker } from 'taro-ui';
+import { File } from 'taro-ui/types/image-picker';
+
+const reLaunchInterval = 1000;
+
+interface PicUploaderState {
+  files: File[];
+}
+
+interface PicUploaderProps {
+  source: string;
+  id: number;
+  superId?: number;
+}
+
+export default class PicUploader extends Component<
+  PicUploaderProps,
+  PicUploaderState
+> {
+  state = {
+    files: [] as File[],
+  };
+  onUpload() {
+    if (this.state.files.length !== 0) {
+      for (let file of this.state.files) {
+        picUpload(this, file.url);
+      }
+    }
+    if (this.props.source == 'comment') {
+      setTimeout(() => {
+        Taro.reLaunch({
+          url: '/pages/TicketDetail/TicketDetail?id=' + this.props.superId,
+        });
+      }, reLaunchInterval);
+    } else if (this.props.source == 'conclusion') {
+      setTimeout(() => {
+        Taro.reLaunch({
+          url: '/pages/index/index',
+        });
+      }, reLaunchInterval);
+    }
+  }
+  handlePicChange(files: File[]) {
+    this.setState({
+      files: files,
+    });
+    return files;
+  }
+  render(): ReactNode {
+    return (
+      <View>
+        <AtImagePicker
+          showAddBtn={this.state.files.length !== 3}
+          count={3}
+          files={this.state.files}
+          sizeType={['compressed']}
+          onChange={this.handlePicChange.bind(this)}
+        />
+      </View>
+    );
+  }
+}

src/pages/AskLeave/AskLeave.config.ts

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

src/pages/AskLeave/AskLeave.tsx

@@ -0,0 +1,187 @@
+import {
+  AtTextarea,
+  AtButton,
+  AtForm,
+  AtMessage,
+  AtInput,
+  AtList,
+  AtListItem,
+  AtModal,
+} from 'taro-ui';
+import { Component, ReactNode } from 'react';
+import Taro from '@tarojs/taro';
+import pt from '@/plain-text';
+import { Picker, View } from '@tarojs/components';
+import { askLeave } from '@/service/askleave';
+import './AskLeave.scss';
+
+const submitInterval = 5000;
+
+export default class AskLeavePage extends Component {
+  state = {
+    isLoading: false,
+    isDisable: false,
+    showModal: false,
+    range: [pt.get().askLeave.shift.week, pt.get().askLeave.shift.shift],
+    shift: [0, 0],
+    reason: '',
+    substitute: '',
+  };
+
+  componentDidMount(): void {
+    Taro.setNavigationBarTitle({
+      title: pt.get().navBar.askLeave,
+    });
+  }
+
+  onShiftSelect(event) {
+    this.setState({
+      shift: event.detail.value,
+    });
+    console.log(event);
+  }
+
+  onModalClose() {
+    this.setState({
+      showModal: false,
+    });
+    setTimeout(() => {
+      this.setState({
+        isDisable: false,
+      });
+    }, submitInterval);
+  }
+
+  onModalCancel() {
+    this.setState({
+      showModal: false,
+    });
+    setTimeout(() => {
+      this.setState({
+        isDisable: false,
+      });
+    }, submitInterval);
+  }
+
+  onModalConfirm() {
+    this.setState({
+      showModal: false,
+    });
+    askLeave(this);
+    setTimeout(() => {
+      this.setState({
+        isDisable: false,
+      });
+    }, submitInterval);
+  }
+
+  handleReasonChange(reason: string) {
+    this.setState({
+      reason,
+    });
+  }
+
+  handleSubstituteChange(substitute: string) {
+    this.setState({
+      substitute,
+    });
+  }
+
+  onSubmit() {
+    this.setState({
+      isDisable: true,
+    });
+    if (this.state.reason == '') {
+      Taro.atMessage({
+        message: pt.get().button.submitText.blank,
+        type: 'error',
+      });
+      setTimeout(() => {
+        this.setState({
+          isDisable: false,
+        });
+      }, submitInterval);
+      return;
+    }
+    if (this.state.substitute == '') {
+      this.setState({
+        showModal: true,
+      });
+      return;
+    }
+    askLeave(this);
+    setTimeout(() => {
+      this.setState({
+        isDisable: false,
+      });
+    }, submitInterval);
+  }
+  render(): ReactNode {
+    return (
+      <View style={{ marginTop: '30rpx', width: '94%', marginLeft: '3%' }}>
+        <AtMessage />
+        <AtModal
+          isOpened={this.state.showModal}
+          title={pt.get().askLeave.modal.title}
+          cancelText={pt.get().modal.cancel}
+          confirmText={pt.get().modal.confirm}
+          onClose={this.onModalClose.bind(this)}
+          onCancel={this.onModalCancel.bind(this)}
+          onConfirm={this.onModalConfirm.bind(this)}
+          content={pt.get().askLeave.modal.content}
+        />
+        <AtForm onSubmit={this.onSubmit.bind(this)}>
+          <View style={{ width: '98%', marginLeft: '1%' }}>
+            <Picker
+              mode='multiSelector'
+              range={this.state.range}
+              onChange={this.onShiftSelect.bind(this)}
+              value={this.state.shift}
+            >
+              <AtList>
+                <AtListItem
+                  title={pt.get().askLeave.shift.title}
+                  extraText={
+                    pt.get().askLeave.shift.week[this.state.shift[0]] +
+                    pt.get().askLeave.shift.shift[this.state.shift[1]]
+                  }
+                />
+              </AtList>
+            </Picker>
+          </View>
+          <View
+            className='at-article__h3'
+            style={{ marginTop: '20rpx', marginBottom: '20rpx' }}
+          >
+            {pt.get().askLeave.reason.title}
+          </View>
+          <AtTextarea
+            value={this.state.reason}
+            onChange={this.handleReasonChange.bind(this)}
+            maxLength={200}
+            placeholder={pt.get().askLeave.reason.placeHolder}
+          />
+
+          <AtInput
+            name='substitute'
+            title={pt.get().askLeave.substitute.title}
+            type='text'
+            placeholder={pt.get().askLeave.substitute.placeHolder}
+            value={this.state.substitute}
+            onChange={this.handleSubstituteChange.bind(this)}
+          />
+          <View>
+            <AtButton
+              loading={this.state.isLoading}
+              formType='submit'
+              type='primary'
+              disabled={this.state.isDisable}
+            >
+              {pt.get().button.buttonText.submit}
+            </AtButton>
+          </View>
+        </AtForm>
+      </View>
+    );
+  }
+}

src/pages/Conclusion/Conclusion.config.ts

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

src/pages/Conclusion/Conclusion.tsx

@@ -0,0 +1,129 @@
+import {
+  AtTextarea,
+  AtButton,
+  AtForm,
+  AtMessage,
+  AtList,
+  AtListItem,
+} from 'taro-ui';
+import React, { Component, ReactNode } from 'react';
+import Taro from '@tarojs/taro';
+import pt from '@/plain-text';
+import { Picker, View } from '@tarojs/components';
+import PicUploader from '@/components/PicUploader/PicUploader';
+import { conclude } from '@/service/conclude';
+import './Conclusion.scss';
+
+const submitInterval = 5000;
+
+export default class ConclusionPage extends Component {
+  state = {
+    isLoading: false,
+    isDisable: false,
+    conclusion: '',
+    conclusionId: 0,
+    range: [pt.get().askLeave.shift.week, pt.get().askLeave.shift.shift],
+    shift: [0, 0],
+  };
+
+  componentDidMount(): void {
+    Taro.setNavigationBarTitle({
+      title: pt.get().navBar.conclusion,
+    });
+  }
+
+  uploaderRef = React.createRef<PicUploader>();
+
+  handleConclusionChange(conclusion: string) {
+    this.setState({
+      conclusion,
+    });
+  }
+
+  onShiftSelect(event) {
+    this.setState({
+      shift: event.detail.value,
+    });
+    console.log(event);
+  }
+
+  onSubmit() {
+    this.setState({
+      isDisable: true,
+    });
+    if (this.state.conclusion == '') {
+      Taro.atMessage({
+        message: pt.get().button.submitText.blank,
+        type: 'error',
+      });
+      setTimeout(() => {
+        this.setState({
+          isDisable: false,
+        });
+      }, submitInterval);
+      return;
+    }
+    conclude(this);
+    this.uploaderRef.current?.onUpload();
+    setTimeout(() => {
+      this.setState({
+        isDisable: false,
+      });
+    }, submitInterval);
+  }
+  render(): ReactNode {
+    return (
+      <View style={{ marginTop: '30rpx', width: '94%', marginLeft: '3%' }}>
+        <AtMessage />
+        <AtForm onSubmit={this.onSubmit.bind(this)}>
+          <View style={{ width: '98%', marginLeft: '1%' }}>
+            <Picker
+              mode='multiSelector'
+              range={this.state.range}
+              onChange={this.onShiftSelect.bind(this)}
+              value={this.state.shift}
+            >
+              <AtList>
+                <AtListItem
+                  title={pt.get().askLeave.shift.title}
+                  extraText={
+                    pt.get().askLeave.shift.week[this.state.shift[0]] +
+                    pt.get().askLeave.shift.shift[this.state.shift[1]]
+                  }
+                />
+              </AtList>
+            </Picker>
+          </View>
+          <View
+            className='at-article__h3'
+            style={{ marginTop: '20rpx', marginBottom: '20rpx' }}
+          >
+            {pt.get().conclusion.title}
+          </View>
+          <AtTextarea
+            value={this.state.conclusion}
+            onChange={this.handleConclusionChange.bind(this)}
+            maxLength={200}
+            height={400}
+            placeholder={pt.get().conclusion.placeHolder}
+          />
+          <PicUploader
+            ref={this.uploaderRef}
+            source='conclusion'
+            id={this.state.conclusionId}
+          />
+          <View>
+            <AtButton
+              loading={this.state.isLoading}
+              formType='submit'
+              type='primary'
+              disabled={this.state.isDisable}
+            >
+              {pt.get().button.buttonText.submit}
+            </AtButton>
+          </View>
+        </AtForm>
+      </View>
+    );
+  }
+}

src/pages/Loading/Loading.config.ts

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

src/pages/Loading/Loading.tsx

@@ -0,0 +1,30 @@
+import { AtActivityIndicator } from 'taro-ui';
+import { Component, ReactNode } from 'react';
+import Taro from '@tarojs/taro';
+import pt from '@/plain-text';
+import { View } from '@tarojs/components';
+import wechatUser from '@/wechat';
+import './Loading.scss';
+
+export default class LoadingPage extends Component {
+  componentDidMount(): void {
+    Taro.setNavigationBarTitle({
+      title: pt.get().navBar.loading,
+    });
+    if (wechatUser.getToken()) {
+      Taro.reLaunch({
+        url: '/pages/index/index',
+      });
+    }
+  }
+  render(): ReactNode {
+    return (
+      <View>
+        <AtActivityIndicator
+          mode='center'
+          content={pt.get().actIndicator.loading}
+        ></AtActivityIndicator>
+      </View>
+    );
+  }
+}

src/pages/TicketDetail/Comment.tsx

@@ -0,0 +1,101 @@
+import { ExpandItem } from '@/components/ExpandItem/ExpandItem';
+import PicUploader from '@/components/PicUploader/PicUploader';
+import pt from '@/plain-text';
+import { submitComment } from '@/service/submitComment';
+import { View } from '@tarojs/components';
+import Taro from '@tarojs/taro';
+import React, { Component, ReactNode } from 'react';
+import { AtButton, AtForm, AtTextarea } from 'taro-ui';
+
+const submitInterval = 5000;
+
+export interface commentData {
+  content: string;
+  id: number;
+}
+
+export class Comment extends Component {
+  state = {
+    isLoading: false,
+    isDisable: false,
+    comment: '',
+    commentId: 0,
+  };
+
+  uploaderRef = React.createRef<PicUploader>();
+
+  props = {
+    setFloatLayout: (_: boolean) => {},
+    id: 0,
+    didMount: false,
+  };
+
+  handleCommentChange(comment: string) {
+    this.setState({
+      comment: comment,
+    });
+    return comment;
+  }
+
+  onCommentSubmit() {
+    this.setState({
+      isDisable: true,
+    });
+    this.props.setFloatLayout(false);
+    if (this.state.comment == '') {
+      Taro.atMessage({
+        message: pt.get().button.submitText.blank,
+        type: 'error',
+      });
+      setTimeout(() => {
+        this.setState({
+          isDisable: false,
+        });
+      }, submitInterval);
+      return;
+    }
+    submitComment(this);
+    this.uploaderRef.current?.onUpload();
+    setTimeout(() => {
+      this.setState({
+        isDisable: false,
+      });
+    }, submitInterval);
+  }
+
+  render(): ReactNode {
+    return this.props.didMount ? (
+      <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}
+        />
+        <ExpandItem
+          title={pt.get().ticketDetail.comment.uploadPic.title}
+          content={
+            <PicUploader
+              ref={this.uploaderRef}
+              source='comment'
+              superId={this.props.id}
+              id={this.state.commentId}
+            />
+          }
+        />
+        <AtButton
+          loading={this.state.isLoading}
+          disabled={this.state.isDisable}
+          formType='submit'
+          type='primary'
+        >
+          {pt.get().button.buttonText.submit}
+        </AtButton>
+        <View style={{ marginBottom: '20rpx' }}></View>
+      </AtForm>
+    ) : (
+      <View></View>
+    );
+  }
+}

src/pages/TicketDetail/TicketDetail.tsx

@@ -11,11 +11,9 @@ import {
   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';
@@ -24,6 +22,7 @@ import { retrieve } from '@/service/retrieve';
 import { changeStatus } from '@/service/changeStatus';
 import { getDisable } from '@/service/getDisable';
 import { StatusStr } from './TicketNote';
+import { Comment } from './Comment';
 
 const submitInterval = 5000;
 
@@ -44,7 +43,6 @@ interface TicketDetailState {
       status: boolean;
     };
   };
-  comment: string;
   isLoading: {
     oreo: boolean;
     pick: boolean;
@@ -52,6 +50,7 @@ interface TicketDetailState {
     comment: boolean;
     status: boolean;
     reminder: boolean;
+    framework: boolean;
   };
   isDisable: {
     oreo: boolean;
@@ -89,7 +88,6 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
         status: false,
       },
     },
-    comment: '',
     isLoading: {
       oreo: false,
       pick: false,
@@ -97,6 +95,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
       comment: false,
       status: false,
       reminder: false,
+      framework: true,
     },
     isDisable: {
       oreo: false,
@@ -119,12 +118,18 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
 
   componentDidMount(): void {
     const { router } = getCurrentInstance();
-    const id = router?.params.id as number;
+    const id = Number(router?.params.id);
     this.setState({
       id: id,
       isMember: wechatUser.getAccess(),
     });
     getDisable(this, id);
+    this.setState({
+      isLoading: {
+        ...this.state.isLoading,
+        framework: false,
+      },
+    });
   }
 
   onAddToOreo(): void {
@@ -338,7 +343,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
   }
 
   handleStatusChange(status: number): void {
-    if (status == 3 || status == 5 || status == 7) {
+    if (status >= 3 && status <= 7) {
       this.setState({
         isDisable: {
           ...this.state.isDisable,
@@ -371,8 +376,10 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
             status: false,
           },
         },
+        // eslint-disable-next-line react/no-unused-state
+        statusToBe: status,
       });
-      changeStatus(this);
+      changeStatus(this, status);
     }
     setTimeout(() => {
       this.setState({
@@ -385,51 +392,16 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
     return;
   }
 
-  handleCommentChange(comment: string) {
+  setFloatLayout(show: boolean) {
     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,
+          comment: show,
         },
       },
     });
-    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>) {
@@ -457,7 +429,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
           },
         },
       });
-      changeStatus(this);
+      changeStatus(this, this.state.statusToBe);
     } else {
       this.setState({
         isDisable: {
@@ -639,6 +611,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
       current: true,
       notelist: true,
       showAllNotes: true,
+      pic: true,
     };
 
     return (
@@ -676,18 +649,11 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
           title={pt.get().ticketDetail.comment.title}
           onClose={this.handleCommentCancel.bind(this)}
         >
-          <AtForm onSubmit={this.onCommentSubmit.bind(this)}>
+          <Comment
-            <AtTextarea
+            setFloatLayout={this.setFloatLayout.bind(this)}
-              value={this.state.comment}
+            id={this.state.id}
-              onChange={this.handleCommentChange.bind(this)}
+            didMount={this.state.show.layout.comment}
-              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}
@@ -719,11 +685,13 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
         >
           {sheetItemsRenderer}
         </AtActionSheet>
-        <DetailFramework
+        {!this.state.isLoading.framework && (
-          middleButton={middleButton}
+          <DetailFramework
-          id={this.state.id}
+            middleButton={middleButton}
-          isInfoShow={isInfoShow}
+            id={this.state.id}
-        />
+            isInfoShow={isInfoShow}
+          />
+        )}
         <PageFooter />
       </View>
     );

src/pages/TicketDetail/TicketNote.ts

@@ -16,9 +16,10 @@ export class TicketNote {
   avatar: string;
   id: number;
   op: string;
-  type: 0 | 1 | 2;
+  type: 0 | 1 | 2 | 3;
   content: string;
   createdTime: moment.Moment;
+  pic: string[];
 }
 
 export class ShowElements {

src/pages/index/DutyInfo.tsx

@@ -15,24 +15,24 @@ export class DutyData {
     this.currentDuty = '1';
     this.otherDutyStart = '2024-03-07T13:30:48.523303';
     this.otherDutyEnd = '2024-03-07T16:00:48.523303';
-    this.dutyRecoverTime = '明天 13：30';
+    this.dutyRecoverTime = '13：30';
     this.place = '东三-204';
   }
 
   isInDuty: boolean;
-  inDutyCnt?: number;
+  inDutyCnt: number;
-  currentDuty?: '0' | '1' | '2' | '3' | 'others';
+  currentDuty: 'off' | '0' | '1' | '2' | '3' | 'others';
-  otherDutyStart?: string;
+  otherDutyStart: string;
-  otherDutyEnd?: string;
+  otherDutyEnd: string;
-  offDutyReason?: string;
+  offDutyReason: string;
-  dutyRecoverTime?: string;
+  dutyRecoverTime: string;
   place: string;
 }
 
 class Card extends Component {
   props = {
     isInDuty: false,
-    place: '东三-204',
+    place: pt.get().common.place,
   };
   render(): ReactNode {
     const inDuty = this.props.isInDuty;
@@ -92,13 +92,13 @@ export class DutyInfo extends Component {
             {
               title:
                 data.currentDuty == '0'
-                  ? pt.get().mainPage.normal.reason
+                  ? od.reason(pt.get().common.offDutyReason)
                   : od.reason(data.offDutyReason as string),
             },
             {
               title:
                 data.currentDuty == '0'
-                  ? pt.get().mainPage.normal.recoverTime
+                  ? od.recoverTime(pt.get().common.dutyRecoverTime)
                   : od.recoverTime(data.dutyRecoverTime as string),
             },
           ]}
@@ -122,9 +122,15 @@ export class DutyInfo extends Component {
                     moment(data.otherDutyStart).format('H:mm') +
                     ' - ' +
                     moment(data.otherDutyEnd).format('H:mm')
-                  : id.currentDutyText(data.currentDuty || '0'),
+                  : id.currentDutyText(data.currentDuty || 'off'),
+            },
+            {
+              title: id.inDutyCnt(
+                data.inDutyCnt === 0
+                  ? pt.get().common.zeroMemberOnDuty
+                  : data.inDutyCnt.toString(),
+              ),
             },
-            { title: id.inDutyCnt(data.inDutyCnt as number) },
           ]}
         />
       </View>

src/pages/index/TitleCard.tsx

@@ -1,24 +1,37 @@
 import React from 'react';
 import { View, Image } from '@tarojs/components';
+import { AtButton } from 'taro-ui';
 import pt from '@/plain-text';
 import wechatUser from '@/wechat';
+import Taro from '@tarojs/taro';
 
 const logo = 'https://wiki.zjueva.net/images/evalogo_hd.png';
 
 export default class TitleCard extends React.Component {
+  onAskLeave() {
+    Taro.redirectTo({
+      url: '/pages/AskLeave/AskLeave',
+    });
+  }
   render(): React.ReactNode {
     const mainPage = pt.get().mainPage;
     const memberPage = pt.get().memberPage;
     return (
-      <View className='at-row at-row__align--center'>
+      <View className='at-row at-row__align--center at-row__justify--start'>
         <View className='at-col at-col-1 at-col--auto'>
           <Image
-            style='width: 100rpx; height: 100rpx; margin-left: 30rpx;'
+            style='width: 100rpx; height: 100rpx; margin-left: 30rpx; border-radius: 50rpx'
             src={wechatUser.getAccess() ? wechatUser.getInfo().avatar : logo}
             mode='aspectFit'
           />
         </View>
-        <View className='page-title'>
+        <View
+          className={
+            wechatUser.getAccess()
+              ? 'at-col page-title at-col-1 at-col--auto'
+              : 'at-col page-title at-col-10 at-col--wrap'
+          }
+        >
           <View className='at-article__h1' style={{ fontWeight: 'bold' }}>
             {wechatUser.getAccess()
               ? memberPage.titleLine.main.index + wechatUser.getInfo().name
@@ -30,6 +43,15 @@ export default class TitleCard extends React.Component {
               : mainPage.titleLine.sub}
           </View>
         </View>
+        {wechatUser.getAccess() ? (
+          <View className='at-col at-col-1 at-col--auto'>
+            <AtButton type='secondary' onClick={this.onAskLeave}>
+              {pt.get().mainPage.askLeave}
+            </AtButton>
+          </View>
+        ) : (
+          <View></View>
+        )}
       </View>
     );
   }

src/pages/index/index.tsx

@@ -3,7 +3,6 @@ import { Component, ReactNode } from 'react';
 import Taro from '@tarojs/taro';
 import {
   AtCard,
-  AtAccordion,
   AtInputNumber,
   AtButton,
   AtList,
@@ -23,6 +22,7 @@ import { getMemberDutyInfo } from '@/service/memberDutyInfo';
 import { getUncompletedTicketList } from '@/service/uncompletedTicket';
 import { changeDutyCnt } from '@/service/changeDutyCount';
 import { TicketListItem } from '@/components/TicketListItem/TicketListItem';
+import { ExpandItem } from '@/components/ExpandItem/ExpandItem';
 import './index.scss';
 import TitleCard from './TitleCard';
 import { DutyInfo, DutyData } from './DutyInfo';
@@ -47,39 +47,10 @@ function mainPageCard(c: CardContent): JSX.Element {
   );
 }
 
-class ExpandItem extends Component {
-  state = {
-    open: false,
-  };
-  props = {
-    title: '',
-    content: <View></View>,
-  };
-
-  handleClick(value: boolean) {
-    this.setState({ open: value });
-  }
-
-  render(): ReactNode {
-    return (
-      <View>
-        <AtAccordion
-          open={this.state.open}
-          onClick={this.handleClick.bind(this)}
-          title={this.props.title}
-        >
-          {this.props.content}
-        </AtAccordion>
-      </View>
-    );
-  }
-}
-
 interface MainPageState {
   fixList: Array<TicketListItem>;
   rs: RequestState;
   dutyData: DutyData;
-  inDutyCnt: number;
   dutyInfoCard: CardContent;
   stepInfoCard: CardContent;
   tipsInfoCard: CardContent;
@@ -90,7 +61,6 @@ interface MainPageState {
 export default class MainPage extends Component<{}, MainPageState> {
   state = {
     dutyData: new DutyData(),
-    inDutyCnt: 0,
     dutyInfoCard: {
       title: '',
       note: '',
@@ -119,7 +89,6 @@ export default class MainPage extends Component<{}, MainPageState> {
     const ptPage = wechatUser.getAccess() ? 'memberPage' : 'mainPage';
     this.setState({
       dutyData: new DutyData(),
-      inDutyCnt: 0,
       dutyInfoCard: {
         title: pt.get()[ptPage].cardTitle.dutyInfo,
         note: pt.get()[ptPage].cardTips.dutyInfo,
@@ -158,7 +127,10 @@ export default class MainPage extends Component<{}, MainPageState> {
 
   handleCnt(inDutyCnt: number) {
     this.setState({
-      inDutyCnt: inDutyCnt,
+      dutyData: {
+        ...this.state.dutyData,
+        inDutyCnt: inDutyCnt,
+      },
     });
     return inDutyCnt;
   }
@@ -181,6 +153,12 @@ export default class MainPage extends Component<{}, MainPageState> {
     });
   }
 
+  conclusionPage() {
+    Taro.navigateTo({
+      url: '/pages/Conclusion/Conclusion',
+    });
+  }
+
   render(): ReactNode {
     const mainPage = pt.get().mainPage;
     const memberPage = pt.get().memberPage;
@@ -213,44 +191,51 @@ export default class MainPage extends Component<{}, MainPageState> {
               <ExpandItem
                 title={memberPage.expandTitle.admin}
                 content={
-                  <View
+                  <View style={{ marginBottom: '40rpx' }}>
-                    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',
+                        display: 'flex',
+                        alignItems: 'center',
+                        marginBottom: '40rpx',
                       }}
                     >
-                      <AtInputNumber
+                      <View
-                        type='number'
+                        className='.at-article__h3'
-                        min={0}
+                        style={{
-                        max={10}
+                          marginTop: '40rpx',
-                        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}
+                        {pt.get().memberPage.dutyCount.text}
+                      </View>
+                      <View
+                        style={{
+                          marginTop: '40rpx',
+                        }}
+                      >
+                        <AtInputNumber
+                          type='number'
+                          min={0}
+                          max={10}
+                          step={1}
+                          value={this.state.dutyData.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>
+                      <AtButton type='primary' onClick={this.conclusionPage}>
+                        {pt.get().button.indexText.conclusion}
                       </AtButton>
                     </View>
                   </View>
@@ -270,7 +255,9 @@ export default class MainPage extends Component<{}, MainPageState> {
                 className='at-article__h3'
                 style={{ marginBottom: '20rpx', fontWeight: 'bold' }}
               >
-                {memberPage.ticketList.hint}
+                {(this.state.fixList.length === 0
+                  ? memberPage.ticketList.nohint
+                  : '') + memberPage.ticketList.hint}
               </View>
               <AtList>{fixListRenderer}</AtList>
               <AtList>

src/pages/repair/repair.tsx

@@ -194,29 +194,30 @@ export default class RepairPage extends Component<{}, RepairPageState> {
           {pt.get().repairPage.currentTicket.hint}
         </View>
         {this.state.currentTicketsIdName.map((pair, idx) => (
-          <AtCard
+          <View key={idx} style={{ marginBottom: '20rpx' }}>
-            key={idx}
+            <AtCard
-            title={pair.values().next().value} //pair.keys().next().value == ticket['device'] + ' ' + ticket['deviceModel']
+              title={pair.values().next().value} //pair.keys().next().value == ticket['device'] + ' ' + ticket['deviceModel']
-            extra={pt.get().repairPage.currentTicket.extra}
+              extra={pt.get().repairPage.currentTicket.extra}
-            onClick={() => {
+              onClick={() => {
-              Taro.navigateTo({
+                Taro.navigateTo({
-                url:
+                  url:
-                  '/pages/TicketDetail/TicketDetail?id=' +
+                    '/pages/TicketDetail/TicketDetail?id=' +
-                  pair.keys().next().value,
+                    pair.keys().next().value,
-              });
+                });
-            }}
+              }}
-            note={
+              note={
-              pt.get().tips.tipsText[
+                pt.get().tips.tipsText[
-                randomInt(0, pt.get().tips.tipsText.length - 1)
+                  randomInt(0, pt.get().tips.tipsText.length - 1)
-              ]
+                ]
-            }
+              }
-          >
+            >
-            <DetailFramework
+              <DetailFramework
-              id={pair.keys().next().value} //pair.keys().next().value == id
+                id={pair.keys().next().value} //pair.keys().next().value == id
-              isInfoShow={isInfoShow}
+                isInfoShow={isInfoShow}
-              middleButton={middleButton}
+                middleButton={middleButton}
-            />
+              />
-          </AtCard>
+            </AtCard>
+          </View>
         ))}
       </View>
     ) : (

src/pages/user/report/report.tsx

@@ -64,6 +64,7 @@ export default class ReportPage extends Component {
           <AtMessage />
           <AtTextarea
             value={this.state.report}
+            height={400}
             onChange={this.handleChange.bind(this)}
             maxLength={200}
             placeholder={pt.get().reportPage.placeHolderText}
@@ -74,7 +75,6 @@ export default class ReportPage extends Component {
               style={{
                 marginTop: '30rpx',
                 marginRight: '10rpx',
-                marginLeft: '10rpx',
                 width: '50%',
               }}
             >
@@ -86,7 +86,6 @@ export default class ReportPage extends Component {
               className='at-col'
               style={{
                 marginTop: '30rpx',
-                marginRight: '10rpx',
                 marginLeft: '10rpx',
                 width: '50%',
               }}

src/pages/user/user.tsx

@@ -123,7 +123,7 @@ export default class UserPage extends Component {
           className='at-row at-row__justify--center at-row__align--center'
           style='height:120rpx;color:#696969;'
         >
-          <Text style={{ fontSize: '32rpx' }}> EVA Eta v1.0.2</Text>
+          <Text style={{ fontSize: '32rpx' }}> EVA Eta v1.1.0</Text>
         </View>
         <AtList>
           <AtListItem

src/plain-text/AskLeave.ts

@@ -0,0 +1,60 @@
+export interface AskLeaveText {
+  modal: {
+    title: string;
+    content: string;
+  };
+  shift: {
+    title: string;
+    week: string[];
+    shift: string[];
+  };
+  reason: {
+    title: string;
+    placeHolder: string;
+  };
+  substitute: {
+    title: string;
+    placeHolder: string;
+  };
+}
+
+export const askLeaveZhCn: AskLeaveText = {
+  modal: {
+    title: '确认无代班？',
+    content: '值班人数少于 4 时须填写代班人员。请假记录将会被上传保存！',
+  },
+  shift: {
+    title: '值班时间',
+    week: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
+    shift: ['第一班', '第二班', '第三班'],
+  },
+  reason: {
+    title: '请假原因',
+    placeHolder: '请在此说明请假原因',
+  },
+  substitute: {
+    title: '替班人员',
+    placeHolder: '人数少于 4 时必填！',
+  },
+};
+
+export const askLeaveEnUs: AskLeaveText = {
+  modal: {
+    title: 'Confirm no substitute?',
+    content:
+      'Must have substitute if members are less than 4! The ticket will be uploaded and saved!',
+  },
+  shift: {
+    title: 'Duty time',
+    week: ['Mon.', 'Tue.', 'Wed.', 'Thu.', 'Fri.', 'Sat.', 'Sun.'],
+    shift: ['1st Shift', '2nd Shift', '3rd Shift'],
+  },
+  reason: {
+    title: 'Reason',
+    placeHolder: 'Leave your reason for leaving here',
+  },
+  substitute: {
+    title: 'Substitute',
+    placeHolder: 'Must have if members are less than 4!',
+  },
+};

src/plain-text/Button.ts

@@ -13,6 +13,10 @@ export interface ButtonText {
   memberText: {
     auth: string;
   };
+  indexText: {
+    conclusion: string;
+    askLeave: string;
+  };
   loginText: {
     success: string;
     error: string;
@@ -39,6 +43,10 @@ export const buttonZhCn: ButtonText = {
   memberText: {
     auth: '协会统一身份认证登录',
   },
+  indexText: {
+    conclusion: '提交值班总结',
+    askLeave: '我要请假',
+  },
   loginText: {
     success: '登录成功',
     error: '登录失败',
@@ -65,6 +73,10 @@ export const buttonEnUs: ButtonText = {
   memberText: {
     auth: 'EVA Auth Login Entry',
   },
+  indexText: {
+    conclusion: 'Submit Duty Conclusion',
+    askLeave: 'Ask for Leave',
+  },
   loginText: {
     success: 'Login Success',
     error: 'Login Failed',

src/plain-text/Conclusion.ts

@@ -0,0 +1,16 @@
+export interface ConclusionText {
+  title: string;
+  placeHolder: string;
+}
+
+export const conclusionTextZhCn: ConclusionText = {
+  title: '值班总结',
+  placeHolder:
+    '请在此填写完整的值班情况，包括：几人请假；收到几台电脑；后续的处理情况；上一班交接的电脑情况；下一班对接的电脑情况；另外，请拍照记录值班桌整理情况',
+};
+
+export const conclusionTextEnUs: ConclusionText = {
+  title: 'Duty Conclusion',
+  placeHolder:
+    'Please fill in the complete duty situation here, including: how many people were on leave; how many computers were received; how the follow-up was handled; how the computers were handed over by the previous shift; how the computers were docked by the next shift; Also, please take photos to document the organization of the duty desk',
+};

src/plain-text/MainPage.ts

@@ -1,8 +1,6 @@
 export interface MainPageText {
-  normal: {
+  askLeave: string;
-    recoverTime: string;
+  conclusion: string;
-    reason: string;
-  };
   titleLine: {
     main: string;
     sub: string;
@@ -37,17 +35,15 @@ export interface MainPageText {
     };
     inDuty: {
       title: string;
-      currentDutyText: (c: '0' | '1' | '2' | '3' | 'others') => string;
+      currentDutyText: (c: 'off' | '0' | '1' | '2' | '3' | 'others') => string;
-      inDutyCnt: (n: number) => string;
+      inDutyCnt: (n: string) => string;
     };
   };
 }
 
 export const mainPageZhCn: MainPageText = {
-  normal: {
+  askLeave: '我要请假',
-    recoverTime: '明天 13:30',
+  conclusion: '提交值班总结',
-    reason: '正常下班',
-  },
   titleLine: {
     main: '您好，这里是E志者协会',
     sub: '维修请至【东三-204】实验室',
@@ -93,8 +89,10 @@ export const mainPageZhCn: MainPageText = {
       title: '值班中',
       currentDutyText: (c) => {
         switch (c) {
+          case 'off':
+            return '暂停值班';
           case '0':
-            return '当前未值班';
+            return '休息中';
           case '1':
             return '第一班 13:30-16:00';
           case '2':
@@ -111,10 +109,8 @@ export const mainPageZhCn: MainPageText = {
 };
 
 export const mainPageEnUs: MainPageText = {
-  normal: {
+  askLeave: 'Absence',
-    recoverTime: 'Tomorrow 13:30',
+  conclusion: 'Submit Duty Conclusion',
-    reason: 'Normal shift',
-  },
   titleLine: {
     main: 'Hi! This is EVA.',
     sub: 'For maintenance, please go to [204 Lab, E3 building]',
@@ -160,6 +156,8 @@ export const mainPageEnUs: MainPageText = {
       title: 'On Duty',
       currentDutyText: (c) => {
         switch (c) {
+          case 'off':
+            return 'Duty paused';
           case '0':
             return 'Normal Shift';
           case '1':

src/plain-text/MemberPage.ts

@@ -58,6 +58,7 @@ export interface MemberPageText {
   stepList: Array<{ title: string }>;
   tipsList: Array<{ title: string }>;
   ticketList: {
+    nohint: string;
     hint: string;
     title: string;
     note: string;
@@ -147,6 +148,7 @@ export const memberPageZhCn: MemberPageText = {
     { title: '螺丝上了吗？电源排线插了吗？' },
   ],
   ticketList: {
+    nohint: '暂无',
     hint: '七日内未完成工单',
     title: '预填写工单列表',
     note: '在这里查看所有的预填写工单！',
@@ -241,6 +243,7 @@ export const memberPageEnUs: MemberPageText = {
     { title: 'Are the screws on? Is the power cable plugged in?' },
   ],
   ticketList: {
+    nohint: 'N/A ',
     hint: 'Uncompleted tickets in 7 days',
     title: 'Pre-filling ticket list',
     note: 'Browse for all pre-filling tickets here!',

src/plain-text/NavBarTitle.ts

@@ -1,7 +1,10 @@
 export interface NavBarTitle {
   notFound: string;
+  loading: string;
   ticketDetail: string;
   ticketList: string;
+  askLeave: string;
+  conclusion: string;
   user: {
     myTicket: string;
     report: string;
@@ -14,8 +17,11 @@ export interface NavBarTitle {
 
 export const navBarTitleZhCn: NavBarTitle = {
   notFound: '连接失败',
+  loading: '加载中',
   ticketDetail: '工单详情',
   ticketList: '所有工单',
+  askLeave: '请假单填写',
+  conclusion: '值班总结',
   user: {
     myTicket: '我的工单',
     report: '意见反馈',
@@ -28,8 +34,11 @@ export const navBarTitleZhCn: NavBarTitle = {
 
 export const navBarTitleEnUs: NavBarTitle = {
   notFound: 'Failed',
+  loading: 'Loading',
   ticketDetail: 'Ticket Detail',
   ticketList: 'All Tickets',
+  askLeave: 'Ask for leave',
+  conclusion: 'Duty Conclusion',
   user: {
     myTicket: 'My Tickets',
     report: 'Report',

src/plain-text/TicketDetail.ts

@@ -33,8 +33,12 @@ export interface TicketDetailText {
   comment: {
     title: string;
     placeholder: string;
+    picked: string;
     createTicketMessage: string;
     statusModifyPrefix: string;
+    uploadPic: {
+      title: string;
+    };
   };
   status: {
     title: string;
@@ -76,9 +80,13 @@ export const ticketDetailZhCn: TicketDetailText = {
   },
   comment: {
     title: '添加评论',
+    picked: '认领了维修',
     placeholder: '可以在这里交流机器情况、维修进度、提出问题~',
     createTicketMessage: '创建了维修',
     statusModifyPrefix: '将维修状态改为：',
+    uploadPic: {
+      title: '上传说明图片处',
+    },
   },
   reminder: {
     title: '注意事项！',
@@ -128,10 +136,14 @@ export const ticketDetailEnUs: TicketDetailText = {
   },
   comment: {
     title: 'Add comment',
+    picked: 'Picked this ticket',
     placeholder:
       'You can exchange information the device, the progress of repairs, and ask questions here.',
     createTicketMessage: 'Created ticket',
     statusModifyPrefix: 'Modified repair status to: ',
+    uploadPic: {
+      title: 'Upload description images',
+    },
   },
   reminder: {
     title: 'Reminder',

src/plain-text/common.ts

@@ -1,17 +1,33 @@
-import { Moment } from 'moment';
+import moment, { Moment } from 'moment';
+
+const dutyStart = moment().format('YYYY-MM-DD').toString() + ' 13:30:00';
 
 export interface CommonText {
   createdAtText(time: Moment): string;
+  offDutyReason: string;
+  place: string;
+  dutyRecoverTime: string;
+  zeroMemberOnDuty: string;
 }
 
 export const commonTextZhCn: CommonText = {
   createdAtText(time: Moment): string {
     return '创建于 ' + time.format('YYYY-MM-DD HH:mm');
   },
+  offDutyReason: '正常值班下班',
+  place: '204',
+  dutyRecoverTime: moment().isBefore(dutyStart) ? '今天 13:30' : '明天 13:30',
+  zeroMemberOnDuty: '待更新',
 };
 
 export const commonTextEnUs: CommonText = {
   createdAtText(time: Moment): string {
     return 'Created at ' + time.format('YYYY-MM-DD HH:mm');
   },
+  offDutyReason: 'Normal Shift',
+  place: 'E3-204',
+  dutyRecoverTime: moment().isBefore(dutyStart)
+    ? '13:30 Today'
+    : '13:30 Tomorrow',
+  zeroMemberOnDuty: 'Wait for update',
 };

src/plain-text/index.ts

@@ -25,6 +25,12 @@ import {
   actIndicatorZhCn,
 } from './ActIndicator';
 import { NotFoundText, notFound } from './404';
+import { AskLeaveText, askLeaveEnUs, askLeaveZhCn } from './AskLeave';
+import {
+  ConclusionText,
+  conclusionTextEnUs,
+  conclusionTextZhCn,
+} from './Conclusion';
 
 interface TextRecord {
   common: CommonText;
@@ -46,6 +52,8 @@ interface TextRecord {
   toast: ToastText;
   actIndicator: ActIndicatorText;
   notFound: NotFoundText;
+  askLeave: AskLeaveText;
+  conclusion: ConclusionText;
 }
 
 const textZhCn: TextRecord = {
@@ -68,6 +76,8 @@ const textZhCn: TextRecord = {
   toast: toastZhCn,
   actIndicator: actIndicatorZhCn,
   notFound: notFound,
+  askLeave: askLeaveZhCn,
+  conclusion: conclusionTextZhCn,
 };
 
 const textEnUs: TextRecord = {
@@ -90,6 +100,8 @@ const textEnUs: TextRecord = {
   toast: toastEnUs,
   actIndicator: actIndicatorEnUs,
   notFound: notFound,
+  askLeave: askLeaveEnUs,
+  conclusion: conclusionTextEnUs,
 };
 
 // type Lang = 'zh_CN' | 'en_US' | ...;

src/service/askleave.ts

@@ -0,0 +1,49 @@
+import AskLeavePage from '@/pages/AskLeave/AskLeave';
+import Taro from '@tarojs/taro';
+import pt from '@/plain-text';
+import wechatUser from '@/wechat';
+import { getUrl } from '.';
+
+const reLaunchInterval = 1000;
+
+export function askLeave(that: AskLeavePage) {
+  that.setState({
+    isLoading: true,
+  });
+  Taro.request({
+    url: getUrl('/member/askleave'),
+    method: 'POST',
+    data: {
+      token: wechatUser.getToken(),
+      week: (that.state.shift[0] + 1).toString(),
+      shift: (that.state.shift[1] + 1).toString(),
+      reason: that.state.reason,
+      substitute: that.state.substitute,
+    },
+  })
+    .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/changeDutyCount.ts

@@ -11,11 +11,11 @@ export function changeDutyCnt(that: MainPage) {
     isLoading: true,
   });
   Taro.request({
-    url: getUrl('/tickets/addtooreo'),
+    url: getUrl('/member/dutycnt'),
     method: 'POST',
     data: {
       token: wechatUser.getToken(),
-      dutyCnt: that.state.inDutyCnt,
+      dutyCnt: that.state.dutyData.inDutyCnt,
     },
   })
     .then((res) => {

src/service/changeStatus.ts

@@ -6,7 +6,7 @@ import { getUrl } from '.';
 
 const reLaunchInterval = 1000;
 
-export function changeStatus(that: TicketDetail) {
+export function changeStatus(that: TicketDetail, status: number) {
   that.setState({
     isLoading: {
       ...that.state.isLoading,
@@ -19,7 +19,7 @@ export function changeStatus(that: TicketDetail) {
     data: {
       token: wechatUser.getToken(),
       id: that.state.id,
-      status: that.state.statusToBe,
+      status: status,
     },
   })
     .then((res) => {

src/service/conclude.ts

@@ -0,0 +1,42 @@
+import ConclusionPage from '@/pages/Conclusion/Conclusion';
+import Taro from '@tarojs/taro';
+import pt from '@/plain-text';
+import wechatUser from '@/wechat';
+import { getUrl } from '.';
+
+export function conclude(that: ConclusionPage) {
+  that.setState({
+    isLoading: true,
+  });
+  Taro.request({
+    url: getUrl('/member/conclusion'),
+    method: 'POST',
+    data: {
+      token: wechatUser.getToken(),
+      conclusion: that.state.conclusion,
+      week: (that.state.shift[0] + 1).toString(),
+      shift: (that.state.shift[1] + 1).toString(),
+    },
+  })
+    .then((res) => {
+      console.log(res.data);
+      that.setState({
+        isLoading: false,
+        conclusionId: res.data.data.id,
+      });
+      Taro.atMessage({
+        message: pt.get().button.submitText.success,
+        type: 'success',
+      });
+    })
+    .catch((err) => {
+      console.log(err.errMsg);
+      that.setState({
+        isLoading: false,
+      });
+      Taro.atMessage({
+        message: pt.get().button.submitText.error + err.errMsg,
+        type: 'error',
+      });
+    });
+}

src/service/dutyInfo.ts

@@ -1,6 +1,7 @@
 import MainPage from '@/pages/index';
 import Taro from '@tarojs/taro';
 import wechatUser from '@/wechat';
+import pt from '@/plain-text';
 import { getUrl } from '.';
 
 export function getDutyInfo(that: MainPage) {
@@ -24,6 +25,31 @@ export function getDutyInfo(that: MainPage) {
         rs: former.trans(true),
         dutyData: data,
       });
+      if (!data.isInDuty) {
+        that.setState({
+          dutyData: {
+            ...data,
+            offDutyReason: pt.get().common.offDutyReason,
+          },
+        });
+        if (data.currentDuty === '0') {
+          that.setState({
+            dutyData: {
+              ...data,
+              place: pt.get().common.place,
+              offDutyReason: pt.get().common.offDutyReason,
+              dutyRecoverTime: pt.get().common.dutyRecoverTime,
+            },
+          });
+        }
+      } else {
+        that.setState({
+          dutyData: {
+            ...data,
+            place: pt.get().common.place,
+          },
+        });
+      }
     })
     .catch((err) => {
       console.log(err.errMsg);
@@ -32,6 +58,10 @@ export function getDutyInfo(that: MainPage) {
         rs: former.trans(false),
         dutyData: {
           isInDuty: false,
+          inDutyCnt: 0,
+          currentDuty: '0',
+          otherDutyStart: '',
+          otherDutyEnd: '',
           offDutyReason: '获取失败！Network Error!',
           dutyRecoverTime: '获取失败！Network Error!',
           place: '204',

src/service/getDisable.ts

@@ -9,6 +9,7 @@ export function getDisable(that: TicketDetail, id: number) {
     method: 'GET',
     data: {
       id: id,
+      token: wechatUser.getToken(),
     },
   })
     .then((res) => {

src/service/getInfo.ts

@@ -6,7 +6,7 @@ import { getLocaleData } from './localeData';
 
 export function getInfo() {
   Taro.request({
-    url: getUrl('/member/login'),
+    url: getUrl('/member/checklogin'),
     method: 'POST',
     data: {
       token: wechatUser.getToken(),

src/service/login.ts

@@ -21,6 +21,9 @@ export function loginAte() {
               data: data.token,
             });
             wechatUser.setToken(data.token);
+            Taro.reLaunch({
+              url: '/pages/index/index',
+            });
             getLocaleData();
           })
           .catch((err) => {

src/service/memberDutyInfo.ts

@@ -1,6 +1,7 @@
 import MainPage from '@/pages/index';
 import Taro from '@tarojs/taro';
 import wechatUser from '@/wechat';
+import pt from '@/plain-text';
 import { getUrl } from '.';
 
 export function getMemberDutyInfo(that: MainPage) {
@@ -13,25 +14,24 @@ export function getMemberDutyInfo(that: MainPage) {
   })
     .then((res) => {
       const data = res.data.data;
-      if (data.isInDuty) {
+      that.setState({
+        dutyData: data,
+      });
+      if (!data.isInDuty) {
         that.setState({
           dutyData: {
-            isInDuty: data.isInDuty,
+            ...data,
-            inDutyCnt: data.inDutyCnt,
+            offDutyReason: pt.get().common.offDutyReason,
-            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,
           },
         });
+        if (data.currentDuty === '0') {
+          that.setState({
+            dutyData: {
+              ...data,
+              place: pt.get().common.place,
+            },
+          });
+        }
       }
     })
     .catch((err) => {
@@ -39,6 +39,10 @@ export function getMemberDutyInfo(that: MainPage) {
       that.setState({
         dutyData: {
           isInDuty: false,
+          inDutyCnt: 0,
+          currentDuty: '0',
+          otherDutyStart: '',
+          otherDutyEnd: '',
           offDutyReason: '获取失败！Network Error!',
           dutyRecoverTime: '获取失败！Network Error!',
           place: '204',

src/service/picUpload.ts

@@ -0,0 +1,35 @@
+import PicUploader from '@/components/PicUploader/PicUploader';
+import Taro from '@tarojs/taro';
+import pt from '@/plain-text';
+import wechatUser from '@/wechat';
+import { randomString } from '@/utils/random';
+import { getUrl } from '.';
+
+const randomLength = 8;
+
+export function picUpload(that: PicUploader, file: string) {
+  Taro.uploadFile({
+    url: getUrl('/upload/pic'),
+    filePath: file,
+    name: randomString(randomLength),
+    formData: {
+      token: wechatUser.getToken(),
+      source: that.props.source,
+      id: that.props.id,
+    },
+  })
+    .then((res) => {
+      console.log(res.data);
+      Taro.atMessage({
+        message: pt.get().button.submitText.success,
+        type: 'success',
+      });
+    })
+    .catch((err) => {
+      console.log(err.errMsg);
+      Taro.atMessage({
+        message: pt.get().button.submitText.error + err.errMsg,
+        type: 'error',
+      });
+    });
+}

src/service/submitComment.ts

@@ -1,51 +1,37 @@
-import TicketDetail from '@/pages/TicketDetail/TicketDetail';
+import { Comment } from '@/pages/TicketDetail/Comment';
 import Taro from '@tarojs/taro';
 import pt from '@/plain-text';
 import wechatUser from '@/wechat';
 import { getUrl } from '.';
 
-const reLaunchInterval = 1000;
+export function submitComment(that: Comment) {
-
-export function submitComment(that: TicketDetail) {
   that.setState({
-    isLoading: {
+    isLoading: true,
-      ...that.state.isLoading,
-      comment: true,
-    },
   });
   Taro.request({
-    url: getUrl('/report'),
+    url: getUrl('/tickets/addnote'),
     method: 'POST',
     data: {
       token: wechatUser.getToken(),
-      comment: that.state.comment,
+      content: that.state.comment,
+      id: that.props.id,
     },
   })
     .then((res) => {
       console.log(res.data);
       that.setState({
-        isLoading: {
+        isLoading: false,
-          ...that.state.isLoading,
+        commentId: res.data.data.id,
-          comment: 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: {
+        isLoading: false,
-          ...that.state.isLoading,
-          comment: false,
-        },
       });
       Taro.atMessage({
         message: pt.get().button.submitText.error + err.errMsg,

src/service/ticketList.ts

@@ -14,7 +14,7 @@ export function getTicketList(that: TicketListPage) {
       token: wechatUser.getToken(),
       pageId: that.state.currentPage,
       count: that.state.pageSize,
-      querytype: 0,
+      queryType: 0,
     },
   })
     .then((res) => {
@@ -28,7 +28,7 @@ export function getTicketList(that: TicketListPage) {
       }
       that.setState({
         rs: former.trans(true),
-        fixList: data.data.map(
+        fixList: data.list.map(
           (item: {
             id: number;
             device: string;
@@ -67,7 +67,7 @@ export function searchTicketList(that: TicketListPage) {
       pageId: that.state.currentPage,
       count: that.state.pageSize,
       value: that.state.search,
-      querytype: 0,
+      queryType: 0,
     },
   })
     .then((res) => {

src/service/ticketsInfo.ts

@@ -4,6 +4,7 @@ import Taro from '@tarojs/taro';
 import moment from 'moment';
 import { FixStatus } from '@/common';
 import pt from '@/plain-text';
+import wechatUser from '@/wechat';
 import { getUrl } from '.';
 
 const mapStatusStep: Map<FixStatus, 0 | 1 | 2 | 3> = new Map([
@@ -23,6 +24,7 @@ export function getTicketInfo(that: DetailFramework, id: number) {
     method: 'GET',
     data: {
       id: id,
+      token: wechatUser.getToken(),
     },
   })
     .then((res) => {
@@ -56,6 +58,7 @@ export function getTicketInfo(that: DetailFramework, id: number) {
             type: 0 | 1 | 2;
             content: string;
             createdTime: string;
+            pic: string[];
           }) => {
             notes.push({
               avatar: item.avatar,
@@ -64,6 +67,7 @@ export function getTicketInfo(that: DetailFramework, id: number) {
               type: item.type,
               content: item.content,
               createdTime: moment(item.createdTime as string),
+              pic: item.pic,
             });
           },
         );

src/utils/random.ts

@@ -1,3 +1,14 @@
 export const randomInt = (floor: number, ceiling: number) => {
   return Math.floor(Math.random() * (ceiling - floor + 1) + floor);
 };
+
+export const randomString = (length: number) => {
+  const chars =
+    '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+  const maxPos = chars.length;
+  let randomStr = '';
+  for (let i = 0; i < length; i++) {
+    randomStr += chars.charAt(Math.floor(Math.random() * maxPos));
+  }
+  return randomStr;
+};