diff --git a/pages.json b/pages.json index 70cb421..651f1b5 100644 --- a/pages.json +++ b/pages.json @@ -420,6 +420,14 @@ "navigationBarTitleText" : "建设银行", "navigationStyle": "custom" } + }, + { + "path" : "game/honor-of-kings", + "style" : + { + "navigationBarTitleText" : "王者荣耀", + "navigationStyle": "custom" + } } ] }, diff --git a/pages/call-log/detail/callDetail.vue b/pages/call-log/detail/callDetail.vue index b8ba0ba..6051078 100644 --- a/pages/call-log/detail/callDetail.vue +++ b/pages/call-log/detail/callDetail.vue @@ -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() @@ -779,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 * (data.info.avatar?65:90); + data.contentY = -p * (data.info.avatar ? 65 : 90); data.avatarY = -p * 0; - data.text2Y = -p * (data.info.avatar?75: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 - data.headerHeight=Math.max(206,(data.info.avatar?519:325) - y); - console.log(data.headerHeight ) - }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/index/index.nvue b/pages/index/index.nvue index 8edaead..e5ce6e6 100644 --- a/pages/index/index.nvue +++ b/pages/index/index.nvue @@ -115,7 +115,8 @@