Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
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
shenshaokai
jinfa-platform
Commits
9e6f2e72
Commit
9e6f2e72
authored
Nov 13, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:
parent
0005f5eb
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
5 additions
and
6 deletions
+5
-6
UserHeader.tsx
src/layouts/components/UserHeader.tsx
+1
-1
index.tsx
src/pages/lxMall/components/QuickNav/index.tsx
+1
-1
PositionSetting.tsx
src/pages/repositories/components/PositionSetting.tsx
+0
-1
useSelfTable.tsx
...ansaction/saleOrder/readyPayResult/model/useSelfTable.tsx
+1
-1
index.tsx
src/pages/user/index.tsx
+1
-1
register.tsx
src/pages/user/register.tsx
+1
-1
No files found.
src/layouts/components/UserHeader.tsx
View file @
9e6f2e72
...
...
@@ -24,7 +24,7 @@ const UserHeader: React.FC<UserHeaderProps> = (props) => {
const
getRouteName
=
()
=>
{
switch
(
pathname
)
{
case
'/user/login'
:
setTitle
(
"欢
迎登陆
"
)
setTitle
(
"欢
登录
"
)
break
case
'/user/register'
:
setTitle
(
"欢迎注册"
)
...
...
src/pages/lxMall/components/QuickNav/index.tsx
View file @
9e6f2e72
...
...
@@ -182,7 +182,7 @@ const QuickNav: React.FC<QuickNavPropsType> = (props) => {
<
span
className=
{
styles
.
welcome_text
}
>
Hi, 欢迎来到
{
name
}
</
span
>
</
div
>
<
div
className=
{
styles
.
btn_group
}
>
<
div
className=
{
cx
(
styles
.
btn_item
,
styles
.
primary
)
}
><
a
href=
{
`/user/login?redirect=${btoa(encodeURIComponent(String(window.location)))}`
}
>
登
陆
</
a
></
div
>
<
div
className=
{
cx
(
styles
.
btn_item
,
styles
.
primary
)
}
><
a
href=
{
`/user/login?redirect=${btoa(encodeURIComponent(String(window.location)))}`
}
>
登
录
</
a
></
div
>
<
div
className=
{
styles
.
btn_item
}
><
a
href=
"/user/register"
>
注册
</
a
></
div
>
</
div
>
...
...
src/pages/repositories/components/PositionSetting.tsx
View file @
9e6f2e72
...
...
@@ -246,7 +246,6 @@ const PositionSetting:React.FC<PositionSettingProps> = (props) => {
const
shopType
=
addSchemaAction
.
getFieldValue
(
'shopType'
);
// 当商城类型为 渠道商城、渠道自由商城和渠道积分商城时,需要带上下面两个参数
const
{
channelMemberIdList
,
channelMemberRoleId
}
=
productState
;
const
data
=
{
...
params
,
shopType
:
shopType
,
...
...
src/pages/transaction/saleOrder/readyPayResult/model/useSelfTable.tsx
View file @
9e6f2e72
...
...
@@ -80,7 +80,7 @@ export const useSelfTable = () => {
width
:
200
},
{
title
:
'
供应
会员'
,
title
:
'
采购
会员'
,
align
:
'left'
,
dataIndex
:
'supplyMembersName'
,
key
:
'supplyMembersName'
,
...
...
src/pages/user/index.tsx
View file @
9e6f2e72
...
...
@@ -91,7 +91,7 @@ const User: React.FC = () => {
</
div
>
<
Row
className=
{
'thirdLogin'
}
align=
'middle'
justify=
'center'
>
<
Col
>
其他方式登录
<
a
title=
"微
信登陆
"
><
img
src=
{
wechat
}
alt=
"微信登录"
/></
a
>
<
a
title=
"微
登录
"
><
img
src=
{
wechat
}
alt=
"微信登录"
/></
a
>
<
a
title=
"QQ登录"
><
img
src=
{
qq
}
alt=
"QQ登录"
/></
a
>
<
a
title=
"支付宝登录"
><
img
src=
{
alipay
}
alt=
"支付宝登录"
/></
a
>
</
Col
>
...
...
src/pages/user/register.tsx
View file @
9e6f2e72
...
...
@@ -328,7 +328,7 @@ const UserRegistry = () => {
</
p
>
</
div
>
}
<
p
className=
{
'readyLogin'
}
>
已有平台账号?
<
Link
to=
"/user/login"
>
去登
陆
</
Link
></
p
>
<
p
className=
{
'readyLogin'
}
>
已有平台账号?
<
Link
to=
"/user/login"
>
去登
录
</
Link
></
p
>
</
div
>
</
div
>
</
Fragment
>
...
...
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