fixed
This commit is contained in:
parent
bcd07e0c8f
commit
f904c8205c
16
.env
16
.env
@ -1,16 +1,16 @@
|
||||
VITE_APP_H5_NO=1
|
||||
VITE_CHANNEL_ID=""
|
||||
# VITE_APP_NAME=Spinz777
|
||||
VITE_APP_NAME=Winzz777
|
||||
VITE_APP_NAME=Spinz777
|
||||
# VITE_APP_NAME=Winzz777
|
||||
VITE_APP_THEME=red
|
||||
# VITE_APP_ID=101
|
||||
VITE_APP_ID=103
|
||||
# VITE_APP_DOWNLOAD_URL="https://www.777spinz.com/spinz777_101_1.0.0.apk"
|
||||
VITE_APP_DOWNLOAD_URL="https://www.777spinz.com/Winzz777_103_100.apk"
|
||||
VITE_APP_ID=101
|
||||
# VITE_APP_ID=103
|
||||
VITE_APP_DOWNLOAD_URL="https://www.777spinz.com/spinz777_101_1.0.0.apk"
|
||||
# VITE_APP_DOWNLOAD_URL="https://www.777spinz.com/Winzz777_103_100.apk"
|
||||
VITE_APP_LOCALE=en
|
||||
VITE_APP_IMAGE_URL="https://img1.sp77.in/frontimg"
|
||||
VITE_WALLET_URL="https://inrchain.in/#/?inviteCode=m5ncrxv0"
|
||||
# VITE_NAME_UPPER=SPINZ777
|
||||
VITE_NAME_UPPER=WINZZ777
|
||||
VITE_NAME_UPPER=SPINZ777
|
||||
# VITE_NAME_UPPER=WINZZ777
|
||||
VITE_CURRENCY=INR
|
||||
VITE_CURRENCY_SYMBOL=₹
|
@ -17,8 +17,8 @@
|
||||
'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
|
||||
(coverSupport ? ', viewport-fit=cover' : '') + '" />')
|
||||
</script> -->
|
||||
<!-- <title>Spinz777</title> -->
|
||||
<title>Winzz777</title>
|
||||
<title>Spinz777</title>
|
||||
<!-- <title>Winzz777</title> -->
|
||||
<!--preload-links-->
|
||||
<!--app-context-->
|
||||
</head>
|
||||
|
80
src/App.vue
80
src/App.vue
@ -21,43 +21,12 @@ import { getAndroidId } from "@/uni_modules/x-uniq-id"
|
||||
import md5 from "crypto-js/md5"
|
||||
export default {
|
||||
onLaunch: function (options) {
|
||||
|
||||
// #ifdef APP-PLUS
|
||||
plus.navigator.hideSystemNavigation()
|
||||
// #endif
|
||||
console.log('App Launch', options)
|
||||
console.log('Process.env', process.env)
|
||||
this.handleAppLaunch(options);
|
||||
// #ifdef APP-PLUS
|
||||
plus.navigator.hideSystemNavigation()
|
||||
// getGoogleAdId().then(adId => {
|
||||
// console.log("Google 广告 ID:", adId);
|
||||
// }).catch(err => {
|
||||
// console.error('Google err:', err);
|
||||
// });
|
||||
// #endif
|
||||
|
||||
// uni.getClipboardData({
|
||||
// success: (res) => {
|
||||
// if (res.data) {
|
||||
// console.log("Clipboard:", res.data)
|
||||
// try {
|
||||
// const params = JSON.parse(res.data)
|
||||
// const appStore = useAppStore()
|
||||
// appStore.channelId = params?.channelId
|
||||
// appStore.h5No = params?.h5no
|
||||
// appStore.fbc = params?.fbc
|
||||
// appStore.fbp = params?.fbp
|
||||
// uni.setClipboardData({
|
||||
// data: '',
|
||||
// })
|
||||
// } catch (error) {
|
||||
// console.log(error);
|
||||
|
||||
// }
|
||||
// uni.hideToast()
|
||||
// }
|
||||
// uni.hideToast()
|
||||
// }
|
||||
// })
|
||||
|
||||
},
|
||||
onShow: function (options) {
|
||||
console.log('App Show', options)
|
||||
@ -97,26 +66,38 @@ export default {
|
||||
const langStore = useLangStore()
|
||||
langStore.asyncFromLocal()
|
||||
const res = uni.getSystemInfoSync()
|
||||
const dInfo = uni.getStorageSync('DEVICE_INFO')
|
||||
console.log("DEVICE_INFO:", dInfo);
|
||||
|
||||
// #ifdef APP-PLUS
|
||||
let s = ''
|
||||
try {
|
||||
const gaid = await getAdid()
|
||||
appStore.androidId = gaid
|
||||
console.log("gaid:", gaid);
|
||||
s = 'g_'
|
||||
} catch (error) {
|
||||
appStore.androidId = await getAndroidId()
|
||||
s = 'a_'
|
||||
if (!dInfo) {
|
||||
let s = ''
|
||||
try {
|
||||
const gaid = await getAdid()
|
||||
appStore.androidId = gaid
|
||||
s = 'g_'
|
||||
} catch (error) {
|
||||
appStore.androidId = await getAndroidId()
|
||||
s = 'a_'
|
||||
if (!appStore.androidId) {
|
||||
appStore.androidId = res.deviceId
|
||||
}
|
||||
}
|
||||
appStore.deviceId = s + md5(appStore.packageName + appStore.androidId).toString()
|
||||
uni.setStorageSync('DEVICE_INFO', JSON.stringify({
|
||||
androidId: appStore.androidId,
|
||||
s
|
||||
}))
|
||||
} else {
|
||||
const info = JSON.parse(dInfo)
|
||||
appStore.androidId = info.androidId
|
||||
appStore.deviceId = info.s + md5(appStore.packageName + info.androidId).toString()
|
||||
}
|
||||
console.log("androidId:", appStore.androidId);
|
||||
|
||||
appStore.deviceId = s + md5(appStore.packageName + appStore.androidId).toString()
|
||||
// appStore.deviceId = s + appStore.androidId
|
||||
// #endif
|
||||
|
||||
//系统信息
|
||||
// #ifdef H5
|
||||
// #ifdef WEB
|
||||
appStore.deviceId = res.deviceId
|
||||
// #endif
|
||||
appStore.systemInfo = res
|
||||
@ -152,7 +133,7 @@ export default {
|
||||
} else {
|
||||
appStore.uniKey = '' + Date.now() + Math.floor(Math.random() * 1000)
|
||||
}
|
||||
if(options.query.mcId) {
|
||||
if (options.query.mcId) {
|
||||
appStore.mcId = options.query.mcId
|
||||
}
|
||||
// NOTE: for 殼包
|
||||
@ -464,9 +445,10 @@ div {
|
||||
justify-content: space-around;
|
||||
}
|
||||
|
||||
.items-start{
|
||||
.items-start {
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
.uni-modal {
|
||||
background-color: #610606 !important;
|
||||
|
||||
|
@ -1,10 +1,10 @@
|
||||
{
|
||||
/* Spinz777 *///
|
||||
"name" : "Winzz777",
|
||||
// "name" : "Spinz777",
|
||||
// "name" : "Winzz777",
|
||||
"name" : "Spinz777",
|
||||
"appid" : "__UNI__FECBD22",
|
||||
"description" : "Winzz777",
|
||||
// "description" : "Spinz777",
|
||||
// "description" : "Winzz777",
|
||||
"description" : "Spinz777",
|
||||
"versionName" : "1.2.2",
|
||||
"versionCode" : 122,
|
||||
"channel_list" : [
|
||||
|
@ -362,8 +362,8 @@
|
||||
"globalStyle": {
|
||||
"navigationStyle": "custom",
|
||||
"navigationBarTextStyle": "white",
|
||||
// "navigationBarTitleText": "Spinz777",
|
||||
"navigationBarTitleText": "Winzz777",
|
||||
"navigationBarTitleText": "Spinz777",
|
||||
// "navigationBarTitleText": "Winzz777",
|
||||
"navigationBarBackgroundColor": "#F8F8F8",
|
||||
"backgroundColor": "#FFFFFF",
|
||||
"app-plus": {
|
||||
|
@ -727,7 +727,13 @@ const getUserBankrupt = async () => {
|
||||
const { data } = await checkBankruptApi();
|
||||
console.log("getUserBankrupt:", data);
|
||||
const { state, details } = data;
|
||||
if (state === 0) return;
|
||||
if (state === 0) {
|
||||
const idx = slideItems.value.findIndex(item => item.dotName === 'bankrupt_doted');
|
||||
if (idx > -1) {
|
||||
slideItems.value.splice(idx, 1);
|
||||
}
|
||||
return;
|
||||
};
|
||||
if (state === 1) {
|
||||
const arr = details.sort((a, b) => a.recharge - b.recharge);
|
||||
bankruptArr.value = [arr[0], arr[2], arr[1]];
|
||||
@ -745,6 +751,7 @@ const getUserBankrupt = async () => {
|
||||
dotName: "bankrupt_doted",
|
||||
count: 1
|
||||
});
|
||||
showPopQueue()
|
||||
return;
|
||||
}
|
||||
if (state === 2) {
|
||||
@ -848,6 +855,9 @@ onLoad(async () => {
|
||||
});
|
||||
|
||||
onShow(() => {
|
||||
setTimeout(() => {
|
||||
userStore.getUserInfo()
|
||||
}, 500);
|
||||
getUserBankrupt();
|
||||
getPageData();
|
||||
checkRedepositApi().then(({ data }) => {
|
||||
|
@ -1,14 +1,14 @@
|
||||
<template>
|
||||
<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 -->
|
||||
<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>
|
||||
@ -122,20 +122,30 @@ const initData = async () => {
|
||||
// #ifdef APP-PLUS
|
||||
if (!appStore.androidId) {
|
||||
console.log("init");
|
||||
let s = ''
|
||||
try {
|
||||
const gaid = await getAdid()
|
||||
console.log("gaid:", gaid)
|
||||
appStore.androidId = gaid
|
||||
s = 'g_'
|
||||
} catch (error) {
|
||||
appStore.androidId = getAndroidId()
|
||||
s = 'a_'
|
||||
const systemInfo = uni.getSystemInfoSync()
|
||||
const deviceInfo = uni.getStorageSync('DEVICE_INFO')
|
||||
if (!deviceInfo) {
|
||||
let s = ''
|
||||
try {
|
||||
const gaid = await getAdid()
|
||||
console.log("gaid:", gaid)
|
||||
appStore.androidId = gaid
|
||||
s = 'g_'
|
||||
} catch (error) {
|
||||
appStore.androidId = getAndroidId()
|
||||
s = 'a_'
|
||||
if(!appStore.androidId){
|
||||
appStore.androidId = systemInfo.deviceId
|
||||
}
|
||||
}
|
||||
console.log("androidId:", appStore.androidId)
|
||||
appStore.deviceId = s + md5(appStore.packageName + appStore.androidId).toString()
|
||||
uni.setStorageSync('DEVICE_INFO', JSON.stringify({ androidId: appStore.androidId, s }))
|
||||
} else {
|
||||
const info = JSON.parse(deviceInfo)
|
||||
appStore.androidId = info.androidId
|
||||
appStore.deviceId = info.s + md5(appStore.packageName + appStore.androidId).toString()
|
||||
}
|
||||
console.log("androidId:", appStore.androidId)
|
||||
// appStore.deviceId = s + appStore.androidId
|
||||
appStore.deviceId = s + md5(appStore.packageName + appStore.androidId).toString()
|
||||
appStore.saveToLocal()
|
||||
}
|
||||
// #endif
|
||||
console.log('isLogin', userStore.isLogin);
|
||||
@ -164,6 +174,7 @@ const initData = async () => {
|
||||
await requestAppFbparams({ fbc: appStore.fbc, fbp: appStore.fbp, uniKey: appStore.uniKey })
|
||||
}
|
||||
try {
|
||||
|
||||
await userStore.guestLogin()
|
||||
await userStore.getAgentInfoV2()
|
||||
await usePromoStore().getPromoList()
|
||||
|
@ -86,6 +86,7 @@ onLoad(async (option) => {
|
||||
// }
|
||||
})
|
||||
const onBack = () => {
|
||||
// reportGameOut()
|
||||
// #ifdef APP-PLUS
|
||||
plus.webview.close(webviewInstance)
|
||||
// #endif
|
||||
@ -168,7 +169,6 @@ onUnmounted(() => {
|
||||
uni.offWindowResize(computeWebviewHeight)
|
||||
stopReport()
|
||||
requestJiliLogout()
|
||||
reportGameOut()
|
||||
})
|
||||
|
||||
const startReport = () => {
|
||||
|
@ -136,9 +136,9 @@ export const useAppStore = defineStore({
|
||||
updateText: '',
|
||||
updateType: 0
|
||||
},
|
||||
// packageName: 'uni.UNIFECBD22',//101 Spinz777
|
||||
packageName: 'uni.UNIFECBD22',//101 Spinz777
|
||||
// packageName: 'uni.UNIFECBD22', //102
|
||||
packageName: 'com.kllksgqoCasw3d.game',//103 Winzz777
|
||||
// packageName: 'com.kllksgqoCasw3d.game',//103 Winzz777
|
||||
}),
|
||||
// "dependencies": [
|
||||
// {
|
||||
|
@ -54,6 +54,10 @@ export const useUserStore = defineStore({
|
||||
this.agentInfo = data || {}
|
||||
}
|
||||
},
|
||||
async getUserInfo() {
|
||||
const {data} = await requestUserInfo({})
|
||||
this.userInfo = data
|
||||
},
|
||||
async getUserTotalInfo() {
|
||||
const appStore = useAppStore()
|
||||
const resList = await Promise.all([requestUserInfo(), getVipInfo()])
|
||||
|
Loading…
Reference in New Issue
Block a user