Merge branch 'yhy' into dev

project.private.config.json

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

src/app.config.ts

@@ -2,12 +2,14 @@ export default defineAppConfig({
   pages: [
     'pages/index/index',
     'pages/repair/repair',
+    'pages/member/member',
     'pages/user/user',
     'pages/user/myTicket/myTicket',
     'pages/user/inform/inform',
     'pages/user/about/about',
     'pages/user/report/report',
     'pages/user/member/member',
+    'pages/TicketDetail/TicketDetail',
   ],
   window: {
     backgroundTextStyle: 'light',
@@ -26,6 +28,10 @@ export default defineAppConfig({
         pagePath: 'pages/repair/repair',
         text: '维修',
       },
+      {
+        pagePath: 'pages/member/member',
+        text: '管理',
+      },
       {
         pagePath: 'pages/user/user',
         text: '我的',

src/app.ts

@@ -17,6 +17,9 @@ function App({ children }: PropsWithChildren<any>) {
     }).then(res => {
       console.log(res.data);
       pt.setLang(res.data.data.lang);
+      Taro.reLaunch({
+        url: '/pages/index/index',
+      });
     });
   });
 

src/custom-tab-bar/index.tsx

@@ -2,6 +2,7 @@ import { Component, ReactNode } from 'react';
 import { AtTabBar } from 'taro-ui';
 import Taro from '@tarojs/taro';
 import pt from '@/plain-text';
+import wechatUser from '@/wechat';
 import 'taro-ui/dist/style/index.scss';
 import './index.scss';
 
@@ -14,6 +15,10 @@ const navList: Array<Taro.TabBarItem> = [
     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,
@@ -23,20 +28,39 @@ const navList: Array<Taro.TabBarItem> = [
 export default class Index extends Component {
   state = {
     selected: 0,
-    tabList: [
+    tabList: wechatUser.getAccess()
-      {
+      ? [
-        title: pt.get().tabBar.indexText,
+          {
-        iconType: 'home',
+            title: pt.get().tabBar.indexText,
-      },
+            iconType: 'home',
-      {
+          },
-        title: pt.get().tabBar.repairText,
+          {
-        iconType: 'settings',
+            title: pt.get().tabBar.repairText,
-      },
+            iconType: 'settings',
-      {
+          },
-        title: pt.get().tabBar.userText,
+          {
-        iconType: 'user',
+            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) {

src/pages/TicketDetail/TicketDetail.config.ts

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

src/pages/TicketDetail/TicketDetail.tsx

@@ -0,0 +1,25 @@
+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';
+
+export default class TicketDetail extends Component {
+  state = {
+    id: 0,
+  };
+  componentDidMount(): void {
+    const navBar = pt.get().navBar;
+    Taro.setNavigationBarTitle({
+      title: navBar.ticketDetail,
+    });
+    const { router } = getCurrentInstance();
+    const id = router?.params.id;
+    this.setState({
+      id: id,
+    });
+  }
+  render(): ReactNode {
+    return <View>TicketDetail: {this.state.id}</View>;
+  }
+}

src/pages/index/index.tsx

@@ -5,6 +5,7 @@ import { AtCard, AtAccordion } from 'taro-ui';
 import type CustomTabBar from '@/custom-tab-bar';
 import PageFooter from '@/components/PageFooter/PageFooter';
 import pt from '@/plain-text';
+import { getUrl } from '@/service';
 import './index.scss';
 import TitleCard from './TitleCard';
 import { DutyInfo, DutyData } from './DutyInfo';
@@ -78,6 +79,46 @@ export default class Index extends Component {
     },
   };
 
+  componentDidMount(): void {
+    Taro.request({
+      url: getUrl('/dutyinfo'),
+      method: 'GET',
+      data: {
+        token: 'token_test',
+      },
+    })
+      .then(res => {
+        const data = res.data.data;
+        if (data.isInDuty) {
+          this.setState({
+            dutyData: {
+              isInDuty: data.isInDuty,
+              inDutyCnt: data.inDutyCnt,
+              currentDuty: data.currentDuty,
+            },
+          });
+        } else {
+          this.setState({
+            dutyData: {
+              isInDuty: data.isInDuty,
+              offDutyReason: data.offDutyReason,
+              dutyRecoverTime: data.dutyRecoverTime,
+            },
+          });
+        }
+      })
+      .catch(err => {
+        console.log(err);
+        this.setState({
+          dutyData: {
+            isInDuty: false,
+            offDutyReason: '获取失败！Network Error!',
+            dutyRecoverTime: '获取失败！Network Error!',
+          },
+        });
+      });
+  }
+
   // 以下是TabBar相关
   pageCtx = Taro.getCurrentInstance().page;
   componentDidShow() {

src/pages/member/member.config.ts

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

src/pages/member/member.tsx

@@ -0,0 +1,23 @@
+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/user/about/about.tsx

@@ -1,8 +1,15 @@
 import { Component, ReactNode } from 'react';
 import { View } from '@tarojs/components';
+import Taro from '@tarojs/taro';
+import pt from '@/plain-text';
 import './about.scss';
 
 export default class SettingsPage extends Component {
+  componentDidMount(): void {
+    Taro.setNavigationBarTitle({
+      title: pt.get().navBar.user.about,
+    });
+  }
   render(): ReactNode {
     return <View></View>;
   }

src/pages/user/inform/inform.tsx

@@ -1,5 +1,6 @@
 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';
@@ -14,6 +15,13 @@ export default class InformPage extends Component {
     isLoading: false,
     isDisable: false,
   };
+
+  componentDidMount(): void {
+    Taro.setNavigationBarTitle({
+      title: pt.get().navBar.user.inform,
+    });
+  }
+
   handleChangePhone(phone: string) {
     this.setState({
       phone: phone,
@@ -67,37 +75,39 @@ export default class InformPage extends Component {
 
   render(): ReactNode {
     return (
-      <AtForm onSubmit={this.onSubmit.bind(this)}>
+      <View>
-        <AtMessage />
+        <AtForm onSubmit={this.onSubmit.bind(this)}>
-        <AtInput
+          <AtMessage />
-          clear
+          <AtInput
-          required
+            clear
-          name='phone'
+            required
-          title={pt.get().informPage.phoneText.title}
+            name='phone'
-          type='number'
+            title={pt.get().informPage.phoneText.title}
-          placeholder={pt.get().informPage.phoneText.placeholder}
+            type='number'
-          value={this.state.phone}
+            placeholder={pt.get().informPage.phoneText.placeholder}
-          onChange={this.handleChangePhone.bind(this)}
+            value={this.state.phone}
-        />
+            onChange={this.handleChangePhone.bind(this)}
-        <AtInput
+          />
-          required
+          <AtInput
-          clear
+            required
-          name='name'
+            clear
-          title={pt.get().informPage.nameText.title}
+            name='name'
-          type='text'
+            title={pt.get().informPage.nameText.title}
-          placeholder={pt.get().informPage.nameText.placeholder}
+            type='text'
-          value={this.state.name}
+            placeholder={pt.get().informPage.nameText.placeholder}
-          onChange={this.handleChangeName.bind(this)}
+            value={this.state.name}
-        />
+            onChange={this.handleChangeName.bind(this)}
-        <AtButton
+          />
-          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}
-      </AtForm>
+          </AtButton>
+        </AtForm>
+      </View>
     );
   }
 }

src/pages/user/member/member.tsx

@@ -14,6 +14,11 @@ export default class MemberPage extends Component {
     isLoading: false,
     isDisable: false,
   };
+  componentDidMount(): void {
+    Taro.setNavigationBarTitle({
+      title: pt.get().navBar.user.member,
+    });
+  }
   handleChangeStuid(stuid: string) {
     this.setState({
       stuid: stuid,

src/pages/user/myTicket/myTicket.tsx

@@ -14,6 +14,7 @@ import './myTicket.scss';
 type FixStatus = 1 | 2 | 3 | 4 | 5;
 
 class TicketListItem {
+  id: number;
   brand: string;
   model: string;
   status: FixStatus;
@@ -21,11 +22,13 @@ class TicketListItem {
   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;
@@ -48,6 +51,11 @@ class TicketListItem {
         extraText={tl.statusMap.get(this.status)}
         arrow='right'
         thumb={this.iconMap.get(this.status)}
+        onClick={() => {
+          Taro.navigateTo({
+            url: '/pages/TicketDetail/TicketDetail?id=' + this.id,
+          });
+        }}
       />
     );
   }
@@ -57,10 +65,13 @@ export default class SettingsPage extends Component {
   state = {
     loading: true,
     success: false,
-    fixList: [new TicketListItem('华硕', '天选3', 3, moment())],
+    fixList: [new TicketListItem(0, '', '', 1, moment())],
   };
 
   componentDidMount(): void {
+    Taro.setNavigationBarTitle({
+      title: pt.get().navBar.user.myTicket,
+    });
     Taro.request({
       url: getUrl('/user/mytickets'),
       method: 'GET',
@@ -82,6 +93,7 @@ export default class SettingsPage extends Component {
           fixList: res.data.data.list.map(
             item =>
               new TicketListItem(
+                item.id,
                 item.device,
                 item.deviceModel,
                 item.status,

src/pages/user/report/report.tsx

@@ -13,6 +13,13 @@ export default class SettingsPage extends Component {
     isLoading: false,
     isDisable: false,
   };
+
+  componentDidMount(): void {
+    Taro.setNavigationBarTitle({
+      title: pt.get().navBar.user.report,
+    });
+  }
+
   handleChange(report: string) {
     this.setState({
       report,

src/pages/user/user.tsx

@@ -7,6 +7,7 @@ import type CustomTabBar from '@/custom-tab-bar';
 import PageFooter from '@/components/PageFooter/PageFooter';
 import aboutIcon from '@/assets/icons/AboutPage/about.svg';
 import pt, { Lang } from '@/plain-text';
+import wechatUser from '@/wechat';
 import logo from '@/assets/images/UserPage/logo.png';
 import './user.scss';
 
@@ -23,13 +24,14 @@ 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(2);
+    tabbar?.setSelected(this.state.haveAccess ? 3 : 2);
   }
   // 以上是TabBar相关
 

src/plain-text/NavBarTitle.ts

@@ -0,0 +1,32 @@
+export interface NavBarTitle {
+  ticketDetail: string;
+  user: {
+    myTicket: string;
+    report: string;
+    member: string;
+    inform: string;
+    about: string;
+  };
+}
+
+export const navBarTitleZhCh: NavBarTitle = {
+  ticketDetail: '工单详情',
+  user: {
+    myTicket: '我的工单',
+    report: '意见反馈',
+    inform: '我的信息',
+    about: '关于我们',
+    member: '协会成员登录',
+  },
+};
+
+export const navBarTitleEnUs: NavBarTitle = {
+  ticketDetail: 'Ticket Detail',
+  user: {
+    myTicket: 'My Tickets',
+    report: 'Report',
+    inform: 'Information',
+    about: 'About us',
+    member: 'Member login',
+  },
+};

src/plain-text/TabBar.ts

@@ -2,16 +2,19 @@ export interface TabBarText {
   indexText: string;
   repairText: string;
   userText: string;
+  memberText: string;
 }
 
 export const tabBarZhCn: TabBarText = {
   indexText: '主页',
   repairText: '维修',
   userText: '我的',
+  memberText: '管理',
 };
 
 export const tabBarEnUs: TabBarText = {
   indexText: 'Home',
   repairText: 'Repair',
   userText: 'Account',
+  memberText: 'Member',
 };

src/plain-text/index.ts

@@ -8,6 +8,7 @@ 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';
 
 interface TextRecord {
   pageFooter: PageFooterText;
@@ -20,6 +21,7 @@ interface TextRecord {
   button: ButtonText;
   memberPage: MemberPageText;
   ticketList: TicketListText;
+  navBar: NavBarTitle;
 }
 
 const textZhCn: TextRecord = {
@@ -33,6 +35,7 @@ const textZhCn: TextRecord = {
   button: buttonZhCn,
   memberPage: memberPageZhCn,
   ticketList: ticketListZhCn,
+  navBar: navBarTitleZhCh,
 };
 
 const textEnUs: TextRecord = {
@@ -46,6 +49,7 @@ const textEnUs: TextRecord = {
   button: buttonEnUs,
   memberPage: memberPageEnUs,
   ticketList: ticketListEnUs,
+  navBar: navBarTitleEnUs,
 };
 
 // type Lang = 'zh_CN' | 'en_US' | ...;

src/wechat/index.ts

@@ -0,0 +1,32 @@
+class WechatUser {
+  private userInfo: any;
+  private isMember: boolean;
+  hasUserInfo: boolean;
+
+  constructor() {
+    this.userInfo = '';
+    this.hasUserInfo = false;
+    this.isMember = true;
+  }
+
+  getAccess() {
+    return this.isMember;
+  }
+
+  getInfo() {
+    return this.userInfo;
+  }
+
+  setInfo(userInfo: any) {
+    this.userInfo = userInfo;
+    this.hasUserInfo = true;
+  }
+
+  setAccess(isMember: boolean) {
+    this.isMember = isMember;
+  }
+}
+
+const wechatUser = new WechatUser();
+
+export default wechatUser;