去掉小班提交周数限制
This commit is contained in:
@@ -6,9 +6,9 @@ if (process.env.NODE_ENV === 'development') {
|
|||||||
// socketUrl = "ws://localhost:6001/";
|
// socketUrl = "ws://localhost:6001/";
|
||||||
// baseUrl = "https://twin-ui.com/demo/";
|
// baseUrl = "https://twin-ui.com/demo/";
|
||||||
// baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
|
// 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.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://59.110.212.44:9200/pb/";
|
||||||
// baseUrl = "http://192.168.110.100:9100/pb/"; // 开发用电脑
|
// baseUrl = "http://192.168.110.100:9100/pb/"; // 开发用电脑
|
||||||
// baseUrl = "http://192.168.110.110:9200/pb/";
|
// baseUrl = "http://192.168.110.110:9200/pb/";
|
||||||
|
|||||||
@@ -26,10 +26,10 @@
|
|||||||
<text class="ciyao">创建日期</text><text class="mainTxt">{{thisClass.createTime.substring(0,10)}}</text>
|
<text class="ciyao">创建日期</text><text class="mainTxt">{{thisClass.createTime.substring(0,10)}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="thisClass.state == '1' || thisClass.state == '3' ">
|
<view v-if="thisClass.state == '1' || thisClass.state == '3' ">
|
||||||
<text class="ciyao">开班日期</text><text class="mainTxt">{{thisClass.createTime.substring(0,10)}}</text>
|
<text class="ciyao">开班日期</text><text class="mainTxt">{{thisClass.startTime.substring(0,10)}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="thisClass.state == '2'">
|
<view v-if="thisClass.state == '2'">
|
||||||
<text class="ciyao">结班日期</text><text class="mainTxt">{{thisClass.createTime.substring(0,10)}}</text>
|
<text class="ciyao">结班日期</text><text class="mainTxt">{{thisClass.endTime.substring(0,10)}}</text>
|
||||||
</view>
|
</view>
|
||||||
<!-- <view >
|
<!-- <view >
|
||||||
<text class="ciyao">教学时长</text><text
|
<text class="ciyao">教学时长</text><text
|
||||||
@@ -343,8 +343,10 @@
|
|||||||
</template>
|
</template>
|
||||||
<template
|
<template
|
||||||
v-if="!item.reply && thisClass.state == '1'">
|
v-if="!item.reply && thisClass.state == '1'">
|
||||||
<text class="no" v-if="index+1<=currentStudyNumber">未提交答案 点击开始答题</text>
|
<text class="no" >未提交答案 点击开始答题</text>
|
||||||
<text class="no" v-else style="color: #a0a1a7;">暂未开始学习</text>
|
<!-- <text class="no" v-else style="color: #a0a1a7;">暂未开始学习</text> -->
|
||||||
|
<!-- <text class="no" v-if="index+1<=currentStudyNumber">未提交答案 点击开始答题</text>
|
||||||
|
<text class="no" v-else style="color: #a0a1a7;">暂未开始学习</text> -->
|
||||||
</template>
|
</template>
|
||||||
<template
|
<template
|
||||||
v-if="!item.reply && (thisClass.state == '2' || thisClass.state == '3')">
|
v-if="!item.reply && (thisClass.state == '2' || thisClass.state == '3')">
|
||||||
@@ -1484,6 +1486,10 @@
|
|||||||
// 点击作业或者医案,进入详细介绍
|
// 点击作业或者医案,进入详细介绍
|
||||||
clickTask(item,index) {
|
clickTask(item,index) {
|
||||||
// var options = JSON.stringify(item)
|
// var options = JSON.stringify(item)
|
||||||
|
if(this.thisClass.state != '1'){
|
||||||
|
this.$commonJS.showToast("当前班级状态不可提交");
|
||||||
|
return
|
||||||
|
}
|
||||||
if (this.tijiaoTitleId == 2) {
|
if (this.tijiaoTitleId == 2) {
|
||||||
// 进入的是心得
|
// 进入的是心得
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
@@ -1491,11 +1497,12 @@
|
|||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if(index+1<=this.currentStudyNumber){
|
console.log('item', this.thisClass);
|
||||||
uni.navigateTo({
|
// if(index+1<=this.currentStudyNumber){
|
||||||
|
uni.navigateTo({
|
||||||
url: `/pages/miniClass/taskDetail?id=${item.id}&classState=${this.thisClass.state}`
|
url: `/pages/miniClass/taskDetail?id=${item.id}&classState=${this.thisClass.state}`
|
||||||
})
|
})
|
||||||
}
|
// }
|
||||||
|
|
||||||
},
|
},
|
||||||
delClass() {
|
delClass() {
|
||||||
@@ -1950,10 +1957,10 @@ uni.navigateTo({
|
|||||||
|
|
||||||
const nowTime = new Date().getTime();
|
const nowTime = new Date().getTime();
|
||||||
console.log("nowTime at line 107:", nowTime, this.thisClass.startTime);
|
console.log("nowTime at line 107:", nowTime, this.thisClass.startTime);
|
||||||
var studyTime =
|
// var studyTime =
|
||||||
Number(nowTime - new Date(this.thisClass.startTime).getTime()) / (1000 * 60 * 60 * 24) / 7;
|
// Number(nowTime - new Date(this.thisClass.startTime).getTime()) / (1000 * 60 * 60 * 24) / 7;
|
||||||
console.log("studyTime at line 108:", Math.ceil(studyTime));
|
// console.log("studyTime at line 108:", Math.ceil(studyTime));
|
||||||
this.currentStudyNumber = Math.ceil(studyTime);
|
// this.currentStudyNumber = Math.ceil(studyTime);
|
||||||
|
|
||||||
// if (this.thisClass.state == '0') {
|
// if (this.thisClass.state == '0') {
|
||||||
// this.tabId = '0'
|
// this.tabId = '0'
|
||||||
|
|||||||
Reference in New Issue
Block a user