From 1dc9a9583517873e28e9388e67318e213e467702 Mon Sep 17 00:00:00 2001 From: saplf Date: Tue, 3 Sep 2019 17:57:56 +0800 Subject: [PATCH] Style fix --- src/components/Header/style.less | 3 ++- src/models/user.ts | 3 ++- src/pages/home/estate/index.tsx | 7 +++++-- src/pages/mine/index.tsx | 35 ++++++++++++++++++++++++++++++++ src/pages/mine/model.ts | 31 ++++++++++++++++++++++++++++ src/pages/mine/service.ts | 18 ++++++++++++++++ src/pages/mine/style.less | 15 ++++++++++++++ src/utils/storage.ts | 5 +++++ 8 files changed, 113 insertions(+), 4 deletions(-) create mode 100644 src/pages/mine/index.tsx create mode 100644 src/pages/mine/model.ts create mode 100644 src/pages/mine/service.ts create mode 100644 src/pages/mine/style.less diff --git a/src/components/Header/style.less b/src/components/Header/style.less index 699b78c..a8b1ee0 100644 --- a/src/components/Header/style.less +++ b/src/components/Header/style.less @@ -19,9 +19,10 @@ text-align: center; line-height: @header-height; font-size: 1.5rem; + transition: background-color .15s; &:active { - background-color: @bg-color; + background-color: rgba(255, 255, 255, .2); } } diff --git a/src/models/user.ts b/src/models/user.ts index 686dd6d..dabdd99 100644 --- a/src/models/user.ts +++ b/src/models/user.ts @@ -1,7 +1,7 @@ import { Model } from 'dva'; import _ from 'lodash'; import { getLocale, setLocale } from 'umi-plugin-locale' -import { loadUser, storeUser, clearUser } from '@/utils/storage'; +import { loadUser, storeUser, clearUser, clearMineList } from '@/utils/storage'; import { User } from '@/types/common'; const initState = () => { @@ -45,6 +45,7 @@ const model: Model = { }, *logout(_, { put, all }) { + clearMineList(); yield all([ put({ type: 'clearUser' }), put({ type: 'home/clear' }), diff --git a/src/pages/home/estate/index.tsx b/src/pages/home/estate/index.tsx index a9d8aec..228f88d 100644 --- a/src/pages/home/estate/index.tsx +++ b/src/pages/home/estate/index.tsx @@ -1,5 +1,5 @@ import React, { useEffect } from 'react'; -import { connect, DispatchProp } from 'dva'; +import { connect, DispatchProp, routerRedux } from 'dva'; import { Spin, Icon } from 'antd'; import { formatMessage } from 'umi-plugin-locale'; import { HomeMineModelState } from './model'; @@ -53,7 +53,10 @@ const MinePage: React.FC = ({ -
+
dispatch(routerRedux.push('/mine'))} + className="right app-btn" + > {formatMessage({ id: 'home.mine.retrieve' })}
diff --git a/src/pages/mine/index.tsx b/src/pages/mine/index.tsx new file mode 100644 index 0000000..b92a708 --- /dev/null +++ b/src/pages/mine/index.tsx @@ -0,0 +1,35 @@ +/** + * Title: 获取矿晶 + * Routes: + * - ./src/pages/routes + */ +import React, { useEffect } from 'react'; +import { connect, DispatchProp } from 'dva'; +import { Spin, Tabs } from 'antd'; +import { formatMessage } from 'umi-plugin-locale'; +import FittedImage from 'react-fitted-image'; +import { MineModelState } from './model'; +import { PageState, EstateType } from '@/types/common'; +import Header from '@/components/Header'; +import Info, { InfoItem } from '@/components/Info'; +import Failure from '@/components/Failure'; + +import styles from './style.less'; + +const MinePage: React.FC = ({ + dispatch, +}) => { + + return ( +
+
+
+ ); +}; + +export default connect( + ({ mine }: any) => ({ ...mine }), +)(MinePage); diff --git a/src/pages/mine/model.ts b/src/pages/mine/model.ts new file mode 100644 index 0000000..5e041dc --- /dev/null +++ b/src/pages/mine/model.ts @@ -0,0 +1,31 @@ +import { Model, routerRedux } from "dva"; +import { message } from 'antd'; +import { Estate, PageState } from '@/types/common'; +import { getEstateDetail } from './service'; +import { isDev } from '@/utils/utils'; + +export interface MineModelState { +} + +const initState: MineModelState = { +}; + +const model: Model = { + namespace: 'mine', + + state: initState, + + effects: { + }, + + reducers: { + onUpdateState(state, payload) { + return { + ...state, + ...payload, + }; + }, + }, +}; + +export default model; diff --git a/src/pages/mine/service.ts b/src/pages/mine/service.ts new file mode 100644 index 0000000..b93cb6f --- /dev/null +++ b/src/pages/mine/service.ts @@ -0,0 +1,18 @@ +import http from '@/utils/http'; +import { Estate, EstateType } from '@/types/common'; +import { calcEstate } from '@/utils/transform'; + +export async function getEstateDetail(id: string) { + const { + ok, + data, + msg, + } = await http.get('/estateorder/detail', { id }); + if (ok && data) { + data.type = data.outTime ? EstateType.Sold : EstateType.Hold; + calcEstate(data); + return data; + } + + throw Error(msg); +} diff --git a/src/pages/mine/style.less b/src/pages/mine/style.less new file mode 100644 index 0000000..e388f9a --- /dev/null +++ b/src/pages/mine/style.less @@ -0,0 +1,15 @@ + +@import '../../global.less'; + +.container { + height: 100%; + background: linear-gradient(to bottom, @purple-one, @purple-two); + position: relative; + + :global { + .header { + background-color: rgba(255,255,255,0); + color: white; + } + } +} diff --git a/src/utils/storage.ts b/src/utils/storage.ts index 89ccc69..6c024a9 100644 --- a/src/utils/storage.ts +++ b/src/utils/storage.ts @@ -50,6 +50,10 @@ function loadMineList() { } } +function clearMineList() { + localStorage.removeItem(mineListKey); +} + export { storeUser, loadUser, @@ -60,4 +64,5 @@ export { storeMineList, loadMineList, + clearMineList, }