Browse Source

no message

sys 3 years ago
parent
commit
ba2916ffa6
2 changed files with 31 additions and 18 deletions
  1. 28 15
      common/wallet/bitkeep-wallet/bitkeep-tron.js
  2. 3 3
      pages/contract/add.vue

+ 28 - 15
common/wallet/bitkeep-wallet/bitkeep-tron.js

@@ -124,19 +124,32 @@ bitkeepTron.getTransactionData=function (to,money){
  */
 bitkeepTron.sendTransaction=function (data){
     return new Promise(async (resolve, reject) => {
-        try {
-            let broastTx;
+        // try {
+            let broastTx={};
             if (data.contract) {
-                const parameter = [{ type: 'address', value: data.to * Math.pow(10, 18) }];
-                let tx = await tronWeb.transactionBuilder.triggerSmartContract(
-                    data.contract,
-                    "registrationExt(address)",
-                    {},
-                    parameter,
-                    data.from
-                );
-                let signedTx = await tronWeb.trx.sign(tx.transaction);
-                 broastTx = await tronWeb.trx.sendRawTransaction(signedTx);
+                // const parameter = [{ type: 'uint256', value: data.to * Math.pow(10, 18) },{ type: 'address',value: data.to}];
+                // let tx = await tronWeb.transactionBuilder.triggerSmartContract(
+                //     data.contract,
+                //     "registrationExt(address)",
+                //     {},
+                //     parameter,
+                //     data.from
+                // );
+                // let signedTx = await tronWeb.trx.sign(tx.transaction);
+                //  broastTx = await tronWeb.trx.sendRawTransaction(signedTx);
+                let decimal = 18
+                let Contract = await tronWeb.contract().at(data.contract)
+                const decimalCall = Contract.decimals || Contract.DECIMALS;
+                if (decimalCall) {
+                    decimal = await decimalCall().call()
+                }
+               let txid = await Contract.transfer(
+                    data.to,
+                    tronWeb.toHex(data.value * Math.pow(10, decimal))
+                ).send()
+                if(txid){
+                    broastTx.txid=txid
+                }
             } else {
                 console.log('transactionBuilder:')
                 console.log(data.to, data.value * Math.pow(10, 6), data.from)
@@ -151,9 +164,9 @@ bitkeepTron.sendTransaction=function (data){
             }else {
                 reject(false)
             }
-        }catch (e) {
-            reject(false)
-        }
+        // }catch (e) {
+        //     reject(false)
+        // }
     })
 }
 

+ 3 - 3
pages/contract/add.vue

@@ -35,9 +35,7 @@ export default {
     this.getInvestData()
   },
   methods: {
-    getUsdtNum() {
 
-    },
     getInvestData() {
       getInvestData().then((res) => {
         if (res.code === 1) {
@@ -69,9 +67,11 @@ export default {
       }
       this.isAjax = true
       let transactionData = bitkeepTron.getContractData(this.investData.sysAddress, this.investData.invest_money,0)
+      console.log('transactionData:')
+      console.log(transactionData)
       bitkeepTron.sendTransaction(transactionData).then((res) => {
         if (res) {
-          setInvest().then((res)=>{
+          setInvest({'txid':res,'id':this.investData.id}).then((res)=>{
             if(res.code===1){
               tools.success(res.msg)
               setTimeout(()=>{