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
d5470972
Commit
d5470972
authored
Sep 08, 2020
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:修改店铺链接地址和站点域名
parent
37a541c4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
8 deletions
+12
-8
demo.js
demo.js
+1
-1
app.tsx
src/app.tsx
+7
-3
index.tsx
src/pages/lxMall/index/index.tsx
+1
-1
LXShopLayout.tsx
src/pages/lxMall/layouts/LXShopLayout.tsx
+3
-3
No files found.
demo.js
View file @
d5470972
...
...
@@ -4,7 +4,7 @@ const mockData = {
data
:
{
global
:
{
siteId
:
352
,
siteUrl
:
'http://
localhost
:4396'
,
siteUrl
:
'http://
10.0.0.25
:4396'
,
logo
:
'https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/4db4e7c5424c471c968ab540bce027f31597319423082.png'
,
countryList
:
[
{
...
...
src/app.tsx
View file @
d5470972
...
...
@@ -117,15 +117,19 @@ export function render(oldRender: Function) {
export
function
onRouteChange
({
routes
,
matchedRoutes
,
location
,
action
})
{
console
.
log
(
'onRouteChange'
)
if
(
isDev
)
{
return
;
// if (isDev) {
// return;
// }
if
(
whiteLists
.
includes
(
location
.
pathname
))
{
return
}
// 是否登录
if
(
getAuth
())
{
const
routeAuthUrls
=
getRouters
()
const
{
query
,
pathname
}
=
location
if
(
userLoginLists
.
includes
(
pathname
))
{
// 当登录过, 并且尝试访问登录相关页面, 需重定向到首页
history
.
replace
(
'/memberCenter/home'
)
...
...
src/pages/lxMall/index/index.tsx
View file @
d5470972
...
...
@@ -110,7 +110,7 @@ const MallIndex: React.FC<MallIndexPropsType> = (props) => {
</
FloorLine
.
FloorHeader
>
<
FloorLine
.
Horizontal
>
<
FloorLine
.
Goods
goodsList=
{
categoryDetail
.
goodsBOList
}
/>
<
FloorLine
.
Shops
shopsList=
{
categoryDetail
.
shopBOList
}
linkUrl=
{
`/shop
?shopId=${btoa(JSON.stringify({ shopId: 3, memberId: 6 }))}
`
}
/>
<
FloorLine
.
Shops
shopsList=
{
categoryDetail
.
shopBOList
}
linkUrl=
{
`/shop`
}
/>
</
FloorLine
.
Horizontal
>
</
FloorLine
.
Vertical
>
</
FloorLine
.
Horizontal
>
...
...
src/pages/lxMall/layouts/LXShopLayout.tsx
View file @
d5470972
...
...
@@ -44,8 +44,8 @@ const LXShopLayout: React.FC<LXMallLayoutPropsType> = (props) => {
},
[])
useEffect
(()
=>
{
if
(
query
.
me
m
berId
)
{
fetchShopInfo
(
query
.
me
m
berId
)
if
(
query
.
meberId
)
{
fetchShopInfo
(
query
.
meberId
)
}
},
[
query
])
...
...
@@ -81,7 +81,7 @@ const LXShopLayout: React.FC<LXMallLayoutPropsType> = (props) => {
{
layoutType
:
'shop'
,
shopId
:
query
.
shopId
,
memberId
:
query
.
me
m
berId
,
memberId
:
query
.
meberId
,
shopUrlParam
:
shopId
,
shopInfo
},
...
...
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