Browse Source

修复bug

chenxiong 3 years ago
parent
commit
9580f2369b
2 changed files with 7 additions and 6 deletions
  1. 2 2
      src/axios.js
  2. 5 4
      src/pages/person-center/my-course/index.vue

+ 2 - 2
src/axios.js

@@ -1,8 +1,8 @@
 import axios from 'axios'
 import store from './store'
 // export const BASE_URL = 'https://api.xyyxt.net'   //release
-export const BASE_URL = 'http://42.192.164.187:19005'    //test
-// export const BASE_URL = 'http://api.xyyxt.net:19009'   //预发布
+// export const BASE_URL = 'http://42.192.164.187:19005'    //test
+export const BASE_URL = 'https://test.xyyxt.net'   //预发布
 // export const BASE_URL = 'http://192.168.1.222:5055'    //dev
 export const tenantId = '867735392558919680'
 

+ 5 - 4
src/pages/person-center/my-course/index.vue

@@ -243,8 +243,9 @@
                   class="btn btn--normal"
                   :class="{
                     disabled:
-                      sysTime <= item.serviceStartTime ||
-                      sysTime >= item.serviceEndTime ||
+                      (item.serviceStartTime &&
+                        (sysTime <= item.serviceStartTime ||
+                          sysTime >= item.serviceEndTime)) ||
                       (item.classStartTime && sysTime <= item.classStartTime) ||
                       (item.classEndTime && sysTime >= item.classEndTime) ||
                       item.learningStatus == 2 ||
@@ -637,8 +638,8 @@ export default {
       }
 
       if (
-        this.sysTime <= item.serviceStartTime ||
-        this.sysTime >= item.serviceEndTime
+        (item.serviceStartTime && this.sysTime <= item.serviceStartTime) ||
+        (item.serviceEndTime && this.sysTime >= item.serviceEndTime)
       ) {
         this.$message({
           type: "warning",