Merge pull request #85 from xyzshen/dev-1.0.2

repair logs decode bug
WeBankBlockchain · Jul 26, 2019 · e480da2 · e480da2
2 parents 0a15459 + e4e10e3
commit e480da2
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/dist/index.html b/dist/index.html
@@ -11,7 +11,7 @@
             vertical-align: -0.15em;
             fill: currentColor;
             overflow: hidden;
-        }</style></head><body><body><div id=app style="height: 100% !important;"></div><script type=text/javascript src=./static/js/0.11347db7393a07f4d6f0.js></script><script type=text/javascript src=./static/js/3.dacdd196d03d0b609601.js></script><script type=text/javascript src=./static/js/runtime.037c2dc15c669aa44ecf.js></script><script type=text/javascript src=./static/js/5.26974de030355e20c144.js></script></body><script src=./static/js/web3.min.js type=text/javascript></script><script>if (self == top) {
+        }</style></head><body><body><div id=app style="height: 100% !important;"></div><script type=text/javascript src=./static/js/0.766498cf5ffeb60a8e30.js></script><script type=text/javascript src=./static/js/3.dacdd196d03d0b609601.js></script><script type=text/javascript src=./static/js/runtime.037c2dc15c669aa44ecf.js></script><script type=text/javascript src=./static/js/5.26974de030355e20c144.js></script></body><script src=./static/js/web3.min.js type=text/javascript></script><script>if (self == top) {
         var antiClickjack = document.getElementById("antiClickjack");
         antiClickjack.parentNode.removeChild(antiClickjack);
     } else {

diff --git a/dist/static/js/0.11347db7393a07f4d6f0.js → dist/static/js/0.766498cf5ffeb60a8e30.js b/dist/static/js/0.11347db7393a07f4d6f0.js → dist/static/js/0.766498cf5ffeb60a8e30.js
diff --git a/src/components/transactionDetail.vue b/src/components/transactionDetail.vue
@@ -435,7 +435,7 @@ export default {
                 }
             }
             list.eventName = list.eventName + ")";
-            let eventResult = web3.eth.abi.decodeLog(eventData.abiInfo.inputs, list.data, list.topics);
+            let eventResult = web3.eth.abi.decodeLog(eventData.abiInfo.inputs, list.data, list.topics.slice(1));
             list.outData = {};
             list.eventLgData = [];
             for (const key in eventResult) {

diff --git a/src/views/chaincode/components/contractCatalog.vue b/src/views/chaincode/components/contractCatalog.vue
@@ -16,12 +16,12 @@
 <template>
     <div class="contract-menu" style="position: relative;height: 100% ;">
         <div class="contract-menu-header" >
-            <el-tooltip class="item" effect="dark" v-if="!disabled" content="新建文件夹" placement="top-start">
-                <i class="wbs-icon-Addfolder icon contract-icon" @click='addFolder'></i>
-            </el-tooltip>
             <el-tooltip class="item" effect="dark" content="新建文件" v-if="!disabled" placement="top-start">
                 <i class="wbs-icon-Addfile icon contract-icon" @click='addFile'></i>
             </el-tooltip>
+            <el-tooltip class="item" effect="dark" v-if="!disabled" content="新建文件夹" placement="top-start">
+                <i class="wbs-icon-Addfolder icon contract-icon" @click='addFolder'></i>
+            </el-tooltip>
             <el-tooltip class="item" effect="dark" content="上传文件" v-if="!disabled" placement="top-start">
                 <i class="wbs-icon-shangchuan contract-icon" style="position:relative;">
                     <input type="file" id="file" ref='file' name="chaincodes" class="uploads"  @change="upload($event)"/>

diff --git a/src/views/chaincode/dialog/editor.vue b/src/views/chaincode/dialog/editor.vue
@@ -194,6 +194,7 @@ export default {
         }
     },
     mounted: function () {
+        this.editorHeight = document.body.offsetHeight * 0.75
         if (this.transationData.output == "0x") {
             this.inputButtonShow = false
         } else {
@@ -205,7 +206,7 @@ export default {
         if (this.typesArray && this.transationData.output != "0x") {
             this.decodefun()
         }
-        this.editorHeight = document.body.offsetHeight * 0.75
+        
     },
     methods: {
         decodeOutput: function () {
@@ -303,7 +304,7 @@ export default {
                 }
             }
             list.eventName = list.eventName + ")";
-            let eventResult = web3.eth.abi.decodeLog(eventData.abiInfo.inputs, list.data, list.topics);
+            let eventResult = web3.eth.abi.decodeLog(eventData.abiInfo.inputs, list.data, list.topics.slice(1));
             list.outData = {};
             list.eventLgData = [];
             for (const key in eventResult) {

diff --git a/src/views/front/front.vue b/src/views/front/front.vue
@@ -197,7 +197,6 @@ export default {
                         this.total = res.data.totalCount;
                         this.frontData = res.data.data || [];
                         this.loading = false;
-                        this.getNodeTable()
                     } else {
                         this.loading = false;
                         this.$message({

diff --git a/src/views/transactionInfo/components/transactionDetail.vue b/src/views/transactionInfo/components/transactionDetail.vue
@@ -310,7 +310,7 @@ export default {
                                 let eventData = web3.eth.abi.decodeLog(
                                     value.inputs,
                                     val.data,
-                                    val.topics
+                                    val.topics.slice(1)
                                 );
                             }
                         });