홈화면 mid 갱신
This commit is contained in:
@@ -58,7 +58,8 @@ export const InfoWrap = () => {
|
|||||||
|
|
||||||
const [payType, setPayType] = useState<number>(2);
|
const [payType, setPayType] = useState<number>(2);
|
||||||
const [itemKey, setItemKey] = useState<string>('');
|
const [itemKey, setItemKey] = useState<string>('');
|
||||||
const [settlementPeriod, setSettlementPeriod] = useState<string>();
|
const [cardSettlementPeriod, setCardSettlementPeriod] = useState<string>();
|
||||||
|
const [nonCardSettlementPeriod, setNonCardSettlementPeriod] = useState<string>();
|
||||||
const [generalTabItems, setGeneralTabItems] = useState<Array<GeneralTabItems>>([]);
|
const [generalTabItems, setGeneralTabItems] = useState<Array<GeneralTabItems>>([]);
|
||||||
const [installmentTabItems, setInstallmentTabItems] = useState<Array<InstallmentTabItems>>([]);
|
const [installmentTabItems, setInstallmentTabItems] = useState<Array<InstallmentTabItems>>([]);
|
||||||
const [moneyPointTabItems, setMoneyPointTabItems] = useState<Array<MoneyPointTabItems>>([]);
|
const [moneyPointTabItems, setMoneyPointTabItems] = useState<Array<MoneyPointTabItems>>([]);
|
||||||
@@ -175,7 +176,7 @@ export const InfoWrap = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
paymentCard(params).then((rs: PaymentCardResponse) => {
|
paymentCard(params).then((rs: PaymentCardResponse) => {
|
||||||
setSettlementPeriod(rs.settlementPeriod);
|
setCardSettlementPeriod(rs.settlementPeriod);
|
||||||
setGeneralTabItems(rs.generalTab.items);
|
setGeneralTabItems(rs.generalTab.items);
|
||||||
setInstallmentTabItems(rs.installmentTab.items);
|
setInstallmentTabItems(rs.installmentTab.items);
|
||||||
setMoneyPointTabItems(rs.moneyPointTab.items);
|
setMoneyPointTabItems(rs.moneyPointTab.items);
|
||||||
@@ -193,7 +194,7 @@ export const InfoWrap = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
paymentNonCard(params).then((rs: PaymentNonCardResponse) => {
|
paymentNonCard(params).then((rs: PaymentNonCardResponse) => {
|
||||||
setSettlementPeriod(rs.settlementPeriod);
|
setNonCardSettlementPeriod(rs.settlementPeriod);
|
||||||
setFeeRanges(rs.accountTransferData.feeRanges);
|
setFeeRanges(rs.accountTransferData.feeRanges);
|
||||||
setBankFees(rs.accountTransferData.bankFees);
|
setBankFees(rs.accountTransferData.bankFees);
|
||||||
setPaymentFees(rs.mobilePaymentData.paymentFees);
|
setPaymentFees(rs.mobilePaymentData.paymentFees);
|
||||||
@@ -297,7 +298,7 @@ export const InfoWrap = () => {
|
|||||||
setCardCommissionBottomSheetOn={ setCardCommissionBottomSheetOn }
|
setCardCommissionBottomSheetOn={ setCardCommissionBottomSheetOn }
|
||||||
payType={ payType }
|
payType={ payType }
|
||||||
itemKey={ itemKey }
|
itemKey={ itemKey }
|
||||||
settlementPeriod={ settlementPeriod }
|
settlementPeriod={ cardSettlementPeriod }
|
||||||
generalTabItems={ generalTabItems }
|
generalTabItems={ generalTabItems }
|
||||||
installmentTabItems={ installmentTabItems }
|
installmentTabItems={ installmentTabItems }
|
||||||
moneyPointTabItems= { moneyPointTabItems }
|
moneyPointTabItems= { moneyPointTabItems }
|
||||||
@@ -311,6 +312,7 @@ export const InfoWrap = () => {
|
|||||||
{ !!transferCommissionBottomSheetOn &&
|
{ !!transferCommissionBottomSheetOn &&
|
||||||
<TransferCommissionBottomSheet
|
<TransferCommissionBottomSheet
|
||||||
itemKey={ itemKey }
|
itemKey={ itemKey }
|
||||||
|
settlementPeriod={ nonCardSettlementPeriod }
|
||||||
transferCommissionBottomSheetOn={ transferCommissionBottomSheetOn }
|
transferCommissionBottomSheetOn={ transferCommissionBottomSheetOn }
|
||||||
setTransferCommissionBottomSheetOn={ setTransferCommissionBottomSheetOn }
|
setTransferCommissionBottomSheetOn={ setTransferCommissionBottomSheetOn }
|
||||||
></TransferCommissionBottomSheet>
|
></TransferCommissionBottomSheet>
|
||||||
|
|||||||
@@ -15,4 +15,5 @@ export enum StorageKeys {
|
|||||||
AppVersion = 'APP_VERSION',
|
AppVersion = 'APP_VERSION',
|
||||||
LogOut = 'LOGOUT',
|
LogOut = 'LOGOUT',
|
||||||
i18nextLng = 'i18nextLng',
|
i18nextLng = 'i18nextLng',
|
||||||
|
UserMid = 'USER_MID',
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ import { ChangeEvent, useEffect, useState } from 'react';
|
|||||||
import { AppAlarmUnreadCountParams, AppAlarmUnreadCountResponse, MERCHANT_ADMIN_APP } from '@/entities/alarm/model/types';
|
import { AppAlarmUnreadCountParams, AppAlarmUnreadCountResponse, MERCHANT_ADMIN_APP } from '@/entities/alarm/model/types';
|
||||||
import { useAppAlarmUnreadCountMutation } from '@/entities/alarm/api/use-app-alarm-unread-count-mutation';
|
import { useAppAlarmUnreadCountMutation } from '@/entities/alarm/api/use-app-alarm-unread-count-mutation';
|
||||||
import { appBridge } from '@/utils/appBridge';
|
import { appBridge } from '@/utils/appBridge';
|
||||||
|
import { getLocalStorage, setLocalStorage } from '@/shared/lib';
|
||||||
|
import { StorageKeys } from '@/shared/constants/local-storage';
|
||||||
|
|
||||||
export const HeaderNavigation = ({
|
export const HeaderNavigation = ({
|
||||||
onBack,
|
onBack,
|
||||||
@@ -28,7 +30,8 @@ export const HeaderNavigation = ({
|
|||||||
|
|
||||||
const {
|
const {
|
||||||
navigate,
|
navigate,
|
||||||
navigateBack
|
navigateBack,
|
||||||
|
reload
|
||||||
} = useNavigate();
|
} = useNavigate();
|
||||||
|
|
||||||
const handleBack = () => {
|
const handleBack = () => {
|
||||||
@@ -53,7 +56,9 @@ export const HeaderNavigation = ({
|
|||||||
const onChangeToMid = (e: ChangeEvent<HTMLSelectElement>) => {
|
const onChangeToMid = (e: ChangeEvent<HTMLSelectElement>) => {
|
||||||
let value = e.target.value;
|
let value = e.target.value;
|
||||||
useStore.getState().UserStore.setMid(value);
|
useStore.getState().UserStore.setMid(value);
|
||||||
setMid(value);
|
setLocalStorage(StorageKeys.UserMid, value);
|
||||||
|
reload();
|
||||||
|
//setMid(value);
|
||||||
};
|
};
|
||||||
|
|
||||||
const callAlarmCount = () => {
|
const callAlarmCount = () => {
|
||||||
|
|||||||
@@ -39,6 +39,8 @@ import { AlarmLinkOptions } from '@/entities/alarm/model/types';
|
|||||||
import { AlarmRoutes } from '@/entities/alarm/ui/alarm-routes';
|
import { AlarmRoutes } from '@/entities/alarm/ui/alarm-routes';
|
||||||
import { useNavigate } from '@/shared/lib/hooks';
|
import { useNavigate } from '@/shared/lib/hooks';
|
||||||
import { PATHS } from '@/shared/constants/paths';
|
import { PATHS } from '@/shared/constants/paths';
|
||||||
|
import { getLocalStorage, setLocalStorage } from '@/shared/lib';
|
||||||
|
import { StorageKeys } from '@/shared/constants/local-storage';
|
||||||
|
|
||||||
export interface ContextType {
|
export interface ContextType {
|
||||||
setOnBack: (onBack: () => void) => void;
|
setOnBack: (onBack: () => void) => void;
|
||||||
@@ -69,6 +71,7 @@ export const SubLayout = () => {
|
|||||||
} = useUserInfo();
|
} = useUserInfo();
|
||||||
|
|
||||||
const { reload, navigateBack, navigate } = useNavigate();
|
const { reload, navigateBack, navigate } = useNavigate();
|
||||||
|
const userMid = getLocalStorage(StorageKeys.UserMid);
|
||||||
|
|
||||||
const { menuOn, setMenuOn } = useMenuOnStore();
|
const { menuOn, setMenuOn } = useMenuOnStore();
|
||||||
const { favoriteEditOn, setFavoriteEditOn } = useFavoriteEditOnStore();
|
const { favoriteEditOn, setFavoriteEditOn } = useFavoriteEditOnStore();
|
||||||
@@ -79,8 +82,7 @@ export const SubLayout = () => {
|
|||||||
const { downloadBottomSheetOn, setDownloadBottomSheetOn } = useDownloadBottomSheetOnStore();
|
const { downloadBottomSheetOn, setDownloadBottomSheetOn } = useDownloadBottomSheetOnStore();
|
||||||
|
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
console.log(location)
|
|
||||||
|
|
||||||
const [isPullToRefreshEnabled, setIsPullToRefreshEnabled] = useState(false);
|
const [isPullToRefreshEnabled, setIsPullToRefreshEnabled] = useState(false);
|
||||||
const [onBack, setOnBack] = useState(undefined);
|
const [onBack, setOnBack] = useState(undefined);
|
||||||
const [onRightClick, setOnRightClick] = useState(undefined);
|
const [onRightClick, setOnRightClick] = useState(undefined);
|
||||||
@@ -90,7 +92,7 @@ export const SubLayout = () => {
|
|||||||
const [footerCurrentPage, setFooterCurrentPage] = useState<undefined | string | null>(undefined);
|
const [footerCurrentPage, setFooterCurrentPage] = useState<undefined | string | null>(undefined);
|
||||||
const [headerNavigationKey, setHeaderNavigationKey] = useState<number>(1);
|
const [headerNavigationKey, setHeaderNavigationKey] = useState<number>(1);
|
||||||
const [loginSuccess, setLoginSuccess] = useState<boolean>(false);
|
const [loginSuccess, setLoginSuccess] = useState<boolean>(false);
|
||||||
const [mid, setMid] = useState<string>();
|
const [mid, setMid] = useState<string>(userMid || undefined);
|
||||||
const [alarmRoutesOn, setAlarmRoutesOn] = useState<boolean>(false);
|
const [alarmRoutesOn, setAlarmRoutesOn] = useState<boolean>(false);
|
||||||
const [alarmOptions, setAlarmOptions] = useState<AlarmLinkOptions>();
|
const [alarmOptions, setAlarmOptions] = useState<AlarmLinkOptions>();
|
||||||
|
|
||||||
@@ -111,9 +113,17 @@ export const SubLayout = () => {
|
|||||||
};
|
};
|
||||||
homeGroups(params).then((rs: HomeGroupsResponse) => {
|
homeGroups(params).then((rs: HomeGroupsResponse) => {
|
||||||
useStore.getState().UserStore.setUserMids(rs.mids);
|
useStore.getState().UserStore.setUserMids(rs.mids);
|
||||||
if(!!rs.mids[0]){
|
let userMid = getLocalStorage(StorageKeys.UserMid);
|
||||||
useStore.getState().UserStore.setMid(rs.mids[0]);
|
if(!userMid){
|
||||||
setMid(rs.mids[0]);
|
if(rs.mids[0]){
|
||||||
|
useStore.getState().UserStore.setMid(rs.mids[0]);
|
||||||
|
setMid(rs.mids[0]);
|
||||||
|
setLocalStorage(StorageKeys.UserMid, rs.mids[0]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
useStore.getState().UserStore.setMid(userMid);
|
||||||
|
setMid(userMid);
|
||||||
}
|
}
|
||||||
let options: Array<Record<string, string>> = rs.mids.map((value, index) => {
|
let options: Array<Record<string, string>> = rs.mids.map((value, index) => {
|
||||||
return {
|
return {
|
||||||
|
|||||||
Reference in New Issue
Block a user