From ff110d6163ba0c00784b1962a9ab48e73dbd7a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 09:51:16 +0800 Subject: [PATCH 1/5] Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun # Conflicts: # public/react/src/modules/courses/exercise/Testpapersettinghomepage.js --- .../modules/courses/exercise/Testpapersettinghomepage.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js index c76e31b7a..1440eac18 100644 --- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js +++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js @@ -171,7 +171,8 @@ class Testpapersettinghomepage extends Component{ } console.log("170"); console.log(params); - axios.get(url+`?${queryString.stringify(params)}`+ '&export=true').then((response) => { + const urll=url+`?${queryString.stringify(params)}`; + axios.get(urll+ '&export=true').then((response) => { if(response===undefined){ return } @@ -195,13 +196,13 @@ class Testpapersettinghomepage extends Component{ }else { this.setState({ donwloading: true }) downloadFile({ - url: url+`?${queryString.stringify(params)}`, + url: urll, successCallback: (url) => { - this.setState({ donwloading: false }); + this.setState({ donwloading: false }) console.log('successCallback') }, failCallback: (responseHtml, url) => { - this.setState({ donwloading: false }); + this.setState({ donwloading: false }) console.log('failCallback') } }) From bed125d00ab2d88662146326a8c99003bc23e102 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 10:01:17 +0800 Subject: [PATCH 2/5] modify library list api --- app/views/libraries/index.json.jbuilder | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/views/libraries/index.json.jbuilder b/app/views/libraries/index.json.jbuilder index 13ab8d77b..8774b72ae 100644 --- a/app/views/libraries/index.json.jbuilder +++ b/app/views/libraries/index.json.jbuilder @@ -11,6 +11,11 @@ json.libraries do json.published_at library.display_published_at json.created_at library.display_created_at - json.tags library.library_tags.map(&:name) + # 标签 + json.tags do + json.array! library.library_tags.each do |tag| + json.extract! tag, :id, :name + end + end end end \ No newline at end of file From 4c8ae830ed07f0ad12f1b0de4baa929cf6e63b5b Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 10:09:37 +0800 Subject: [PATCH 3/5] modify tiding api --- app/views/tidings/_tiding.json.jbuilder | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/views/tidings/_tiding.json.jbuilder b/app/views/tidings/_tiding.json.jbuilder index 34b06320d..cdaa48299 100644 --- a/app/views/tidings/_tiding.json.jbuilder +++ b/app/views/tidings/_tiding.json.jbuilder @@ -1,6 +1,9 @@ json.extract! tiding, :id, :status, :viewed, :user_id, :tiding_type, :container_id, :container_type, :parent_container_id, :parent_container_type json.content tiding.content + json.identifier tiding.identifier +json.auth_type tiding.container_type == 'ApplyUserAuthentication' ? tiding.container.auth_type : nil + json.time tiding.how_long_time json.new_tiding tiding.unread?(@onclick_time) From d5848ee3ea68890b496fb376932733e6cab03b52 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 2 Aug 2019 10:27:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/create.json.jbuilder | 3 ++- app/views/courses/index.json.jbuilder | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/courses/create.json.jbuilder b/app/views/courses/create.json.jbuilder index baf14da46..be20a994b 100644 --- a/app/views/courses/create.json.jbuilder +++ b/app/views/courses/create.json.jbuilder @@ -1 +1,2 @@ -json.course_id @course.id \ No newline at end of file +json.course_id @course.id +json.first_category_url module_url(@course.none_hidden_course_modules.first, @course) \ No newline at end of file diff --git a/app/views/courses/index.json.jbuilder b/app/views/courses/index.json.jbuilder index 32a7047b7..7b404211b 100644 --- a/app/views/courses/index.json.jbuilder +++ b/app/views/courses/index.json.jbuilder @@ -4,7 +4,7 @@ json.courses @courses do |course| json.avatar_url url_to_avatar(course.teacher) json.creator course.teacher.real_name json.school course.school&.name - json.technical_title course.teacher.identity + json.technical_title "" # course.teacher.identity json.course_members_count course.course_members_count json.tasks_count get_tasks_count course json.visits course.visits From a9669387dc8877a31de6dcab6863f2cbe7ed17eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 10:31:11 +0800 Subject: [PATCH 5/5] b --- public/react/src/modules/message/js/Messagerouting.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index bfd1a6d37..2c649c23c 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -93,8 +93,8 @@ class Messagerouting extends Component{ // console.log("64"); // console.log(data); this.setState({ - unread_message_count:data.unread_message_count, - unread_tiding_count:data.unread_tiding_count, + unread_message_count:parseInt(data.unread_message_count), + unread_tiding_count:parseInt(data.unread_tiding_count), }) }; @@ -172,11 +172,11 @@ class Messagerouting extends Component{