bugfix
This commit is contained in:
@@ -1,3 +1,8 @@
|
||||
import { logger } from '../../utils/logger'
|
||||
|
||||
// 日志模块名
|
||||
const LOG = 'clothes-card'
|
||||
|
||||
Component({
|
||||
properties: {
|
||||
item: { type: Object, value: {} },
|
||||
@@ -8,6 +13,8 @@ Component({
|
||||
},
|
||||
methods: {
|
||||
onTap() {
|
||||
const item = this.data.item as any
|
||||
logger.debug(LOG, '点击衣物卡片, uuid=', item && item.clothes_uuid)
|
||||
this.triggerEvent('select', { item: this.data.item })
|
||||
},
|
||||
},
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
import { logger } from '../../utils/logger'
|
||||
|
||||
// 日志模块名
|
||||
const LOG = 'empty-state'
|
||||
|
||||
Component({
|
||||
properties: {
|
||||
icon: { type: String, value: 'icon-hanger' },
|
||||
@@ -8,6 +13,7 @@ Component({
|
||||
},
|
||||
methods: {
|
||||
onTap() {
|
||||
logger.debug(LOG, '点击空态按钮, text=', this.data.buttonText)
|
||||
this.triggerEvent('action')
|
||||
},
|
||||
},
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
import { logger } from '../../utils/logger'
|
||||
|
||||
// 日志模块名
|
||||
const LOG = 'navigation-bar'
|
||||
|
||||
Component({
|
||||
options: {
|
||||
multipleSlots: true // 在组件定义时的选项中启用多slot支持
|
||||
@@ -64,17 +69,30 @@ Component({
|
||||
lifetimes: {
|
||||
attached() {
|
||||
const rect = wx.getMenuButtonBoundingClientRect()
|
||||
const apply = (windowWidth: number, platform: string, safeTop: number) => {
|
||||
const isAndroid = platform === 'android'
|
||||
const isDevtools = platform === 'devtools'
|
||||
this.setData({
|
||||
ios: !isAndroid,
|
||||
innerPaddingRight: `padding-right: ${windowWidth - rect.left}px`,
|
||||
leftWidth: `width: ${windowWidth - rect.left}px`,
|
||||
safeAreaTop: isDevtools || isAndroid ? `height: calc(var(--height) + ${safeTop}px); padding-top: ${safeTop}px` : ``
|
||||
})
|
||||
}
|
||||
|
||||
// wx.getSystemInfo 已废弃(基础库 2.20.1+ 拆分接口),改用同步的 window/device 接口
|
||||
const wxAny = wx as any
|
||||
if (typeof wxAny.getWindowInfo === 'function') {
|
||||
const win = wxAny.getWindowInfo()
|
||||
const dev = typeof wxAny.getDeviceInfo === 'function' ? wxAny.getDeviceInfo() : {}
|
||||
apply(win.windowWidth, dev.platform || win.platform || '', win.safeArea ? win.safeArea.top : 0)
|
||||
logger.debug(LOG, '布局计算完成, 窗口宽=', win.windowWidth, '平台=', dev.platform || win.platform)
|
||||
return
|
||||
}
|
||||
// 低版本基础库走废弃接口兜底
|
||||
logger.warn(LOG, 'getWindowInfo 不可用,降级到已废弃的 wx.getSystemInfo')
|
||||
wx.getSystemInfo({
|
||||
success: (res) => {
|
||||
const isAndroid = res.platform === 'android'
|
||||
const isDevtools = res.platform === 'devtools'
|
||||
this.setData({
|
||||
ios: !isAndroid,
|
||||
innerPaddingRight: `padding-right: ${res.windowWidth - rect.left}px`,
|
||||
leftWidth: `width: ${res.windowWidth - rect.left }px`,
|
||||
safeAreaTop: isDevtools || isAndroid ? `height: calc(var(--height) + ${res.safeArea.top}px); padding-top: ${res.safeArea.top}px` : ``
|
||||
})
|
||||
}
|
||||
success: (res) => apply(res.windowWidth, res.platform, res.safeArea ? res.safeArea.top : 0)
|
||||
})
|
||||
},
|
||||
},
|
||||
@@ -99,8 +117,10 @@ Component({
|
||||
back() {
|
||||
const data = this.data
|
||||
if (data.delta) {
|
||||
logger.debug(LOG, '返回上一页, delta=', data.delta)
|
||||
wx.navigateBack({
|
||||
delta: data.delta
|
||||
delta: data.delta,
|
||||
fail: (e) => logger.warn(LOG, 'navigateBack 失败, err=', e && e.errMsg)
|
||||
})
|
||||
}
|
||||
this.triggerEvent('back', { delta: data.delta }, {})
|
||||
|
||||
Reference in New Issue
Block a user