创建分支提交最新代码

index.html

@@ -9,6 +9,7 @@
   <!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />  -->
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" href="static/favicon.ico">
   <script>
     window.onload = function () {
       // js增加svg的outerHTML

package.json

@@ -55,7 +55,7 @@
     "connect-history-api-fallback": "^1.3.0",
     "copy-webpack-plugin": "^4.0.1",
     "cross-spawn": "^5.0.1",
-    "css-loader": "^0.28.0",
+    "css-loader": "^0.28.11",
     "css-mqpacker": "^7.0.0",
     "cssnano": "^4.1.10",
     "eslint": "^3.19.0",
@@ -87,8 +87,9 @@
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.2",
     "url-loader": "^0.5.8",
-    "vue-loader": "^13.0.4",
-    "vue-style-loader": "^3.0.1",
+    "vue-html-loader": "^1.2.4",
+    "vue-loader": "^13.7.3",
+    "vue-style-loader": "^3.1.2",
     "vue-template-compiler": "^2.4.2",
     "webpack": "^2.6.1",
     "webpack-bundle-analyzer": "^2.2.1",

src/ImgConfig/index.js

@@ -4,11 +4,11 @@ if (process.env.NODE_ENV === 'development') {
     IMG_BASE_URL = 'https://xtimg.sharingschool.com/' //测试环境图片地址
     APPOR_BASE_URL = 'https://xtkmt.sharingschool.com/kmt/index.html#/' //测试环境作业批改地址
 } else {
-    IMG_BASE_URL = 'https://img.sharingschool.com'; //正式环境图片地址;
-    // IMG_BASE_URL = 'https://xtimg.sharingschool.com' //实习，测试环境图片地址;
+    // IMG_BASE_URL = 'https://img.sharingschool.com'; //正式环境图片地址;
+    IMG_BASE_URL = 'https://xtimg.sharingschool.com' //实习，测试环境图片地址;
 
-    // APPOR_BASE_URL = 'https://xtkmt.sharingschool.com/kmt/index.html#/' //测试环境作业批改地址
-    APPOR_BASE_URL = 'https://kmt.sharingschool.com/aijia/kmt/index.html#/'; //正式环境作业批改地址地址;
+    APPOR_BASE_URL = 'https://xtkmt.sharingschool.com/kmt/index.html#/' //测试环境作业批改地址
+    // APPOR_BASE_URL = 'https://kmt.sharingschool.com/aijia/kmt/index.html#/'; //正式环境作业批改地址地址;
     // APPOR_BASE_URL = 'https://aikmt.sharingschool.com/kmt/index.html#/'; //oss正式环境作业批改地址地址;
     // APPOR_BASE_URL = 'http://sxkmt.sharingschool.com/kmt/index.html#/' //实习环境作业批改地址
 }

src/api/index.js

@@ -6,6 +6,10 @@ const urlFn = v => BASE_URL + v
 const GET_TOKEN = urlFn('/api/kmt/login/wxlogin/newscanlogin')
 // Uniconid登录
 const GET_UUIONID_TOKEN = urlFn('/api/kmt/login/unionidlogin')
+// 手机号验证吗登陆
+const GET_PHONE_TOKEN = urlFn('/api/kmt/login/phoneLogin')
+// 获取手机验证码
+const GET_VERIFICATION_CODE = urlFn('/api/kmt/login/getVerificationCode')
 // 获取用户信息
 const GetInfo = urlFn('/api/kmt/correctSys/getMyInfo')
 // 校区群管理员数据监控
@@ -73,6 +77,8 @@ const UnmatchHomeworkList = urlFn('/api/kmt/correctSys/unmatchHomeworkList')
 export {
     GET_TOKEN,
     GET_UUIONID_TOKEN,
+    GET_VERIFICATION_CODE,
+    GET_PHONE_TOKEN,
     GetInfo,
     InfoWatch,
     InfoWatchDay,
@@ -104,5 +110,5 @@ export {
     MonitorKnowTeacherList,
     MonitorKnowTeacherOneDayList,
     MonitorKnowTeacherOneMonthList,
-    UnmatchHomeworkList
+    UnmatchHomeworkList,
 }

src/api/scheduling.js

@@ -19,6 +19,14 @@ const TeacherThisMonthDutyList = urlFn('/api/kmt/arrange/teacherThisMonthDutyLis
 const SaveSysTeacherDuty = urlFn('/api/kmt/arrange/saveSysTeacherDuty')
 // 排班设置接口
 const DutyTemplateList = urlFn('/api/kmt/arrange/dutyTemplateList')
+//校区群管理员列表（质检员角色查看）
+const GetManagerListForChecker = urlFn('/api/kmt/correctSys/getManagerListForChecker')
+//校区群管理员列表（质检员角色查看）老师列表
+const TeacherListForChecker = urlFn('/api/kmt/correctSys/teacherListForChecker')
+//校区群管理员列表（质检员角色查看）查看老师批改完的作业列表
+const TeacherHomeworkListForChecker = urlFn('/api/kmt/correctSys/teacherHomeworkListForChecker')
+const FindArrangeTemplateIntervalList = urlFn('/api/kmt/arrange/findArrangeTemplateIntervalList')
+//
 export {
     FindCalendarList,
     FindHaveTeacherList,
@@ -28,5 +36,10 @@ export {
     FindTeamTeacherList,
     TeacherThisMonthDutyList,
     SaveSysTeacherDuty,
-    DutyTemplateList
+    DutyTemplateList,
+    GetManagerListForChecker,
+    TeacherListForChecker,
+    TeacherHomeworkListForChecker,
+    FindArrangeTemplateIntervalList
+
 }