lex-xin 5 years ago
parent
commit
3a9cf4ad0e

File diff suppressed because it is too large
+ 0 - 0
dist/css/VIPApply.db3df595.css


+ 0 - 0
dist/css/chunk-vendors.96e82baf.css → dist/css/chunk-vendors.a174678b.css


File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 0 - 0
dist/js/Approval.75f732a6.js → dist/js/Approval.627522fd.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/Approval~Attendance~IStarted~Leave~PeriodAdjust~PeriodChange~TeachingSchool~TeachingSet~VIPApply~ord~3d35106e.0c210a5b.js


File diff suppressed because it is too large
+ 7 - 0
dist/js/Approval~Attendance~IStarted~Leave~PeriodAdjust~PeriodChange~TeachingSchool~TeachingSet~VIPApply~ord~3d35106e.45152f1e.js


+ 0 - 0
dist/js/Attendance.4b880718.js → dist/js/Attendance.41e00ad0.js


+ 0 - 0
dist/js/BookingSet.1184215b.js → dist/js/BookingSet.68bf1b09.js


+ 0 - 0
dist/js/Business.b891cb3c.js → dist/js/Business.15a345fa.js


+ 0 - 0
dist/js/CallNames.febc0fc2.js → dist/js/CallNames.f1e2d8b3.js


+ 0 - 0
dist/js/CcMe.bec83d25.js → dist/js/CcMe.aa62976b.js


+ 0 - 0
dist/js/IStarted.e2394146.js → dist/js/IStarted.32b499c9.js


+ 0 - 0
dist/js/Leave.84a5e1e9.js → dist/js/Leave.6bbed902.js


+ 0 - 0
dist/js/PeriodAdjust.81ab0536.js → dist/js/PeriodAdjust.8a66e4bd.js


+ 0 - 0
dist/js/PeriodAdjust~PeriodChange.9b586419.js → dist/js/PeriodAdjust~PeriodChange.24bae92c.js


+ 0 - 0
dist/js/PeriodChange.332e1201.js → dist/js/PeriodChange.299e6404.js


+ 0 - 0
dist/js/StartedDetail.43d3080c.js → dist/js/StartedDetail.b4cdf0bb.js


+ 0 - 0
dist/js/TeachingSchool.83c5c8b8.js → dist/js/TeachingSchool.b32b3550.js


+ 0 - 0
dist/js/TeachingSet.89bc8fb1.js → dist/js/TeachingSet.d3bf16f1.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/VIPApply.e468cc60.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.001601ad.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/chunk-vendors.159b9db5.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/chunk-vendors.545d4ffb.js


+ 0 - 0
dist/js/order.102bc564.js → dist/js/order.96e16183.js


+ 0 - 0
dist/js/privacy.3ed09be7.js → dist/js/privacy.16d90f3f.js


+ 5 - 0
package-lock.json

@@ -11065,6 +11065,11 @@
       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
       "dev": true
     },
+    "vconsole": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/vconsole/-/vconsole-3.3.4.tgz",
+      "integrity": "sha512-9yihsic96NPoMLQx/lCQwH9d89H0bbMW3LZPzo/t4yGQcS1X+vTCe9OHm1XSH7WNxzGDmcSwBiKLsFGwvJpQBg=="
+    },
     "vendors": {
       "version": "1.0.3",
       "resolved": "https://registry.npm.taobao.org/vendors/download/vendors-1.0.3.tgz",

+ 1 - 0
package.json

@@ -13,6 +13,7 @@
     "install": "^0.13.0",
     "qs": "^6.8.0",
     "vant": "^2.1.4",
+    "vconsole": "^3.3.4",
     "vue": "^2.6.10",
     "vue-amap": "^0.5.10",
     "vue-awesome-swiper": "^3.1.3",

+ 3 - 0
src/main.js

@@ -19,6 +19,9 @@ Vue.use(Button).use(Icon).use(Tag).use(Swipe).use(SwipeItem)
    .use(CountDown).use(Panel).use(Dialog).use(Sticky)
 Vue.config.productionTip = false
 
+import Vconsole from 'vconsole'
+const vconsole = new Vconsole()
+
 import VueAMap from 'vue-amap'
 Vue.use(VueAMap)
 VueAMap.initAMapApiLoader({

+ 3 - 4
src/views/teacher/VIPApply.vue

@@ -608,7 +608,6 @@ export default {
             //     this.$toast('请选择排课开始时间')
             //     return
             // }
-
             // 拿到线上课数与线下课数 以及
             let online = parseInt(form.onlineClassesNums ? form.onlineClassesNums : 0)
             let offline = parseInt(form.offlineClassesNums ? form.offlineClassesNums : 0)
@@ -644,7 +643,7 @@ export default {
 
                     // 判断是否大于当前时间
                     let nowGetTime = new Date().getTime()
-                    let courseTime = new Date(dataStr + ' ' + scheduleList[i].startTime).getTime()
+                    let courseTime = new Date(dataStr.replace(/-/ig, '/') + ' ' + scheduleList[i].startTime + ':00').getTime()
                     if(nowGetTime < courseTime) {
                         let tempArr = {
                             'classDate': dataStr,
@@ -681,8 +680,6 @@ export default {
                     forMark++
                 }
                 
-                
-                // forMark++
             }
         },
         onGiveMode() { // 赠送课改变时
@@ -828,6 +825,8 @@ export default {
         },
         onSubmit() {
             let form = this.form
+            // 排课
+            this.setTimeTable()
             if(!(form.name)) {
                 this.$toast('请输入课程班名称')
                 return false

+ 3 - 3
vue.config.js

@@ -1,7 +1,7 @@
-// let targetUrl = 'http://47.99.212.176:8000'
-// let targetUrl = 'http://testadm.dayaedu.com/'
+// let targetUrl = 'https://online.dayaedu.com'
+let targetUrl = 'http://testadm.dayaedu.com/'
+// let targetUrl = 'http://192.168.3.28:8000'
 // let targetUrl = 'http://192.168.3.28:8000'
-let targetUrl = 'http://192.168.3.28:8000'
 module.exports = {
     publicPath: './',
     // 生产环境 sourceMap

Some files were not shown because too many files changed in this diff