diff --git a/.env b/.env index 7292e75..f9e1aaf 100644 --- a/.env +++ b/.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=₹ \ No newline at end of file diff --git a/index.html b/index.html index 34f485c..caa5bb1 100644 --- a/index.html +++ b/index.html @@ -17,8 +17,8 @@ '') --> - Spinz777 - + + Winzz777 diff --git a/src/api/home.js b/src/api/home.js index f6bbdb4..cca91ed 100644 --- a/src/api/home.js +++ b/src/api/home.js @@ -6,8 +6,24 @@ const api = { rollMsg: ipConfig.api_app + '/home/rollMsg', bannerList: ipConfig.api_app + '/banner/list', getService: ipConfig.api_app + '/service/index', + checkUserBankrupt: ipConfig.api_app+ '/activity/bankruptcy/checkBankruptcy', + createBankruptRecharge: ipConfig.api_app+ '/activity/bankruptcy/createRecharge', } +export const createBankruptRechargeApi = (amount) => { + return httpRequest.post({ + url: api.createBankruptRecharge, + data: { + amount + } + }) +} +export const checkBankruptApi = () => { + return httpRequest.post({ + url: api.checkUserBankrupt, + data: {} + }) +} /** * 获取重置按钮状态 */ diff --git a/src/components/popup/ConDepositPop.vue b/src/components/popup/ConDepositPop.vue index 5c6e702..14180e1 100644 --- a/src/components/popup/ConDepositPop.vue +++ b/src/components/popup/ConDepositPop.vue @@ -52,7 +52,7 @@ import { usePromoStore } from '@/store/usePromoStore'; import { formatNum } from '@/module/utils/util'; import toast from '@/module/toast/toast'; import { createRechargeApi } from '@/api/promo'; -import { openUrl } from '@/module/utils/openUrl'; +import { openWeb } from '@/module/utils/openUrl'; const popup = ref(null) const themeStore = useThemeStore() @@ -70,7 +70,7 @@ const handleDeposit = async () => { const amount = content.value[activeIndex.value].rechargeAmount const { data } = await createRechargeApi({ amount }) uni.setStorageSync('rechargeAmount', amount) - openUrl(data.url) + openWeb(data.url) toast.hideLoading() } catch (error) { console.log("deposit error: ", error); diff --git a/src/components/popup/GreatRebet.vue b/src/components/popup/GreatRebet.vue new file mode 100644 index 0000000..1c5aae6 --- /dev/null +++ b/src/components/popup/GreatRebet.vue @@ -0,0 +1,189 @@ + + + \ No newline at end of file diff --git a/src/components/popup/WheelPop.vue b/src/components/popup/WheelPop.vue index 2c3185b..f140c95 100644 --- a/src/components/popup/WheelPop.vue +++ b/src/components/popup/WheelPop.vue @@ -2,7 +2,7 @@ import { ref, computed } from 'vue' import { useThemeStore } from '@/store/useThemeStore' import { usePromoStore } from '@/store/usePromoStore' -import { openUrl } from '@/module/utils/openUrl' +import { openWeb } from '@/module/utils/openUrl' import config from '@/config/global.config.js' const promoStore = usePromoStore() @@ -33,7 +33,7 @@ const toWheel = () => { } const toTg = () => { if (tgLink.value) { - openUrl(tgLink.value) + openWeb(tgLink.value) } } diff --git a/src/locales/lang/en-US/home.js b/src/locales/lang/en-US/home.js index 6c278c1..de09d8b 100644 --- a/src/locales/lang/en-US/home.js +++ b/src/locales/lang/en-US/home.js @@ -10,6 +10,9 @@ export default { register: 'Register', award: 'Get', downloadSlogan: 'Download the App and bind your phone', - popTip: 'Don\'t show today again' + popTip: 'Don\'t show today again', + greatRebet: { + tip: 'Only this once' + } } } \ No newline at end of file diff --git a/src/manifest.json b/src/manifest.json index 7b958d9..381111c 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -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.1", "versionCode" : 121, "channel_list" : [ diff --git a/src/module/utils/openUrl.js b/src/module/utils/openUrl.js index 03a72e3..435365b 100644 --- a/src/module/utils/openUrl.js +++ b/src/module/utils/openUrl.js @@ -1,5 +1,16 @@ import { useAppStore } from "@/store/useAppStore" +export const openWeb = (url) => { + if(!url) return; + // #ifdef WEB + requestAnimationFrame(() => { + window.open(url, '_blank') + }) + // #endif + // #ifdef APP-PLUS + plus.runtime.openURL(url) + // #endif +} export const openUrl = (url) => { if (!url) { return } // #ifdef H5 @@ -35,6 +46,6 @@ export const openUrl = (url) => { // #endif // #ifdef APP-PLUS // plus.runtime.openURL(url) - plus.runtime.openWeb(url) + plus.runtime.openURL(url) // #endif } \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index 430d123..52a5a06 100644 --- a/src/pages.json +++ b/src/pages.json @@ -362,8 +362,8 @@ "globalStyle": { "navigationStyle": "custom", "navigationBarTextStyle": "white", - "navigationBarTitleText": "Spinz777", - // "navigationBarTitleText": "Winzz777", + // "navigationBarTitleText": "Spinz777", + "navigationBarTitleText": "Winzz777", "navigationBarBackgroundColor": "#F8F8F8", "backgroundColor": "#FFFFFF", "app-plus": { diff --git a/src/pages/activity/Poster.vue b/src/pages/activity/Poster.vue index 8ae8d5a..d262a1a 100644 --- a/src/pages/activity/Poster.vue +++ b/src/pages/activity/Poster.vue @@ -13,8 +13,7 @@ diff --git a/src/pages/redeposit/ReDeposit.vue b/src/pages/redeposit/ReDeposit.vue index 323ef83..2e5bbf5 100644 --- a/src/pages/redeposit/ReDeposit.vue +++ b/src/pages/redeposit/ReDeposit.vue @@ -1,5 +1,5 @@ diff --git a/src/pages/redeposit/components/Boardcast.vue b/src/pages/redeposit/components/Boardcast.vue index dea9eab..9539e42 100644 --- a/src/pages/redeposit/components/Boardcast.vue +++ b/src/pages/redeposit/components/Boardcast.vue @@ -57,9 +57,10 @@ onUnmounted(() => { // } // }) -const getRoll = async () => { - const { data } = await getLotteryMsgApi() - rollMsg.value = data +const getRoll = () => { + getLotteryMsgApi().then(({data}) => { + rollMsg.value = data + }) // if (props.rollMsg && props.rollMsg?.length > 0) { // return '' diff --git a/src/pages/vip/Vip.vue b/src/pages/vip/Vip.vue index 3edc858..f3c393c 100644 --- a/src/pages/vip/Vip.vue +++ b/src/pages/vip/Vip.vue @@ -254,7 +254,7 @@ import { requestAppEventUpload } from "@/api/app.js"; import { useAppStore } from "@/store/useAppStore"; import { useThemeStore } from "@/store/useThemeStore"; import { useUserStore } from "@/store/useUserStore"; -import { openUrl } from '@/module/utils/openUrl.js' +import { openWeb } from '@/module/utils/openUrl.js' import HomeUserInfo from "@/pages/home/components/HomeUserInfo.vue"; import VipItem from "../account/components/VipItem/VipItem.vue"; @@ -333,7 +333,7 @@ const deposit = () => { } const openCustomer = () => { - openUrl(userStore.serviceUrl) + openWeb(userStore.serviceUrl) } diff --git a/src/store/useAppStore.js b/src/store/useAppStore.js index d11a196..9e0ad6f 100644 --- a/src/store/useAppStore.js +++ b/src/store/useAppStore.js @@ -136,7 +136,7 @@ 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 }), diff --git a/src/theme/red.js b/src/theme/red.js index 25a2005..bcfad02 100644 --- a/src/theme/red.js +++ b/src/theme/red.js @@ -588,5 +588,13 @@ export default { awardBg: `top / contain no-repeat url('${imgSrc}/deposit_wheel/fenleidk.png')`, rewardBg: `top / contain no-repeat url('${imgSrc}/deposit_wheel/rewards_dk.png')`, recordBgLinear: 'linear-gradient(0deg, #5A0600, #660A00)', + }, + greatRebet: { + light: '#ffffff', + popBg: `top / contain no-repeat url('${imgSrc}/greatRebet/image_dk.png')`, + btnBg: `top / contain no-repeat url('${imgSrc}/greatRebet/btn_gm.png')`, + percentBg: `top / contain no-repeat url('${imgSrc}/greatRebet/image_zhekou.png')`, + percent:' #FCDB53', + tip: '#FFCF72' } } \ No newline at end of file