diff --git a/main.js b/main.js index 62f5d60..70e3a61 100644 --- a/main.js +++ b/main.js @@ -29,7 +29,7 @@ export function createApp() { app.config.globalProperties.$system = plus.os.name; // #endif app.config.globalProperties.$systemInfo = systemInfo - uni.setStorageSync('version', '1.0.6.sp4') + uni.setStorageSync('version', '1.0.6.sp5') app.config.globalProperties.$version = uni.getStorageSync('version') app.use(globalMethods); return { diff --git a/pages/call-log/detail/callDetail.vue b/pages/call-log/detail/callDetail.vue index 7ccd710..b8ba0ba 100644 --- a/pages/call-log/detail/callDetail.vue +++ b/pages/call-log/detail/callDetail.vue @@ -12,10 +12,10 @@ - @@ -27,10 +27,10 @@ {{data.info.name.substring(0,1)}} + :style="{opacity:data.info.avatar?(data.headerHeight=='206'?1:0):1,transform: `scale(${data.avatarScale}) translateY(${data.avatarY}px)`}" /> {{data.info.address}} - {{data.info.name||formatString(data.info.phone)}} + {{data.info.name||formatString(data.info.phone)}} @@ -784,15 +784,15 @@ const y = e.scrollTop; const max = 200; let p = Math.min(y / max, 1); - data.contentY = -p * (data.info.avatar?70:90); + data.contentY = -p * (data.info.avatar?65:90); data.avatarY = -p * 0; - data.text2Y = -p * (data.info.avatar?70:130); + data.text2Y = -p * (data.info.avatar?75:130); data.avatarScale = 1 - p * 0.55; // 1 → 0.6 textScale data.textScale = 1 - p * 0.5; // 1 → 0.6 data.scale = 1 - p * 1; // 1 → 0.6 - console.log(data.avatarScale ) data.headerHeight=Math.max(206,(data.info.avatar?519:325) - y); + console.log(data.headerHeight ) }else{ } diff --git a/pages/common/recharge/index.vue b/pages/common/recharge/index.vue index 72918db..560c75d 100644 --- a/pages/common/recharge/index.vue +++ b/pages/common/recharge/index.vue @@ -36,8 +36,7 @@