merge

WeBankBlockchain · Dec 24, 2019 · a25eb68 · a25eb68
1 parent 137e7ef
commit a25eb68
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 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.c7ccd3a9a86b5063d53e.js></script><script type=text/javascript src=./static/js/3.0bfe8c760b770e19ca7c.js></script><script type=text/javascript src=./static/js/runtime.3b3ce3a07b1ffbe27563.js></script><script type=text/javascript src=./static/js/5.a3fd349a55a77c83539a.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.e6f6c4eef8f46e99bd0a.js></script><script type=text/javascript src=./static/js/3.0bfe8c760b770e19ca7c.js></script><script type=text/javascript src=./static/js/runtime.3b3ce3a07b1ffbe27563.js></script><script type=text/javascript src=./static/js/5.a3fd349a55a77c83539a.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.c7ccd3a9a86b5063d53e.js → dist/static/js/0.e6f6c4eef8f46e99bd0a.js b/dist/static/js/0.c7ccd3a9a86b5063d53e.js → dist/static/js/0.e6f6c4eef8f46e99bd0a.js
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
@@ -18,11 +18,7 @@
         <div class="login-lang">
             <lang-select class="right-menu-item hover-effect"></lang-select>
         </div>
-<<<<<<< HEAD
         <!-- <div class="login-encrypt">
-=======
-        <div class="login-encrypt">
->>>>>>> c2231e5db56f6470b02181bcc10009a4f8533d9d
             <el-radio-group v-model="encryption" @change="handleEncryption" size="mini">
                 <el-radio-button label="hash">{{$t('login.hash')}}</el-radio-button>
                 <el-radio-button label="guomi">{{$t('login.guomi')}}</el-radio-button>