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
c25115a7
Commit
c25115a7
authored
Jan 22, 2021
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 1.修改生成电子合同接口;2.修改商城首页分类样式;3.修改渠道商城装修相关接口参数
parent
63b91f6e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
9 deletions
+12
-9
index.tsx
src/pages/editor/channelEdit/index.tsx
+2
-1
index.tsx
src/pages/lxMall/channel/index.tsx
+4
-4
index.less
src/pages/lxMall/components/Category/index.less
+2
-2
index.tsx
src/pages/lxMall/components/Recommand/index.tsx
+1
-0
index.tsx
src/pages/lxMall/order/index.tsx
+1
-1
index.tsx
src/pages/preview/channelPreview/index.tsx
+2
-1
No files found.
src/pages/editor/channelEdit/index.tsx
View file @
c25115a7
...
...
@@ -105,7 +105,8 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
const
param
:
any
=
{
templateId
:
id
,
categoryId
,
memberId
:
userInfo
.
memberId
memberId
:
userInfo
.
memberId
,
roleId
:
userInfo
.
memberRoleId
,
}
PublicApi
.
getTemplateAdornWebChannelMemberCategoryAdorn
(
param
).
then
(
res
=>
{
...
...
src/pages/lxMall/channel/index.tsx
View file @
c25115a7
...
...
@@ -8,7 +8,6 @@ import AboutUs from '../components/AboutUs'
import
{
inject
,
observer
}
from
'mobx-react'
import
{
PublicApi
}
from
'@/services/api'
import
{
LAYOUT_TYPE
}
from
'@/constants'
import
{
GetTemplatePlatformFindAllFirstCategoryResponse
,
GetTemplateWebMemberChannelWebFindCurrMemberChannelResponse
}
from
'@/services/TemplateApi'
import
{
GlobalConfig
}
from
'@/global/config'
import
styles
from
'./index.less'
...
...
@@ -17,13 +16,13 @@ interface ChannelIndexPropsType {
memberId
:
number
;
shopId
:
number
;
shopUrlParam
:
string
;
shopInfo
:
GetTemplateWebMemberChannelWebFindCurrMemberChannelResponse
;
shopInfo
:
any
;
layoutType
:
LAYOUT_TYPE
}
const
ChannelIndex
:
React
.
FC
<
ChannelIndexPropsType
>
=
(
props
)
=>
{
const
{
memberId
,
shopUrlParam
,
shopInfo
,
layoutType
}
=
props
const
[
categoryList
,
setCategoryList
]
=
useState
<
GetTemplatePlatformFindAllFirstCategoryResponse
>
([])
const
[
categoryList
,
setCategoryList
]
=
useState
<
any
>
([])
const
[
firstAdvertList
,
setFirstAdvertList
]
=
useState
([])
const
[
secondAdvertList
,
setSecondAdvertList
]
=
useState
([])
const
[
categoryComponents
,
setCategoryComponents
]
=
useState
<
React
.
ReactNode
>
()
...
...
@@ -106,7 +105,8 @@ const ChannelIndex: React.FC<ChannelIndexPropsType> = (props) => {
const
param
:
any
=
{
templateId
:
templateId
,
categoryId
,
memberId
memberId
,
roleId
:
shopInfo
.
roleId
,
}
PublicApi
.
getTemplateAdornWebChannelMemberCategoryAdorn
(
param
).
then
(
res
=>
{
...
...
src/pages/lxMall/components/Category/index.less
View file @
c25115a7
...
...
@@ -85,6 +85,7 @@
font-size: 12px;
line-height: 12px;
margin-top: 10px;
padding-right: 32px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
...
...
@@ -232,4 +233,4 @@
}
}
\ No newline at end of file
}
src/pages/lxMall/components/Recommand/index.tsx
View file @
c25115a7
...
...
@@ -107,6 +107,7 @@ const Recommand: React.FC<RecommandPropsType> = (props) => {
case
LAYOUT_TYPE
.
channel
:
case
LAYOUT_TYPE
.
ichannel
:
param
.
memberId
=
memberId
param
.
roleId
=
shopInfo
.
roleId
getFn
=
PublicApi
.
getTemplateAdornWebChannelFindAllFirstCategory
break
;
default
:
...
...
src/pages/lxMall/order/index.tsx
View file @
c25115a7
...
...
@@ -145,7 +145,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
param
.
deliveryAddresId
=
selectAddressInfo
.
id
}
const
signRes
=
await
PublicApi
.
postOrderSignatureSignContractCreate
(
param
)
const
signRes
=
await
PublicApi
.
postOrderSignature
PreOrder
SignContractCreate
(
param
)
const
signData
:
any
=
signRes
.
data
message
.
destroy
()
if
(
signRes
.
code
===
1000
)
{
...
...
src/pages/preview/channelPreview/index.tsx
View file @
c25115a7
...
...
@@ -106,7 +106,8 @@ const ChannelEdit: React.FC<ChannelEditPropsType> = (props) => {
const
param
:
any
=
{
templateId
:
id
,
categoryId
,
memberId
:
userInfo
.
memberId
memberId
:
userInfo
.
memberId
,
roleId
:
userInfo
.
memberRoleId
,
}
PublicApi
.
getTemplateAdornWebChannelMemberCategoryAdorn
(
param
).
then
(
res
=>
{
...
...
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