diff --git a/common/uni.css b/common/uni.css index 4414e9b..b88f592 100644 --- a/common/uni.css +++ b/common/uni.css @@ -3,6 +3,7 @@ font-weight: normal; font-style: normal; src: url('~@/static/uni.ttf') format('truetype'); + src: url('~@/static/fonts/SourceHanSansSC-VF.ttf') format('truetype'); } /* #ifdef H5 */ diff --git a/pages/YNEduApp/index/index.vue b/pages/YNEduApp/index/index.vue index a153bfc..f4a52eb 100644 --- a/pages/YNEduApp/index/index.vue +++ b/pages/YNEduApp/index/index.vue @@ -7,15 +7,10 @@ suffixIcon="search" v-model="keyword" placeholder="请输入搜索关键词" - @iconClick="toggleSearch" + @blur="toggleSearch" > - - - - {{ part.name }} - - + @@ -23,6 +18,13 @@ + + + + + {{ part.name }} + + .page { width: 100vw; - height: 100vh; background-color: #f8f8f8; box-sizing: border-box; padding: 0 20px; .search { width: 100%; - margin: 10px auto 0; + margin: 3vh auto 0; display: flex; align-items: center; } @@ -284,14 +285,14 @@ export default { } .swipe-area { + margin-top: 3vh; width: 100%; - height: 20vh; border-radius: 15rpx; overflow: hidden; - margin-bottom: 10rpx; } .my-task { + margin-bottom: 3vh; width: 100%; height: 40vh; background-color: #fff; diff --git a/pages/YNEduApp/learnProj/learnProj.vue b/pages/YNEduApp/learnProj/learnProj.vue index 5f35557..bde2955 100644 --- a/pages/YNEduApp/learnProj/learnProj.vue +++ b/pages/YNEduApp/learnProj/learnProj.vue @@ -1,21 +1,39 @@ @@ -61,6 +89,8 @@ import config from '@/config' export default { data() { return { + showPicker: false, + columns: [], activeIndex: 0, statusList: [ // status -1: 全部 1: 已完成 0: 未完成 @@ -77,26 +107,20 @@ export default { qualStatus: '', signupStatus: '' }, - // 状态选项 + // 学习类型 learnTypeRange: [ - { text: '学习类型', value: '' }, - { text: '不学', value: 1 }, - { text: '要学', value: 2 } + { label: '不学', value: 1 }, + { label: '要学', value: 2 } ], + // 逾期状态 outDateStatusRange: [ - { text: '逾期状态', value: '' }, - { text: '临期', value: 1 }, - { text: '过期', value: 2 } + { label: '临期', value: 1 }, + { label: '过期', value: 2 } ], + // 合格状态 qualStatusRange: [ - { text: '合格状态', value: '' }, - { text: '合格', value: 1 }, - { text: '不及格', value: 2 } - ], - signupStatusRange: [ - { text: '报名状态', value: '' }, - { text: '报了', value: 1 }, - { text: '没报', value: 2 } + { label: '合格', value: 1 }, + { label: '不及格', value: 2 } ], // 项目列表 projList: [] @@ -106,6 +130,24 @@ export default { this.getList() }, methods: { + openPicker(type) { + console.log('🚀 ~ openPicker ~ type:', type) + this.columns = [] + if (type === 1) { + this.columns = this.learnTypeRange + } else if (type === 2) { + this.columns = this.outDateStatusRange + } else if (type === 3) { + this.columns = this.qualStatusRange + } else if (type === 4) { + this.columns = this.signupStatusRange + } + this.showPicker = true + }, + confirmPicker(e) { + console.log('🚀 ~ confirmPicker ~ e:', e) + this.showPicker = false + }, async getList() { const params = { userId: uni.getStorageSync('userId'), @@ -205,6 +247,10 @@ export default {