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
shenshaokai
jinfa-admin
Commits
a31fab34
Commit
a31fab34
authored
Sep 14, 2021
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: app商城装修修改
parent
4d909fbd
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
17 deletions
+33
-17
global.d.ts
src/global/config/global.d.ts
+2
-2
index.ts
src/global/config/index.ts
+24
-11
MobileDesignPanel.tsx
src/pages/pageCustomized/components/MobileDesignPanel.tsx
+2
-2
index.tsx
src/pages/pageCustomized/mobileEdit/index.tsx
+1
-1
index.tsx
src/pages/pageCustomized/platformEdit/index.tsx
+4
-1
No files found.
src/global/config/global.d.ts
View file @
a31fab34
...
...
@@ -41,7 +41,7 @@ export interface ShopInfo {
describe
:
string
;
state
:
number
;
url
:
string
;
isDefault
:
number
;
isDefault
?:
any
;
}
export
interface
OrderMode
{
...
...
@@ -62,7 +62,7 @@ export interface SiteInfo {
name
:
string
;
logo
:
string
;
siteUrl
:
string
;
symbol
:
string
;
symbol
?:
any
;
}
export
interface
Site
{
...
...
src/global/config/index.ts
View file @
a31fab34
...
...
@@ -6,18 +6,31 @@
* **********
*/
import
SELF_CONFIG
from
'../../../config/base.config.json'
import
{
RootObject
}
from
'./global'
import
SELF_CONFIG
from
'../../../config/base.config.json'
import
{
RootObject
}
from
'./global'
interface
NewRootObject
extends
RootObject
{
channelRootRoute
:
string
;
ichannelRootRoute
:
string
;
}
interface
GlobalConfigType
extends
RootObject
{
channelRootRoute
:
string
;
ichannelRootRoute
:
string
;
srmMallId
:
number
|
undefined
,
}
const
channelRootRoute
=
'channel'
const
ichannelRootRoute
=
'ichannel'
const
channelRootRoute
=
'channel'
const
ichannelRootRoute
=
'ichannel'
SELF_CONFIG
.
channelRootRoute
=
channelRootRoute
// 渠道商城路由根路径
SELF_CONFIG
.
ichannelRootRoute
=
ichannelRootRoute
// 渠道自有商城路由根路径
SELF_CONFIG
.
channelRootRoute
=
channelRootRoute
// 渠道商城路由根路径
SELF_CONFIG
.
ichannelRootRoute
=
ichannelRootRoute
// 渠道自有商城路由根路径
export
const
GlobalConfig
:
NewRootObject
=
SELF_CONFIG
const
getSrmdMallId
=
()
=>
{
const
shopInfo
=
SELF_CONFIG
.
web
.
shopInfo
const
webMallList
=
shopInfo
.
filter
((
item
:
any
)
=>
item
.
isDefault
===
1
&&
item
.
type
===
6
)
if
(
webMallList
&&
webMallList
.
length
>
0
)
{
const
mallItem
=
webMallList
[
0
]
return
mallItem
.
id
}
return
undefined
}
SELF_CONFIG
.
srmMallId
=
getSrmdMallId
()
export
const
GlobalConfig
:
GlobalConfigType
=
SELF_CONFIG
src/pages/pageCustomized/components/MobileDesignPanel.tsx
View file @
a31fab34
...
...
@@ -13,8 +13,8 @@ interface MobileDesignPanelPropsType {
}
const
MobileDesignPanel
:
React
.
FC
<
MobileDesignPanelPropsType
>
=
(
props
)
=>
{
const
{
pageConfig
,
theme
,
isPreview
,
onlyEidt
}
=
props
;
const
{
theme
,
isPreview
,
onlyEidt
}
=
props
;
const
{
pageConfig
}
=
useSelector
([
'pageConfig'
]);
return
(
<
div
className=
{
styles
.
mobileDesignContainer
}
>
...
...
src/pages/pageCustomized/mobileEdit/index.tsx
View file @
a31fab34
...
...
@@ -447,7 +447,7 @@ const appMallEdit: React.FC<ShopPreviewPropsType> = (props) => {
setComponentConfigs
(
finalConfig
)
setLoading
(
false
);
//
updatePageConfig(finalConfig);
updatePageConfig
(
finalConfig
);
}
catch
(
error
)
{
console
.
log
(
error
);
}
...
...
src/pages/pageCustomized/platformEdit/index.tsx
View file @
a31fab34
...
...
@@ -180,7 +180,10 @@ const MallEdit: React.FC<MallEditPropsType> = (props) => {
pageSize
:
6
,
overdue
:
true
};
PublicApi
.
getPurchaseInviteTenderGetInviteTenderListByEnterpriseWeb
(
param
).
then
((
res
)
=>
{
const
headers
:
any
=
{
shopId
:
GlobalConfig
.
srmMallId
}
PublicApi
.
getPurchaseInviteTenderGetInviteTenderListByEnterpriseWeb
(
param
,
{
headers
}).
then
((
res
)
=>
{
if
(
res
.
code
===
1000
)
{
let
list
:
any
[]
=
res
.
data
.
data
;
list
=
list
.
map
((
item
)
=>
{
...
...
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