Merge branch 'feat-vip' into test

This commit is contained in:
2026-06-24 17:10:24 +08:00
7 changed files with 161 additions and 33 deletions
+5
View File
@@ -41,6 +41,10 @@ const props = defineProps({
type: Boolean,
default: true,
},
titleStyle: {
type: [String, Object, Array],
default: () => ({}),
},
showBottom: {
type: Boolean,
default: true,
@@ -155,6 +159,7 @@ const goCalibration = async () => {
:title="title"
:onBack="onBack"
:whiteBackArrow="whiteBackArrow"
:titleStyle="titleStyle"
/>
<BackToGame v-if="showBackToGame" />
<scroll-view
+7 -1
View File
@@ -26,6 +26,10 @@ const props = defineProps({
type: Boolean,
default: true,
},
titleStyle: {
type: [String, Object, Array],
default: () => ({}),
},
});
const onClick = () => {
@@ -118,7 +122,9 @@ onBeforeUnmount(() => {
mode="widthFix"
/>
</view>
<view :style="{ color: whiteBackArrow ? '#fff' : '#000' }">
<view
:style="[{ color: whiteBackArrow ? '#fff' : '#000' }, titleStyle]"
>
<view
v-if="currentPage === 'pages/point-book'"
class="user-header"