Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev

src/views/login.vue

@@ -40,12 +40,12 @@
             <span v-else>登 录 中...</span>
           </el-button>
           <div style="float: right;" v-if="register">
-            <router-link class="link-type" :to="'/register'">立即注册</router-link>
-            <!-- <el-button type="text" @click="registrationLink('/register')">立即注册</el-button> -->
+            <!-- <router-link class="link-type" :to="'/register'">立即注册</router-link> -->
+            <el-button type="text" @click="registrationLink('/register')">立即注册</el-button>
           </div>
-          <!-- <div class="registerImg">
+          <div class="registerImg">
             <div id="qrcodeImg"></div>
-          </div> -->
+          </div>
         </el-form-item>
       </el-form>
     </div>
@@ -151,7 +151,7 @@ export default {
     },
     registrationLink(path) {
       selectIdentityAuthenticaEIDtoken().then(res => {
-        console.log(res)
+        let url = res.data.eidToken
         document.getElementById("qrcodeImg").innerHTML = "";
         return new QRCode("qrcodeImg", {
           width: 200,
@@ -278,6 +278,12 @@ export default {
   }
 }
 
+.registerImg {
+  border: 1px solid black;
+  width: 350px;
+  height: 250px;
+}
+
 .login-code-img {
   height: 38px;
 }