diff --git a/config/baseUrl.js b/config/baseUrl.js
index d0b6b61..34b1545 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -6,9 +6,9 @@ if (process.env.NODE_ENV === 'development') {
// socketUrl = "ws://localhost:6001/";
// baseUrl = "https://twin-ui.com/demo/";
// baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
- // baseUrl = "https://api.nuttyreading.com/"; // 线上正式
+ baseUrl = "https://api.nuttyreading.com/"; // 线上正式
// baseUrl = "http://192.168.110.110:9200/pb/"; // 磊哥
- baseUrl = "http://192.168.110.100:9200/pb/"; // 开发用电脑
+ // baseUrl = "http://192.168.110.100:9200/pb/"; // 开发用电脑
// baseUrl = "http://59.110.212.44:9200/pb/";
// baseUrl = "http://192.168.110.100:9100/pb/"; // 开发用电脑
// baseUrl = "http://192.168.110.110:9200/pb/";
diff --git a/pages/miniClass/classInfo.vue b/pages/miniClass/classInfo.vue
index 48d236d..2730b38 100644
--- a/pages/miniClass/classInfo.vue
+++ b/pages/miniClass/classInfo.vue
@@ -26,10 +26,10 @@
创建日期{{thisClass.createTime.substring(0,10)}}
- 开班日期{{thisClass.createTime.substring(0,10)}}
+ 开班日期{{thisClass.startTime.substring(0,10)}}
- 结班日期{{thisClass.createTime.substring(0,10)}}
+ 结班日期{{thisClass.endTime.substring(0,10)}}
+
@@ -1484,6 +1486,10 @@
// 点击作业或者医案,进入详细介绍
clickTask(item,index) {
// var options = JSON.stringify(item)
+ if(this.thisClass.state != '1'){
+ this.$commonJS.showToast("当前班级状态不可提交");
+ return
+ }
if (this.tijiaoTitleId == 2) {
// 进入的是心得
uni.navigateTo({
@@ -1491,11 +1497,12 @@
})
return
}
- if(index+1<=this.currentStudyNumber){
-uni.navigateTo({
+ console.log('item', this.thisClass);
+ // if(index+1<=this.currentStudyNumber){
+ uni.navigateTo({
url: `/pages/miniClass/taskDetail?id=${item.id}&classState=${this.thisClass.state}`
})
- }
+ // }
},
delClass() {
@@ -1950,10 +1957,10 @@ uni.navigateTo({
const nowTime = new Date().getTime();
console.log("nowTime at line 107:", nowTime, this.thisClass.startTime);
- var studyTime =
- Number(nowTime - new Date(this.thisClass.startTime).getTime()) / (1000 * 60 * 60 * 24) / 7;
- console.log("studyTime at line 108:", Math.ceil(studyTime));
- this.currentStudyNumber = Math.ceil(studyTime);
+ // var studyTime =
+ // Number(nowTime - new Date(this.thisClass.startTime).getTime()) / (1000 * 60 * 60 * 24) / 7;
+ // console.log("studyTime at line 108:", Math.ceil(studyTime));
+ // this.currentStudyNumber = Math.ceil(studyTime);
// if (this.thisClass.state == '0') {
// this.tabId = '0'