Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
quantum-blocks-h5
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
ui
quantum-blocks-h5
Commits
de60a9f2
Commit
de60a9f2
authored
Oct 26, 2022
by
徐光星
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 增加历史记录页面路由
parent
db75319e
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
43 additions
and
14 deletions
+43
-14
activity.ts
app/controller/activity.ts
+7
-0
router.ts
app/router.ts
+1
-0
editor.api.ts
app/web/api/editor.api.ts
+3
-0
index.ts
app/web/page/activity/router/index.ts
+5
-0
index.ts
app/web/page/activity/view/activity/index.ts
+4
-1
index.ts
app/web/page/store/modules/activity/index.ts
+10
-0
apollo.json
config/apollo.json
+11
-11
apollo.ssr.json
config/apollo.ssr.json
+1
-1
package.json
package.json
+1
-1
No files found.
app/controller/activity.ts
View file @
de60a9f2
...
...
@@ -21,4 +21,11 @@ export default class ActivityController extends Controller {
}
ctx
.
body
=
body
;
}
public
async
history
(
ctx
:
Context
)
{
// 获取页面历史记录页面数据
const
apollo
=
ctx
.
app
.
config
.
apollo
||
{};
const
body
=
await
ctx
.
renderToHtml
(
'
activity.js
'
,
{
url
:
ctx
.
url
,
apollo
});
ctx
.
body
=
body
;
}
}
app/router.ts
View file @
de60a9f2
...
...
@@ -10,4 +10,5 @@ export default (application: Application) => {
});
router
.
get
(
'
/activity/:id
'
,
controller
.
activity
.
home
);
router
.
get
(
'
/history/:id
'
,
controller
.
activity
.
history
);
};
\ No newline at end of file
app/web/api/editor.api.ts
View file @
de60a9f2
...
...
@@ -5,6 +5,9 @@ export default {
getPageById
(
params
)
{
return
http
.
get
(
`
${
config
.
apiHost
}
/editor/get/
${
params
.
pageId
}
?lite=1`
);
},
getHistoryDataById
(
params
)
{
return
http
.
get
(
`
${
config
.
apiHost
}
/editor/getHistoryPage/
${
params
.
id
}
?lite=1`
);
},
getShopCartCount
()
{
return
http
.
get
(
`
${
config
.
kdspHost
}
/api/kdsp/shop-cart/count`
);
},
...
...
app/web/page/activity/router/index.ts
View file @
de60a9f2
...
...
@@ -12,6 +12,11 @@ export default function createRouter() {
{
path
:
'
/activity/:pageId
'
,
component
:
Activity
},
{
name
:
'
history
'
,
path
:
'
/history/:id
'
,
component
:
Activity
}
]
});
...
...
app/web/page/activity/view/activity/index.ts
View file @
de60a9f2
...
...
@@ -207,12 +207,15 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle
}
async
fetchApi
(
options
)
{
const
{
store
,
route
}
=
options
;
const
{
pageId
}
=
route
.
params
;
const
{
pageId
,
id
}
=
route
.
params
;
try
{
await
store
.
dispatch
(
'
getFinanceSetting
'
);
}
catch
(
err
)
{
console
.
log
(
err
);
}
if
(
route
.
name
&&
route
.
name
==
'
history
'
)
{
return
store
.
dispatch
(
'
getHistoryPageData
'
,
{
id
});
}
return
store
.
dispatch
(
'
getPageDate
'
,
{
pageId
});
}
updateShopCartCount
()
{
...
...
app/web/page/store/modules/activity/index.ts
View file @
de60a9f2
...
...
@@ -29,6 +29,16 @@ export default class EditorModule implements Module<EditorState, RootState> {
commit
(
SET_EMPTY_PAGE
,
true
);
}
},
async
getHistoryPageData
({
commit
},
condition
)
{
const
[
res
]
=
await
api
.
getHistoryDataById
(
condition
);
if
(
res
)
{
const
{
page
,
...
rest
}
=
res
as
PageInfo
;
commit
(
SET_PAGE_INFO
,
{
...
rest
,
page
:
JSON
.
parse
(
page
as
string
)
});
commit
(
SET_EMPTY_PAGE
,
false
);
}
else
{
commit
(
SET_EMPTY_PAGE
,
true
);
}
},
};
mutations
:
MutationTree
<
EditorState
>
=
{
...
...
config/apollo.json
View file @
de60a9f2
{
"api"
:
{
"apiHost"
:
"https://quantum-blocks-
toc
.liangkebang.net"
,
"h5Host"
:
"https://quantum-h5-
toc
.liangkebang.net"
,
"opapiHost"
:
"https://opapi-
toc
.liangkebang.net"
,
"passportHost"
:
"https://passportapi-
toc
.liangkebang.net"
,
"talosHost"
:
"https://talos-
toc
.liangkebang.net"
,
"kdspHost"
:
"https://kdsp-api-
toc
.liangkebang.net"
,
"apiHost"
:
"https://quantum-blocks-
ds
.liangkebang.net"
,
"h5Host"
:
"https://quantum-h5-
ds
.liangkebang.net"
,
"opapiHost"
:
"https://opapi-
ds
.liangkebang.net"
,
"passportHost"
:
"https://passportapi-
ds
.liangkebang.net"
,
"talosHost"
:
"https://talos-
ds
.liangkebang.net"
,
"kdspHost"
:
"https://kdsp-api-
ds
.liangkebang.net"
,
"loginUrl"
:
""
,
"newApolloFlag"
:
true
,
"h5ShopHost"
:
"https://tenet-
toc
.liangkebang.net/#"
,
"mallHost"
:
"https://mall-
toc
.liangkebang.net"
,
"xyqbH5Host"
:
"https://mapi-
toc
.liangkebang.net"
,
"h5ShopHost"
:
"https://tenet-
ds
.liangkebang.net/#"
,
"mallHost"
:
"https://mall-
ds
.liangkebang.net"
,
"xyqbH5Host"
:
"https://mapi-
ds
.liangkebang.net"
,
"yxmTenantId"
:
560761
,
"appIdMap"
:
{
"560761"
:
"wxe16bf9293671506c"
,
...
...
@@ -18,8 +18,8 @@
}
},
"redis"
:
{
"port"
:
"3
0895
"
,
"host"
:
"172.16.
4.89
"
,
"port"
:
"3
1980
"
,
"host"
:
"172.16.
92.18
"
,
"password"
:
""
,
"db"
:
0
},
...
...
config/apollo.ssr.json
View file @
de60a9f2
{
"apiHost"
:
"https://quantum-blocks-toc.liangkebang.net","h5Host"
:
"https://quantum-h5-toc.liangkebang.net","opapiHost"
:
"https://opapi-toc.liangkebang.net","passportHost"
:
"https://passportapi-toc.liangkebang.net","talosHost"
:
"https://talos-toc.liangkebang.net","kdspHost"
:
"https://kdsp-api-toc.liangkebang.net","loginUrl"
:
"","newApolloFlag"
:
true
,
"h5ShopHost"
:
"https://tenet-toc.liangkebang.net/#","mallHost"
:
"https://mall-toc.liangkebang.net","xyqbH5Host"
:
"https://mapi-toc.liangkebang.net","yxmTenantId"
:
560761
,
"appIdMap"
:{
"560761"
:
"wxe16bf9293671506c","560867"
:
"wxccb8435d68e8c7d6"},"qiniuUpHost"
:
"https://up-z0.qiniup.com","qiniuHost"
:
"https://appsync.lkbang.net"
}
\ No newline at end of file
{
"apiHost"
:
"https://quantum-blocks-ds.liangkebang.net","h5Host"
:
"https://quantum-h5-ds.liangkebang.net","opapiHost"
:
"https://opapi-ds.liangkebang.net","passportHost"
:
"https://passportapi-ds.liangkebang.net","talosHost"
:
"https://talos-ds.liangkebang.net","kdspHost"
:
"https://kdsp-api-ds.liangkebang.net","loginUrl"
:
"","newApolloFlag"
:
true
,
"h5ShopHost"
:
"https://tenet-ds.liangkebang.net/#","mallHost"
:
"https://mall-ds.liangkebang.net","xyqbH5Host"
:
"https://mapi-ds.liangkebang.net","yxmTenantId"
:
560761
,
"appIdMap"
:{
"560761"
:
"wxe16bf9293671506c","560867"
:
"wxccb8435d68e8c7d6"},"qiniuUpHost"
:
"https://up-z0.qiniup.com","qiniuHost"
:
"https://appsync.lkbang.net"
}
\ No newline at end of file
package.json
View file @
de60a9f2
...
...
@@ -8,7 +8,7 @@
"test"
:
"cross-env NODE_ENV=production EGG_SERVER_ENV=sit egg-scripts start --port 80 --workers 1"
,
"stop"
:
"egg-scripts stop"
,
"backend"
:
"nohup egg-scripts start --port 7001 --workers 4"
,
"dev"
:
"cross-env NODE_ENV=test APOLLO_CLUSTER=k8s NAMESPACE=
toc
npm run apollo && egg-bin dev -r egg-ts-helper/register"
,
"dev"
:
"cross-env NODE_ENV=test APOLLO_CLUSTER=k8s NAMESPACE=
ds
npm run apollo && egg-bin dev -r egg-ts-helper/register"
,
"debug"
:
"egg-bin debug -r egg-ts-helper/register"
,
"apollo"
:
"node bin/apollo.js"
,
"build"
:
"cross-env NODE_ENV=production APOLLO_CLUSTER=3C npm run apollo && cross-env COS_ENV=production easy build --devtool"
,
...
...
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