diff --git a/component/open-ad/open-ad.wxml b/component/open-ad/open-ad.wxml index 5634179..748140b 100644 --- a/component/open-ad/open-ad.wxml +++ b/component/open-ad/open-ad.wxml @@ -4,7 +4,7 @@ {{ num }} 跳过 - + 点击查看详情 diff --git a/pages/projectDetails/projectDetails.js b/pages/projectDetails/projectDetails.js index bae613d..9e68b55 100644 --- a/pages/projectDetails/projectDetails.js +++ b/pages/projectDetails/projectDetails.js @@ -193,8 +193,7 @@ Page({ const info = data.info || {} - let contras = data.contras - if (Array.isArray(contras)) contras = {} + let contras = Array.isArray(data.contras) ? {} : data.contras; let side = this.data.side @@ -238,10 +237,7 @@ Page({ } }); - if (data.language_of_instruction) { - let strOutput = data.language_of_instruction.join(','); - data['language_of_instruction_text'] = strOutput - } + data.language_of_instruction && (data.language_of_instruction_text = data.language_of_instruction.join(",")); let course = { required: [], @@ -370,11 +366,10 @@ Page({ }) const standardized = target.standardized_tests_requirements || [] - let arr = [] - standardized.forEach(element => { - element['level'] = obj[element.requirement_level] - arr.push(element) - }) + const arr = standardized.map((element) => ({ + ...element, + level: obj[element.requirement_level], + })); if (arr.length != 0) { language.push({ diff --git a/pages/projectSchoolHomepage/projectSchoolHomepage.less b/pages/projectSchoolHomepage/projectSchoolHomepage.less index 45dfd5d..0d63421 100644 --- a/pages/projectSchoolHomepage/projectSchoolHomepage.less +++ b/pages/projectSchoolHomepage/projectSchoolHomepage.less @@ -259,13 +259,17 @@ view { .indication { display: flex; justify-content: center; + margin-right: 22.5rpx; .item { width: 15rpx; height: 6rpx; background-color: rgba(215, 215, 215, 1); border-radius: 30rpx; - margin-right: 6rpx; + + &:not(:last-of-type) { + margin-right: 6rpx; + } &.pitch { background-color: rgba(250, 107, 17, 1); diff --git a/pages/projectSchoolHomepage/projectSchoolHomepage.wxss b/pages/projectSchoolHomepage/projectSchoolHomepage.wxss index ced387e..d7374ec 100644 --- a/pages/projectSchoolHomepage/projectSchoolHomepage.wxss +++ b/pages/projectSchoolHomepage/projectSchoolHomepage.wxss @@ -219,12 +219,15 @@ view { .hot .indication { display: flex; justify-content: center; + margin-right: 22.5rpx; } .hot .indication .item { width: 15rpx; height: 6rpx; background-color: #d7d7d7; border-radius: 30rpx; +} +.hot .indication .item:not(:last-of-type) { margin-right: 6rpx; } .hot .indication .item.pitch {