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

app/queries/weapps/subject_query.rb

@@ -19,9 +19,9 @@ class Weapps::SubjectQuery < ApplicationQuery
       subjects = subjects.joins(:sub_discipline_containers).where(sub_discipline_containers: {container_type: "Subject"})
     end
 
-    subjects = subjects.left_joins(:shixuns).select('subjects.id, subjects.name, subjects.excellent, subjects.stages_count, subjects.status,
+    subjects = subjects.left_joins(:shixuns).select('subjects.id, subjects.name, subjects.excellent, subjects.stages_count, subjects.status, subjects.homepage_show,
                                                      subjects.shixuns_count, subjects.updated_at, IFNULL(sum(shixuns.myshixuns_count), 0) myshixuns_count')
-                                            .group('subjects.id').order("#{order_type} #{sort_type}")
+                                            .group('subjects.id').order("(homepage_show, #{order_type}) #{sort_type}")
     subjects
   end
 

public/react/public/index.html

@@ -17,8 +17,8 @@
     <meta name=”Description” Content=”EduCoder翻转课堂教学模式，颠覆了传统教学模式，让教师与学生的关系由“权威”变成了“伙伴”。将学习的主动权转交给学生，使学生可个性化化学，学生的学习主体得到了彰显。”>
     <meta name=”Description” Content=”EduCoder实训项目为单个知识点关卡实践训练，帮助学生巩固单一弱点，强化学习。 ”>
     <meta name=”Description” Content=”EduCoder实践教学平台，各类大赛为进一步提高各类学生综合运用高级语言程序设计能力，培养创新意识和实践探索精神，发掘优秀软件人才。 ”>
-    <meta name="viewport" id="viewport" content="width=device-width, initial-scale=0.3, maximum-scale=0.3, user-scalable=no">
-
+<!--    <meta name="viewport" id="viewport" content="width=device-width, initial-scale=0.3, maximum-scale=0.3, user-scalable=no">-->
+    <meta name="viewport" id="viewport" content="width=device-width, initial-scale=0.3, maximum-scale=0.3">
 
     <meta name="theme-color" content="#000000">
     <!--<meta http-equiv="cache-control" content="no-cache,no-store, must-revalidate" />-->
@@ -44,13 +44,13 @@
       window.__isR = true;
       // 不支持ie9 ie10
       if (
-          ( navigator.userAgent.indexOf('MSIE 9') != -1 
+          ( navigator.userAgent.indexOf('MSIE 9') != -1
             || navigator.userAgent.indexOf('MSIE 10') != -1 )
-          && 
+          &&
           location.pathname.indexOf("/compatibility") == -1) {
         debugger;
         // location.href = './compatibility'
-        location.href = '/compatibility.html'  
+        location.href = '/compatibility.html'
       }
       // const isMobile = (/android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(navigator.userAgent.toLowerCase()));
       const isWeiXin = (/MicroMessenger/i.test(navigator.userAgent.toLowerCase()));
@@ -203,10 +203,10 @@
     <script type="text/javascript" src="https://testeduplus2.educoder.net/javascripts/educoder/edu_application.js"></script> -->
     <script type="text/javascript" src="https://cdn.bootcss.com/quill/1.3.7/quill.core.min.js"></script>
 
-    <script>
-      document.body.addEventListener('touchmove', function (e) {
-        e.preventDefault(); //阻止默认的处理方式(阻止下拉滑动的效果)
-      }, {passive: false});  
-    </script>
+<!--    <script>-->
+<!--      document.body.addEventListener('touchmove', function (e) {-->
+<!--        e.preventDefault(); //阻止默认的处理方式(阻止下拉滑动的效果)-->
+<!--      }, {passive: false});-->
+<!--    </script>-->
   </body>
 </html>