Skip to content

Q
quantum-blocks-h5
Commit 6be015a1 authored by 徐光星's avatar 徐光星
Browse files
Options

Merge branch 'feat/history' into 'master' 

Feat/history

See merge request !101
parents 8eb78cb4 e023e552
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 29 deletions
app/controller/activity.ts
View file @ 6be015a1
...@@ -21,4 +21,11 @@ export default class ActivityController extends Controller { ...@@ -21,4 +21,11 @@ export default class ActivityController extends Controller {
} }
ctx.body = body; 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 @ 6be015a1
...@@ -10,4 +10,5 @@ export default (application: Application) => { ...@@ -10,4 +10,5 @@ export default (application: Application) => {
}); });
router.get('/activity/:id', controller.activity.home); 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 @ 6be015a1
...@@ -5,6 +5,9 @@ export default { ...@@ -5,6 +5,9 @@ export default {
getPageById(params) { getPageById(params) {
return http.get(`${config.apiHost}/editor/get/${params.pageId}?lite=1`); 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() { getShopCartCount() {
return http.get(`${config.kdspHost}/api/kdsp/shop-cart/count`); return http.get(`${config.kdspHost}/api/kdsp/shop-cart/count`);
}, },
......
app/web/page/activity/router/index.ts
View file @ 6be015a1
...@@ -12,6 +12,11 @@ export default function createRouter() { ...@@ -12,6 +12,11 @@ export default function createRouter() {
{ {
path: '/activity/:pageId', path: '/activity/:pageId',
component: Activity component: Activity
},
{
name: 'history',
path: '/history/:id',
component: Activity
} }
] ]
}); });
......
app/web/page/activity/view/activity/index.ts
View file @ 6be015a1
...@@ -60,7 +60,7 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle ...@@ -60,7 +60,7 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle
couponModalData: object = {}; couponModalData: object = {};
get layout() { get layout() {
if (!isApp && !isWxMp && !EASY_ENV_IS_NODE) { if (!isApp && !isWxMp && !EASY_ENV_IS_NODE) {
this.pageData.elements = this.pageData.elements.filter(v => v.name !== 'cs-search-bar' && v.name !== 'cs-snap-up'); this.pageData.elements = this.$route.query.isPreview ? this.pageData.elements : this.pageData.elements.filter(v => v.name !== 'cs-search-bar' && v.name !== 'cs-snap-up');
} }
return this.pageData && this.pageData.elements.map(v => v.point) || []; return this.pageData && this.pageData.elements.map(v => v.point) || [];
} }
...@@ -121,7 +121,7 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle ...@@ -121,7 +121,7 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle
} }
mounted() { mounted() {
if (!isApp && !isWxMp && !EASY_ENV_IS_NODE) { if (!isApp && !isWxMp && !EASY_ENV_IS_NODE) {
this.pageData.elements = this.pageData.elements.filter(v => v.name !== 'cs-search-bar' && v.name !== 'cs-snap-up'); this.pageData.elements = this.$route.query.isPreview ? this.pageData.elements : this.pageData.elements.filter(v => v.name !== 'cs-search-bar' && v.name !== 'cs-snap-up');
} }
this.targetEle = document.querySelector('body'); this.targetEle = document.querySelector('body');
if (EASY_ENV_IS_BROWSER) { this.showBackTop = true; } if (EASY_ENV_IS_BROWSER) { this.showBackTop = true; }
...@@ -276,12 +276,15 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle ...@@ -276,12 +276,15 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle
} }
async fetchApi(options) { async fetchApi(options) {
const { store, route } = options; const { store, route } = options;
const { pageId } = route.params; const { pageId, id } = route.params;
// try { try {
// await store.dispatch('getFinanceSetting'); await store.dispatch('getFinanceSetting');
// } catch (err) { } catch (err) {
// console.log(err); console.log(err);
// } }
if (route.name && route.name == 'history') {
return store.dispatch('getHistoryPageData', { id });
}
return store.dispatch('getPageDate', { pageId }); return store.dispatch('getPageDate', { pageId });
} }
updateShopCartCount() { updateShopCartCount() {
......
app/web/page/store/modules/activity/index.ts
View file @ 6be015a1
...@@ -29,6 +29,16 @@ export default class EditorModule implements Module<EditorState, RootState> { ...@@ -29,6 +29,16 @@ export default class EditorModule implements Module<EditorState, RootState> {
commit(SET_EMPTY_PAGE, true); 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> = { mutations: MutationTree<EditorState> = {
......
config/apollo.json
View file @ 6be015a1
{ {
"api": { "api": {
"apiHost": "https://quantum-blocks-ds.liangkebang.net", "apiHost": "https://quantum-blocks-yxm2.liangkebang.net",
"h5Host": "https://quantum-h5-ds.liangkebang.net", "h5Host": "https://quantum-h5-yxm2.liangkebang.net",
"opapiHost": "https://opapi-ds.liangkebang.net", "opapiHost": "https://opapi-yxm2.liangkebang.net",
"passportHost": "https://passportapi-ds.liangkebang.net", "passportHost": "https://passportapi-yxm2.liangkebang.net",
"talosHost": "https://talos-ds.liangkebang.net", "talosHost": "https://talos-yxm2.liangkebang.net",
"kdspHost": "https://kdsp-api-ds.liangkebang.net", "kdspHost": "https://kdsp-api-yxm2.liangkebang.net",
"loginUrl": "", "loginUrl": "",
"newApolloFlag": true, "newApolloFlag": true,
"h5ShopHost": "https://tenet-ds.liangkebang.net/#", "h5ShopHost": "https://tenet-yxm2.liangkebang.net/#",
"mallHost": "https://mall-ds.liangkebang.net", "mallHost": "https://mall-yxm2.liangkebang.net",
"xyqbH5Host": "https://mapi-ds.liangkebang.net", "xyqbH5Host": "https://mapi-yxm2.liangkebang.net",
"yxmTenantId": 560761, "yxmTenantId": 560761,
"appIdMap": { "appIdMap": {
"560761": "wxe16bf9293671506c", "560761": "wxe16bf9293671506c",
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
} }
}, },
"redis": { "redis": {
"port": "31980", "port": "30924",
"host": "172.16.92.18", "host": "172.16.92.56",
"password": "", "password": "",
"db": 0 "db": 0
}, },
......
config/apollo.ssr.json
View file @ 6be015a1
{"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"} {"apiHost":"https://quantum-blocks-yxm2.liangkebang.net","h5Host":"https://quantum-h5-yxm2.liangkebang.net","opapiHost":"https://opapi-yxm2.liangkebang.net","passportHost":"https://passportapi-yxm2.liangkebang.net","talosHost":"https://talos-yxm2.liangkebang.net","kdspHost":"https://kdsp-api-yxm2.liangkebang.net","loginUrl":"","newApolloFlag":true,"h5ShopHost":"https://tenet-yxm2.liangkebang.net/#","mallHost":"https://mall-yxm2.liangkebang.net","xyqbH5Host":"https://mapi-yxm2.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 \ No newline at end of file
package-lock.json
View file @ 6be015a1
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
"@better-scroll/core": "^2.0.5", "@better-scroll/core": "^2.0.5",
"@qg/apollo-nodejs": "^2.1.2", "@qg/apollo-nodejs": "^2.1.2",
"@qg/cherry-ui": "2.23.10", "@qg/cherry-ui": "2.23.10",
"@qg/citrus-ui": "0.3.57-beta1", "@qg/citrus-ui": "0.3.59",
"@qg/js-bridge": "^1.1.12", "@qg/js-bridge": "^1.1.12",
"babel-plugin-transform-vue-jsx": "^4.0.1", "babel-plugin-transform-vue-jsx": "^4.0.1",
"cos-nodejs-sdk-v5": "^2.9.12", "cos-nodejs-sdk-v5": "^2.9.12",
...@@ -3274,9 +3274,9 @@ ...@@ -3274,9 +3274,9 @@
} }
}, },
"node_modules/@qg/citrus-ui": { "node_modules/@qg/citrus-ui": {
"version": "0.3.57-beta1", "version": "0.3.59",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.57-beta1.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.59.tgz",
"integrity": "sha512-LwDWiKca4AwcjC7YQlfB0gkOA1BwXS0OlLiDtvH6MUlcyRitIBReHjQV3S36LlSH6XfgMNoLUGi3FgMsX3SLrA==", "integrity": "sha512-+uMf1BPpyxgjKSkb2S2WShtU8+thLLfi3V7Zo/H5F/XWzNCKTCwTCb/Z1UmRrtHlITVEbr0tYYQ822On5eQX3g==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@better-scroll/core": "^2.1.1", "@better-scroll/core": "^2.1.1",
...@@ -39584,9 +39584,9 @@ ...@@ -39584,9 +39584,9 @@
} }
}, },
"@qg/citrus-ui": { "@qg/citrus-ui": {
"version": "0.3.57-beta1", "version": "0.3.59",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.57-beta1.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.59.tgz",
"integrity": "sha512-LwDWiKca4AwcjC7YQlfB0gkOA1BwXS0OlLiDtvH6MUlcyRitIBReHjQV3S36LlSH6XfgMNoLUGi3FgMsX3SLrA==", "integrity": "sha512-+uMf1BPpyxgjKSkb2S2WShtU8+thLLfi3V7Zo/H5F/XWzNCKTCwTCb/Z1UmRrtHlITVEbr0tYYQ822On5eQX3g==",
"requires": { "requires": {
"@better-scroll/core": "^2.1.1", "@better-scroll/core": "^2.1.1",
"@qg/cherry-ui": "^2.23.9", "@qg/cherry-ui": "^2.23.9",
package.json
View file @ 6be015a1
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"test": "cross-env NODE_ENV=production EGG_SERVER_ENV=sit egg-scripts start --port 80 --workers 1", "test": "cross-env NODE_ENV=production EGG_SERVER_ENV=sit egg-scripts start --port 80 --workers 1",
"stop": "egg-scripts stop", "stop": "egg-scripts stop",
"backend": "nohup egg-scripts start --port 7001 --workers 4", "backend": "nohup egg-scripts start --port 7001 --workers 4",
"dev": "cross-env NODE_ENV=test APOLLO_CLUSTER=k8s NAMESPACE=ds npm run apollo && egg-bin dev -r egg-ts-helper/register", "dev": "cross-env NODE_ENV=test APOLLO_CLUSTER=k8s NAMESPACE=yxm2 npm run apollo && egg-bin dev -r egg-ts-helper/register",
"debug": "egg-bin debug -r egg-ts-helper/register", "debug": "egg-bin debug -r egg-ts-helper/register",
"apollo": "node bin/apollo.js", "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", "build": "cross-env NODE_ENV=production APOLLO_CLUSTER=3C npm run apollo && cross-env COS_ENV=production easy build --devtool",
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
"@better-scroll/core": "^2.0.5", "@better-scroll/core": "^2.0.5",
"@qg/apollo-nodejs": "^2.1.2", "@qg/apollo-nodejs": "^2.1.2",
"@qg/cherry-ui": "2.23.10", "@qg/cherry-ui": "2.23.10",
"@qg/citrus-ui": "0.3.57-beta1", "@qg/citrus-ui": "0.3.59",
"@qg/js-bridge": "^1.1.12", "@qg/js-bridge": "^1.1.12",
"babel-plugin-transform-vue-jsx": "^4.0.1", "babel-plugin-transform-vue-jsx": "^4.0.1",
"cos-nodejs-sdk-v5": "^2.9.12", "cos-nodejs-sdk-v5": "^2.9.12",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment