From 76c9020b766b3f092fc435bd5d6539768453a016 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Wed, 28 Aug 2019 16:54:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=A6=81=E7=94=A8zoom=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=EF=BC=8C=E7=AE=97=E6=B3=95=E4=B8=8D=E5=AF=B9=EF=BC=8C=E6=9C=89?= =?UTF-8?q?=E4=BA=9B=E6=98=BE=E7=A4=BA=E5=99=A8=EF=BC=88=E5=B0=8F=E7=B1=B3?= =?UTF-8?q?=E7=AC=94=E8=AE=B0=E6=9C=AC=EF=BC=89=E9=BB=98=E8=AE=A4=E4=B8=BA?= =?UTF-8?q?125?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/page/Index.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/page/Index.js b/public/react/src/modules/page/Index.js index c695a0022..b2daa27e4 100644 --- a/public/react/src/modules/page/Index.js +++ b/public/react/src/modules/page/Index.js @@ -55,12 +55,12 @@ class Index extends Component { window.$('#root').css('position', 'absolute') // TPI浏览器缩放 - setTimeout(() => { - const agent = navigator.userAgent; - if (agent.indexOf('Mac OS') == -1) { - window._initZoomCheck() - } - }, 800) + // setTimeout(() => { + // const agent = navigator.userAgent; + // if (agent.indexOf('Mac OS') == -1) { + // window._initZoomCheck() + // } + // }, 800) this.onDrawerButtonClick = this.onDrawerButtonClick.bind(this) From 8dbaf05da29cc9c80257cab9e060191bd55328d4 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 28 Aug 2019 17:24:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B0=8F=E7=B1=BB=E5=88=AB=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7c8015894..951baea86 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -428,7 +428,7 @@ class ApplicationController < ActionController::Base list = [] mirrors = MirrorRepository.select([:id, :type_name]).published_small_mirror mirrors.try(:each) do |mirror| - list << {id: mirror.id, type_name: mirror.type_name} + list << {id: mirror.id, type_name: mirror.type_name, description: mirror.description} end list end From cbb95d3022d5a94d5daa1bf4aff4e52fcde2dafe Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 28 Aug 2019 17:25:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B0=8F=E7=B1=BB=E5=88=AB=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 951baea86..6046be5af 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -426,7 +426,7 @@ class ApplicationController < ActionController::Base # 小类别列表 def shixun_small_type list = [] - mirrors = MirrorRepository.select([:id, :type_name]).published_small_mirror + mirrors = MirrorRepository.select([:id, :type_name, :description]).published_small_mirror mirrors.try(:each) do |mirror| list << {id: mirror.id, type_name: mirror.type_name, description: mirror.description} end From 9b3ae694ff2910491ba0d25c06b54852cb5dd707 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Wed, 28 Aug 2019 17:28:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/page/component/TPICodeSetting.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/page/component/TPICodeSetting.js b/public/react/src/modules/page/component/TPICodeSetting.js index 27ad3746b..51a9f390c 100644 --- a/public/react/src/modules/page/component/TPICodeSetting.js +++ b/public/react/src/modules/page/component/TPICodeSetting.js @@ -146,23 +146,25 @@ class TPICodeSetting extends Component { {/* */}
- +
跳关
{ task_pass ? '允许' : '不允许'}
+
+ + : "不允许学员通过金币解锁查看测试集内容"} disableFocusListener={true}>
测试集解锁
{ test_set_permission ? '允许' : '不允许'}
 - +
代码复制粘贴