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 b183255..6051078 100644 --- a/pages/call-log/detail/callDetail.vue +++ b/pages/call-log/detail/callDetail.vue @@ -12,11 +12,11 @@ - + + :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)}} @@ -583,8 +583,6 @@ import { ref, reactive, - watch, - nextTick, getCurrentInstance } from "vue"; import { @@ -595,16 +593,8 @@ onReachBottom } from "@dcloudio/uni-app"; const { - appContext, proxy } = getCurrentInstance(); - import { - useStore - } from '@/store/index.js' - const { - getCallDetail, - setCallDetail - } = useStore() let recordPopup = ref() let timePickerPopup = ref() let editTimePopup = ref() @@ -768,6 +758,7 @@ data.index = Number(option.index) let listArr = uni.getStorageSync('callLog') data.info = listArr[data.index] + // data.info.avatar='/static/logo.png' data.list = data.info.list || data.list console.log(data.info) data.headerHeight=data.info.avatar?519:325 @@ -778,24 +769,24 @@ onShow(() => { }) - onPageScroll((e) => { - if(data.type=='ios'){ + onPageScroll((e) => { + if (data.type == 'ios') { const y = e.scrollTop; - const max = 200; + const max = 200; let p = Math.min(y / max, 1); - data.contentY = -p * 90; + data.contentY = -p * (data.info.avatar ? 65 : 90); data.avatarY = -p * 0; - data.text2Y = -p * 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.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); - }else{ - - } - }) + data.scale = 1 - p * 1; // 1 → 0.6 + data.headerHeight = Math.max(206, (data.info.avatar ? 519 : 325) - y); + console.log(data.headerHeight) + } else { + // 其他类型的处理 + } + }) onReachBottom(() => { }) 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 @@