Commit 82fc39b9 authored by 郭志伟's avatar 郭志伟

fix(activity): 问题修复

parent 808c194c
...@@ -146,13 +146,6 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin, Disab ...@@ -146,13 +146,6 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin, Disab
} }
}); });
} }
getPageElements(ids = []) {
return ids.length === 0 ? this.pageData.elements : ids.map(item => {
const targetEl =
this.pageData.elements.find(it => it.id === (item.componentId || item));
return targetEl;
});
}
layoutUpdatedEvent() { layoutUpdatedEvent() {
// console.log('layoutUpdatedEvent'); // console.log('layoutUpdatedEvent');
// 高度更新时重新计算导航组件样式 // 高度更新时重新计算导航组件样式
...@@ -162,6 +155,17 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin, Disab ...@@ -162,6 +155,17 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin, Disab
hideBottomBtns(state) { hideBottomBtns(state) {
this.showBackTop = state; this.showBackTop = state;
} }
// overlay遮罩显示时,降低其他sticky的z-index (通过设置transform实现)
setDownOtherEleZIndex(state, id) {
const HAVE_Z_INDEX_EL = ['cs-floor-nav', 'cs-goods-tabs'];
const elements = this.pageData?.elements?.map(item => {
if (item.id !== id && HAVE_Z_INDEX_EL.includes(item.name)) {
item.commonStyle.transform = state ? 'rotateZ(0)' : 'none';
}
return item;
});
this.setPageElement(elements);
}
// 处理页面隐藏 // 处理页面隐藏
pageVisibilityChange() { pageVisibilityChange() {
if (EASY_ENV_IS_NODE) { return; } if (EASY_ENV_IS_NODE) { return; }
......
...@@ -22,7 +22,7 @@ export default class TransformStyleMixin extends Vue { ...@@ -22,7 +22,7 @@ export default class TransformStyleMixin extends Vue {
style.backgroundImage = `url(${style.backgroundImage})`; style.backgroundImage = `url(${style.backgroundImage})`;
} }
} }
if (name === 'freedom-container') { if (name === 'freedom-container' && point) {
style.height = point?.h ? `${(point.h / 37.5).toFixed(2)}rem` : null; style.height = point?.h ? `${(point.h / 37.5).toFixed(2)}rem` : null;
} }
// style.zIndex = 2; // style.zIndex = 2;
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
} }
}, },
"redis": { "redis": {
"port": "172.17.6.7", "port": "172.17.5.2",
"host": "32625", "host": "32625",
"password": "", "password": "",
"db": 0 "db": 0
......
...@@ -30,7 +30,7 @@ export default (appInfo: EggAppConfig) => { ...@@ -30,7 +30,7 @@ export default (appInfo: EggAppConfig) => {
exports.redis = { exports.redis = {
client: { client: {
port: 32625, // Redis port port: 32625, // Redis port
host: '172.17.6.7', // Redis host host: '172.17.5.2', // Redis host
password: '', password: '',
db: 0 db: 0
} }
......
...@@ -1658,9 +1658,9 @@ ...@@ -1658,9 +1658,9 @@
} }
}, },
"@qg/citrus-ui": { "@qg/citrus-ui": {
"version": "0.3.5-beta4", "version": "0.3.5-beta5",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.5-beta4.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.5-beta5.tgz",
"integrity": "sha512-gt58YL5EstZ//TttcsJcwCsMQJO1vPb55qj5wJdcDc5kAO6QCyd8O1zZuy0Nu+cOO3/iovGK3f3edVykX2eo/w==", "integrity": "sha512-AmC1Qa07cikivqxSU5nTibddd3cmfOlfZFxToPIWTd3tmys/ZCFlVU5tXuUYK/kufC4mtqluqY3VnjqZK4GVSg==",
"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