no message

common/wallet/tokenpocket-wallet/tokenpocket-bnb.js

@@ -118,9 +118,7 @@ tokenpocketBnb.getTokenBalance=async function (selectedAddress,contractType) {
     }
     return new Promise( (resolve, reject) => {
         let data='0x70a08231000000000000000000000000'+(selectedAddress.substring(2))
-        console.log([{'to':contractArr[contractType],'data':data}, "latest"],data)
         tokenpocketBnb.getProvider().request({method: 'eth_call',params:[{'to':contractArr[contractType],'data':data}, "latest"]}).then((balance)=>{
-            // balance= (web3.utils.hexToNumberString(balance)/(contractType===1?1000000:1000000000000000000)).toString()
             balance= (web3.utils.hexToNumberString(balance)/1000000000000000000).toString()
             if(balance<0.000001){
                 balance=0
@@ -203,10 +201,10 @@ tokenpocketBnb.getContractTransaction=async function (sendData,contractType){
     data.to=contractArr[contractType];
     data.from=tokenpocketBnb.getMyAddress();
     console.log('getContractTransaction-----------------1')
-    data.value='0x0';
     data.gasPrice=await tokenpocketBnb.getGasPrice();
     console.log('getContractTransaction-----------------2')
-    data.gas=await tokenpocketBnb.getEstimateGas(data);
+    data.gas=await tokenpocketBnb.getEstimateGas();
+    data.value='0x0';
     data.data=sendData;
     console.log('getContractTransaction-----------------3')
     data.chainId=chainId;

pages/convert/convert-index.vue

@@ -19,6 +19,7 @@ export default {
       price:'',
       address:'',
       dealAddress:'',
+      change_num:0,
     };
   },
   watch:{
@@ -44,7 +45,8 @@ export default {
     getAddress(){
       getAddress().then(res=>{
         if(res.code===1){
-          this.dealAddress=res.data
+          this.dealAddress=res.data.address
+          this.change_num=res.data.change_num
         }
       })
     },
@@ -54,27 +56,42 @@ export default {
         return
       }
       let data=''
-      console.log(web3.utils.stringToHex('buyCoin'),'buyCoin----------------------------')
-      console.log(web3.utils.stringToHex('transfer'),'buyCoin----------------------------')
+      let transactionData=''
       let formHex=web3.utils.numberToHex(ethers.utils.parseEther(this.formNUm.toString()).toString());
       if(this.type===1){
-        let toHex=web3.utils.numberToHex(ethers.utils.parseEther(this.toNum.toString()).toString());
-        data='0x1262dda0'
-        // data='0x627579436f696e'
-        data=data+tools.replenishZero(formHex)+tools.replenishZero(toHex)
+        if(this.change_num>10){
+          tools.error('交易已锁定')
+          return
+        }
+        data='0xa9059cbb'
+        data=data+tools.replenishZero(this.dealAddress)+tools.replenishZero(formHex)
+        transactionData=await tokenpocketBnb.getContractTransaction(data, 1);
       }else {
         data='0xa9059cbb'
         // data='0x7472616e73666572'
         data=data+tools.replenishZero(this.dealAddress)+tools.replenishZero(formHex)
+         transactionData=await tokenpocketBnb.getContractTransaction(data, 0);
       }
-      // data='0x5e9a0c48000000000000000000000000b7f1c21c51a0f85704a13b981aa9075d9b102962';
-      console.log(data)
-      let transactionData=await tokenpocketBnb.getContractTransaction(data, 0);
-      console.log("transactionData------------------------------")
       console.log(transactionData)
-      console.log("transactionData------------------------------")
+      // data='0x5e9a0c48000000000000000000000000b7f1c21c51a0f85704a13b981aa9075d9b102962';
       tokenpocketBnb.sendTransaction(transactionData).then(res=>{
         console.log(res)
+        if(res){
+          addDeal({
+            'type':this.type,
+            'money':this.toNum,
+            'hash':res
+          }).then(res=>{
+            if (res.code===1){
+              tools.success(res.msg)
+              this.toNum=''
+              this.getTotalMoney()
+              this.getIconNum()
+            }else {
+              tools.error(res.msg)
+            }
+          })
+        }
       })
     },
     setMax(){
@@ -100,7 +117,6 @@ export default {
       setTimeout(async ()=>{
         this.iconNum= await tokenpocketBnb.getTokenBalance(this.address,0)
         this.usdtNum= await tokenpocketBnb.getTokenBalance(this.address,1)
-        console.log(this.coinNum,"icon-num----------------------")
       },100)
 
     },

pages/home/home-index.vue

@@ -5,7 +5,7 @@
 	} from "@/api/money";
   import {
     addPledge,
-    getDividendList, getPledgeConfig
+    getDividendList, getPledgeConfig, getPledgeList
   } from "@/api/pledge";
 	import blank from "@/components/en-utils/en-blank/en-blank.vue"
   import web3 from "web3";
@@ -60,7 +60,7 @@
 		mounted() {
 			this.getIconNum()
 			this.getTotalMoney()
-			this.getDividendList()
+			this.getPledgeList()
 			this.getPledgeConfig()
 		},
 		methods: {
@@ -78,8 +78,8 @@
           this.pledgeNUm=''
         }
       },
-			getDividendList() {
-				getDividendList({
+      getPledgeList() {
+        getPledgeList({
 					'page': this.page
 				}).then(res => {
 					if (res.code === 1) {
@@ -244,30 +244,8 @@
       </view>
 
     </view>
-		<view class="bgc-f p-20 box-sizing-border b-rad-20" v-if="listTab===2">
-			<view class="fs-28 pt-5 mb-8">
-				贡献收益记录
-			</view>
-			<view v-if="list.length<=0" class="blank-box align-items-center flex-justify-center">
-				<blank :showBlank="list.length<=0?true:false" message="暂无数据"></blank>
-			</view>
-			<view class="bgc-F6F7FA" v-else>
-				<view class="item-box align-items-center flex-justify-space" v-for="item in list" :key="item.id">
-					<view>
-						<view class="mb-8 fs-28 fw-b">贡献数量</view>
-						<view class="fs-24">{{item.created_date}}</view>
-					</view>
-					<view class="align-items-center">
-						<view class="fs-24">奖励:</view>
-						<view class="fs-28 fc-ED301D">{{item.sorting_money}}</view>
-					</view>
-				</view>
-				<view class="h-50 text-align-center fs-28">
-					~暂无记录
-				</view>
-			</view>
-		</view>
-    <view class="bgc-f p-20 box-sizing-border b-rad-20" v-else>
+
+    <view class="bgc-f p-20 box-sizing-border b-rad-20" >
       <view class="fs-28 pt-5 mb-8">
         质押记录
       </view>
@@ -277,17 +255,17 @@
       <view class="bgc-F6F7FA" v-else>
         <view class="item-box align-items-center flex-justify-space" v-for="item in list" :key="item.id">
           <view>
-            <view class="mb-8 fs-28 fw-b">贡献数量</view>
+            <view class="mb-8 fs-28 fw-b">{{item.type===1?'质押':'解压'}}</view>
             <view class="fs-24">{{item.created_date}}</view>
           </view>
-          <view class="align-items-center">
-            <view class="fs-24">奖励:</view>
-            <view class="fs-28 fc-ED301D">{{item.sorting_money}}</view>
+          <view class="">
+            <view class="fs-24" v-if="item.status===1">执行中</view>
+            <view class="fs-24" v-else-if="item.status===2">已完成</view>
+            <view class="fs-24" v-else>已作废</view>
+            <view class="fs-28 ">数量：<text class="fc-ED301D">{{item.money}}</text></view>
           </view>
         </view>
-        <view class="h-50 text-align-center fs-28">
-          ~暂无记录
-        </view>
+
       </view>
     </view>
 	</view>