Commit 4c4e37fd42bce02d49405d0535ff0954dedcbc0d
1 parent
7753bd4c
登录面板增加钉钉、企业微信支付按钮
Showing
3 changed files
with
38 additions
and
5 deletions
yudao-ui-admin/src/assets/logo/login-logo.png
0 → 100644
3.16 KB
yudao-ui-admin/src/assets/styles/login.scss
| ... | ... | @@ -10,11 +10,11 @@ $buttonH: 50; |
| 10 | 10 | |
| 11 | 11 | // container |
| 12 | 12 | $containerBgColor: #e6ebf2; |
| 13 | -$containerBgImage: '/assets/images/bg.png'; | |
| 13 | +$containerBgImage: '../assets/images/bg.png'; | |
| 14 | 14 | // container-logo |
| 15 | 15 | $logoWidth: 417px; |
| 16 | 16 | $logoHeight: 64px; |
| 17 | -$logoImage: '/assets/logo/logo.png'; | |
| 17 | +$logoImage: '../assets/logo/login-logo.png'; | |
| 18 | 18 | // container-content |
| 19 | 19 | $contentWidth: round($W / $H * 100) * 1vw; |
| 20 | 20 | $contentHeight: round($picH / $W * 100) / 100 * $contentWidth; |
| ... | ... | @@ -22,7 +22,7 @@ $contentBgColor: #ffffff; |
| 22 | 22 | // container-content-pic |
| 23 | 23 | $picWidth: round($picW / $H * 100) * 1vw; |
| 24 | 24 | $picHeight: inherit; |
| 25 | -$picImage: '/assets/images/pic.png'; | |
| 25 | +$picImage: '../assets/images/pic.png'; | |
| 26 | 26 | // container-content-field |
| 27 | 27 | $fieldWidth: $contentWidth - $picWidth; |
| 28 | 28 | $fieldHeight: inherit; |
| ... | ... | @@ -270,7 +270,7 @@ $mobileRowH: 48; |
| 270 | 270 | $mobileButtonH: 48; |
| 271 | 271 | |
| 272 | 272 | // container |
| 273 | -$mobileContainerBgImage: '/assets/images/bg-mobile.png'; | |
| 273 | +$mobileContainerBgImage: '../assets/images/bg-mobile.png'; | |
| 274 | 274 | // container-content |
| 275 | 275 | $mobileContentWidth: round($mobileContentW / $mobileW * 100) * 1vw; |
| 276 | 276 | $mobileContentHeight: round($mobileContentH / $mobileW * 100) / 100 * $mobileContentWidth; |
| ... | ... | @@ -278,7 +278,7 @@ $mobileContentHeight: round($mobileContentH / $mobileW * 100) / 100 * $mobileCon |
| 278 | 278 | $mobileFormWidth: round($mobileFormW / $mobileW *100) * 1vw; |
| 279 | 279 | $mobileRowHeight: $mobileRowH * 1px; |
| 280 | 280 | $mobileButtonHeight: $mobileButtonH * 1px; |
| 281 | -$iconBgImage: '/assets/images/icon.png'; | |
| 281 | +$iconBgImage: '../assets/images/icon.png'; | |
| 282 | 282 | |
| 283 | 283 | // - - - - - 移动端设置 |
| 284 | 284 | @media screen and (max-width: 599px) { | ... | ... |
yudao-ui-admin/src/views/login.vue
| ... | ... | @@ -81,7 +81,20 @@ |
| 81 | 81 | <span v-else>登 录 中...</span> |
| 82 | 82 | </el-button> |
| 83 | 83 | </el-form-item> |
| 84 | + | |
| 85 | + <el-form-item style="width:100%;"> | |
| 86 | + <div class="oauth-login" style="display:flex"> | |
| 87 | + <div class="oauth-login-item" v-for="item in SysUserSocialTypeEnum" :key="item.type" @click="doSocialLogin(item)"> | |
| 88 | + <img :src="item.img" height="25px" width="25px" alt="登录" > | |
| 89 | + <span>{{item.title}}</span> | |
| 90 | + </div> | |
| 91 | + </div> | |
| 92 | + </el-form-item> | |
| 93 | + | |
| 94 | + | |
| 84 | 95 | </el-form> |
| 96 | + | |
| 97 | + | |
| 85 | 98 | </div> |
| 86 | 99 | </div> |
| 87 | 100 | </div> |
| ... | ... | @@ -283,4 +296,24 @@ export default { |
| 283 | 296 | </script> |
| 284 | 297 | <style lang="scss" scoped> |
| 285 | 298 | @import "~@/assets/styles/login.scss"; |
| 299 | + | |
| 300 | + | |
| 301 | +.oauth-login { | |
| 302 | + display: flex; | |
| 303 | + align-items: cen; | |
| 304 | + cursor:pointer; | |
| 305 | +} | |
| 306 | +.oauth-login-item { | |
| 307 | + display: flex; | |
| 308 | + align-items: center; | |
| 309 | + margin-right: 10px; | |
| 310 | +} | |
| 311 | +.oauth-login-item img { | |
| 312 | + height: 25px; | |
| 313 | + width: 25px; | |
| 314 | +} | |
| 315 | +.oauth-login-item span:hover { | |
| 316 | + text-decoration: underline red; | |
| 317 | + color: red; | |
| 318 | +} | |
| 286 | 319 | </style> | ... | ... |