From bcd07e0c8f86996a8073f2d5356c2db6ec5e8658 Mon Sep 17 00:00:00 2001
From: Eudemon <jarvanzx@qq.com>
Date: Wed, 12 Mar 2025 19:10:46 +0800
Subject: [PATCH] fixed

---
 src/components/layout/CommonLayout.vue  |  2 +-
 src/components/loading/StartLoading.vue |  2 +-
 src/pages/index/index.vue               | 38 ++++++++++++++-----------
 src/theme/red.js                        |  1 +
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/components/layout/CommonLayout.vue b/src/components/layout/CommonLayout.vue
index 9bf8d60..2c4bd92 100644
--- a/src/components/layout/CommonLayout.vue
+++ b/src/components/layout/CommonLayout.vue
@@ -126,7 +126,7 @@
 	
 	.service-icon {
 		position: fixed;
-		z-index: 101;
+		z-index: 1011;
 	}
 	
 	.content-container {
diff --git a/src/components/loading/StartLoading.vue b/src/components/loading/StartLoading.vue
index 26cd1b1..3d9b0d7 100644
--- a/src/components/loading/StartLoading.vue
+++ b/src/components/loading/StartLoading.vue
@@ -28,7 +28,7 @@ const props = defineProps({
 
     .start-loading-view {
         position: fixed;
-        z-index: 9999;
+        z-index: 99;
         top: 0;
         left: 0;
         bottom: 0;
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index e60917b..4bc52a7 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,14 +1,16 @@
 <template>
-	<view class="w-full relative" style="height: 100vh;overflow: hidden;">
-		<StartLoading :visible="true" />
-		<!-- #ifdef APP-PLUS -->
-		<view class="progress" v-if="showProgress">
-			<progress :percent="appStore.progress" activeColor="#ffffff" backgroundColor="#400105"></progress>
-			<view style="text-align: center;margin-top: 10rpx;">Loading...</view>
-		</view>
-		<Download ref="downloadRef" @close="handleClose" @confirm="handleConfirm" />
-		<!-- #endif -->
-	</view>
+	<common-layout :bgColor="themeStore.theme.startColor">
+		<!-- <view class="w-full relative" style="height: 100vh;overflow: hidden;"> -->
+			<StartLoading :visible="true" />
+			<!-- #ifdef APP-PLUS -->
+			<view class="progress" v-if="showProgress">
+				<progress :percent="appStore.progress" activeColor="#ffffff" backgroundColor="#400105"></progress>
+				<view style="text-align: center;margin-top: 10rpx;">Loading...</view>
+			</view>
+			<Download ref="downloadRef" @close="handleClose" @confirm="handleConfirm" />
+			<!-- #endif -->
+		<!-- </view> -->
+	</common-layout>
 </template>
 
 <script setup>
@@ -28,7 +30,9 @@ import { getAndroidId } from "@/uni_modules/x-uniq-id"
 // #endif
 import md5 from "crypto-js/md5"
 import { getFbInfoApi } from "@/api/account"
+import { useThemeStore } from "@/store/useThemeStore"
 
+const themeStore = useThemeStore()
 const userStore = useUserStore()
 const appStore = useAppStore()
 const downloadRef = ref(null)
@@ -114,21 +118,21 @@ const initData = async () => {
 		url: '/pages/home/Home'
 	})
 	console.log("init", appStore.androidId);
-    
+
 	// #ifdef APP-PLUS
 	if (!appStore.androidId) {
-        console.log("init");
+		console.log("init");
 		let s = ''
 		try {
 			const gaid = await getAdid()
-            console.log("gaid:", gaid)
+			console.log("gaid:", gaid)
 			appStore.androidId = gaid
 			s = 'g_'
 		} catch (error) {
 			appStore.androidId = getAndroidId()
 			s = 'a_'
 		}
-        console.log("androidId:", appStore.androidId)
+		console.log("androidId:", appStore.androidId)
 		// appStore.deviceId = s + appStore.androidId
 		appStore.deviceId = s + md5(appStore.packageName + appStore.androidId).toString()
 		appStore.saveToLocal()
@@ -136,13 +140,13 @@ const initData = async () => {
 	// #endif
 	console.log('isLogin', userStore.isLogin);
 	const { data } = await getFbInfoApi()
-	if(data?.name) {
+	if (data?.name) {
 		appStore.channelId = data?.name
 	}
-	if(data?.pixelH5) {
+	if (data?.pixelH5) {
 		appStore.h5No = data?.pixelH5
 	}
-	
+
 	if (userStore.isLogin) {
 		// await userStore.getUserTotalInfo()
 		// await getAdjustAdid()
diff --git a/src/theme/red.js b/src/theme/red.js
index bcfad02..ab46edd 100644
--- a/src/theme/red.js
+++ b/src/theme/red.js
@@ -16,6 +16,7 @@ export default {
 	itemLightBgColor: "#7d1616",
 	normal: '#333333',
 	light: '#ffffff',
+	startColor: '#830707',
 	startLoginBgColor: 'linear-gradient(180deg, #830707, #210403)',
 	dark: '#000000',
 	dark300: '#999999',