From f18eeeaeb8692371ecee76bdc1350e8c7cf9e825 Mon Sep 17 00:00:00 2001 From: A1300399510 Date: Wed, 26 Feb 2025 18:57:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- component/admission-box/admission-box.wxml | 4 +- component/projectShowText/projectShowText.js | 3 +- pages/projectComparison/projectComparison.js | 2 + .../projectComparison/projectComparison.less | 4 +- .../projectComparison/projectComparison.wxml | 39 +++++++++---------- .../projectComparison/projectComparison.wxss | 4 +- pages/projectDetails/projectDetails.js | 2 +- pages/projectDetails/projectDetails.wxml | 4 +- pages/projectList/projectList.js | 3 +- pages/projectList/projectList.wxml | 2 +- pages/projectMy/projectMy.js | 5 +-- pages/projectMy/projectMy.wxml | 2 +- .../projectSchoolHomepage.js | 4 +- .../projectSchoolHomepage.wxml | 2 +- .../projectSubjectList/projectSubjectList.js | 2 + .../projectSubjectList.less | 3 +- .../projectSubjectList.wxml | 2 +- .../projectSubjectList.wxss | 1 + utils/miucms.js | 5 +++ 19 files changed, 52 insertions(+), 41 deletions(-) diff --git a/component/admission-box/admission-box.wxml b/component/admission-box/admission-box.wxml index cd80d07..62f0aea 100644 --- a/component/admission-box/admission-box.wxml +++ b/component/admission-box/admission-box.wxml @@ -13,7 +13,7 @@ {{ countDown.minutes }}: {{ countDown.seconds }} - + more @@ -25,7 +25,7 @@ - + diff --git a/component/projectShowText/projectShowText.js b/component/projectShowText/projectShowText.js index f70c5d9..24474a5 100644 --- a/component/projectShowText/projectShowText.js +++ b/component/projectShowText/projectShowText.js @@ -41,10 +41,9 @@ Component({ const height = lineHeight * 10 const query = wx.createSelectorQuery(); query.select(`.main >>> .hide.text.${ this.data.className }`).boundingClientRect(rect => { + if (!rect) return const page = rect.height / height - // console.log("rect.height", rect.height); let arr = [] - for (let i = 0; i < Math.floor(page); i++) { arr.push(height) } diff --git a/pages/projectComparison/projectComparison.js b/pages/projectComparison/projectComparison.js index 1cad3cd..0341b4d 100644 --- a/pages/projectComparison/projectComparison.js +++ b/pages/projectComparison/projectComparison.js @@ -37,6 +37,7 @@ Page({ loading: true, isInitFinish: false, + user: {}, }, /** @@ -62,6 +63,7 @@ Page({ totalTopHeight: screen_data.totalTopHeight, islogin: app.globalData.user.uid > 0 ? true : false, isInitFinish: true, + user: app.globalData.user, }) if (!this.indexSidebar) this.indexSidebar = this.selectComponent('#index-sidebar') diff --git a/pages/projectComparison/projectComparison.less b/pages/projectComparison/projectComparison.less index ff6400d..f7904a7 100644 --- a/pages/projectComparison/projectComparison.less +++ b/pages/projectComparison/projectComparison.less @@ -43,11 +43,11 @@ navigator { border-right: 1rpx solid rgba(241, 241, 241, 1); } - &:nth-child(2) { + &:nth-of-type(2) { background-color: rgba(245, 252, 253, 1); } - &:nth-child(3) { + &:nth-of-type(3) { background-color: rgba(251, 251, 243, 1); } diff --git a/pages/projectComparison/projectComparison.wxml b/pages/projectComparison/projectComparison.wxml index 56d0370..55d3577 100644 --- a/pages/projectComparison/projectComparison.wxml +++ b/pages/projectComparison/projectComparison.wxml @@ -1,5 +1,5 @@ -项目对比 +项目对比 @@ -52,13 +52,13 @@ 学科领域 - - - + + + @@ -111,66 +111,65 @@ 专业方向 - - - + + + 学术要求 - - - + + + 英语能力要求 - - - + + + 必要文件 - - - - + + + 专业认证 - - - + + + diff --git a/pages/projectComparison/projectComparison.wxss b/pages/projectComparison/projectComparison.wxss index 49ddbb8..b83f628 100644 --- a/pages/projectComparison/projectComparison.wxss +++ b/pages/projectComparison/projectComparison.wxss @@ -27,10 +27,10 @@ navigator { .block .item:not(:last-of-type) { border-right: 1rpx solid #f1f1f1; } -.block .item:nth-child(2) { +.block .item:nth-of-type(2) { background-color: #f5fcfd; } -.block .item:nth-child(3) { +.block .item:nth-of-type(3) { background-color: #fbfbf3; } .block .item .mode1 { diff --git a/pages/projectDetails/projectDetails.js b/pages/projectDetails/projectDetails.js index b82aab4..421822a 100644 --- a/pages/projectDetails/projectDetails.js +++ b/pages/projectDetails/projectDetails.js @@ -389,7 +389,7 @@ Page({ // 对键数组进行倒序排列 let closestValue = keys.reduce((acc, key) => { const diff = sideHeight[key] - scrollTop; - if (diff <= this.data.totalTopHeight) return key + if (diff <= this.data.totalTopHeight + 5) return key return acc; }, null); diff --git a/pages/projectDetails/projectDetails.wxml b/pages/projectDetails/projectDetails.wxml index 06dc1df..e557dd9 100644 --- a/pages/projectDetails/projectDetails.wxml +++ b/pages/projectDetails/projectDetails.wxml @@ -408,7 +408,7 @@ - + {{ item.schoolname }} @@ -608,7 +608,7 @@ 榜单 - + Offer榜 diff --git a/pages/projectList/projectList.js b/pages/projectList/projectList.js index 3f1da62..4c9715f 100644 --- a/pages/projectList/projectList.js +++ b/pages/projectList/projectList.js @@ -43,7 +43,7 @@ Page({ university: [], universityArr: [], isInitFinish: false, - + user: {}, }, /** @@ -66,6 +66,7 @@ Page({ this.setData({ university: data.university, universityArr, + user: app.globalData.user, }) if (options.type == 'subject') { diff --git a/pages/projectList/projectList.wxml b/pages/projectList/projectList.wxml index a709c0c..68142ac 100644 --- a/pages/projectList/projectList.wxml +++ b/pages/projectList/projectList.wxml @@ -1,6 +1,6 @@ - 榜单 + 榜单 diff --git a/pages/projectMy/projectMy.js b/pages/projectMy/projectMy.js index 265b546..91ec0f0 100644 --- a/pages/projectMy/projectMy.js +++ b/pages/projectMy/projectMy.js @@ -49,7 +49,7 @@ Page({ // allQuickHeight: 0, vsBottom: false, // 底部显示状态 - + user: {}, }, /** @@ -72,6 +72,7 @@ Page({ screen_data, islogin, manageHintState, + user: app.globalData.user, }) this.windowHeight = screen_data.windowHeight || 812 @@ -126,7 +127,6 @@ Page({ this.getList({ page: this.data.projectPage, }).then(res => { - console.log("getUserProject"); this.handleProjectListData(res) }) }, @@ -174,7 +174,6 @@ Page({ page: this.data.page, typeid: this.data.typeid }).then(res => { - console.log("getUserProject"); this.handleUserProjectData(res) }) }, diff --git a/pages/projectMy/projectMy.wxml b/pages/projectMy/projectMy.wxml index 41c55f1..8fbabea 100644 --- a/pages/projectMy/projectMy.wxml +++ b/pages/projectMy/projectMy.wxml @@ -1,6 +1,6 @@ - 我的项目 + 我的项目 diff --git a/pages/projectSchoolHomepage/projectSchoolHomepage.js b/pages/projectSchoolHomepage/projectSchoolHomepage.js index cb936ad..226f721 100644 --- a/pages/projectSchoolHomepage/projectSchoolHomepage.js +++ b/pages/projectSchoolHomepage/projectSchoolHomepage.js @@ -56,6 +56,7 @@ Page({ sortIndex: 0, // 排名由高到低 0 学费由低到高 1 学费由高到低 2 isInitFinish: false, + user: {}, }, /** @@ -78,7 +79,8 @@ Page({ this.setData({ islogin: app.globalData.user.uid > 0 ? true : false, - id: options.id + id: options.id, + user: app.globalData.user, }) common.xgBasicData(this, app).then(data => { diff --git a/pages/projectSchoolHomepage/projectSchoolHomepage.wxml b/pages/projectSchoolHomepage/projectSchoolHomepage.wxml index 47697d3..1f7b085 100644 --- a/pages/projectSchoolHomepage/projectSchoolHomepage.wxml +++ b/pages/projectSchoolHomepage/projectSchoolHomepage.wxml @@ -1,5 +1,5 @@ - + diff --git a/pages/projectSubjectList/projectSubjectList.js b/pages/projectSubjectList/projectSubjectList.js index 82e004e..38fb8e7 100644 --- a/pages/projectSubjectList/projectSubjectList.js +++ b/pages/projectSubjectList/projectSubjectList.js @@ -41,6 +41,7 @@ Page({ territoryState: false, isInitFinish: false, + user: {}, }, /** @@ -62,6 +63,7 @@ Page({ bottomLift: screen_data.bottomLift, contentHeight: totalTopHeight + util.rpxTopx(96), id: options.id, + user: app.globalData.user, }) if (!this.indexSidebar) this.indexSidebar = this.selectComponent('#index-sidebar') diff --git a/pages/projectSubjectList/projectSubjectList.less b/pages/projectSubjectList/projectSubjectList.less index c54dd04..72e5c4d 100644 --- a/pages/projectSubjectList/projectSubjectList.less +++ b/pages/projectSubjectList/projectSubjectList.less @@ -302,7 +302,8 @@ scroll-view { margin: 36rpx 0rpx 0; flex-direction: column; height: 60vh; - + padding-right: 36rpx; + .dot-box { .dot { width: 12rpx; diff --git a/pages/projectSubjectList/projectSubjectList.wxml b/pages/projectSubjectList/projectSubjectList.wxml index 3ac146f..570018a 100644 --- a/pages/projectSubjectList/projectSubjectList.wxml +++ b/pages/projectSubjectList/projectSubjectList.wxml @@ -1,5 +1,5 @@ - + {{ discipline[id].label }} diff --git a/pages/projectSubjectList/projectSubjectList.wxss b/pages/projectSubjectList/projectSubjectList.wxss index 5081f4c..cf178d5 100644 --- a/pages/projectSubjectList/projectSubjectList.wxss +++ b/pages/projectSubjectList/projectSubjectList.wxss @@ -250,6 +250,7 @@ scroll-view { margin: 36rpx 0rpx 0; flex-direction: column; height: 60vh; + padding-right: 36rpx; } .empty .dot-box .dot { width: 12rpx; diff --git a/utils/miucms.js b/utils/miucms.js index a30f926..7ea5106 100644 --- a/utils/miucms.js +++ b/utils/miucms.js @@ -173,6 +173,11 @@ function sendData(code) { // const openAdTimer = wx.getStorageSync('openAdTimer'); // if (openAdTimer && isToday(openAdTimer)) app.globalData.offerkaipingadvertisementState = true // } + + app.globalData.offerkaipingadvertisement = data.offerkaipingadvertisement || {} + const openAdTimer = wx.getStorageSync("openAdTimer") + if (openAdTimer && isToday(openAdTimer)) app.globalData.offerkaipingadvertisementState = true + }, fail: function () { // fail