diff --git a/.env.development b/.env.development index 6dda3a2..dcfe9d4 100644 --- a/.env.development +++ b/.env.development @@ -19,7 +19,7 @@ REACT_APP_SNAPSHOT_VOTING_API = "https://xtjyd0liqe.execute-api.ap-northeast-1.a -REACT_APP_REQUEST_URL = 'http://192.253.237.94:9090' +# REACT_APP_REQUEST_URL = 'http://192.253.237.94:9090' # REACT_APP_REQUEST_URL = 'http://192.168.2.147:8080' -# REACT_APP_REQUEST_URL = 'http://192.168.2.28:8080' +REACT_APP_REQUEST_URL = 'http://192.168.2.176:8080' # REACT_APP_REQUEST_URL = 'http://6o7g1fv83e.51xd.pub' diff --git a/src/components/Menu/index.tsx b/src/components/Menu/index.tsx index 3d6d002..e8363cf 100644 --- a/src/components/Menu/index.tsx +++ b/src/components/Menu/index.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState, useMemo } from 'react' import { Menu as UikitMenu, ConnectorNames } from '@pancakeswap/uikit' import { useDispatch } from 'react-redux' -import { uccnDetail, indexInfo } from 'services/user' +import { uccnDetail, indexInfo, getProjectDoc } from 'services/user' import { useWeb3React } from '@web3-react/core' import { languageList } from 'config/localization/languages' import { useTranslation } from 'contexts/Localization' @@ -17,6 +17,7 @@ const Menu = (props) => { const account = useAccount() const { login, logout } = useAuth() const [hasWalletLogin, setHasWalletLogin] = useState(false) + const [documentAddress, setDocumentAddress] = useState('') const { isDark, toggleTheme } = useTheme() const hccPriceUsdt = usePriceHccUsdt() const { library } = useWeb3Provider() @@ -50,6 +51,13 @@ const Menu = (props) => { }) setSocialLink(list) } + const getDoc = async () => { + const result = await getProjectDoc() + console.log(result) + const { data } = result.data + setDocumentAddress(data) + console.log(data) + } // 钱包登录后 useEffect(() => { if (unActiveAccount && library.provider && hasWalletLogin) { @@ -59,6 +67,7 @@ const Menu = (props) => { }, [unActiveAccount, hasWalletLogin, library]) useEffect(() => { getDetails() + getDoc() }, []) return ( { cakePriceUsd={hccPriceUsdt} links={config(t)} socialLink={socialLink} + documentAddress={documentAddress} {...props} /> ) diff --git a/src/services/board.ts b/src/services/board.ts index fbb8ff9..3f81bd4 100644 --- a/src/services/board.ts +++ b/src/services/board.ts @@ -2,7 +2,7 @@ import request from 'utils/request' export const getBaseConfig = () => { return request.request({ - url: '/high_city/app/api/base/config', + url: '/high_city/app/api/base/config/bod/lock/time', method: 'get', }) } diff --git a/src/services/user.ts b/src/services/user.ts index 5146557..1a0346b 100644 --- a/src/services/user.ts +++ b/src/services/user.ts @@ -19,4 +19,11 @@ export const indexInfo = () => { }) } +export const getProjectDoc = () => { + return request.request({ + url: '/high_city/app/api/base/config/project/doc', + method: 'get', + }) +} + export default queryUserInfo diff --git a/src/views/Announcement/components/Detail.tsx b/src/views/Announcement/components/Detail.tsx index c58d58a..4e9173a 100644 --- a/src/views/Announcement/components/Detail.tsx +++ b/src/views/Announcement/components/Detail.tsx @@ -18,6 +18,7 @@ const DetailDiv = styled.div` border-radius: 20px; margin: 0 auto; box-sizing: border-box; + margin-top: 30px; padding: 40px 30px; ` const HeaderFlex = styled(Flex)` @@ -40,7 +41,8 @@ const TextTime = styled(Text)` padding: 30px 0 20px 0; border-bottom: 1px solid #e3e3e3; ` -const TextInfo = styled.div` +const TextInfo = styled.span` + display: block; font-size: 14px; color: #999999; margin-top: 30px; @@ -63,7 +65,12 @@ const Detail: React.FC = ({ title, publishTime, content, close }) => {title} {dayjs(publishTime).format('YYYY-MM-DD HH:mm')} - {content} + {/* */} + ) diff --git a/src/views/Announcement/index.tsx b/src/views/Announcement/index.tsx index 27b387f..690b343 100644 --- a/src/views/Announcement/index.tsx +++ b/src/views/Announcement/index.tsx @@ -19,7 +19,7 @@ const MainDiv = styled.div` padding: 20px 0; width: 100%; min-height: calc(100vh - 64px); - box-sizing: border-box; + /* box-sizing: border-box; */ ` const TableDiv = styled.div` width: 80%; @@ -180,7 +180,7 @@ const Announcement: React.FC = () => {
{list.map((item) => ( lookDetail(item.id)}> - + ))}
@@ -213,13 +213,6 @@ const Announcement: React.FC = () => { {renderContent()} {totalVisible ? {t('Loaded all')} : ''} - - {/*
*/} - {/* {list.map((item) => ( - lookDetail(item.id)}> - - - ))} */} )} diff --git a/src/views/Bazaar/index.tsx b/src/views/Bazaar/index.tsx index bd28a93..ea1be75 100644 --- a/src/views/Bazaar/index.tsx +++ b/src/views/Bazaar/index.tsx @@ -5,12 +5,14 @@ import useRefresh from 'hooks/useRefresh' import { UnOpenModel } from 'components/Modal' const PageContent = styled.div` - /* background: rgba(255, 255, 255, 0.39); */ + height: calc(100vh - 64px); + /* background-image: url('/images/home/bg.svg'); + background-size: cover; + background-repeat: no-repeat; */ background-image: url('/images/page/bazaar.jpg'); background-position: 50%; background-size: 50% 90%; background-repeat: no-repeat; - min-height: calc(100vh - 64px); ` const Bazaar: React.FC = () => { diff --git a/src/views/Board/index.tsx b/src/views/Board/index.tsx index 6e71964..06f852e 100644 --- a/src/views/Board/index.tsx +++ b/src/views/Board/index.tsx @@ -139,7 +139,7 @@ const Boards: React.FC = () => { return ( - {/* */} +
{t('Total capital pool')}