jarvanzx/spinz777
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed

Browse Source
This commit is contained in:
Eudemon 2025-03-12 19:10:46 +08:00
parent 5519dee3cf
commit bcd07e0c8f
4 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/layout/CommonLayout.vue
View File

@ -126,7 +126,7 @@
.service-icon { .service-icon {
position: fixed; position: fixed;
z-index: 101; z-index: 1011;
} }
.content-container { .content-container {

2
src/components/loading/StartLoading.vue
View File

@ -28,7 +28,7 @@ const props = defineProps({
.start-loading-view { .start-loading-view {
position: fixed; position: fixed;
z-index: 9999; z-index: 99;
top: 0; top: 0;
left: 0; left: 0;
bottom: 0; bottom: 0;

34
src/pages/index/index.vue
View File

@ -1,14 +1,16 @@
<template> <template>
<view class="w-full relative" style="height: 100vh;overflow: hidden;"> <common-layout :bgColor="themeStore.theme.startColor">
<StartLoading :visible="true" /> <!-- <view class="w-full relative" style="height: 100vh;overflow: hidden;"> -->
<!-- #ifdef APP-PLUS --> <StartLoading :visible="true" />
<view class="progress" v-if="showProgress"> <!-- #ifdef APP-PLUS -->
<progress :percent="appStore.progress" activeColor="#ffffff" backgroundColor="#400105"></progress> <view class="progress" v-if="showProgress">
<view style="text-align: center;margin-top: 10rpx;">Loading...</view> <progress :percent="appStore.progress" activeColor="#ffffff" backgroundColor="#400105"></progress>
</view> <view style="text-align: center;margin-top: 10rpx;">Loading...</view>
<Download ref="downloadRef" @close="handleClose" @confirm="handleConfirm" /> </view>
<!-- #endif --> <Download ref="downloadRef" @close="handleClose" @confirm="handleConfirm" />
</view> <!-- #endif -->
<!-- </view> -->
</common-layout>
</template> </template>
<script setup> <script setup>
@ -28,7 +30,9 @@ import { getAndroidId } from "@/uni_modules/x-uniq-id"
// #endif // #endif
import md5 from "crypto-js/md5" import md5 from "crypto-js/md5"
import { getFbInfoApi } from "@/api/account" import { getFbInfoApi } from "@/api/account"
import { useThemeStore } from "@/store/useThemeStore"
const themeStore = useThemeStore()
const userStore = useUserStore() const userStore = useUserStore()
const appStore = useAppStore() const appStore = useAppStore()
const downloadRef = ref(null) const downloadRef = ref(null)
@ -117,18 +121,18 @@ const initData = async () => {
// #ifdef APP-PLUS // #ifdef APP-PLUS
if (!appStore.androidId) { if (!appStore.androidId) {
console.log("init"); console.log("init");
let s = '' let s = ''
try { try {
const gaid = await getAdid() const gaid = await getAdid()
console.log("gaid:", gaid) console.log("gaid:", gaid)
appStore.androidId = gaid appStore.androidId = gaid
s = 'g_' s = 'g_'
} catch (error) { } catch (error) {
appStore.androidId = getAndroidId() appStore.androidId = getAndroidId()
s = 'a_' s = 'a_'
} }
console.log("androidId:", appStore.androidId) console.log("androidId:", appStore.androidId)
// appStore.deviceId = s + appStore.androidId // appStore.deviceId = s + appStore.androidId
appStore.deviceId = s + md5(appStore.packageName + appStore.androidId).toString() appStore.deviceId = s + md5(appStore.packageName + appStore.androidId).toString()
appStore.saveToLocal() appStore.saveToLocal()
@ -136,10 +140,10 @@ const initData = async () => {
// #endif // #endif
console.log('isLogin', userStore.isLogin); console.log('isLogin', userStore.isLogin);
const { data } = await getFbInfoApi() const { data } = await getFbInfoApi()
if(data?.name) { if (data?.name) {
appStore.channelId = data?.name appStore.channelId = data?.name
} }
if(data?.pixelH5) { if (data?.pixelH5) {
appStore.h5No = data?.pixelH5 appStore.h5No = data?.pixelH5
} }

1
src/theme/red.js
View File

@ -16,6 +16,7 @@ export default {
itemLightBgColor: "#7d1616", itemLightBgColor: "#7d1616",
normal: '#333333', normal: '#333333',
light: '#ffffff', light: '#ffffff',
startColor: '#830707',
startLoginBgColor: 'linear-gradient(180deg, #830707, #210403)', startLoginBgColor: 'linear-gradient(180deg, #830707, #210403)',
dark: '#000000', dark: '#000000',
dark300: '#999999', dark300: '#999999',