refactor: merge index & member page

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',
         },
       });
     });