Skip to content

Q
quantum-blocks-h5
Commit 8bec1cd4 authored by 郭志伟's avatar 郭志伟
Browse files
Options

chore(ui): 升级业务库

parent 37d6a105
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 48 deletions
app/controller/activity.ts
View file @ 8bec1cd4
......@@ -2,19 +2,20 @@ import { Controller, Context } from 'egg';
export default class ActivityController extends Controller {
public async home(ctx: Context) {
const redisKey = `quantum-blocks:page:${ctx.params.id}`;
let body = await ctx.service.redis.get(redisKey);
if (body) {
ctx.logger.info('请求redis成功 key: %j', redisKey);
}
if (!body) {
let apollo = {};
if (process.env.NODE_ENV === 'production' && process.env.EGG_SERVER_ENV === 'sit') {
apollo = ctx.app.config.apollo || {};
}
body = await ctx.renderView('activity.js', { url: ctx.url, apollo });
await ctx.service.redis.set(redisKey, body);
}
ctx.body = body;
// const redisKey = `quantum-blocks:page:${ctx.params.id}`;
// let body = await ctx.service.redis.get(redisKey);
// if (body) {
// ctx.logger.info('请求redis成功 key: %j', redisKey);
// }
// if (!body) {
// let apollo = {};
// if (process.env.NODE_ENV === 'production' && process.env.EGG_SERVER_ENV === 'sit') {
// apollo = ctx.app.config.apollo || {};
// }
// body = await ctx.renderView('activity.js', { url: ctx.url, apollo });
// await ctx.service.redis.set(redisKey, body);
// }
// ctx.body = body;
ctx.body = await ctx.renderView('activity.js', { url: ctx.url });
}
}
\ No newline at end of file
app/web/component/layout/activity/index.vue
View file @ 8bec1cd4
......@@ -195,9 +195,6 @@ body,
#app {
height: 100%;
}
.cr-back-top__txt {
margin-top: -1.5px;
}
.cr-popup .cr-notify {
font-size: 14px;
}
......
app/web/config/dev.config.ts
View file @ 8bec1cd4
......@@ -2,7 +2,7 @@ import apolloSsr from '../../../config/apollo.ssr.json';
const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'https';
const hostMap = {
apiHost: `${protocol}//quantum-blocks-test1.liangkebang.net`,
apiHost: `${protocol}//quantum-blocks-vcc2.liangkebang.net`,
shenceUrl: `${protocol}//bn.xyqb.com/sa?project=default`,
test: true
};
......
app/web/config/test.config.ts
View file @ 8bec1cd4
......@@ -2,7 +2,7 @@ import apolloSsr from '../../../config/apollo.ssr.json';
const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'https';
const hostMap = {
apiHost: `${protocol}//quantum-blocks-test1.liangkebang.net`,
apiHost: `${protocol}//quantum-blocks-vcc2.liangkebang.net`,
shenceUrl: `${protocol}//bn.xyqb.com/sa?project=default`,
test: true
};
......
app/web/page/activity/component/FreedomContainer/index.ts
View file @ 8bec1cd4
......@@ -11,6 +11,7 @@ export default class FreedomContainer extends Mixins(TransformStyleMixin, SaMixi
@Mutation('UPDATE_PAGE_INFO') updatePageInfo;
@Prop({type: Object, default: () => ({ child: [] })}) childItem;
@Prop({type: Object, default: () => ({})}) saInfo;
@Prop(String) backgroundImage;
mounted() {
......
app/web/page/activity/component/FreedomContainer/index.vue
View file @ 8bec1cd4
<template>
<div class="freedom">
<div class="freedom" v-track>
<div class="freedom-body">
<component :class="['freedom-body-item', { 'Fb-item_selected': curChildIndex === index }]" v-for="(item, index) in childItem.child" :style="transformStyle(item.commonStyle, 'container')" :is="item.name" :key="index" :sa-info="getSaInfo(item)" v-bind="item.props"></component>
</div>
......
app/web/page/activity/view/activity/index.ts
View file @ 8bec1cd4
......@@ -16,7 +16,7 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin) {
@Mutation('SET_PAGE_ELEMENTS') setPageElement;
@Provide() editor = this;
isEditor: boolean = false;
bottomInfo: object = {
x: 0,
y: 0,
......
app/web/view/layout.html
View file @ 8bec1cd4
......@@ -172,9 +172,6 @@
.cr-popup .cr-notify {
font-size: 14px;
}
.cr-back-top__txt {
margin-top: -1.5px;
}
.cr-toast .cr-toast--inner {
box-sizing: content-box;
......
config/apollo.json
View file @ 8bec1cd4
{
"api": {
"apiHost": "https://quantum-blocks-test1.liangkebang.net",
"h5Host": "https://quantum-h5-test1.liangkebang.net",
"opapiHost": "https://opapi-test1.liangkebang.net",
"passportHost": "https://passportapi-test1.liangkebang.net",
"kdspHost": "https://talos-test1.liangkebang.net",
"apiHost": "https://quantum-blocks-vcc2.liangkebang.net",
"h5Host": "https://quantum-h5-vcc2.liangkebang.net",
"opapiHost": "https://opapi-vcc2.liangkebang.net",
"passportHost": "https://passportapi-vcc2.liangkebang.net",
"kdspHost": "https://talos-vcc2.liangkebang.net",
"loginUrl": "",
"h5ShopHost": "https://tenet-test1.liangkebang.net/#"
"h5ShopHost": "https://tenet-vcc2.liangkebang.net/#"
},
"mysql": {
"low_code": {
......
config/apollo.ssr.json
View file @ 8bec1cd4
{
"apiHost": "https://quantum-blocks-test1.liangkebang.net",
"h5Host": "https://quantum-h5-test1.liangkebang.net",
"opapiHost": "https://opapi-test1.liangkebang.net",
"passportHost": "https://passportapi-test1.liangkebang.net",
"kdspHost": "https://talos-test1.liangkebang.net",
"apiHost": "https://quantum-blocks-vcc2.liangkebang.net",
"h5Host": "https://quantum-h5-vcc2.liangkebang.net",
"opapiHost": "https://opapi-vcc2.liangkebang.net",
"passportHost": "https://passportapi-vcc2.liangkebang.net",
"kdspHost": "https://talos-vcc2.liangkebang.net",
"loginUrl": "",
"h5ShopHost": "https://tenet-test1.liangkebang.net/#"
"h5ShopHost": "https://tenet-vcc2.liangkebang.net/#"
}
\ No newline at end of file
config/config.local.ts
View file @ 8bec1cd4
......@@ -29,8 +29,8 @@ export default (appInfo: EggAppConfig) => {
exports.redis = {
client: {
port: 31400, // Redis port
host: '172.17.5.17', // Redis host
port: 31565, // Redis port
host: '172.17.5.13', // Redis host
password: '',
db: 0
}
......
package-lock.json
View file @ 8bec1cd4
......@@ -1658,9 +1658,9 @@
}
},
"@qg/citrus-ui": {
"version": "0.2.5",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.2.5.tgz",
"integrity": "sha512-pbn9bXtgzVSTz4cseS3wsy8QwkB5IIIx6H2Q7GaZgDqs/2cr1X2VlV7mIadcwuznuyloo67nC62MemyYO3bXUg==",
"version": "0.2.7",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.2.7.tgz",
"integrity": "sha512-eZUlDHkQtBW7/BLHHrdwbanKKNL3kSGEcA2hTXX0AzKBENHyUTaZgcB0vqI9Dn2K6jhqjRwrCyBam4KnGyImKw==",
"requires": {
"@better-scroll/core": "^2.1.1",
"@qg/cherry-ui": "^2.21.1",
......@@ -20870,9 +20870,9 @@
"integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w="
},
"rollup": {
"version": "2.52.8",
"resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.52.8.tgz",
"integrity": "sha512-IjAB0C6KK5/lvqzJWAzsvOik+jV5Bt907QdkQ/gDP4j+R9KYNI1tjqdxiPitGPVrWC21Mf/ucXgowUjN/VemaQ==",
"version": "2.53.1",
"resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.53.1.tgz",
"integrity": "sha512-yiTCvcYXZEulNWNlEONOQVlhXA/hgxjelFSjNcrwAAIfYx/xqjSHwqg/cCaWOyFRKr+IQBaXwt723m8tCaIUiw==",
"requires": {
"fsevents": "~2.3.2"
},
......@@ -20949,9 +20949,9 @@
}
},
"sa-sdk-javascript": {
"version": "1.18.2",
"resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.18.2.tgz",
"integrity": "sha512-DzNLzfhfOlQluu/UxYjm5ri2qjHy1mND5l+CX+jDM150GUZmArxEnJ+vyeLMT0oHRYfAksxegsObSeYxVhXVxw=="
"version": "1.18.3",
"resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.18.3.tgz",
"integrity": "sha512-IrS0xhfeed/EgoEYEdDC6m5aeZsMrO1dXeYuuLf3PSPAyXs2v8QMiNrL060MLW7Exc8TP4icOCd999/Qtt98Cw=="
},
"safe-buffer": {
"version": "5.2.1",
......
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