diff --git a/pages/learnPath/pathSearch.vue b/pages/learnPath/pathSearch.vue index 8678f02..e9689e3 100644 --- a/pages/learnPath/pathSearch.vue +++ b/pages/learnPath/pathSearch.vue @@ -94,6 +94,7 @@ this.startList = res.data if(res.code == 200 ){ this.posiLists = res.data + this.indexs.push(0) if(this.posiLists.length > 9){ this.posiLists = this.posiLists.slice(0, 9) } @@ -114,6 +115,9 @@ this.isTrue = true }, searchItem(item,index){ + if(index == 0){ + return + } const indexToRemove = this.indexs.indexOf(index); if (indexToRemove !== -1) { this.indexs.splice(indexToRemove, 1); diff --git a/pages/study/index.vue b/pages/study/index.vue index 700bc20..31407da 100644 --- a/pages/study/index.vue +++ b/pages/study/index.vue @@ -197,10 +197,19 @@ - 总进度 + + + + + {{Number(((detailData.overallCompletionRate || 0)*100).toFixed(2))}}% + 总进度 + + + @@ -751,18 +760,17 @@ if (this.tabIndex == 1 && this.studyList.length == 0) { this.getLearning() } else if (this.tabIndex == 2) { - if(localStorage.getItem("checkedTrue")!=null){ - this.learnModal = localStorage.getItem("checkedTrue") === "true" - this.isChecked = localStorage.getItem("checkedTrue") === "false" - getList(this.userInfo.aid).then(res=>{ - console.log(res,'res') - if(res.code == 200 ){ - this.detailData = res.data + getList(this.userInfo.aid).then(res=>{ + if(res.code == 200 ){ + this.detailData = res.data + if(Object.keys(this.detailData).length&&localStorage.getItem("checkedTrue")!=null){ + this.learnModal = localStorage.getItem("checkedTrue") === "true" + this.isChecked = localStorage.getItem("checkedTrue") === "false" + }else{ + this.learnModal = true } - }) - }else{ - this.learnModal = true - } + } + }) //this.history() } else if (this.tabIndex == 0 && this.couresList.length == 0) { this.loadBoeData() @@ -1233,10 +1241,50 @@ } } .plan_right{ + margin-right: -50px; + .semi-circle-progress { + width: 340rpx; + height: 120rpx; + position: relative; + overflow: hidden; + } + .progress-bar{ + width: 50%; + height: 150%; + border-radius: 50%; + border: 24rpx solid #DFDFE4 ; + display: flex; + justify-content: center; + .item{ + margin-top: 16rpx; + text-align: center; + .pro{ + font-weight: 600; + font-size: 36rpx; + color: #2E72F2; + } + .text{ + font-weight: 400; + font-size: 28rpx; + color: #A7ACBA; + } + } + } + .pro_line{ + width: 50%; + height: 150%; + border-radius: 50%; + border: 24rpx solid #2E72F2; + position: absolute; + top: 0; + clip-path: inset(0 0 0 var(--progress)); + // clip-path: inset(0 0 0 50%); + transform: rotate(180deg); + } // display: flex; // justify-content: center; // align-items: center; - margin-top: 31px; + margin-top: 46rpx; .line{ width: 184rpx; height: 1rpx;