Merge pull request #413 from 724338817/dev-3.0

webase12-9
WeBankBlockchain · Dec 9, 2021 · 1ea978a · 1ea978a
2 parents 26de6c4 + d9dc206
commit 1ea978a
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 10 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,4 +1,15 @@
+### v2.0.0-rc1(2021-12-09)
 
+**Add**
+- 适配兼容FISCO BCOS v3.0.0
+
+
+**兼容性**
+- 支持FISCO-BCOS v3.0.0 及以上版本
+- WeBASE-Node-Manager v2.0.0-rc1
+- WeBASE-Front v2.0.0-rc1
+- WeBASE-Sign v2.0.0-rc1
+详细了解,请阅读[**技术文档**](https://webasedoc.readthedocs.io/zh_CN/lab/)。
 ### v1.5.3(2021-09-27)
 
 **Add**

diff --git a/README.md b/README.md
@@ -1,17 +1,17 @@
 # Web管理平台
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](https://webasedoc.readthedocs.io/zh_CN/latest/docs/WeBASE/CONTRIBUTING.html)
-[![CodeFactor](https://www.codefactor.io/repository/github/webankfintech/webase-web/badge)](https://www.codefactor.io/repository/github/webankfintech/webase-web)
-[![Code Lines](https://tokei.rs/b1/github/WeBankFinTech/WeBASE-Web?category=code)](https://github.com/WeBankFinTech/WeBASE-Web)
+[![CodeFactor](https://www.codefactor.io/repository/github/webankfintech/webase-web/badge)](https://www.codefactor.io/repository/github/webankblockchain/webase-web)
+[![Code Lines](https://tokei.rs/b1/github/WeBankBlockchain/WeBASE-Web?category=code)](https://github.com/WeBankBlockchain/WeBASE-Web)
 [![license](http://img.shields.io/badge/license-Apache%20v2-blue.svg)](http://www.apache.org/licenses/)
-[![GitHub (pre-)release](https://img.shields.io/github/release/WeBankFinTech/WeBASE-Web/all.svg)](https://github.com/WeBankFinTech/WeBASE-Web/releases)
+[![GitHub (pre-)release](https://img.shields.io/github/release/WeBankBlockchain/WeBASE-Web/all.svg)](https://github.com/WeBankBlockchain/WeBASE-Web/releases)
 
 ## 简介
 
 本项目是区块链中间件平台WeBASE管理平台，使用框架`vue-cli`，支持fisco-bcos 2.0版本及以上。
 
 兼容浏览器IE9及以上，360浏览器兼容版（IE9内核），360浏览器极速版，chrome浏览器。
 
-本平台支持群组切换、区块信息浏览、合约管理、私钥管理、交易审计和账号管理等功能。详细介绍请查看[WeBASE-Web在线文档](https://webasedoc.readthedocs.io/zh_CN/latest/docs/WeBASE-Web/index.html)
+本平台支持群组切换、区块信息浏览、合约管理、私钥管理、交易审计和账号管理等功能。详细介绍请查看[WeBASE-Web在线文档](https://webasedoc.readthedocs.io/zh_CN/lab/docs/WeBASE-Web/index.html)
 
 ## 贡献说明
 

diff --git a/development.md b/development.md
@@ -1,6 +1,6 @@
 # WeBASE-Web开发文档
 
-本代码仅支持fisco-bcos 2.0以上版本，支持群组和群组切换。
+本代码仅支持fisco-bcos 3.0以上版本，支持群组和群组切换。
 
 
 ## 1、开发环境搭建
@@ -19,7 +19,7 @@ nodejs下载地址：https://nodejs.org/en/download/
 
 > 执行命令：
 
-    git clone https://github.com/WeBankFinTech/WeBASE-Web.git
+    git clone https://github.com/WeBankBlockchain/WeBASE-Web.git
 
 将代码放在你的工作目录，例如：D：\project
 

diff --git a/dist/index.html b/dist/index.html
@@ -21,7 +21,7 @@
       height: 100%;
       margin: 0px;
       padding: 0px;
-    }</style></head><body><body><div id=app></div><script type=text/javascript src=./static/js/0.1e9ec0c1b48cbe6beb00.js></script><script type=text/javascript src=./static/js/3.7c35d918193d783a312a.js></script><script type=text/javascript src=./static/js/runtime.95139ededb3d89d39a6c.js></script><script type=text/javascript src=./static/js/5.dc528bc95a8777b87cc4.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></div><script type=text/javascript src=./static/js/0.a040d801b0492a4027cb.js></script><script type=text/javascript src=./static/js/3.7c35d918193d783a312a.js></script><script type=text/javascript src=./static/js/runtime.95139ededb3d89d39a6c.js></script><script type=text/javascript src=./static/js/5.dc528bc95a8777b87cc4.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.1e9ec0c1b48cbe6beb00.js.gz b/dist/static/js/0.1e9ec0c1b48cbe6beb00.js.gz
diff --git a/dist/static/js/0.1e9ec0c1b48cbe6beb00.js → dist/static/js/0.a040d801b0492a4027cb.js b/dist/static/js/0.1e9ec0c1b48cbe6beb00.js → dist/static/js/0.a040d801b0492a4027cb.js
diff --git a/dist/static/js/0.a040d801b0492a4027cb.js.gz b/dist/static/js/0.a040d801b0492a4027cb.js.gz
diff --git a/release_note.txt b/release_note.txt
@@ -1 +1 @@
-v1.5.3
+v2.0.0-rc1
diff --git a/src/components/sendTransaction.vue b/src/components/sendTransaction.vue
@@ -520,7 +520,7 @@ export default {
               this.isUserNameShow = false;
             } else {
               this.isUserNameShow = true;
-              this.placeholderText = this.$t("placeholder.selectedNoUser");
+              //this.placeholderText = this.$t("placeholder.selectedNoUser");
             }
             this.changeFunc();
           } else {