diff --git a/pages/index/testtraining/signup.vue b/pages/index/testtraining/signup.vue index fdd06ac..93be933 100644 --- a/pages/index/testtraining/signup.vue +++ b/pages/index/testtraining/signup.vue @@ -170,34 +170,34 @@ this.register = uni.getStorageSync('register'); // console.log('register--',this.register) // console.log('wxUserInfo---',this.wxUserInfo) - this.http.quickGet(`/train/course/list?pageNum=1&pageSize=100`).then(res=>{ - // console.log('res---', res) - this.courselist = res.data.rows; - if(this.courselist.length>0){ - this.courselist.sort((a,b)=>{ - return a.orderNum-b.orderNum - }) - this.courselist.forEach(item=>{ - if(item.children.length>0){ - item.children.sort((a,b)=>{ - return a.orderNum-b.orderNum - }) - if(item.orderNum==1){ - item.index='一' - }else if(item.orderNum==2){ - item.index='二' - }else if(item.orderNum==3){ - item.index='三' - }else if(item.orderNum==4){ - item.index='四' - }else if(item.orderNum==5){ - item.index='五' - } - } - }) - // console.log('课程培训列表--', this.courselist) - } - }) + // this.http.quickGet(`/train/course/list?pageNum=1&pageSize=100`).then(res=>{ + // // console.log('res---', res) + // this.courselist = res.data.rows; + // if(this.courselist.length>0){ + // this.courselist.sort((a,b)=>{ + // return a.orderNum-b.orderNum + // }) + // this.courselist.forEach(item=>{ + // if(item.children.length>0){ + // item.children.sort((a,b)=>{ + // return a.orderNum-b.orderNum + // }) + // if(item.orderNum==1){ + // item.index='一' + // }else if(item.orderNum==2){ + // item.index='二' + // }else if(item.orderNum==3){ + // item.index='三' + // }else if(item.orderNum==4){ + // item.index='四' + // }else if(item.orderNum==5){ + // item.index='五' + // } + // } + // }) + // // console.log('课程培训列表--', this.courselist) + // } + // }) this.http.quickGet(`/train/issue/detail/${this.issueId}`).then(res=>{ console.log('报名期号信息---',res) this.issueinform=res.data diff --git a/pages/index/testtraining/testtraining.vue b/pages/index/testtraining/testtraining.vue index 93a31f3..598b6d9 100644 --- a/pages/index/testtraining/testtraining.vue +++ b/pages/index/testtraining/testtraining.vue @@ -42,21 +42,19 @@ 针对企业用人需求进行课程培训 - + - {{item.index}} 、{{item.courseName}} - + 序号 + 课程名称 课时 - - - {{itemd.orderNum}} - {{itemd.courseName}} - {{itemd.period.slice(0,1)}} - - {{itemd.period}} + + + {{key+1}} + {{item.con}} + {{item.num}} @@ -520,7 +518,7 @@ * - + @@ -566,9 +564,10 @@ export default { let schooldata = res.data.rows[0] this.calltext = schooldata.schoolName + '-' + schooldata.trainClassName if (schooldata.trainStartTime && schooldata.trainEndTime) { - console.log(schooldata); + console.log(schooldata) this.timetext = - schooldata.trainClassName + ' ' + + schooldata.trainClassName + + ' ' + '课程周期:' + schooldata.trainStartTime.slice(0, 10) + '至' + @@ -600,6 +599,7 @@ export default { isShowDown: false, tokenshow: false, isPopupShow: false, + inpDisabled: false, signobj: { name: '', qq: '', @@ -625,7 +625,29 @@ export default { label: '硕士', }, ], - courselist: '', //培训课程列表 + courselist: [ + { con: '静态分析的概念介绍。', num: '1课时' }, + { con: '静态分析工具介绍。', num: '1课时' }, + { con: '静态分析的基本流程。', num: '1课时' }, + { con: '单元测试的概念介绍。', num: '1课时' }, + { con: '单元测试依据的标准介绍。', num: '1课时' }, + { con: '介绍单元测试的测试类型。', num: '1课时' }, + { con: '单元测试的基本流程。', num: '1课时' }, + { con: '单元测试工具的安装和使用。', num: '2课时' }, + { con: '单元测试环境配置。', num: '2课时' }, + { con: '单元测试工具静态分析操作流程。', num: '2课时' }, + { con: '单元测试操作流程。', num: '2课时' }, + { con: '单元测试工具的测试报告导出。', num: '1课时' }, + { con: '静态测试工具的安装和使用。', num: '2课时' }, + { + con: '通过项目进行代码行数、圈复杂度、扇入扇出、注释率进行测试。', + num: '4课时', + }, + { + con: '通过项目进行文档审查、代码审查、静态分析、测试用例的设计、单元测试的执行、单元测试的记录填写、单元测试的测试用例的自动生成、单元测试的问题记录方法、单元测试文档编写。', + num: '4课时', + }, + ], //培训课程列表 wxUserInfo: null, //微信基本信息 register: null, swipelist: [ @@ -978,34 +1000,34 @@ export default { this.register = uni.getStorageSync('register') console.log('register--', this.register) console.log('wxUserInfo---', this.wxUserInfo) - this.http.quickGet(`/train/course/list?pageNum=1&pageSize=100`).then((res) => { - console.log('res---', res) - this.courselist = res.data.rows - if (this.courselist.length > 0) { - this.courselist.sort((a, b) => { - return a.orderNum - b.orderNum - }) - this.courselist.forEach((item) => { - if (item.children.length > 0) { - item.children.sort((a, b) => { - return a.orderNum - b.orderNum - }) - if (item.orderNum == 1) { - item.index = '一' - } else if (item.orderNum == 2) { - item.index = '二' - } else if (item.orderNum == 3) { - item.index = '三' - } else if (item.orderNum == 4) { - item.index = '四' - } else if (item.orderNum == 5) { - item.index = '五' - } - } - }) - console.log('课程培训列表--', this.courselist) - } - }) + // this.http.quickGet(`/train/course/list?pageNum=1&pageSize=100`).then((res) => { + // console.log('res---', res) + // this.courselist = res.data.rows + // if (this.courselist.length > 0) { + // this.courselist.sort((a, b) => { + // return a.orderNum - b.orderNum + // }) + // this.courselist.forEach((item) => { + // if (item.children.length > 0) { + // item.children.sort((a, b) => { + // return a.orderNum - b.orderNum + // }) + // if (item.orderNum == 1) { + // item.index = '一' + // } else if (item.orderNum == 2) { + // item.index = '二' + // } else if (item.orderNum == 3) { + // item.index = '三' + // } else if (item.orderNum == 4) { + // item.index = '四' + // } else if (item.orderNum == 5) { + // item.index = '五' + // } + // } + // }) + // console.log('课程培训列表--', this.courselist) + // } + // }) // 获取课程列表 this.getClassList() @@ -1173,6 +1195,7 @@ export default { }, // 模块1点击 model1CLick() { + console.log('click me') this.isShowDown = true }, closeShowDown() { @@ -1239,6 +1262,7 @@ export default { }, closeclosejj() { this.isPCshow = false + this.inpDisabled = false this.$refs.uFormjj.resetFields() this.jjform = { studentName: '', @@ -1248,6 +1272,10 @@ export default { } }, jjOpen(it) { + const accessToken = uni.getStorageSync('accessToken') + const wxUserInfo = uni.getStorageSync('wxUserInfo') + console.log(accessToken) + console.log(wxUserInfo) // let accessToken = uni.getStorageSync('accessToken'); // if (!accessToken) { // this.tokenshow = true @@ -1255,6 +1283,10 @@ export default { // this.isPCshow = true // this.classInfo = it // } + if (accessToken && wxUserInfo.phonenumber) { + this.jjform.mobile = wxUserInfo.phonenumber + this.inpDisabled = true + } if (it) { this.classInfo = it } @@ -1983,13 +2015,14 @@ export default { } .table_heade { - width: 90%; + width: 100rpx; text-align: center; + line-height: 20rpx; /* margin:5px 0 */ } .table_kheade { - width: 10%; + width: 140rpx; text-align: center; } @@ -2004,17 +2037,18 @@ export default { background-color: #ffffff; display: flex; align-items: center; + line-height: 20px; color: #1a1a1a; /* height: 26px; */ } .table_obody { - width: 10%; + width: 100rpx; text-align: center; } .table_tbody { - width: 80%; + width: 600rpx; text-align: left; padding: 4px 8px; border-left: 1px solid #cfdddd; @@ -2022,7 +2056,7 @@ export default { } .table_hbody { - width: 10%; + width: 140rpx; text-align: center; } diff --git a/pages/personal/courseSign/courseSign.vue b/pages/personal/courseSign/courseSign.vue index 23a1fab..2a34d6c 100644 --- a/pages/personal/courseSign/courseSign.vue +++ b/pages/personal/courseSign/courseSign.vue @@ -12,12 +12,12 @@ {{ nowTime }} - + 已签到 - + 无法识别二维码 @@ -78,12 +78,11 @@ export default { }) }, init() { - - this.http.quickGet(`/course/singin/${this.courseId}`,true).then((response) => { - console.log(response); - if(response.data.msg == '已签到'){ - this.isSignin = true - } + this.http.quickGet(`/course/singin/${this.courseId}`, true).then((response) => { + console.log(response) + if (response.data.msg == '已签到') { + this.isSignin = true + } }) }, }, diff --git a/pages/personal/courseSign/error.1png b/pages/personal/courseSign/error.1png deleted file mode 100644 index f6f9d4b..0000000 Binary files a/pages/personal/courseSign/error.1png and /dev/null differ diff --git a/pages/personal/courseSign/error.png b/pages/personal/courseSign/error.png deleted file mode 100644 index ef1e67e..0000000 Binary files a/pages/personal/courseSign/error.png and /dev/null differ diff --git a/pages/personal/courseSign/signSuc.1png b/pages/personal/courseSign/signSuc.1png deleted file mode 100644 index d9044a5..0000000 Binary files a/pages/personal/courseSign/signSuc.1png and /dev/null differ diff --git a/pages/personal/courseSign/signSuc.png b/pages/personal/courseSign/signSuc.png deleted file mode 100644 index f790ffc..0000000 Binary files a/pages/personal/courseSign/signSuc.png and /dev/null differ diff --git a/pages/personal/setup/peixunban.vue b/pages/personal/setup/peixunban.vue index 1323f31..b06b3c7 100644 --- a/pages/personal/setup/peixunban.vue +++ b/pages/personal/setup/peixunban.vue @@ -3,7 +3,7 @@ - + {{item.trainClassName}}