diff --git a/mock/api.ts b/mock/api.ts index ed775d8..89ff08b 100644 --- a/mock/api.ts +++ b/mock/api.ts @@ -103,6 +103,7 @@ export default { isInDuty: true, inDutyCnt: 6, currentDuty: '3', + place: '204', }, }, 'POST /login': { diff --git a/src/app.config.ts b/src/app.config.ts index 6e6846e..472a856 100644 --- a/src/app.config.ts +++ b/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', @@ -28,10 +27,6 @@ export default defineAppConfig({ pagePath: 'pages/repair/repair', text: '维修', }, - { - pagePath: 'pages/member/member', - text: '管理', - }, { pagePath: 'pages/user/user', text: '我的', diff --git a/src/custom-tab-bar/index.tsx b/src/custom-tab-bar/index.tsx index 1ef7be9..8e96fbb 100644 --- a/src/custom-tab-bar/index.tsx +++ b/src/custom-tab-bar/index.tsx @@ -7,35 +7,20 @@ import 'taro-ui/dist/style/index.scss'; import './index.scss'; const navList: () => Array = () => { - return wechatUser.getAccess() - ? [ - { - pagePath: '/pages/member/member', - text: pt.get().tabBar.memberText, - }, - { - pagePath: '/pages/repair/repair', - text: pt.get().tabBar.repairText, - }, - { - pagePath: '/pages/user/user', - text: pt.get().tabBar.userText, - }, - ] - : [ - { - pagePath: '/pages/index/index', - text: pt.get().tabBar.indexText, - }, - { - pagePath: '/pages/repair/repair', - text: pt.get().tabBar.repairText, - }, - { - pagePath: '/pages/user/user', - text: pt.get().tabBar.userText, - }, - ]; + return [ + { + pagePath: '/pages/index/index', + text: pt.get().tabBar.indexText, + }, + { + pagePath: '/pages/repair/repair', + text: pt.get().tabBar.repairText, + }, + { + pagePath: '/pages/user/user', + text: pt.get().tabBar.userText, + }, + ]; }; const tabList = () => { diff --git a/src/pages/index/DutyInfo.tsx b/src/pages/index/DutyInfo.tsx index c44a2f6..2b06a02 100644 --- a/src/pages/index/DutyInfo.tsx +++ b/src/pages/index/DutyInfo.tsx @@ -4,6 +4,8 @@ import { AtTimeline } from 'taro-ui'; import pt from '@/plain-text'; import tick from '@/assets/icons/MainPage/tick.svg'; import cross from '@/assets/icons/MainPage/cross.svg'; +import clock from '@/assets/icons/MemberPage/clock.svg'; +import wechatUser from '@/wechat'; export class DutyData { constructor() { @@ -17,7 +19,7 @@ export class DutyData { isInDuty: boolean; inDutyCnt?: number; - currentDuty?: 'off' | '1' | '2' | '3'; + currentDuty?: 'off' | '1' | '2' | '3' | 'others'; offDutyReason?: string; dutyRecoverTime?: string; place: string; @@ -33,7 +35,7 @@ class Card extends Component { 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 ( - + ); } @@ -17,7 +24,13 @@ export class TipsInfo extends Component { render(): ReactNode { return ( - + ); } diff --git a/src/pages/index/TitleCard.tsx b/src/pages/index/TitleCard.tsx index d4082d8..cede77f 100644 --- a/src/pages/index/TitleCard.tsx +++ b/src/pages/index/TitleCard.tsx @@ -2,24 +2,32 @@ import React from 'react'; import { View, Image } from '@tarojs/components'; import pt from '@/plain-text'; import logo from '@/assets/images/UserPage/logo.png'; +import wechatUser from '@/wechat'; export default class TitleCard extends React.Component { render(): React.ReactNode { const mainPage = pt.get().mainPage; + const memberPage = pt.get().memberPage; return ( - {mainPage.mainTitleLine} + {wechatUser.getAccess() + ? memberPage.mainTitleLine + wechatUser.getInfo().name + : mainPage.mainTitleLine} + + + {wechatUser.getAccess() + ? memberPage.subTitleLine + : mainPage.subTitleLine} - {mainPage.subTitleLine} ); diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index 770fa24..361f25b 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -1,16 +1,25 @@ 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 } from 'taro-ui'; import type CustomTabBar from '@/custom-tab-bar'; import PageFooter from '@/components/PageFooter/PageFooter'; import pt from '@/plain-text'; 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; @@ -57,39 +66,77 @@ class ExpandItem extends Component { } interface MainPageState { + fixList: Array; + rs: RequestState; dutyData: DutyData; + inDutyCnt: number; dutyInfoCard: CardContent; stepInfoCard: CardContent; tipsInfoCard: CardContent; - //rs: RequestState; + isLoading: boolean; + isDisable: boolean; } export default class MainPage extends Component<{}, MainPageState> { state = { dutyData: new DutyData(), + inDutyCnt: 0, dutyInfoCard: { - title: pt.get().mainPage.cardTitle.dutyInfo, - note: pt.get().mainPage.cardTips.dutyInfo, - extra: pt.get().mainPage.extraInfo.dutyInfo, - content: () => , + title: '', + note: '', + extra: '', + content: () => <>, }, stepInfoCard: { - title: pt.get().mainPage.cardTitle.stepInfo, - note: pt.get().mainPage.cardTips.stepInfo, - extra: pt.get().mainPage.extraInfo.dutyInfo, - content: () => , + title: '', + note: '', + extra: '', + content: () => <>, }, tipsInfoCard: { - title: pt.get().mainPage.cardTitle.tipsInfo, - note: pt.get().mainPage.cardTips.tipsInfo, - extra: pt.get().mainPage.extraInfo.dutyInfo, - content: () => , + title: '', + note: '', + extra: '', + content: () => <>, }, - // rs: new RequestState(), + fixList: [new TicketListItem(0, '', '', 1, moment())], + rs: new RequestState(), + isLoading: false, + isDisable: false, }; componentDidMount(): void { - getDutyInfo(this); + const ptPage = wechatUser.getAccess() ? 'mainPage' : 'memberPage'; + + this.setState({ + dutyData: new DutyData(), + inDutyCnt: 0, + dutyInfoCard: { + title: pt.get()[ptPage].cardTitle.dutyInfo, + note: pt.get()[ptPage].cardTips.dutyInfo, + extra: pt.get()[ptPage].extraInfo.dutyInfo, + content: () => , + }, + stepInfoCard: { + title: pt.get()[ptPage].cardTitle.stepInfo, + note: pt.get()[ptPage].cardTips.stepInfo, + extra: pt.get()[ptPage].extraInfo.dutyInfo, + content: () => , + }, + tipsInfoCard: { + title: pt.get()[ptPage].cardTitle.tipsInfo, + note: pt.get()[ptPage].cardTips.tipsInfo, + extra: pt.get()[ptPage].extraInfo.dutyInfo, + content: () => , + }, + }); + + if (wechatUser.getAccess()) { + getMemberDutyInfo(this); + getUncompletedTicketList(this); + } else { + getDutyInfo(this); + } } // 以下是TabBar相关 @@ -100,8 +147,35 @@ export default class MainPage extends Component<{}, MainPageState> { } // 以上是TabBar相关 + handleCnt(inDutyCnt: number) { + this.setState({ + inDutyCnt: inDutyCnt, + }); + return inDutyCnt; + } + + onChangeCnt() { + this.setState({ + isDisable: true, + }); + changeDutyCnt(this); + setTimeout(() => { + this.setState({ + isDisable: false, + }); + }, submitInterval); + } + render(): ReactNode { const mainPage = pt.get().mainPage; + const memberPage = pt.get().memberPage; + if (this.state.rs.loading) { + return loading; + } + if (!this.state.rs.success) { + return Failed; + } + const fixListRenderer = this.state.fixList.map((item) => item.render()); return ( @@ -109,11 +183,66 @@ export default class MainPage extends Component<{}, MainPageState> { {mainPageCard(this.state.dutyInfoCard)} {mainPageCard(this.state.tipsInfoCard)} + {wechatUser.getAccess() && this.state.dutyData.isInDuty ? ( + + + {pt.get().memberPage.dutyCount.text} + + + + + + + {pt.get().memberPage.dutyCount.button} + + + + } + /> + ) : ( + + )} + {wechatUser.getAccess() ? ( + {fixListRenderer} + ) : ( + + )} diff --git a/src/pages/member/MemberDutyInfo.tsx b/src/pages/member/MemberDutyInfo.tsx deleted file mode 100644 index 14b6a44..0000000 --- a/src/pages/member/MemberDutyInfo.tsx +++ /dev/null @@ -1,120 +0,0 @@ -import { Component, ReactNode } from 'react'; -import { View, Image } from '@tarojs/components'; -import { AtTimeline } from 'taro-ui'; -import pt from '@/plain-text'; -import tick from '@/assets/icons/MainPage/tick.svg'; -import clock from '@/assets/icons/MemberPage/clock.svg'; - -export class MemberDutyData { - constructor() { - this.isInDuty = false; - this.currentDuty = '2'; - this.inDutyCnt = 3; - this.offDutyReason = '学园维修'; - this.dutyRecoverTime = '下周一'; - } - - isInDuty: boolean; - currentDuty?: 'off' | '1' | '2' | '3' | 'others'; - offDutyReason?: string; - dutyRecoverTime?: string; - inDutyCnt?: number; -} - -class Card extends Component { - props = { - isInDuty: false, - }; - render(): ReactNode { - const inDuty = this.props.isInDuty; - const dc = pt.get().memberPage.dutyCard; - const title = inDuty ? dc.inDuty.title : dc.offDuty.title; - const iconsrc = inDuty ? tick : clock; - return ( - - - - - {title} - - - - ); - } -} - -export class MemberDutyInfo extends Component { - state: { - isLoading: false; - isDisable: false; - }; - - props = { - data: new MemberDutyData(), - }; - - offDutyContent(): ReactNode { - const data = this.props.data; - const od = pt.get().memberPage.dutyCard.offDuty; - return ( - - - - - ); - } - - inDutyContent(): ReactNode { - const data = this.props.data; - const id = pt.get().memberPage.dutyCard.inDuty; - return ( - - - - - - - ); - } - - render(): ReactNode { - if (this.props.data.isInDuty) { - return this.inDutyContent(); - } else { - return this.offDutyContent(); - } - } -} diff --git a/src/pages/member/MemberStepTipsInfo.tsx b/src/pages/member/MemberStepTipsInfo.tsx deleted file mode 100644 index 1f5a967..0000000 --- a/src/pages/member/MemberStepTipsInfo.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import { Component, ReactNode } from 'react'; -import { View } from '@tarojs/components'; -import { AtTimeline } from 'taro-ui'; -import pt from '@/plain-text'; - -export class MemberStepInfo extends Component { - render(): ReactNode { - return ( - - - - ); - } -} - -export class MemberTipsInfo extends Component { - render(): ReactNode { - return ( - - - - ); - } -} diff --git a/src/pages/member/MemberTitleCard.tsx b/src/pages/member/MemberTitleCard.tsx deleted file mode 100644 index 78d96e6..0000000 --- a/src/pages/member/MemberTitleCard.tsx +++ /dev/null @@ -1,27 +0,0 @@ -import React from 'react'; -import { View, Image } from '@tarojs/components'; -import pt from '@/plain-text'; -import wechatUser from '@/wechat'; - -export default class MemberTitleCard extends React.Component { - render(): React.ReactNode { - const memberPage = pt.get().memberPage; - return ( - - - - - - - {memberPage.mainTitleLine + wechatUser.getInfo().name} - - {memberPage.subTitleLine} - - - ); - } -} diff --git a/src/pages/member/member.config.ts b/src/pages/member/member.config.ts deleted file mode 100644 index a9ca517..0000000 --- a/src/pages/member/member.config.ts +++ /dev/null @@ -1,3 +0,0 @@ -export default definePageConfig({ - usingComponents: {}, -}); diff --git a/src/pages/member/member.scss b/src/pages/member/member.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/pages/member/member.tsx b/src/pages/member/member.tsx deleted file mode 100644 index b009318..0000000 --- a/src/pages/member/member.tsx +++ /dev/null @@ -1,226 +0,0 @@ -import { View } from '@tarojs/components'; -import { Component, ReactNode } from 'react'; -import { - AtAccordion, - AtButton, - AtCard, - AtInputNumber, - AtList, - AtMessage, -} from 'taro-ui'; -import Taro from '@tarojs/taro'; -import pt from '@/plain-text'; -import { getUncompletedTicketList } from '@/service/uncompletedTicket'; -import type CustomTabBar from '@/custom-tab-bar'; -import { TicketListItem } from '@/components/TicketListItem/TicketListItem'; -import { RequestState } from '@/service'; -import moment from 'moment'; -import { getMemberDutyInfo } from '@/service/memberDutyInfo'; -import PageFooter from '@/components/PageFooter/PageFooter'; -import { changeDutyCnt } from '@/service/changeDutyCount'; -import './member.scss'; -import { MemberDutyData, MemberDutyInfo } from './MemberDutyInfo'; -import { MemberStepInfo, MemberTipsInfo } from './MemberStepTipsInfo'; -import MemberTitleCard from './MemberTitleCard'; - -const submitInterval = 5000; - -class CardContent { - title: string; - note: string; - extra: JSX.Element | string; - content: () => JSX.Element; -} - -function memberPageCard(c: CardContent): JSX.Element { - return ( - - - {c.content()} - - - ); -} - -class ExpandItem extends Component { - state = { - open: false, - }; - props = { - title: '', - content: , - }; - - handleClick(value: boolean) { - this.setState({ open: value }); - } - - render(): ReactNode { - return ( - - - {this.props.content} - - - ); - } -} - -interface MemberPageState { - fixList: Array; - rs: RequestState; - dutyData: MemberDutyData; - inDutyCnt: number; - dutyInfoCard: CardContent; - stepInfoCard: CardContent; - tipsInfoCard: CardContent; - isLoading: boolean; - isDisable: boolean; -} - -export default class MemberPage extends Component<{}, MemberPageState> { - state = { - dutyData: new MemberDutyData(), - inDutyCnt: 0, - dutyInfoCard: { - title: pt.get().mainPage.cardTitle.dutyInfo, - note: pt.get().mainPage.cardTips.dutyInfo, - extra: pt.get().mainPage.extraInfo.dutyInfo, - content: () => , - }, - stepInfoCard: { - title: pt.get().mainPage.cardTitle.stepInfo, - note: pt.get().mainPage.cardTips.stepInfo, - extra: pt.get().mainPage.extraInfo.dutyInfo, - content: () => , - }, - tipsInfoCard: { - title: pt.get().mainPage.cardTitle.tipsInfo, - note: pt.get().mainPage.cardTips.tipsInfo, - extra: pt.get().mainPage.extraInfo.dutyInfo, - content: () => , - }, - fixList: [new TicketListItem(0, '', '', 1, moment())], - rs: new RequestState(), - isLoading: false, - isDisable: false, - }; - - componentDidMount(): void { - getMemberDutyInfo(this); - Taro.setNavigationBarTitle({ - title: pt.get().navBar.user.member, - }); - getUncompletedTicketList(this); - } - - // 以下是TabBar相关 - pageCtx = Taro.getCurrentInstance().page; - componentDidShow() { - const tabbar = Taro.getTabBar(this.pageCtx); - tabbar?.setSelected(0); - } - // 以上是TabBar相关 - - handleCnt(inDutyCnt: number) { - this.setState({ - inDutyCnt: inDutyCnt, - }); - return inDutyCnt; - } - - onChangeCnt() { - this.setState({ - isDisable: true, - }); - changeDutyCnt(this); - setTimeout(() => { - this.setState({ - isDisable: false, - }); - }, submitInterval); - } - - render(): ReactNode { - const memberPage = pt.get().memberPage; - if (this.state.rs.loading) { - return loading; - } - if (!this.state.rs.success) { - return Failed; - } - const fixListRenderer = this.state.fixList.map((item) => item.render()); - return ( - - - - - - {memberPageCard(this.state.dutyInfoCard)} - {memberPageCard(this.state.tipsInfoCard)} - {this.state.dutyData.isInDuty ? ( - - - {pt.get().memberPage.dutyCount.text} - - - - - - - {pt.get().memberPage.dutyCount.button} - - - - } - /> - ) : ( - - )} - - - {fixListRenderer} - - - - ); - } -} diff --git a/src/plain-text/MainPage.ts b/src/plain-text/MainPage.ts index 7bf4955..085a82d 100644 --- a/src/plain-text/MainPage.ts +++ b/src/plain-text/MainPage.ts @@ -31,7 +31,7 @@ export interface MainPageText { }; inDuty: { title: string; - currentDutyText: (c: 'off' | '1' | '2' | '3') => string; + currentDutyText: (c: 'off' | '1' | '2' | '3' | 'others') => string; inDutyCnt: (n: number) => string; }; }; @@ -89,6 +89,8 @@ export const mainPageZhCn: MainPageText = { return '第二班 16:00-18:00'; case '3': return '第三班 18:00-20:30'; + case 'others': + return '其他值班时间，见通知'; } }, inDutyCnt: (n) => '当前值班人数：' + n, @@ -148,6 +150,8 @@ export const mainPageEnUs: MainPageText = { return '2nd Shift 16:00-18:00'; case '3': return '3rd Shift 18:00-20:30'; + case 'others': + return 'Other duty time, see notice'; } }, inDutyCnt: (n) => 'EVA members on duty: ' + n, diff --git a/src/plain-text/MemberPage.ts b/src/plain-text/MemberPage.ts index 0e63d53..4ef45c3 100644 --- a/src/plain-text/MemberPage.ts +++ b/src/plain-text/MemberPage.ts @@ -1,6 +1,11 @@ export interface MemberPageText { mainTitleLine: string; subTitleLine: string; + cardTitle: { + dutyInfo: string; + stepInfo: string; + tipsInfo: string; + }; dutyCount: { button: string; text: string; @@ -33,6 +38,16 @@ export interface MemberPageText { 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 }>; } @@ -40,6 +55,11 @@ export interface MemberPageText { export const memberPageZhCn: MemberPageText = { mainTitleLine: '您好，', subTitleLine: '祝你满绩每一天', + cardTitle: { + dutyInfo: '值班情况', + stepInfo: '维修步骤', + tipsInfo: '注意事项', + }, dutyCount: { button: '更新值班人数', text: '当前值班人数：', @@ -85,6 +105,16 @@ export const memberPageZhCn: MemberPageText = { tipsInfo: '查看注意事项', admin: '组长管理入口', }, + cardTips: { + dutyInfo: '提示：可以先前往【维修】页面在线上预填写工单！', + stepInfo: '提示：请在 20:30 之前取走自己的物品哦！', + tipsInfo: '', + }, + extraInfo: { + dutyInfo: '', + stepInfo: '', + tipsInfo: '', + }, stepList: [ { title: '机主线上填写工单，审核接取维修后加入 Oreo' }, { title: '进行维修工作，认领工单，通过小程序与机主交流' }, @@ -102,6 +132,11 @@ export const memberPageZhCn: MemberPageText = { export const memberPageEnUs: MemberPageText = { mainTitleLine: 'Hi! ', subTitleLine: 'Have a great day!', + cardTitle: { + dutyInfo: 'Duty Situation', + stepInfo: 'Maintenance Steps', + tipsInfo: 'Tips', + }, dutyCount: { button: 'Update Duty Count', text: 'The duty count: ', @@ -147,6 +182,16 @@ export const memberPageEnUs: MemberPageText = { tipsInfo: 'Check for tips', admin: 'Entry for admin', }, + cardTips: { + dutyInfo: '提示：可以先前往【维修】页面在线上预填写工单！', + stepInfo: '提示：请在 20:30 之前取走自己的物品哦！', + 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' }, diff --git a/src/service/changeDutyCount.ts b/src/service/changeDutyCount.ts index ba79185..89aa0b0 100644 --- a/src/service/changeDutyCount.ts +++ b/src/service/changeDutyCount.ts @@ -1,4 +1,4 @@ -import MemberPage from '@/pages/member/member'; +import MainPage from '@/pages/index'; import Taro from '@tarojs/taro'; import pt from '@/plain-text'; import wechatUser from '@/wechat'; @@ -6,7 +6,7 @@ import { getUrl } from '.'; const reLaunchInterval = 1000; -export function changeDutyCnt(that: MemberPage) { +export function changeDutyCnt(that: MainPage) { that.setState({ isLoading: true, }); @@ -29,7 +29,7 @@ export function changeDutyCnt(that: MemberPage) { }); setTimeout(() => { Taro.reLaunch({ - url: '/pages/member/member', + url: '/pages/index/index', }); }, reLaunchInterval); }) diff --git a/src/service/dutyInfo.ts b/src/service/dutyInfo.ts index 9e54925..0bb1577 100644 --- a/src/service/dutyInfo.ts +++ b/src/service/dutyInfo.ts @@ -12,9 +12,17 @@ export function getDutyInfo(that: MainPage) { }, }) .then((res) => { + let former = that.state.rs; + if (!res.data.success) { + that.setState({ + rs: former.trans(false), + }); + return; + } const data = res.data.data; if (data.isInDuty) { that.setState({ + rs: former.trans(true), dutyData: { isInDuty: data.isInDuty, inDutyCnt: data.inDutyCnt, @@ -24,6 +32,7 @@ export function getDutyInfo(that: MainPage) { }); } else { that.setState({ + rs: former.trans(true), dutyData: { isInDuty: data.isInDuty, offDutyReason: data.offDutyReason, @@ -35,7 +44,9 @@ export function getDutyInfo(that: MainPage) { }) .catch((err) => { console.log(err); + let former = that.state.rs; that.setState({ + rs: former.trans(false), dutyData: { isInDuty: false, offDutyReason: '获取失败！Network Error!', diff --git a/src/service/localeData.ts b/src/service/localeData.ts index 510f299..6ad90b7 100644 --- a/src/service/localeData.ts +++ b/src/service/localeData.ts @@ -27,9 +27,7 @@ export function getLocaleData() { console.log(res.data); pt.setLang(res.data.data.lang); Taro.reLaunch({ - url: wechatUser.getAccess() - ? '/pages/member/member' - : '/pages/index/index', + url: '/pages/index/index', }); }); } diff --git a/src/service/login.ts b/src/service/login.ts index 976224e..bde649a 100644 --- a/src/service/login.ts +++ b/src/service/login.ts @@ -26,6 +26,7 @@ export function loginAte() { .catch((err) => { console.log(err); }); + getLocaleData(); } else { console.log('Login Failed: ' + res.errMsg); } diff --git a/src/service/memberDutyInfo.ts b/src/service/memberDutyInfo.ts index d283fd9..4afaeaa 100644 --- a/src/service/memberDutyInfo.ts +++ b/src/service/memberDutyInfo.ts @@ -1,9 +1,9 @@ -import MemberPage from '@/pages/member/member'; +import MainPage from '@/pages/index'; import Taro from '@tarojs/taro'; import wechatUser from '@/wechat'; import { getUrl } from '.'; -export function getMemberDutyInfo(that: MemberPage) { +export function getMemberDutyInfo(that: MainPage) { Taro.request({ url: getUrl('/member/duty/info'), method: 'GET', @@ -19,6 +19,7 @@ export function getMemberDutyInfo(that: MemberPage) { isInDuty: data.isInDuty, inDutyCnt: data.inDutyCnt, currentDuty: data.currentDuty, + place: data.place, }, inDutyCnt: data.inDutyCnt, }); @@ -28,6 +29,7 @@ export function getMemberDutyInfo(that: MemberPage) { isInDuty: data.isInDuty, offDutyReason: data.offDutyReason, dutyRecoverTime: data.dutyRecoverTime, + place: data.place, }, }); } @@ -39,6 +41,7 @@ export function getMemberDutyInfo(that: MemberPage) { isInDuty: false, offDutyReason: '获取失败！Network Error!', dutyRecoverTime: '获取失败！Network Error!', + place: '204', }, }); }); diff --git a/src/service/uncompletedTicket.ts b/src/service/uncompletedTicket.ts index 44baf83..6ff18b2 100644 --- a/src/service/uncompletedTicket.ts +++ b/src/service/uncompletedTicket.ts @@ -1,11 +1,11 @@ -import MemberPage from '@/pages/member/member'; +import MainPage from '@/pages/index'; import Taro from '@tarojs/taro'; import { TicketListItem } from '@/components/TicketListItem/TicketListItem'; import moment from 'moment'; import wechatUser from '@/wechat'; import { getUrl } from '.'; -export function getUncompletedTicketList(that: MemberPage) { +export function getUncompletedTicketList(that: MainPage) { Taro.request({ url: getUrl('/tickets/uncompleted'), method: 'GET',