m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
dev_admin
cxt 6 years ago
parent f109f7aaeb fed8142ea9
commit e84b6d46dc
8 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File

46
app/views/games/picture_display.json.jbuilder
Unescape View File

@ -25,28 +25,28 @@ elsif @type == "txt"
elsif @type =="qrcode" elsif @type =="qrcode"
json.qrcode_str @qrcode_str json.qrcode_str @qrcode_str
elsif @type == "mp3" || @type == "mp4" elsif @type == "mp3" || @type == "mp4"
# if @type == "mp4" if @type == "mp4"
# json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378171/123.mp4"}] json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378171"}]
# json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378172/456.mp4"}] json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378172"}]
# json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378173/789.mp4"}] json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378173"}]
# else else
# json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378174/58099.mp3"}] json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378174"}]
# json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}] json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175"}]
# json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}] json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175"}]
# end
json.orignal_file do
json.array! @orignal_picture do |file|
json.file_url attachment_show_users_path(:file_name => file, :path => @original_path)
end
end
json.user_file do
json.array! @user_picture do |file|
json.file_url attachment_show_users_path(:file_name => file, :path => @user_path, :time => Time.now.to_i)
end
end
json.answer_file do
json.array! @answer_picture do |file|
json.file_url attachment_show_users_path(:file_name => file, :path => @answer_path)
end
end end
# json.orignal_file do
# json.array! @orignal_picture do |file|
# json.file_url attachment_show_users_path(:file_name => file, :path => @original_path)
# end
# end
# json.user_file do
# json.array! @user_picture do |file|
# json.file_url attachment_show_users_path(:file_name => file, :path => @user_path, :time => Time.now.to_i)
# end
# end
# json.answer_file do
# json.array! @answer_picture do |file|
# json.file_url attachment_show_users_path(:file_name => file, :path => @answer_path)
# end
# end
end end

2
public/react/src/modules/courses/busyWork/CommonWorkPost.js
Unescape View File

@ -470,7 +470,7 @@ class CommonWorkPost extends Component{
} }
gocannel=()=>{ gocannel=()=>{
window.history.go(-1) this.props.history.goBack()
} }
render(){ render(){

2
public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
Unescape View File

@ -362,7 +362,7 @@ class GraduationTasksSubmitedit extends Component{
} }
gocannel=()=>{ gocannel=()=>{
window.history.go(-1) this.props.history.goBack()
} }
handleSubmit=(e) => { handleSubmit=(e) => {

2
public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
Unescape View File

@ -362,7 +362,7 @@ class GraduationTasksSubmitnew extends Component{
} }
} }
gocannel=()=>{ gocannel=()=>{
window.history.go(-1) this.props.history.goBack()
} }
//公用数据 //公用数据

10
public/react/src/modules/home/home.css
Unescape View File

@ -11,10 +11,10 @@
} }
.user_navlist{ .user_navlist{
margin-left: 40px; /*margin-left: 40px;*/
} }
.next-slick-list{ .next-slick-list{
margin-left: 12px; /*margin-left: 12px;*/
} }
.black_nav_span{ .black_nav_span{
@ -58,7 +58,7 @@
} }
.educontentSlider{ .educontentSlider{
width: 1282px !important; /*width: 1282px !important;*/
} }
.user_navlist_white{ .user_navlist_white{
max-height:350px !important; max-height:350px !important;
@ -72,4 +72,8 @@
.iconfontshixundaibeijing{ .iconfontshixundaibeijing{
font-size: 18px !important; font-size: 18px !important;
line-height: 24px; line-height: 24px;
}
.next-slick.next-slick-horizontal.next-slick-outer{
padding:0px !important;
} }

4
public/react/src/modules/paths/PathDetail/PathDetailIndex.js
Unescape View File

@ -112,14 +112,14 @@ class PathDetailIndex extends Component{
this.setState({ this.setState({
Modalstype:false, Modalstype:false,
}) })
window.history.go(-1) this.props.history.goBack()
} }
cardsModalsave=()=>{ cardsModalsave=()=>{
this.setState({ this.setState({
Modalstype:false, Modalstype:false,
}) })
window.history.go(-1) this.props.history.goBack()
} }
// 加载markdown // 加载markdown
updatamakedown=(id)=>{ updatamakedown=(id)=>{

3
public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js
Unescape View File

@ -230,7 +230,8 @@ class PackageIndexNEITaskDetails extends Component {
} }
goback = () => { goback = () => {
// window.history.go(-1) // window.history.go(-1)
window.location.href="/crowdsourcing"; // window.location.href="/crowdsourcing";
this.props.history.goBack()
} }
render() { render() {

3
public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNewandEditIndex.js
Unescape View File

@ -30,7 +30,8 @@ class PackageIndexNewandEditIndex extends Component{
goback = () => { goback = () => {
// window.history.go(-1) // window.history.go(-1)
window.location.href="/crowdsourcing"; // window.location.href="/crowdsourcing";
this.props.history.goBack()
} }
render() { render() {

Write Preview
Loading…
Cancel
Save