Commit 716cb81c authored by 郭志伟's avatar 郭志伟

fix(switch): 问题修复

parent 8587dd34
...@@ -85,6 +85,6 @@ export default class Layout extends Vue { ...@@ -85,6 +85,6 @@ export default class Layout extends Vue {
} }
defaultTitle() { defaultTitle() {
return +localStorage.get('tenantId') === 560671 ? '羊小咩' : '活动页'; return +localStorage.get('tenantId') === 560761 ? '羊小咩' : '活动页';
} }
} }
\ No newline at end of file
...@@ -161,7 +161,7 @@ export default { ...@@ -161,7 +161,7 @@ export default {
const { coverImage, pageName, pageDescribe, shareCoverImage } = this.pageInfo; const { coverImage, pageName, pageDescribe, shareCoverImage } = this.pageInfo;
const link = `${window.location.origin}${window.location.pathname}?vccToken={token}&tenantId=${localStorage.get('tenantId') || ''}`; const link = `${window.location.origin}${window.location.pathname}?vccToken={token}&tenantId=${localStorage.get('tenantId') || ''}`;
this.link = link; this.link = link;
const defaultTitle = +localStorage.get('tenantId') === 560671 ? '羊小咩' : '活动页'; const defaultTitle = +localStorage.get('tenantId') === 560761 ? '羊小咩' : '活动页';
this.shareInfo = { this.shareInfo = {
event: "showShareView", event: "showShareView",
data: { data: {
......
...@@ -39,7 +39,7 @@ export default class TransformStyleMixin extends Vue { ...@@ -39,7 +39,7 @@ export default class TransformStyleMixin extends Vue {
// 修改对应组件point // 修改对应组件point
const eleId = element.getAttribute('id'); const eleId = element.getAttribute('id');
const component = this.pageData.elements.find(v => v.id === eleId); const component = this.pageData.elements.find(v => v.id === eleId);
if (!component || (component && component.commonStyle.position === 'absolute')) { return; } if (!component || (component && component.commonStyle && component.commonStyle.position === 'absolute')) { return; }
const calcHeight = +height + (component.commonStyle.paddingTop || 0) + (component.commonStyle.paddingBottom || 0); const calcHeight = +height + (component.commonStyle.paddingTop || 0) + (component.commonStyle.paddingBottom || 0);
const point = { ...component.point, h: component.name === 'cs-goods-tabs' ? Math.floor(+calcHeight) : Math.ceil(+calcHeight) }; const point = { ...component.point, h: component.name === 'cs-goods-tabs' ? Math.floor(+calcHeight) : Math.ceil(+calcHeight) };
this.setElementPoint({ id: eleId, data: point }); this.setElementPoint({ id: eleId, data: point });
......
...@@ -2367,9 +2367,9 @@ ...@@ -2367,9 +2367,9 @@
} }
}, },
"@qg/citrus-ui": { "@qg/citrus-ui": {
"version": "0.3.23-beta0", "version": "0.3.23-beta1",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.23-beta0.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.23-beta1.tgz",
"integrity": "sha512-Zk8w5QWA5LqwYdYjirFG5PwoMMLYUHOI4ym6po8CNFqO00BXYyahoeG3qXHlwL88yWl9DJ+378S5uk1nEfrKkQ==", "integrity": "sha512-FZ/Udd865iJY6Qtzcl2paKjB6rMZgytiOrVYDaUj0h/IjD08Z2hrDC3iGBwTPzMqwkBb3Fxjaw0ZDJNIFSPzpg==",
"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",
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