Răsfoiți Sursa

add 新增 对接 maxkey 三方单点登录 优化三方登录按钮位置

疯狂的狮子Li 2 ani în urmă
părinte
comite
1d33b01c66

Fișier diff suprimat deoarece este prea mare
+ 1 - 0
src/assets/icons/svg/maxkey.svg


+ 14 - 14
src/views/login.vue

@@ -27,6 +27,20 @@
         </div>
       </el-form-item>
       <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
+      <el-form-item style="float: right;">
+        <el-button circle title="微信登录">
+          <svg-icon icon-class="wechat" @click="doSocialLogin('wechat')" />
+        </el-button>
+        <el-button circle title="MaxKey登录">
+          <svg-icon icon-class="maxkey" @click="doSocialLogin('maxkey')" />
+        </el-button>
+        <el-button circle title="Gitee登录">
+          <svg-icon icon-class="gitee" @click="doSocialLogin('gitee')" />
+        </el-button>
+        <el-button circle title="Github登录">
+          <svg-icon icon-class="github" @click="doSocialLogin('github')" />
+        </el-button>
+      </el-form-item>
       <el-form-item style="width:100%;">
         <el-button :loading="loading" size="large" type="primary" style="width:100%;" @click.prevent="handleLogin">
           <span v-if="!loading">登 录</span>
@@ -36,20 +50,6 @@
           <router-link class="link-type" :to="'/register'">立即注册</router-link>
         </div>
       </el-form-item>
-      <div style="display: flex;justify-content: flex-end;flex-direction: row;">
-        <el-button circle>
-          <svg-icon icon-class="qq" @click="doSocialLogin('qq')" />
-        </el-button>
-        <el-button circle>
-          <svg-icon icon-class="wechat" @click="doSocialLogin('wechat')" />
-        </el-button>
-        <el-button circle>
-          <svg-icon icon-class="gitee" @click="doSocialLogin('gitee')" />
-        </el-button>
-        <el-button circle>
-          <svg-icon icon-class="github" @click="doSocialLogin('github')" />
-        </el-button>
-      </div>
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">

+ 12 - 15
src/views/system/user/profile/thirdParty.vue

@@ -20,32 +20,29 @@
     <div id="git-user-binding">
       <h4 class="provider-desc">你可以绑定以下第三方帐号</h4>
       <div id="authlist" class="user-bind">
-        <a class="third-app" href="#" @click="authUrl('gitee');" title="使用 Gitee 账号授权登录">
+        <a class="third-app" href="#" @click="authUrl('wechar');" title="使用 微信 账号授权登录">
           <div class="git-other-login-icon">
-            <svg-icon icon-class="gitee" />
+            <svg-icon icon-class="wechat" />
           </div>
-          <span class="app-name">Gitee</span>
+          <span class="app-name">WeiXin</span>
         </a>
-
-        <a class="third-app" href="#" @click="authUrl('github');" title="使用 GitHub 账号授权登录">
+        <a class="third-app" href="#" @click="authUrl('maxkey');" title="使用 MaxKey 账号授权登录">
           <div class="git-other-login-icon">
-            <svg-icon icon-class="github" />
+            <svg-icon icon-class="maxkey" />
           </div>
-          <span class="app-name">Github</span>
+          <span class="app-name">MaxKey</span>
         </a>
-
-        <a class="third-app" href="#" @click="authUrl('wechar');" title="使用 微信 账号授权登录">
+        <a class="third-app" href="#" @click="authUrl('gitee');" title="使用 Gitee 账号授权登录">
           <div class="git-other-login-icon">
-            <svg-icon icon-class="wechat" />
+            <svg-icon icon-class="gitee" />
           </div>
-          <span class="app-name">WeiXin</span>
+          <span class="app-name">Gitee</span>
         </a>
-
-        <a class="third-app" href="#" @click="authUrl('qq');" title="使用 QQ 账号授权登录">
+        <a class="third-app" href="#" @click="authUrl('github');" title="使用 GitHub 账号授权登录">
           <div class="git-other-login-icon">
-            <svg-icon icon-class="qq" />
+            <svg-icon icon-class="github" />
           </div>
-          <span class="app-name">QQ</span>
+          <span class="app-name">Github</span>
         </a>
       </div>
     </div>

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff