Skip to content

Q
quantum-blocks-h5
Commit 8a9d18e7 authored by 郝聪敏's avatar 郝聪敏
Browse files
Options

fix: 修改bug

parent 4a978980
Hide whitespace changes
Inline Side-by-side
Showing with 194 additions and 21 deletions
app/controller/activity.ts
View file @ 8a9d18e7
...@@ -3,6 +3,12 @@ import { Controller, Context } from 'egg'; ...@@ -3,6 +3,12 @@ import { Controller, Context } from 'egg';
export default class ActivityController extends Controller { export default class ActivityController extends Controller {
public async home(ctx: Context) { public async home(ctx: Context) {
await ctx.render('activity.js', { url: ctx.url }); const redisKey = `quantum-blocks:page:${ctx.params.id}`;
let body = await ctx.service.redis.get(redisKey);
if (!body) {
body = await ctx.renderView('activity.js', { url: ctx.url });
await ctx.service.redis.set(redisKey, body);
}
ctx.body = body;
} }
} }
\ No newline at end of file
app/service/redis.ts 0 → 100644
View file @ 8a9d18e7
import { Context, Service } from 'egg';
export default class ArticeService extends Service {
private context: Context;
constructor(ctx: Context) {
super(ctx);
this.context = ctx;
}
async set(key, value, seconds = 1000 * 60 * 60 * 24) {
value = JSON.stringify(value);
if (this.context.app.redis) {
await this.context.app.redis.set(key, value, 'EX', seconds);
}
}
async get(key) {
if (this.context.app.redis) {
const data = await this.context.app.redis.get(key);
if (!data) {
return;
}
return JSON.parse(data);
}
}
}
app/typings/global.d.ts
View file @ 8a9d18e7
declare module 'egg' {
interface Application {
redis: any;
}
}
\ No newline at end of file
app/web/page/activity/component/FreedomContainer/index.ts
View file @ 8a9d18e7
...@@ -11,6 +11,7 @@ export default class FreedomContainer extends Mixins(TransformStyleMixin) { ...@@ -11,6 +11,7 @@ export default class FreedomContainer extends Mixins(TransformStyleMixin) {
@Prop({type: Object, default: () => ({ child: [] })}) childItem; @Prop({type: Object, default: () => ({ child: [] })}) childItem;
@Prop(String) backgroundImage; @Prop(String) backgroundImage;
@Prop(Object) saInfo;
mounted() { mounted() {
// 根据背景图设置元素高度 // 根据背景图设置元素高度
...@@ -21,5 +22,7 @@ export default class FreedomContainer extends Mixins(TransformStyleMixin) { ...@@ -21,5 +22,7 @@ export default class FreedomContainer extends Mixins(TransformStyleMixin) {
this.updatePageInfo({ containerIndex: index, data: { ...this.pageData?.elements[index], point: { ...point, h: height ?? point.h } } }); this.updatePageInfo({ containerIndex: index, data: { ...this.pageData?.elements[index], point: { ...point, h: height ?? point.h } } });
}); });
} }
// console.log('saInfo', this.saInfo);
} }
} }
\ No newline at end of file
app/web/page/activity/view/activity/index.ts
View file @ 8a9d18e7
...@@ -76,6 +76,15 @@ export default class Activity extends Mixins(TransformStyleMixin) { ...@@ -76,6 +76,15 @@ export default class Activity extends Mixins(TransformStyleMixin) {
console.log(title, '点击了'); console.log(title, '点击了');
} }
getSaInfo(element) {
const { id, title, name } = element;
return {
assembly_id: id,
assembly_type: title,
assembly_name: name
};
}
modfiTabsStyle() { modfiTabsStyle() {
const tabsEle = document.querySelector('.tabs'); const tabsEle = document.querySelector('.tabs');
if (tabsEle) { if (tabsEle) {
......
app/web/page/activity/view/activity/index.vue
View file @ 8a9d18e7
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
:key="item.point.i" :key="item.point.i"
@click.native="dot(item.title)" @click.native="dot(item.title)"
> >
<component v-exp-dot :data-dot="item.title" :data-index="index" :containerIndex="index" :childItem="item" :is="item.name" :key="item.id" v-bind="item.props"></component> <component v-exp-dot :data-dot="item.title" :data-index="index" :containerIndex="index" :childItem="item" :is="item.name" :key="item.id" :sa-info="getSaInfo(item)" v-bind="item.props"></component>
</grid-item> </grid-item>
</grid-layout> </grid-layout>
<cr-back-top v-if="showBackTop && pageData.props.showBackTop" /> <cr-back-top v-if="showBackTop && pageData.props.showBackTop" />
......
app/web/service/sa.service.ts
View file @ 8a9d18e7
...@@ -9,7 +9,7 @@ export function initSa(router) { ...@@ -9,7 +9,7 @@ export function initSa(router) {
server_url: config.shenceUrl, server_url: config.shenceUrl,
heatmap: { heatmap: {
// 是否开启点击图，默认 default 表示开启，自动采集 $WebClick 事件，可以设置 'not_collect' 表示关闭 // 是否开启点击图，默认 default 表示开启，自动采集 $WebClick 事件，可以设置 'not_collect' 表示关闭
clickmap: 'default', clickmap: 'not_collect',
// 是否开启触达注意力图，默认 default 表示开启，自动采集 $WebStay 事件，可以设置 'not_collect' 表示关闭 // 是否开启触达注意力图，默认 default 表示开启，自动采集 $WebStay 事件，可以设置 'not_collect' 表示关闭
scroll_notice_map: 'default', scroll_notice_map: 'default',
}, },
......
bin/server.js
View file @ 8a9d18e7
...@@ -2,8 +2,12 @@ ...@@ -2,8 +2,12 @@
"use strict"; "use strict";
const npm = require("npm"); const npm = require("npm");
npm.load(() => { npm.load(() => {
npm.run("start"); if (process.env.NODE_ENV === 'production') {
npm.run("start");
} else {
npm.run("test");
}
}); });
\ No newline at end of file
config/config.local.ts
View file @ 8a9d18e7
...@@ -27,5 +27,14 @@ export default (appInfo: EggAppConfig) => { ...@@ -27,5 +27,14 @@ export default (appInfo: EggAppConfig) => {
browser: 'http://localhost:7001/' browser: 'http://localhost:7001/'
}; };
exports.redis = {
client: {
port: 31565, // Redis port
host: '172.17.5.13', // Redis host
password: '',
db: 0
}
};
return exports; return exports;
}; };
config/config.prod.ts
View file @ 8a9d18e7
...@@ -13,14 +13,25 @@ export default (appInfo: EggAppConfig) => { ...@@ -13,14 +13,25 @@ export default (appInfo: EggAppConfig) => {
dir: '/home/quant_group/logs', dir: '/home/quant_group/logs',
}; };
const prodMysqlConfig = { const prodRedisConfig = {
dialect: 'mysql', client: {
username: 'low_code_w', port: 6379, // Redis port
password: 'B2pRHuGMLBNybuKp', host: 'front-redis.quantgroups.com', // Redis host
host: 'low-code-db.quantgroups.com', password: 'ln4^ESq80j4nrTMZ',
port: 3306, db: 0
database: 'low_code', }
}; };
const localRedisConfig = {
client: {
port: 31565, // Redis port
host: '172.17.5.13', // Redis host
password: '',
db: 0
}
};
exports.redis = process.env.NAMESPACE ? prodRedisConfig : localRedisConfig;
return exports; return exports;
}; };
config/plugin.ts
View file @ 8a9d18e7
...@@ -5,4 +5,8 @@ export default { ...@@ -5,4 +5,8 @@ export default {
cors: { cors: {
package: 'egg-cors' package: 'egg-cors'
}, },
redis: {
enable: true,
package: 'egg-redis'
}
}; };
\ No newline at end of file
package-lock.json
View file @ 8a9d18e7
{ {
"name": "quantum-blocks", "name": "quantum-blocks-h5",
"version": "0.0.1", "version": "0.0.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
...@@ -1590,9 +1590,9 @@ ...@@ -1590,9 +1590,9 @@
"integrity": "sha512-DvJbbn3dUgMxDnJLH+RZQPnXak1h4ZVYQ7CWiFWjQwBFkVajT4rfw2PdpHLTSTwxrYfnoEXkuBiwkDm6tPMQeA==" "integrity": "sha512-DvJbbn3dUgMxDnJLH+RZQPnXak1h4ZVYQ7CWiFWjQwBFkVajT4rfw2PdpHLTSTwxrYfnoEXkuBiwkDm6tPMQeA=="
}, },
"@qg/cherry-ui": { "@qg/cherry-ui": {
"version": "2.20.5", "version": "2.20.6",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.20.5.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.20.6.tgz",
"integrity": "sha512-DL3ZtlydZzj8uz+Z7WavMUD9qq0xXTig+cb05FtajKXsY8ZjHIaZJQmUB3kYJQzeWfks1nubJDb4UcG4GdMm6A==", "integrity": "sha512-meVa0I+uoKkit49zVqlqDVvMwjzMnSOp034BiB+YEHgJ8XJsCweewZxaR2PHyQEUf5x3oKgnAWGDFldGq/ERbg==",
"requires": { "requires": {
"@popperjs/core": "^2.5.4", "@popperjs/core": "^2.5.4",
"vue-lazyload": "^1.3.3", "vue-lazyload": "^1.3.3",
...@@ -1765,6 +1765,14 @@ ...@@ -1765,6 +1765,14 @@
"resolved": "http://npmprivate.quantgroups.com/@types%2fhttp-errors/-/http-errors-1.8.0.tgz", "resolved": "http://npmprivate.quantgroups.com/@types%2fhttp-errors/-/http-errors-1.8.0.tgz",
"integrity": "sha512-2aoSC4UUbHDj2uCsCxcG/vRMXey/m17bC7UwitVm5hn22nI8O8Y9iDpA76Orc+DWkQ4zZrOKEshCqR/jSuXAHA==" "integrity": "sha512-2aoSC4UUbHDj2uCsCxcG/vRMXey/m17bC7UwitVm5hn22nI8O8Y9iDpA76Orc+DWkQ4zZrOKEshCqR/jSuXAHA=="
}, },
"@types/ioredis": {
"version": "4.22.1",
"resolved": "http://npmprivate.quantgroups.com/@types%2fioredis/-/ioredis-4.22.1.tgz",
"integrity": "sha512-GxXT828fkvBeThO68ZJg8cD2haqea5ANBJaxA+UZqLranNkEnQ8N7QLPtykwWbN/sRQz75O7kj+PNmCKF4CEKw==",
"requires": {
"@types/node": "*"
}
},
"@types/istanbul-lib-coverage": { "@types/istanbul-lib-coverage": {
"version": "2.0.3", "version": "2.0.3",
"resolved": "http://npmprivate.quantgroups.com/@types%2fistanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", "resolved": "http://npmprivate.quantgroups.com/@types%2fistanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
...@@ -5671,6 +5679,11 @@ ...@@ -5671,6 +5679,11 @@
"utility": "^1.15.0" "utility": "^1.15.0"
} }
}, },
"cluster-key-slot": {
"version": "1.1.0",
"resolved": "http://npmprivate.quantgroups.com/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz",
"integrity": "sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw=="
},
"cluster-reload": { "cluster-reload": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "http://npmprivate.quantgroups.com/cluster-reload/-/cluster-reload-1.0.2.tgz", "resolved": "http://npmprivate.quantgroups.com/cluster-reload/-/cluster-reload-1.0.2.tgz",
...@@ -7132,6 +7145,11 @@ ...@@ -7132,6 +7145,11 @@
"resolved": "http://npmprivate.quantgroups.com/delegates/-/delegates-1.0.0.tgz", "resolved": "http://npmprivate.quantgroups.com/delegates/-/delegates-1.0.0.tgz",
"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
}, },
"denque": {
"version": "1.5.0",
"resolved": "http://npmprivate.quantgroups.com/denque/-/denque-1.5.0.tgz",
"integrity": "sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ=="
},
"depd": { "depd": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "http://npmprivate.quantgroups.com/depd/-/depd-1.1.2.tgz", "resolved": "http://npmprivate.quantgroups.com/depd/-/depd-1.1.2.tgz",
...@@ -8010,6 +8028,16 @@ ...@@ -8010,6 +8028,16 @@
"path-to-regexp": "^1.7.0" "path-to-regexp": "^1.7.0"
} }
}, },
"egg-redis": {
"version": "2.4.0",
"resolved": "http://npmprivate.quantgroups.com/egg-redis/-/egg-redis-2.4.0.tgz",
"integrity": "sha512-c8NBivXMfHhxBh2hdAFlYP5R1790SF+E9dMCEN54Qbgu3QsMKoGH3Db5dN2cZ6SpBD0XED/Evlcl0LXqNecToA==",
"requires": {
"@types/ioredis": "^4.0.10",
"await-first": "^1.0.0",
"ioredis": "^4.9.0"
}
},
"egg-schedule": { "egg-schedule": {
"version": "3.6.6", "version": "3.6.6",
"resolved": "http://npmprivate.quantgroups.com/egg-schedule/-/egg-schedule-3.6.6.tgz", "resolved": "http://npmprivate.quantgroups.com/egg-schedule/-/egg-schedule-3.6.6.tgz",
...@@ -11433,6 +11461,23 @@ ...@@ -11433,6 +11461,23 @@
"resolved": "http://npmprivate.quantgroups.com/invert-kv/-/invert-kv-2.0.0.tgz", "resolved": "http://npmprivate.quantgroups.com/invert-kv/-/invert-kv-2.0.0.tgz",
"integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==" "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="
}, },
"ioredis": {
"version": "4.24.4",
"resolved": "http://npmprivate.quantgroups.com/ioredis/-/ioredis-4.24.4.tgz",
"integrity": "sha512-v28xxBENyTmReC6lVTL7EkAPjVF8cuGtDEjGDi1Z2n7htsC2WdiDceZrCIPeuPiLa6kDFWHb1Y8O0upZROsMgA==",
"requires": {
"cluster-key-slot": "^1.1.0",
"debug": "^4.3.1",
"denque": "^1.1.0",
"lodash.defaults": "^4.2.0",
"lodash.flatten": "^4.4.0",
"p-map": "^2.1.0",
"redis-commands": "1.7.0",
"redis-errors": "^1.2.0",
"redis-parser": "^3.0.0",
"standard-as-callback": "^2.1.0"
}
},
"ip": { "ip": {
"version": "1.1.5", "version": "1.1.5",
"resolved": "http://npmprivate.quantgroups.com/ip/-/ip-1.1.5.tgz", "resolved": "http://npmprivate.quantgroups.com/ip/-/ip-1.1.5.tgz",
...@@ -12637,8 +12682,12 @@ ...@@ -12637,8 +12682,12 @@
"lodash.defaults": { "lodash.defaults": {
"version": "4.2.0", "version": "4.2.0",
"resolved": "http://npmprivate.quantgroups.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz", "resolved": "http://npmprivate.quantgroups.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
"integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=", "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw="
"dev": true },
"lodash.flatten": {
"version": "4.4.0",
"resolved": "http://npmprivate.quantgroups.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
"integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8="
}, },
"lodash.get": { "lodash.get": {
"version": "4.4.2", "version": "4.4.2",
...@@ -18219,6 +18268,11 @@ ...@@ -18219,6 +18268,11 @@
"p-limit": "^2.0.0" "p-limit": "^2.0.0"
} }
}, },
"p-map": {
"version": "2.1.0",
"resolved": "http://npmprivate.quantgroups.com/p-map/-/p-map-2.1.0.tgz",
"integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="
},
"p-try": { "p-try": {
"version": "2.2.0", "version": "2.2.0",
"resolved": "http://npmprivate.quantgroups.com/p-try/-/p-try-2.2.0.tgz", "resolved": "http://npmprivate.quantgroups.com/p-try/-/p-try-2.2.0.tgz",
...@@ -19994,6 +20048,24 @@ ...@@ -19994,6 +20048,24 @@
"strip-indent": "^1.0.1" "strip-indent": "^1.0.1"
} }
}, },
"redis-commands": {
"version": "1.7.0",
"resolved": "http://npmprivate.quantgroups.com/redis-commands/-/redis-commands-1.7.0.tgz",
"integrity": "sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ=="
},
"redis-errors": {
"version": "1.2.0",
"resolved": "http://npmprivate.quantgroups.com/redis-errors/-/redis-errors-1.2.0.tgz",
"integrity": "sha1-62LSrbFeTq9GEMBK/hUpOEJQq60="
},
"redis-parser": {
"version": "3.0.0",
"resolved": "http://npmprivate.quantgroups.com/redis-parser/-/redis-parser-3.0.0.tgz",
"integrity": "sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=",
"requires": {
"redis-errors": "^1.0.0"
}
},
"regenerate": { "regenerate": {
"version": "1.4.2", "version": "1.4.2",
"resolved": "http://npmprivate.quantgroups.com/regenerate/-/regenerate-1.4.2.tgz", "resolved": "http://npmprivate.quantgroups.com/regenerate/-/regenerate-1.4.2.tgz",
...@@ -21231,6 +21303,11 @@ ...@@ -21231,6 +21303,11 @@
"resolved": "http://npmprivate.quantgroups.com/stack-trace/-/stack-trace-0.0.10.tgz", "resolved": "http://npmprivate.quantgroups.com/stack-trace/-/stack-trace-0.0.10.tgz",
"integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=" "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA="
}, },
"standard-as-callback": {
"version": "2.1.0",
"resolved": "http://npmprivate.quantgroups.com/standard-as-callback/-/standard-as-callback-2.1.0.tgz",
"integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A=="
},
"static-extend": { "static-extend": {
"version": "0.1.2", "version": "0.1.2",
"resolved": "http://npmprivate.quantgroups.com/static-extend/-/static-extend-0.1.2.tgz", "resolved": "http://npmprivate.quantgroups.com/static-extend/-/static-extend-0.1.2.tgz",
......
package.json
View file @ 8a9d18e7
{ {
"name": "quantum-blocks", "name": "quantum-blocks-h5",
"version": "0.0.1", "version": "0.0.1",
"description": "低代码平台", "description": "低代码平台",
"scripts": { "scripts": {
"start": "egg-scripts start --port 80 --workers 1", "start": "egg-scripts start --port 9050",
"test": "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": "egg-bin dev -r egg-ts-helper/register", "dev": "egg-bin dev -r egg-ts-helper/register",
...@@ -19,12 +20,13 @@ ...@@ -19,12 +20,13 @@
}, },
"dependencies": { "dependencies": {
"@better-scroll/core": "^2.0.5", "@better-scroll/core": "^2.0.5",
"@qg/cherry-ui": "^2.20.5", "@qg/cherry-ui": "^2.20.6",
"@qg/citrus-ui": "0.0.42", "@qg/citrus-ui": "0.0.42",
"babel-plugin-transform-vue-jsx": "^4.0.1", "babel-plugin-transform-vue-jsx": "^4.0.1",
"egg": "^2.3.0", "egg": "^2.3.0",
"egg-bin": "^4.9.0", "egg-bin": "^4.9.0",
"egg-cors": "^2.1.1", "egg-cors": "^2.1.1",
"egg-redis": "^2.4.0",
"egg-scripts": "^2.10.0", "egg-scripts": "^2.10.0",
"egg-ts-helper": "^1.13.0", "egg-ts-helper": "^1.13.0",
"egg-view-vue-ssr": "^3.0.5", "egg-view-vue-ssr": "^3.0.5",
......
typings/app/service/index.d.ts 0 → 100644
View file @ 8a9d18e7
// This file is created by egg-ts-helper@1.25.8
// Do not modify this file!!!!!!!!!
import 'egg';
type AnyClass = new (...args: any[]) => any;
type AnyFunc<T = any> = (...args: any[]) => T;
type CanExportFunc = AnyFunc<Promise<any>> | AnyFunc<IterableIterator<any>>;
type AutoInstanceType<T, U = T extends CanExportFunc ? T : T extends AnyFunc ? ReturnType<T> : T> = U extends AnyClass ? InstanceType<U> : U;
import ExportRedis from '../../../app/service/redis';
declare module 'egg' {
interface IService {
redis: AutoInstanceType<typeof ExportRedis>;
}
}
typings/config/plugin.d.ts
View file @ 8a9d18e7
...@@ -16,6 +16,7 @@ import 'egg-jsonp'; ...@@ -16,6 +16,7 @@ import 'egg-jsonp';
import 'egg-view'; import 'egg-view';
import 'egg-view-vue-ssr'; import 'egg-view-vue-ssr';
import 'egg-cors'; import 'egg-cors';
import 'egg-redis';
import 'egg-webpack'; import 'egg-webpack';
import 'egg-webpack-vue'; import 'egg-webpack-vue';
import { EggPluginItem } from 'egg'; import { EggPluginItem } from 'egg';
...@@ -35,6 +36,7 @@ declare module 'egg' { ...@@ -35,6 +36,7 @@ declare module 'egg' {
view?: EggPluginItem; view?: EggPluginItem;
vuessr?: EggPluginItem; vuessr?: EggPluginItem;
cors?: EggPluginItem; cors?: EggPluginItem;
redis?: EggPluginItem;
webpack?: EggPluginItem; webpack?: EggPluginItem;
webpackvue?: EggPluginItem; webpackvue?: EggPluginItem;
} }
......
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