From f688ef5258e6bd7bef27b90c3fa175704618bd50 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 8 Dec 2022 14:50:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=96=87=E4=BB=B6-content?= =?UTF-8?q?=E7=94=A8base64=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Newfile/UserSubmitComponent.js | 3 ++- src/forge/Order/order.scss | 2 +- src/modules/login/LoginDialog.js | 13 +++++++++---- src/modules/login/WeChat@2x.png | Bin 8077 -> 2970 bytes src/modules/login/gitee.png | Bin 0 -> 3238 bytes src/modules/login/github.png | Bin 0 -> 3309 bytes src/modules/login/qq@2x.png | Bin 7663 -> 2635 bytes src/modules/loginRegister/Login.jsx | 13 +++++++++---- 8 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 src/modules/login/gitee.png create mode 100644 src/modules/login/github.png diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js index 08cac8d69..5ec1fc7cf 100644 --- a/src/forge/Newfile/UserSubmitComponent.js +++ b/src/forge/Newfile/UserSubmitComponent.js @@ -4,6 +4,7 @@ import { Form, Input, Button, Radio, Icon, Spin } from "antd"; import { Link } from "react-router-dom"; import "./index.css"; import { turnbar , returnbar } from 'educoder'; +import { Base64 } from 'js-base64'; import axios from "axios"; const TextArea = Input.TextArea; @@ -63,7 +64,7 @@ class UserSubmitComponent extends Component { filepath: filename ? filename : path, branch: returnbar(branch), new_branch: submitType === "1" ? values.branchname : undefined, - content, + content:Base64.encode(content), message: values.desc, }) .then((result) => { diff --git a/src/forge/Order/order.scss b/src/forge/Order/order.scss index fb801b0af..bff07c9a8 100644 --- a/src/forge/Order/order.scss +++ b/src/forge/Order/order.scss @@ -128,7 +128,7 @@ .topWrapper_btn { background: #fff; border: 1px solid $primary-color; - color: $primary-color ; + color: $primary-color!important ; padding: 0px 12px; text-align: center; height: 32px; diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js index 4cb66de68..3ba0af12a 100644 --- a/src/modules/login/LoginDialog.js +++ b/src/modules/login/LoginDialog.js @@ -5,6 +5,10 @@ import { notification } from 'antd'; import axios from 'axios'; import educoderLogo from './educoder.png'; +import qqlogo from './qq.png'; +import WeChatlogo from './WeChat.png'; +import giteelogo from './gitee.png'; +import githublogo from './github.png'; import cookie from 'react-cookies'; import './LoginDialog.css'; import { broadcastChannelPostMessage } from 'educoder' @@ -458,6 +462,7 @@ class LoginDialog extends Component { }) } + render() { let { login, isGoing, isGoingValue, disabled , Phonenumberisnotco , dialogBox, isRender, weixinlogin, settings } = this.state; @@ -569,14 +574,14 @@ class LoginDialog extends Component {
{ - settings && settings.third_party && settings.third_party.length > 0 ? + settings && settings.third_party_new && settings.third_party_new.length > 0 ?———————— 快速登录 ————————
R>v7zL<0A3V4p)AhgdO9Yx$XigQM4`!Z%%xzd5JA*f_0
zY+OL$TkI4(r^nr-#$swN=vuvHv0z-3lVT6luUkx6C=~!f81u&MN7-tFzGoD9#TasI
z45fX#og8%oy(8ddVCz&}`)qCfs#CaHvnvC*%d4Cv1osNXvZ5QwGQJKOp)CnzQqYO9
z_V<* SBt)uPw{D4F
}
zdYuM21?~v5tdT!{0VD}N{J?_zT%wVXV_BF&>Wf=dEho_JN#%O7J;Mp`9SsCNg
+
+
)
})