diff --git a/.env.development b/.env.development index 63bc273..b5a0f5c 100644 --- a/.env.development +++ b/.env.development @@ -1,13 +1,10 @@ VITE_BASE_API='https://oauth-svr.cebggame.com/mint' VITE_GPAL_API='http://192.168.100.83:4000/sns' -# VITE_GPAL_ROUTER='https://vlpwkzon-testflight.counterfire.games' VITE_GPAL_ROUTER='https://mint.kingsome.cn' VITE_TOKENID_ID='0x34a1' VITE_NET_ID='13473' VITE_ERC_ADDRESS='0xFd42bfb03212dA7e1A4608a44d7658641D99CF34' VITE_CFNFT_ADDRESS='0xaa34B79A0Ab433eaC900fB3CB9f191F5Cd27501D' -VITE_CLAIM_ADDRESS='0xf45702180314187a3549FEDac3B78349b47ca6A0' VITE_CLAIMWL_ADDRESS='0xc11A64Cc2Ec7aEFbd5E25a37f1d9216f3f8CF11a' - VITE_PASSPORT_PUBLISHABLE_KEY=pk_imapik-test-1E-detBXtG7U$5961WuL VITE_PASSPORT_CLIENT_ID=gYQrjtct7CN4UVwDG2sb8yACfYRo3xQJ \ No newline at end of file diff --git a/src/view/mintIndex.vue b/src/view/mintIndex.vue index 06d4736..d4063f5 100644 --- a/src/view/mintIndex.vue +++ b/src/view/mintIndex.vue @@ -651,13 +651,13 @@ -->
  • - +
  • @@ -1024,7 +1024,6 @@ const getIsWhite = async () => { whiteAmount = num1 + num2 - minted } whiteAmount = whiteAmount < 0 ? 0 : whiteAmount - console.log(whiteAmount,'whiteAmount-------') if(whiteAmount > 0) { whiteCount.value = whiteAmount; mintTotal.value = whiteAmount; @@ -1097,6 +1096,7 @@ const mintClaim = async () => { // } else { // openLoading.value = false; } + } catch (e) { openStatus.value = 3; openLoading.value = false; @@ -1134,7 +1134,7 @@ const getMyNftList = async () => { arr.push(parseInt(res[i])) } nftList.value = arr - console.log(nftList.value,'===') + // console.log(nftList.value,'===') } else { const data = { type: '0', @@ -1144,7 +1144,7 @@ const getMyNftList = async () => { } let res = await axios.get(`https://market-test.kingsome.cn/api/asset/${import.meta.env.VITE_NET_ID}/${getAddress.value}?type=0&page_size=20&cursor=&search_name=`) nftList.value = res.data.rows - console.log(nftList.value) + // console.log(nftList.value) } } } diff --git a/src/wallet/index.js b/src/wallet/index.js index aa2a5ea..2caec06 100644 --- a/src/wallet/index.js +++ b/src/wallet/index.js @@ -191,13 +191,11 @@ const GAS_BOOST = 2 export const claimStage2Nft = async (name, myAddress, params, mintPrice, web3) => { await checkAndSwitchChain(name) const price = params * mintPrice * 1e18 - console.log(BigInt(price)) const gasPrice = await web3.eth.getGasPrice() const contractFT = new web3.eth.Contract(abis['ERC'].abi, ERCAddress, { from: myAddress }); const allowance = await contractFT.methods.allowance(myAddress, claimWlAddress).call() - if(allowance < BigInt(price)) { let gasApprove = await contractFT.methods.approve(claimWlAddress, price).estimateGas(); gasApprove = (parseInt(gasApprove) * GAS_BOOST) | 0; diff --git a/src/wallet/initPassport.js b/src/wallet/initPassport.js index ad9c765..a81a6f9 100644 --- a/src/wallet/initPassport.js +++ b/src/wallet/initPassport.js @@ -1,5 +1,5 @@ import { config, passport } from '@imtbl/sdk'; -console.log(import.meta.env.VITE_GPAL_ROUTER,'import.meta.env.VITE_GPAL_ROUTER') +console.log(`${import.meta.env.VITE_GPAL_ROUTER}/redirect`) const environment = process.env.NODE_ENV === 'production' ? config.Environment.PRODUCTION : config.Environment.SANDBOX; const passportInstance = new passport.Passport({ baseConfig: {