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
黄庭坚
jinfa-platform
Commits
9b20668f
Commit
9b20668f
authored
Nov 10, 2020
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:修复资讯的问题和模板装修的问题
parent
7c3576d6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
10 deletions
+33
-10
index.tsx
src/pages/editor/channelEdit/index.tsx
+6
-2
index.tsx
...ngsPanel/propsSettings/components/AdvertSetting/index.tsx
+23
-4
index.less
...ages/lxMall/information/components/breadCrumbs/index.less
+1
-1
index.tsx
...pages/lxMall/information/components/breadCrumbs/index.tsx
+3
-3
No files found.
src/pages/editor/channelEdit/index.tsx
View file @
9b20668f
...
@@ -185,9 +185,13 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
...
@@ -185,9 +185,13 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
// 二号位广告
// 二号位广告
serviceAdvertConfig
[
serviceAdvertConfig
.
key
].
props
.
advertList
=
await
findSecondAdvertsByType
()
serviceAdvertConfig
[
serviceAdvertConfig
.
key
].
props
.
advertList
=
await
findSecondAdvertsByType
()
//店铺信息
const
channelInfo
:
any
=
await
fetchShopInfo
()
AboutUsConfig
[
AboutUsConfig
.
key
].
props
.
shopInfo
=
channelInfo
//店铺信息
headerConfig
[
headerConfig
.
key
].
props
.
logoUrl
=
channelInfo
.
logo
||
""
AboutUsConfig
[
AboutUsConfig
.
key
].
props
.
shopInfo
=
await
fetchShopInfo
()
topBarConfig
[
topBarConfig
.
key
].
props
.
shopname
=
channelInfo
.
company
||
""
// 行情资讯
// 行情资讯
InformationConfig
[
InformationConfig
.
key
].
props
.
newsList
=
await
fetchLeadNews
()
InformationConfig
[
InformationConfig
.
key
].
props
.
newsList
=
await
fetchLeadNews
()
...
...
src/pages/editor/settingsPanel/propsSettings/components/AdvertSetting/index.tsx
View file @
9b20668f
import
React
,
{
forwardRef
,
useState
,
useCallback
}
from
'react'
import
React
,
{
forwardRef
,
useState
,
useCallback
}
from
'react'
import
{
Button
,
Input
}
from
'antd'
import
{
Button
,
Input
,
Select
}
from
'antd'
import
UploadImage
from
'@/components/UploadImage'
import
UploadImage
from
'@/components/UploadImage'
import
{
filterPropsFunction
,
getAdvertType
}
from
'../../../../utils'
import
{
filterPropsFunction
,
getAdvertType
}
from
'../../../../utils'
import
SettingPanel
from
'../../../../components/SettingPanel'
import
SettingPanel
from
'../../../../components/SettingPanel'
...
@@ -193,9 +193,17 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
...
@@ -193,9 +193,17 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
return
return
}
}
setConfirmLoading
(
true
)
setConfirmLoading
(
true
)
saveAdvert
(
newProps
).
then
(()
=>
{
let
newParam
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
newProps
))
newParam
.
advertList
=
newParam
.
advertList
.
map
((
item
)
=>
{
if
(
!
item
.
link
.
startsWith
(
'http://'
)
&&
!
item
.
link
.
startsWith
(
'https://'
))
{
item
.
link
=
`http://
${
item
.
link
}
`
}
return
item
})
saveAdvert
(
newParam
).
then
(()
=>
{
changeProps
({
changeProps
({
props
:
newP
rops
props
:
newP
aram
})
})
clearSelectedStatus
()
clearSelectedStatus
()
setConfirmLoading
(
false
)
setConfirmLoading
(
false
)
...
@@ -263,6 +271,13 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
...
@@ -263,6 +271,13 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
}
}
const
selectBefore
=
(
<
Select
defaultValue=
"http://"
className=
"select-before"
>
<
Select
.
Option
value=
"http://"
>
http://
</
Select
.
Option
>
<
Select
.
Option
value=
"https://"
>
https://
</
Select
.
Option
>
</
Select
>
);
return
(
return
(
<
SettingPanel
<
SettingPanel
confirmLoading=
{
confirmLoading
}
confirmLoading=
{
confirmLoading
}
...
@@ -304,7 +319,11 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
...
@@ -304,7 +319,11 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
<
div
className=
{
styles
.
advert_setting_line_addItem_line
}
>
<
div
className=
{
styles
.
advert_setting_line_addItem_line
}
>
<
div
className=
{
styles
.
advert_setting_line_addItem_line_label
}
>
链接
</
div
>
<
div
className=
{
styles
.
advert_setting_line_addItem_line_label
}
>
链接
</
div
>
<
div
className=
{
styles
.
advert_setting_line_addItem_line_brief
}
>
<
div
className=
{
styles
.
advert_setting_line_addItem_line_brief
}
>
<
Input
className=
{
styles
.
advert_setting_line_addItem_input
}
value=
{
item
.
link
}
onChange=
{
(
e
)
=>
handleKeyChange
(
e
.
target
.
value
,
item
.
sort
,
'link'
)
}
/>
<
Input
className=
{
styles
.
advert_setting_line_addItem_input
}
value=
{
item
.
link
}
onChange=
{
(
e
)
=>
handleKeyChange
(
e
.
target
.
value
,
item
.
sort
,
'link'
)
}
/>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
...
...
src/pages/lxMall/information/components/breadCrumbs/index.less
View file @
9b20668f
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
background-color: rgba(250, 250, 250, 1);
background-color: rgba(250, 250, 250, 1);
box-shadow: none;
box-shadow: none;
&:focus {
&:focus
, &:active, &:hover
{
box-shadow: none;
box-shadow: none;
}
}
}
}
...
...
src/pages/lxMall/information/components/breadCrumbs/index.tsx
View file @
9b20668f
...
@@ -20,15 +20,15 @@ const BreadCrumbs: React.FC<BreadCrumbsPropsType> = (props) => {
...
@@ -20,15 +20,15 @@ const BreadCrumbs: React.FC<BreadCrumbsPropsType> = (props) => {
const
handlePreeEnter
=
(
e
)
=>
{
const
handlePreeEnter
=
(
e
)
=>
{
const
{
value
}
=
e
.
target
const
{
value
}
=
e
.
target
history
.
push
(
getLink
(
'/infomation/search'
,
`
?
keyword=
${
value
}
`
))
history
.
push
(
getLink
(
'/infomation/search'
,
`
&
keyword=
${
value
}
`
))
}
}
const
getLink
=
(
path
,
param
?)
=>
{
const
getLink
=
(
path
,
param
?)
=>
{
switch
(
layoutType
)
{
switch
(
layoutType
)
{
case
LAYOUT_TYPE
.
channel
:
case
LAYOUT_TYPE
.
channel
:
return
`
${
GlobalConfig
.
channelRootRoute
}${
path
}
${
param
?
param
:
''
}
&channelId=
${
shopUrlParam
}
`
return
`
${
GlobalConfig
.
channelRootRoute
}${
path
}
?channelId=
${
shopUrlParam
}${
param
?
param
:
''
}
`
case
LAYOUT_TYPE
.
ichannel
:
case
LAYOUT_TYPE
.
ichannel
:
return
`
${
GlobalConfig
.
ichannelRootRoute
}${
path
}
${
param
?
param
:
''
}
&channelId=
${
shopUrlParam
}
`
return
`
${
GlobalConfig
.
ichannelRootRoute
}${
path
}
?channelId=
${
shopUrlParam
}${
param
?
param
:
''
}
`
default
:
default
:
return
`
${
path
}${
param
?
param
:
''
}
`
return
`
${
path
}${
param
?
param
:
''
}
`
}
}
...
...
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