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 ?———————— 快速登录 ————————
快速登录 - {setting.third_party.map((item,key)=>{ + {setting.third_party_new.map((item,key)=>{ return( - -