From 55994c3910b8f87309b0217b6d05b692718e6d5a Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Wed, 4 Sep 2024 16:39:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/applyForm/index.vue | 18 +- packages/apply/index.vue | 14 +- packages/booksubmit/index.vue | 801 ++++++++++++++++------------- packages/mycourse/courseStatus.vue | 28 +- packages/mycourse/courseTxl.vue | 14 +- packages/mycourse/index.vue | 40 +- pages/book/index.vue | 9 +- pages/course/index.vue | 22 +- pages/index/index.vue | 13 +- pages/me/index.vue | 6 +- 10 files changed, 544 insertions(+), 421 deletions(-) diff --git a/components/applyForm/index.vue b/components/applyForm/index.vue index d9cc773..6d44a14 100644 --- a/components/applyForm/index.vue +++ b/components/applyForm/index.vue @@ -151,29 +151,35 @@ console.log("success", data, index, lists, name, item) }, onUploaded(lists, name, item) { - let arr = [] + let arr = [] + let arrid = [] if (lists.length > 0) { this.base.toast("全部上传成功") lists.map(item => { - arr.push(item.response.url.replace(baseUrl, '')) + arr.push(item.response.url.replace(baseUrl, '')) + arrid.push(item.response) }) } this.course_forms.map(item1 => { if (item1.field === item.field) { - this.$set(item1, 'value', arr.join(",")) + this.$set(item1, 'value', arr.join(",")) + this.$set(item1, 'fileList', arrid) } }) }, onRemove(index, lists, name, item) { - let arr = [] + let arr = [] + let arrid = [] if (lists.length > 0) { lists.map(item => { - arr.push(item.response.url.replace(baseUrl, '')) + arr.push(item.response.url.replace(baseUrl, '')) + arrid.push(item.response) }) } this.course_forms.map(item1 => { if (item1.field === item.field) { - this.$set(item1, 'value', arr.join(",")) + this.$set(item1, 'value', arr.join(",")) + this.$set(item1, 'fileList', arrid) } }) }, diff --git a/packages/apply/index.vue b/packages/apply/index.vue index 4c9a0da..380adc3 100644 --- a/packages/apply/index.vue +++ b/packages/apply/index.vue @@ -166,6 +166,9 @@ if(item.belong_user===1){ item.value = this.form[item.field] } + if(item.value===null){ + item.value = '' + } }) this.course_forms = res.course_forms.sort((a,b)=>(a.sort-b.sort)) } @@ -175,11 +178,12 @@ backForm(e) { let _arr = [] e.map(item => { - _arr.push({ - name: item.name, - field: item.field, - value: item.value ? item.value : '' - }) + // _arr.push({ + // name: item.name, + // field: item.field, + // value: item.value ? item.value : '' + // }) + _arr.push(item) // 更新扩展字段 if (item.belong_user === 1 && !this.base.isNull(item.value)) { this.form[item.field] = item.value diff --git a/packages/booksubmit/index.vue b/packages/booksubmit/index.vue index b8a369e..878ba6a 100644 --- a/packages/booksubmit/index.vue +++ b/packages/booksubmit/index.vue @@ -1,77 +1,79 @@ \ No newline at end of file diff --git a/packages/mycourse/courseStatus.vue b/packages/mycourse/courseStatus.vue index 5617e4a..c7797a3 100644 --- a/packages/mycourse/courseStatus.vue +++ b/packages/mycourse/courseStatus.vue @@ -12,14 +12,14 @@ {{userInfo.username}}: {{info.reason?info.reason:pass_tip}} - - 查看录取通知书 + + 查看录取通知书 - - 上传缴费信息 + + 上传缴费信息 - - 我要放弃 + + 我要放弃 @@ -121,7 +121,21 @@ if (this.base.isNull(this.form.giveup_reason)) { this.base.toast("请输入放弃原因") return - } + } + this.$u.api.courseUpdateSign({ + id:this.info.id, + giveup_reason:this.form.giveup_reason, + status:5 + }).then(res => { + that.base.toast("已放弃课程", 1500, function() { + this.showCancel = false + setTimeout(function() { + uni.redirectTo({ + url:"/packages/mycourse/index" + }) + }, 500) + }) + }) }, openFiles(files) { console.log("files", files) diff --git a/packages/mycourse/courseTxl.vue b/packages/mycourse/courseTxl.vue index 18a5a38..ffbef46 100644 --- a/packages/mycourse/courseTxl.vue +++ b/packages/mycourse/courseTxl.vue @@ -3,7 +3,7 @@ - + @@ -11,14 +11,14 @@ - {{teacher.name}} + {{tea.name}} 班主任 - {{teacher.mobile?teacher.mobile:''}} + {{tea.mobile?tea.mobile:''}} @@ -38,9 +38,9 @@ {{item.course_signs[0]['position']}} - {{item.company_name}} - {{item.company_position}} - {{item.mobile}} + {{item.company_name?item.company_name:''}} + {{item.company_position?item.company_position:''}} + {{item.mobile?item.mobile:''}} @@ -69,7 +69,7 @@ data() { return { list: [], - teacher: null, + teacher: [], studentList: [], show_mobile: false, } diff --git a/packages/mycourse/index.vue b/packages/mycourse/index.vue index 8977938..ae1f68f 100644 --- a/packages/mycourse/index.vue +++ b/packages/mycourse/index.vue @@ -46,17 +46,17 @@ - 进入 - 进入 取消报名 - 查看进度 - 查看 + 查看 @@ -148,22 +148,29 @@ clickShareId(item) { this.shareObj = item }, - toUrl(id, type) { + toUrl(item, type) { // 付费审核通过 if (type === 1) { uni.navigateTo({ - url: '/packages/mycourse/detail?id=' + id + url: '/packages/mycourse/detail?id=' + item.id }) } else if (type === 2) { // 审核不通过 或待审核 备选 uni.navigateTo({ - url: '/packages/mycourse/courseStatus?id=' + id + url: '/packages/mycourse/courseStatus?id=' + item.id }) } else if (type === 3) { - // 不付费的 审核通过 - uni.navigateTo({ - url: '/packages/course/freeDetail?id=' + id - }) + // 不付费的 审核通过 + // 有群聊二维码 进详情，没有进状态 + if(!this.base.isNull(item.qun_image_id)){ + uni.navigateTo({ + url: '/packages/course/freeDetail?id=' + item.id + }) + }else{ + uni.navigateTo({ + url: '/packages/mycourse/courseStatus?id=' + item.id + }) + } } }, @@ -184,6 +191,17 @@ }, submitCancel(item){ console.log("item",item) + let that = this + this.$u.api.courseUpdateSign({ + id:item.course_signs[0].id, + status:4 + }).then(res => { + that.base.toast("已取消课程", 1500, function() { + setTimeout(function() { + that.getMyCourse() + }, 500) + }) + }) }, async getBannerList() { const res = await this.$u.api.otherBanner({ diff --git a/pages/book/index.vue b/pages/book/index.vue index 5c0fca7..5a37983 100644 --- a/pages/book/index.vue +++ b/pages/book/index.vue @@ -3,11 +3,11 @@ - 加入我们 + - 立即预约 + @@ -78,7 +78,10 @@ url: '/packages/schoolmate/index' }) } else { - this.base.toast("您还不是校友，无权查看") + this.base.toast("您还不是校友，无权查看") + uni.switchTab({ + url: '/pages/course/index' + }) } } diff --git a/pages/course/index.vue b/pages/course/index.vue index e067fdf..797756f 100644 --- a/pages/course/index.vue +++ b/pages/course/index.vue @@ -3,7 +3,8 @@ - + + @@ -129,7 +130,7 @@ } }, onLoad() { - this.getBannerList() + // this.getBannerList() this.getCourseList() }, @@ -147,7 +148,12 @@ }, - methods: { + methods: { + goCourse(){ + uni.navigateTo({ + url:'/packages/mycourse/index' + }) + }, scrollGet() { if (!this.hasData) { return @@ -293,7 +299,8 @@ .list { - height: 100vh; + height: 100vh; + padding:30rpx 0; position: relative; top: 0; left: 0; @@ -305,7 +312,12 @@ left: 50%; transform: translate(-50%, -50%); } - + &-img { + width: calc(100% - 60rpx); + height: 125rpx; + display: block; + margin: 0 auto; + } &-item { margin: 30rpx; background-color: #fff; diff --git a/pages/index/index.vue b/pages/index/index.vue index 90e89a3..c7be6a2 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -17,14 +17,14 @@ - - - + + + @@ -180,8 +180,11 @@ }, tourl(type, url) { if (type === 1) { - uni.navigateTo({ - url: '/packages/webview/index?type=1' + // uni.navigateTo({ + // url: '/packages/webview/index?type=1' + // }) + uni.navigateTo({ + url:'/packages/mycourse/index' }) } else if (type === 2) { uni.switchTab({ diff --git a/pages/me/index.vue b/pages/me/index.vue index 731b9c6..8d7997a 100644 --- a/pages/me/index.vue +++ b/pages/me/index.vue @@ -15,7 +15,7 @@ 学籍： - {{course_signs[0]['course'].year?course_signs[0]['course'].year+'年':''}}{{course_signs[0]['course'].type_detail?course_signs[0]['type_detail'].name+"|":''}}{{course_signs[0]['course'].name}} + {{course_signs[0]['course'].year?course_signs[0]['course'].year+'年':''}}{{course_signs[0]['course'].type_detail?course_signs[0]['course']['type_detail'].name+"|":''}}{{course_signs[0]['course'].name}} @@ -87,7 +87,7 @@ X - + @@ -111,7 +111,7 @@ 学籍： - {{course_signs[0]['course'].year?course_signs[0]['course'].year+'年':''}}{{course_signs[0]['course'].type_detail?course_signs[0]['type_detail'].name+"|":''}}{{course_signs[0]['course'].name}} + {{course_signs[0]['course'].year?course_signs[0]['course'].year+'年':''}}{{course_signs[0]['course'].type_detail?course_signs[0]['course']['type_detail'].name+"|":''}}{{course_signs[0]['course'].name}}