diff --git a/.env.development b/.env.development index cdb41669..1f920724 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ ENV = 'development' # VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001' -# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' +# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # VITE_APP_BASE_API_Url = 'http://192.168.247.200' # VITE_APP_BASE_API_Url = 'http://aitscdn.jlbank.com.cn:7001' diff --git a/src/api/messageNotification.js b/src/api/messageNotification.js index 3022df25..e02d1076 100644 --- a/src/api/messageNotification.js +++ b/src/api/messageNotification.js @@ -39,4 +39,14 @@ export const noticeMessageCount = (data) => { method: 'post', data }); -}; \ No newline at end of file +}; + +export const queryMessageNoticeClass = (data) => { + return request({ + url: base_url + '/traPersonalMessageNotice/queryMessageNoticeClass', + method: 'post', + data + }); +}; + + diff --git a/src/pages.json b/src/pages.json index 3addab7b..20c296e6 100644 --- a/src/pages.json +++ b/src/pages.json @@ -164,6 +164,15 @@ } } }, + { + "path": "pages/messageNotification/list", + "style": { + "navigationBarTitleText": "消息列表", + "app-plus": { + "titleNView": false + } + } + }, { "path": "pages/testingHall/index", "style": { diff --git a/src/pages/examination/result.vue b/src/pages/examination/result.vue index 8d81911c..ee40d311 100644 --- a/src/pages/examination/result.vue +++ b/src/pages/examination/result.vue @@ -290,13 +290,12 @@ requestCount.value = 0; // 触发获取结果完成事件 console.log('触发获取结果完成事件', result.mode); - if(result.mode === 'examination') { console.log('调用它'); - if (result.crsId !== '') { - pointAndBadgesRun('03', result.crsId) - } else { + if (result.crsId === '') { // 没有crsId是考试中心,考试中心是完成就调用 pointAndBadgesRun('05', result.papersId) + } else if(pass_status.value === 1) { // 这里是有crsId,那就是课程,课程的话必须通过才调用 + pointAndBadgesRun('03', result.crsId) } } @@ -467,7 +466,7 @@ left: 0; top: -2rpx; width: 100%; - z-index: 600; + z-index: 93; background-color: #fff; } diff --git a/src/pages/messageNotification/index.vue b/src/pages/messageNotification/index.vue index af9ed9b6..7f8cbcc9 100644 --- a/src/pages/messageNotification/index.vue +++ b/src/pages/messageNotification/index.vue @@ -18,7 +18,7 @@ - + @@ -40,83 +40,50 @@ - - - - - {{ popup_info.title }} - - {{ popup_info.text }} - - 我知道了 - - - - + diff --git a/src/pages/messageNotification/listBauk.vue b/src/pages/messageNotification/listBauk.vue new file mode 100644 index 00000000..af9ed9b6 --- /dev/null +++ b/src/pages/messageNotification/listBauk.vue @@ -0,0 +1,370 @@ + + + + + diff --git a/src/pages/practice/result.vue b/src/pages/practice/result.vue index 452cd52a..ae743b7d 100644 --- a/src/pages/practice/result.vue +++ b/src/pages/practice/result.vue @@ -225,7 +225,8 @@ display: flex; align-items: center; justify-content: center; - margin-top: 84rpx; + margin-top: calc(104rpx + var(--status-bar-height)); + height: 68rpx; .img { width: 36rpx; diff --git a/src/pagesA.json b/src/pagesA.json index d02772c4..0d926927 100644 --- a/src/pagesA.json +++ b/src/pagesA.json @@ -100,6 +100,15 @@ } } }, + { + "path": "pages/messageNotification/list", + "style": { + "navigationBarTitleText": "消息列表", + "app-plus": { + "titleNView": false + } + } + }, { "path": "pages/testingHall/index", "style": { diff --git a/src/static/images/messageNotification/popup_bg.png b/src/static/images/messageNotification/popup_bg.png index 7e3bfb81..9e7b9419 100644 Binary files a/src/static/images/messageNotification/popup_bg.png and b/src/static/images/messageNotification/popup_bg.png differ diff --git a/src/static/images/messageNotification/type_06.png b/src/static/images/messageNotification/type_06.png new file mode 100644 index 00000000..c962f964 Binary files /dev/null and b/src/static/images/messageNotification/type_06.png differ diff --git a/src/static/images/messageNotification/type_07.png b/src/static/images/messageNotification/type_07.png new file mode 100644 index 00000000..115c671c Binary files /dev/null and b/src/static/images/messageNotification/type_07.png differ