Skip to content

J
jinfa-admin
Commit ae04fe52 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫
Browse files
Options

Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-system into v2

parents e3afda52 8b1ce999
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 12 deletions
config/config.ts
View file @ ae04fe52
......@@ -28,7 +28,7 @@ if (PRO_ENV) {
export default defineConfig({
title: '瓴犀平台后台',
title: '平台后台',
// 如需写入环境变量 需在config中先写入
define: {
"process.env.SITE_ID": process.env.SITE_ID || 1,
......
public/static/imgs/Fav.jpg
View replaced file @ e3afda52 View file @ ae04fe52
public/static/imgs/Fav.jpg

2.6 KB | W: | H:

public/static/imgs/Fav.jpg

2.11 KB | W: | H:

public/static/imgs/Fav.jpg
public/static/imgs/Fav.jpg
public/static/imgs/Fav.jpg
public/static/imgs/Fav.jpg
  • 2-up
  • Swipe
  • Onion skin
src/asserts/menuIcon/logo.png
View replaced file @ e3afda52 View file @ ae04fe52
src/asserts/menuIcon/logo.png

8.01 KB | W: | H:

src/asserts/menuIcon/logo.png

2.7 KB | W: | H:

src/asserts/menuIcon/logo.png
src/asserts/menuIcon/logo.png
src/asserts/menuIcon/logo.png
src/asserts/menuIcon/logo.png
  • 2-up
  • Swipe
  • Onion skin
src/global/config/global.d.ts
View file @ ae04fe52
......@@ -32,7 +32,7 @@ export interface SiteInfo {
name: string;
logo: string;
siteUrl: string;
symbol?: any;
symbol: string;
}
export interface Global {
......
src/layouts/index.tsx
View file @ ae04fe52
......@@ -50,7 +50,7 @@ export const getSelectedMenuKeys = (
const defaultFooterDom = (
<DefaultFooter
links={[]}
copyright="Copy Right©广州市数商云网络科技有限公司 粤ICP备13044797号-5"
copyright="全链数字化解决方案"
/>
);
......
src/locales/zh-CN.ts
View file @ ae04fe52
......@@ -2,7 +2,7 @@ import menu from './zh-CN/menu'
import basicsSetting from './zh-CN/basicsSetting'
export default {
'global.siteName': '瓴犀',
'global.siteName': '中国站',
...menu,
...basicsSetting
}
\ No newline at end of file
}
src/pages/document.ejs
View file @ ae04fe52
......@@ -4,7 +4,7 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="icon" type="image/x-icon" href="/static/imgs/Fav.jpg" />
<title>瓴犀平台后台</title>
<title>平台后台</title>
</head>
<body>
<div id="root"></div>
......
src/pages/marketingManage/marketing/marketingActivitiesManagement/activePage/fixtures/components/ComponentTree/web.tsx
View file @ ae04fe52
......@@ -343,7 +343,10 @@ const WebComponentModule: React.FC<Iprops> = (props: Iprops) => {
})
return;
}
const newKey = Object.keys(pageConfig).length + 1
const childNodes = [...pageConfig[0].childNodes];
childNodes.sort((a, b) => +a - +b);
const newKey = childNodes[childNodes.length - 1] + 1
addChildComponent({
newKey: `${newKey}`,
......
src/pages/marketingManage/marketing/marketingActivitiesManagement/activePage/fixtures/components/WebDesignPanel/components/WebLayout/topbar.tsx
View file @ ae04fe52
......@@ -13,7 +13,7 @@ const TopBar = () => {
<div className={styles.topBar}>
<div className={styles['topBar-content']}>
<div>
<div>瓴犀企业商城</div>
<div>企业商城</div>
</div>
<div className={styles.right}>
<div className={styles.toLogin}>你好，请登录</div>
......
src/pages/user/login/index.tsx
View file @ ae04fe52
......@@ -125,7 +125,7 @@ class Index extends Component<{}, IndexState> {
<Row align="middle">
<Col span={8}>
<div className="left-text">
<h1>数商云</h1>
<h1></h1>
<h3>B2B业务中台运营平台</h3>
</div>
</Col>
......@@ -207,7 +207,7 @@ class Index extends Component<{}, IndexState> {
</Form.Item>
<Form.Item>
<div>
<img className="login-logo" src={logo} alt="数商云" />
{/* <img className="login-logo" src={logo} alt="数商云" /> */}
</div>
</Form.Item>
</Form>
......@@ -216,7 +216,7 @@ class Index extends Component<{}, IndexState> {
</Row>
</Col>
</Row>
<footer className="footer">Copy Right©广州市数商云网络科技有限公司 粤ICP备13044797号-5</footer>
<footer className="footer">全链数字化解决方案</footer>
</div>
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment