diff --git a/pages/course/chapterDetailAndorid.vue b/pages/course/chapterDetailAndorid.vue
index 7863ce5..6a3f7f0 100644
--- a/pages/course/chapterDetailAndorid.vue
+++ b/pages/course/chapterDetailAndorid.vue
@@ -105,13 +105,15 @@
-
- 欢迎留下你的见解
- 提交到{{classList[0].title}}
-
-
- 写见解
-
+
+
+ 欢迎留下你的见解
+ 提交到{{classList[0].title}}
+
+
+ 写见解
+
+
diff --git a/pages/mine/mine/index.vue b/pages/mine/mine/index.vue
index cd6c3ee..35938b4 100644
--- a/pages/mine/mine/index.vue
+++ b/pages/mine/mine/index.vue
@@ -3,15 +3,10 @@
padding: 0 0;
font-size: 28rpx;
;
- " class="commonPage commonPageBox">
+ " class="commonPageeeee commonPageBox">
-
-
-
-
-
+
@@ -20,28 +15,36 @@
众妙之门VIP
吴门医述VIP
-
+
-
+
昵称：{{ userMes.nickname ? userMes.nickname : "未设置" }}
-
+
手机号：({{ userMes.tel }})
邮箱({{ userMes.email }})
-
+
+ VIP{{userMes.userVip.endTime.split(" ")[0]}}到期
+
+
+
+
+
+
+
+
+ 班级状态：{{getClassStatus}}
+
-
- 班级状态：{{getClassStatus}}
-
-
+
+
{{thisClass.title}}
退出班级
@@ -138,7 +142,10 @@
@click="clickHelp">
-
+
作业得分
@@ -158,10 +165,10 @@
{{performanceScore.questionScore}}分
-
+
@@ -205,11 +212,8 @@
-
-
-
+
+
@@ -245,14 +249,25 @@
-
+
{{item.name}}
-
-
-
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
快来添加一条记录吧~
@@ -329,6 +344,27 @@
-->
+
+
+
+
+
+
+
+ 未作答
+ 已作答
+
+
+
+
+
+
+
+
+
+
@@ -468,7 +504,9 @@
-
+
+
+
@@ -487,7 +525,12 @@
export default {
data() {
return {
+ buyCourseMsg:'',
fileList1: [],
+ questionsList:[],
+ curCourseId:undefined,
+ curCourseIndex:0,
+ tabCourseList:[],
showCropper: false,
submitInfo: {
img: undefined, // 证件图
@@ -511,7 +554,7 @@
showSubmitInfoBlank: false,
thisClass: {},
students: [],
- tabId: '3',
+ tabId: undefined,
curTagIndex: 0,
scrollable: false,
pPage: 0,
@@ -608,6 +651,7 @@
},
],
tijiaoTitleId: '0',
+ tijiaoTitleIndex:0,
taskList: [], // 任务列表
taskHaveMore: false, // 是否还有更多
myExperience: '1',
@@ -621,6 +665,15 @@
firstLoad: true, // 是否是第一次请求
blankNumber: 0,
paperList: [],
+ scrollTop:0,
+ bgiStyle: {
+ background: '#fff'
+ },
+ iconStyle: {
+ fontSize: '40rpx',
+ fontWeight: 'bold',
+ color: '#258feb',
+ },
paperSore: 0, // 最终的笔试成绩
showTestTips: false,
showPaperList: false,
@@ -628,8 +681,12 @@
ingPaper: undefined, // 正在进行中的试卷信息
newCLass: undefined, // 同模型的待开班班级
certificate:undefined, // 证书
+ // stickyBgColor:'#ff9277',
}
},
+ onPageScroll(e) {
+ this.scrollTop = e.scrollTop;
+ },
onLoad(e) {
uni.hideTabBar();
// #ifdef APP-PLUS
@@ -660,7 +717,9 @@
}
},
onPullDownRefresh() {
- this.curTagIndex = 0
+ // this.curTagIndex = 0
+
+ console.log('this.tabId------',this.tabId);
this.getClassInfo()
this.getScore()
this.pPage = 0
@@ -671,8 +730,13 @@
async onShow() {
console.log('this.curTagIndex', this.curTagIndex);
var ss = await this.getClassInfo()
- this.curTagIndex = 0
- this.getScore()
+ if(this.thisClass.state == '0' && this.isHave){
+ this.buyCourseMsg = await this.checkUserCourse()
+ }
+ // this.curTagIndex = 0
+ if(this.thisClass.state != '0'){
+ this.getScore()
+ }
if (this.thisClass.state == '3' || this.thisClass.state == '2') {
var ll = await this.getPaperList()
console.log('this.paperList.length', this.paperList.length);
@@ -755,8 +819,12 @@
},
tabList() {
+ console.log('是否计算tab了？')
+ var ss = this.getBlankNumber
+ var qq = this.blankNumber
+ console.log('ss',ss,qq);
var list = []
- if (this.thisClass.state == '0' || !this.isHave) {
+ if (this.thisClass.state == '0' || !this.isHave || qq == 0) {
list = this.tabList01
} else if (this.thisClass.state == '1') {
list = this.tabList02
@@ -764,6 +832,8 @@
console.log('走这里了吗？');
list = this.tabList03
}
+
+ this.tabId = list[this.curTagIndex].id
return list
},
@@ -788,8 +858,10 @@
}
// return _list
if(_list.length > 0){
+ console.log('是否进入了这里666666666666');
this.tijiaoTitleList = _list
- this.tijiaoTitleId = this.tijiaoTitleList[0].id
+ this.titleClick(this.tijiaoTitleList[this.tijiaoTitleIndex],this.tijiaoTitleIndex)
+ // this.tijiaoTitleId = this.tijiaoTitleList[0].id
}
// this.tabId =
},
@@ -807,12 +879,46 @@
if (this.classModel.isQuestion == 1) {
this.blankNumber++
}
+
// if(this.classModel.isExam == 1){
// this.blankNumber++
// }
}
},
- methods: {
+ methods: {
+ // 获得思考题列表及答案
+ async getQuestionsList(){
+ var list = []
+ await $http.request({
+ url: "common/class/getThinkQuestionListStudent",
+ method: "POST",
+ data: {
+ "classId": this.classId
+ },
+ header: { //默认 无 说明：请求头
+ 'Content-Type': 'application/json'
+ },
+ })
+ .then(async (res) => {
+ if (res.code == 0) {
+ if(res.getThinkQuestionListStudent.length > 0){
+ list = res.getThinkQuestionListStudent
+ }
+ }else{
+ uni.showToast({
+ title:res.errMsg,
+ icon:"none"
+ })
+ }
+ }).catch(e => {
+ console.log('获取思考题报错',e);
+ uni.showToast({
+ title:e.errMsg,
+ icon:"none"
+ })
+ });
+ return list
+ },
async showSubmit() {
if(this.certificate && this.certificate.id){
// 已生成
@@ -851,6 +957,50 @@
}
});
},
+ // 全角字符串转半角
+ async convertToHalfWidth(str) {
+ const fullWidthChars = "！＂＃＄％＆＇（）＊＋，－．／【】０１２３４５６７８９：；＜＝＞？＠ＡＢＣＤＥＦＧＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ［＼］＾＿｀ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏｐｑｒｓｔｕｖｗｘｙｚ｛｜｝～";
+ const halfWidthChars = "!\"#$%&'()*+,-./[]0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~";
+ let result = "";
+ for (let i = 0; i < str.length; i++) {
+ const char = str[i];
+ const index = fullWidthChars.indexOf(char);
+ if (index!== -1) {
+ result += halfWidthChars[index];
+ } else {
+ result += char;
+ }
+ }
+ return result;
+ },
+
+ // 检测是否已经购买了全部课程
+ async checkUserCourse(){
+ var msg = ''
+ await $http.request({
+ url: "common/class/getUserCourseBuy",
+ method: "POST",
+ data: {"classId": this.classId},
+ header: { //默认 无 说明：请求头
+ 'Content-Type': 'application/json'
+ },
+ })
+ .then(async (res) => {
+ if (res.code == 0) {
+ if(res.msg != ''){
+ msg = res.msg
+ var outputStr = await this.convertToHalfWidth(res.msg)
+ uni.showModal({
+ title:'提示',
+ content:`您${outputStr}课程没有购买,请尽快购买班级内教学需要的课程，逾期您将被系统自动踢出班级,感谢您的理解和支持`
+ })
+ }
+ }
+ }).catch(e => {
+ console.log('检测是否已经购买了全部课程报错',e);
+ });
+ return msg
+ },
selectImage() {
this.chooseImage()
// .then(res => {
@@ -1231,6 +1381,24 @@
url: `${url}?classId=${classId}&type=${type}`
})
},
+ clickCourseTab(index, id){
+ if(this.curCourseIndex == index ){
+ return
+ }else{
+ this.curCourseIndex = index
+ this.curCourseId = id
+ }
+
+ },
+ // 跳转到播放页面
+ jumpToVideoPage(val){
+ uni.navigateTo({
+ url: `/pages/course/chapterDetailAndorid?navTitle=${this.questionsList[this.curCourseIndex].courseEntity.title}
+ &title=${val.title}&courseId=${this.questionsList[this.curCourseIndex].courseEntity.id}
+ &id=${val.id}&noRecored=false`,
+ });
+
+ },
// 点击作业或者医案，进入详细介绍
clickTask(item) {
// var options = JSON.stringify(item)
@@ -1377,13 +1545,27 @@
})
});
},
- titleClick(item, textIndex) {
- console.log('进来了吗');
- if (this.tijiaoTitleId == textIndex) {
- return
- }
+ async titleClick(item, textIndex) {
+ console.log('进来了吗', item);
+
+ if(item.id=='3'){
+ this.tijiaoTitleId = item.id
+ this.questionsList = await this.getQuestionsList()
+ if(this.questionsList.length > 0){
+ this.curCourseId = this.questionsList[this.curCourseIndex].courseEntity.id
+ this.tabCourseList = this.questionsList.map( item => {
+ return item.courseEntity
+ })
+ }
+ }
+ // if (this.tijiaoTitleId == item.id) {
+ // console.log(5555555555555555, this.tijiaoTitleId,item.id);
+ // return
+ // }
this.tijiaoTitleId = item.id
+ this.tijiaoTitleIndex = textIndex
console.log('e班内提交子按钮', this.tijiaoTitleId);
+
this.pPage = 0
this.taskList = []
this.myExperience = '1'
@@ -1471,7 +1653,7 @@
return newContent;
},
// 加入班级
- addClass() {
+ async addClass() {
$http.request({
url: "common/class/joinClass",
method: "POST",
@@ -1482,7 +1664,7 @@
'Content-Type': 'application/json'
},
})
- .then(res => {
+ .then(async res => {
if (res.code == 0) {
this.isHave = true
@@ -1490,8 +1672,9 @@
title: `加入成功！`,
icon: 'success'
})
- setTimeout(() => {
+ setTimeout(async () => {
this.getClassInfo()
+ this.buyCourseMsg = await this.checkUserCourse()
}, 200)
}
}).catch(e => {
@@ -1656,16 +1839,17 @@
.then(async res => {
console.log('班级信息', res);
this.refresh = false
- if (res.code == 0) {
- // res = classData // 测试数据
+ if (res.code == 0) {
this.isHave = res.result.isJoin
this.thisClass = res.result.class
- if (this.thisClass.state == '0') {
- this.tabId = '0'
- } else {
- this.tijiaoTitleId = '0'
- this.tabId = '3'
- }
+ // if (this.thisClass.state == '0') {
+ // this.tabId = '0'
+
+ // } else {
+ // this.tijiaoTitleId = '0'
+ // this.tabId = '3'
+ // console.log('-------------------+');
+ // }
this.admins.list = res.result.admins
this.admins.monitor = {}
this.admins.dmonitor = {}
@@ -1707,13 +1891,13 @@
}
this.refresh = true
var ss = this.getTijiaoTitleList
- if (this.thisClass.state != 0) {
+ if (this.thisClass.state != 0 && this.tabId != '3') {
this.pPage = 0
this.taskList = []
if(this.tijiaoTitleList.length > 0){
if (this.firstLoad) {
this.firstLoad = false
- this.tijiaoTitleId = this.tijiaoTitleList[0].id
+ this.tijiaoTitleId = this.tijiaoTitleList[this.tijiaoTitleIndex].id
}
this.getList()
@@ -1935,7 +2119,7 @@
}
}
}
-
+ .stickyyy{padding: 20rpx; color: #fff; background-color: #ff9277;}
.chengji {
padding-top: 20rpx;
margin-top: 20rpx;
@@ -1983,7 +2167,8 @@
color: $themeColor;
}
}
-
+
+ .questJUmp{font-size: 28rpx; text-align: center; color: #55aaff;}
.submitRecode {
// padding: 20rpx;
@@ -2063,7 +2248,9 @@
}
}
}
-
+ .questionbox{
+ .leve1{ border: none !important}
+ }
.zhedie {
@include bov(2);
}
@@ -2122,7 +2309,15 @@
}
}
-
+ .courseTab{
+ margin-bottom: 20rpx; padding: 8rpx;
+ background:#c6d1d5; line-height: 50rpx; overflow: hidden;
+ .item{ display: block; text-align: center; height: 50rpx; font-size: 26rpx; width: 100%;
+ padding:0 6rpx;@include toe(); box-sizing: border-box;
+ // text{ }
+ }
+ .item.cur{ @include mshadow(6px,1);background-color: #fff; }
+ }
.mainContent {
color: #333;
padding: 0 20rpx;
@@ -2305,7 +2500,12 @@
}
}
}
-
+ .alcentertt{
+ justify-content: space-around !important;
+ }
+.alcenterss{
+ justify-content: center !important;
+}
.otherItems {
// border: 1px solid #dadada;
padding: 20rpx;
diff --git a/pages/miniClass/taskList.vue b/pages/miniClass/taskList.vue
index 3a28af3..d401bf2 100644
--- a/pages/miniClass/taskList.vue
+++ b/pages/miniClass/taskList.vue
@@ -10,9 +10,9 @@
{{item.title}}
-
- {{item.otherInfo.setNoGiveScoreNumber}}
- {{item.otherInfo.setNoGiveScoreNumber}}
+
+ {{item.otherInfo.userNoCount}}
+
diff --git a/style/common.scss b/style/common.scss
index 28fd874..e996881 100644
--- a/style/common.scss
+++ b/style/common.scss
@@ -255,7 +255,15 @@ $themeBgColor: #EDF6F5 !important;
}
}
}
-
+.commonPageeeee{
+ width: 100%;
+ // background-color: #ffffff;
+ padding: 0 65rpx 40rpx;
+ // box-sizing: border-box;
+ // height: calc(100vh - 120rpx);
+ padding-bottom: 120rpx;
+ // overflow-y: scroll;
+}
.commonPage {
width: 100%;
// background-color: #ffffff;