Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
project
jinfa-admin
Commits
8b1ce999
Commit
8b1ce999
authored
Jan 20, 2022
by
Bill
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2' of
http://10.0.0.22:3000/lingxi/lingxi-business-system
into v2
parents
e641e13a
6018a75e
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
97 additions
and
99 deletions
+97
-99
config.ts
config/config.ts
+1
-1
Fav.jpg
public/static/imgs/Fav.jpg
+0
-0
logo.png
src/asserts/menuIcon/logo.png
+0
-0
global.d.ts
src/global/config/global.d.ts
+1
-1
index.tsx
src/layouts/index.tsx
+1
-1
zh-CN.ts
src/locales/zh-CN.ts
+2
-3
document.ejs
src/pages/document.ejs
+1
-1
topbar.tsx
...components/WebDesignPanel/components/WebLayout/topbar.tsx
+1
-1
index.tsx
...Manage/platformCoupon/platformCouponUnsubmitted/index.tsx
+2
-2
schema.ts
...Manage/platformCoupon/platformCouponUnsubmitted/schema.ts
+85
-86
index.tsx
src/pages/user/login/index.tsx
+3
-3
No files found.
config/config.ts
View file @
8b1ce999
...
...
@@ -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 @
e641e13a
View file @
8b1ce999
2.6 KB
|
W:
|
H:
2.11 KB
|
W:
|
H:
2-up
Swipe
Onion skin
src/asserts/menuIcon/logo.png
View replaced file @
e641e13a
View file @
8b1ce999
8.01 KB
|
W:
|
H:
2.7 KB
|
W:
|
H:
2-up
Swipe
Onion skin
src/global/config/global.d.ts
View file @
8b1ce999
...
...
@@ -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 @
8b1ce999
...
...
@@ -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 @
8b1ce999
...
...
@@ -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 @
8b1ce999
...
...
@@ -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/WebDesignPanel/components/WebLayout/topbar.tsx
View file @
8b1ce999
...
...
@@ -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/marketingManage/platformCoupon/platformCouponUnsubmitted/index.tsx
View file @
8b1ce999
...
...
@@ -214,7 +214,7 @@ const PlatformCouponUnsubmitted: React.FC = () => {
});
};
const
ControllerBtns
=
()
=>
(
const
ControllerBtns
1
=
()
=>
(
<
Space
size=
{
16
}
>
<
Button
type=
"primary"
...
...
@@ -250,7 +250,7 @@ const PlatformCouponUnsubmitted: React.FC = () => {
<
NiceForm
actions=
{
formActions
}
components=
{
{
ControllerBtns
,
ControllerBtns
1
,
RangePicker
:
DatePicker
.
RangePicker
,
}
}
onSubmit=
{
values
=>
ref
.
current
.
reload
(
values
)
}
...
...
src/pages/marketingManage/platformCoupon/platformCouponUnsubmitted/schema.ts
View file @
8b1ce999
/*
* @Author: XieZhiXiong
* @Date: 2021-06-23 17:41:57
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-23 17:41:58
* @Description:
*/
import
{
ISchema
}
from
'@formily/antd'
;
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
export
const
querySchema
:
ISchema
=
{
type
:
'object'
,
properties
:
{
megaLayout
:
{
type
:
'object'
,
'x-component'
:
'mega-layout'
,
properties
:
{
topLayout
:
{
type
:
'object'
,
'x-component'
:
'Mega-Layout'
,
'x-component-props'
:
{
grid
:
true
,
},
properties
:
{
ctl
:
{
type
:
'object'
,
'x-component'
:
'ControllerBtns'
,
},
name
:
{
type
:
'string'
,
'x-component'
:
'Search'
,
'x-component-props'
:
{
placeholder
:
'搜索'
,
tip
:
'输入 优惠劵名称 进行搜索'
,
},
},
},
},
[
FORM_FILTER_PATH
]:
{
type
:
'object'
,
'x-component'
:
'flex-layout'
,
'x-component-props'
:
{
colStyle
:
{
marginLeft
:
20
,
},
},
properties
:
{
id
:
{
type
:
'string'
,
'x-component-props'
:
{
placeholder
:
'优惠劵ID'
,
allowClear
:
true
,
},
},
'[effectiveTimeStart, effectiveTimeEnd]'
:
{
type
:
'object'
,
'x-component'
:
'RangePicker'
,
'x-component-props'
:
{
placeholder
:
[
'劵有效期起始时间'
,
'劵有效期截止时间'
],
},
},
type
:
{
type
:
'string'
,
default
:
undefined
,
enum
:
[],
'x-component-props'
:
{
placeholder
:
'优惠劵类型(所有)'
,
allowClear
:
true
,
},
},
submit
:
{
'x-component'
:
'Submit'
,
'x-mega-props'
:
{
span
:
1
,
},
'x-component-props'
:
{
children
:
'查询'
,
},
},
},
},
},
},
},
};
\ No newline at end of file
/*
* @Author: XieZhiXiong
* @Date: 2021-06-23 17:41:57
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-23 17:41:58
* @Description:
*/
import
{
ISchema
}
from
'@formily/antd'
;
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
export
const
querySchema
:
ISchema
=
{
type
:
'object'
,
properties
:
{
megaLayout
:
{
type
:
'object'
,
'x-component'
:
'mega-layout'
,
properties
:
{
topLayout
:
{
type
:
'object'
,
'x-component'
:
'Mega-Layout'
,
'x-component-props'
:
{
grid
:
true
,
},
properties
:
{
ctl
:
{
type
:
'object'
,
'x-component'
:
'ControllerBtns1'
,
},
name
:
{
type
:
'string'
,
'x-component'
:
'Search'
,
'x-component-props'
:
{
placeholder
:
'搜索'
,
tip
:
'输入 优惠劵名称 进行搜索'
,
},
},
},
},
[
FORM_FILTER_PATH
]:
{
type
:
'object'
,
'x-component'
:
'flex-layout'
,
'x-component-props'
:
{
colStyle
:
{
marginLeft
:
20
,
},
},
properties
:
{
id
:
{
type
:
'string'
,
'x-component-props'
:
{
placeholder
:
'优惠劵ID'
,
allowClear
:
true
,
},
},
'[effectiveTimeStart, effectiveTimeEnd]'
:
{
type
:
'object'
,
'x-component'
:
'RangePicker'
,
'x-component-props'
:
{
placeholder
:
[
'劵有效期起始时间'
,
'劵有效期截止时间'
],
},
},
type
:
{
type
:
'string'
,
default
:
undefined
,
enum
:
[],
'x-component-props'
:
{
placeholder
:
'优惠劵类型(所有)'
,
allowClear
:
true
,
},
},
submit
:
{
'x-component'
:
'Submit'
,
'x-mega-props'
:
{
span
:
1
,
},
'x-component-props'
:
{
children
:
'查询'
,
},
},
},
},
},
},
},
};
src/pages/user/login/index.tsx
View file @
8b1ce999
...
...
@@ -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
>
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment