diff --git a/.env.development b/.env.development
index 136e3641..797038a3 100644
--- a/.env.development
+++ b/.env.development
@@ -3,10 +3,10 @@ ENV = 'development'
# 'development'
-# VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
+#VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
-#VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
@@ -15,7 +15,7 @@ ENV = 'development'
# VITE_APP_BASE_API_Url = 'http://aitscdn.jlbank.com.cn:7001'
# VITE_APP_BASE_API_Url = 'http://192.168.108.129'
# dev
-VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
+# VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
# sit
diff --git a/src/App.vue b/src/App.vue
index 141b9280..f955a764 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -144,4 +144,8 @@
.bold {
font-weight: bold;
}
+ .maoh{
+ margin-right: 8rpx;
+ margin-left: 2rpx;
+ }
diff --git a/src/api/messageNotification.js b/src/api/messageNotification.js
index e02d1076..7b7bf3ca 100644
--- a/src/api/messageNotification.js
+++ b/src/api/messageNotification.js
@@ -50,3 +50,13 @@ export const queryMessageNoticeClass = (data) => {
};
+// 按照分类一键读取消息
+export const oneTimeReadByNoticeTyp = (data) => {
+ return request({
+ url: base_url + '/traPersonalMessageNotice/oneTimeReadByNoticeTyp',
+ method: 'post',
+ data
+ });
+};
+
+
\ No newline at end of file
diff --git a/src/components/points-and-badge/check-in.vue b/src/components/points-and-badge/check-in.vue
index cb19ed5d..0bd0b94d 100644
--- a/src/components/points-and-badge/check-in.vue
+++ b/src/components/points-and-badge/check-in.vue
@@ -178,7 +178,7 @@
// 计算text字段
let text = '1'; // 默认显示1
if (dayNumber === 30) {
- text = '30'; // 第30天显示30
+ text = '20'; // 第30天显示30
} else if ((dayNumber % 30) % 7 === 0) {
text = '5'; // 每7天（第7、14、21、28、35天）显示5
}
@@ -207,8 +207,8 @@
}
const open = (isSignedStatus, days, onCheckInClick = () => {}, onCheckInSuccess = () => {}) => {
- console.log('isSignedStatus', isSignedStatus);
isSigned.value = isSignedStatus; // 今日签到状态
+ // isSigned.value = false; // 今日签到状态
continuousDay.value = days; // 连续签到
checkInClickCallback = onCheckInClick;
checkInSuccessCallback = onCheckInSuccess;
diff --git a/src/pages/competitionRecord/components/competitionRecordItem.vue b/src/pages/competitionRecord/components/competitionRecordItem.vue
index a7d61f11..93e091c3 100644
--- a/src/pages/competitionRecord/components/competitionRecordItem.vue
+++ b/src/pages/competitionRecord/components/competitionRecordItem.vue
@@ -127,20 +127,19 @@
margin: 17rpx 20rpx;
background-color: #fff;
border-radius: 16rpx;
- padding: 32rpx 22rpx;
+ padding: 22rpx 22rpx;
.details_div {
display: flex;
.img_div {
position: relative;
- width: 226rpx;
- height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
overflow: hidden;
- border-radius: 22rpx;
-
+ border-radius: 16rpx;
.img {
- width: 226rpx;
- height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
}
.subscript {
@@ -188,7 +187,7 @@
display: flex;
align-items: center;
overflow: hidden;
- height: 116rpx;
+ height: 92rpx;
background-color: #f9fbff;
border-radius: 8rpx;
justify-content: space-around;
diff --git a/src/pages/courseRecord/components/examRecordItem.vue b/src/pages/courseRecord/components/examRecordItem.vue
index 1ca4dd81..46cb8dcb 100644
--- a/src/pages/courseRecord/components/examRecordItem.vue
+++ b/src/pages/courseRecord/components/examRecordItem.vue
@@ -122,20 +122,19 @@
margin: 17rpx 20rpx;
background-color: #fff;
border-radius: 16rpx;
- padding: 32rpx 22rpx;
+ padding: 22rpx 22rpx;
.details_div {
display: flex;
.img_div {
position: relative;
- width: 224rpx;
- height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
overflow: hidden;
- border-radius: 22rpx;
-
+ border-radius: 16rpx;
.img {
- width: 224rpx;
- height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
}
.subscript {
@@ -183,7 +182,7 @@
display: flex;
align-items: center;
overflow: hidden;
- height: 116rpx;
+ height: 92rpx;
background-color: #f9fbff;
border-radius: 8rpx;
justify-content: space-around;
diff --git a/src/pages/courseRecord/components/practiceRecordItem.vue b/src/pages/courseRecord/components/practiceRecordItem.vue
index 10da90da..129e69a8 100644
--- a/src/pages/courseRecord/components/practiceRecordItem.vue
+++ b/src/pages/courseRecord/components/practiceRecordItem.vue
@@ -121,20 +121,19 @@
margin: 17rpx 20rpx;
background-color: #fff;
border-radius: 16rpx;
- padding: 32rpx 22rpx;
+ padding: 22rpx 22rpx;
.details_div {
display: flex;
.img_div {
position: relative;
- width: 224rpx;
- height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
overflow: hidden;
- border-radius: 22rpx;
-
+ border-radius: 16rpx;
.img {
- width: 224rpx;
- height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
}
.subscript {
@@ -182,7 +181,7 @@
display: flex;
align-items: center;
overflow: hidden;
- height: 116rpx;
+ height: 92rpx;
background-color: #f9fbff;
border-radius: 8rpx;
justify-content: space-around;
diff --git a/src/pages/courseRecord/components/studyRecordItem.vue b/src/pages/courseRecord/components/studyRecordItem.vue
index 446f92ed..ce72abd4 100644
--- a/src/pages/courseRecord/components/studyRecordItem.vue
+++ b/src/pages/courseRecord/components/studyRecordItem.vue
@@ -122,20 +122,18 @@
margin: 17rpx 20rpx;
background-color: #fff;
border-radius: 16rpx;
- padding: 32rpx 22rpx;
+ padding: 22rpx 22rpx;
.details_div {
display: flex;
-
.img_div {
position: relative;
- width: 224rpx;
- height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
overflow: hidden;
- border-radius: 22rpx;
-
+ border-radius: 16rpx;
.img {
- width: 224rpx;
- height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
}
.subscript {
@@ -183,7 +181,7 @@
display: flex;
align-items: center;
overflow: hidden;
- height: 116rpx;
+ height: 92rpx;
background-color: #f9fbff;
border-radius: 8rpx;
justify-content: space-around;
diff --git a/src/pages/favorites/components/favoritesCourse.vue b/src/pages/favorites/components/favoritesCourse.vue
index 84e422e2..7b313b8e 100644
--- a/src/pages/favorites/components/favoritesCourse.vue
+++ b/src/pages/favorites/components/favoritesCourse.vue
@@ -32,8 +32,8 @@
- 发布：{{ item.issuTm?.substr(0, 10) }}
- 已学：{{ item.accmStdyCnt }}次
+ 发布:{{ item.issuTm?.substr(0, 10) }}
+ 已学:{{ item.accmStdyCnt }}次
@@ -106,7 +106,7 @@
border-radius: 16rpx;
}
.item-swipe-action {
- margin: 32rpx 22rpx;
+ margin: 22rpx 22rpx;
overflow: hidden;
:deep(.uv-swipe-action-item__right__button__wrapper) {
border-radius: 20rpx !important;
@@ -114,18 +114,17 @@
}
.item {
- height: 170rpx;
+ // height: 180rpx;
display: flex;
.img_div {
position: relative;
- width: 224rpx;
- height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
overflow: hidden;
- border-radius: 22rpx;
-
+ border-radius: 16rpx;
.img {
- width: 224rpx;
- height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
}
.subscript {
diff --git a/src/pages/favorites/components/favoritesTask.vue b/src/pages/favorites/components/favoritesTask.vue
index e61b7c8e..2a9705d7 100644
--- a/src/pages/favorites/components/favoritesTask.vue
+++ b/src/pages/favorites/components/favoritesTask.vue
@@ -28,18 +28,18 @@
{{ item.taskName }}
- 起止时间：
+ 起止时间:
{{ item.startTm?.substr(0, 10) }}至{{ item.endTm?.substr(0, 10) }}
-
- 完成人数：
+
+ 完成人数:
{{ item.taskFinishSums ?? 0 }}/{{ item.taskSums ?? 0 }}
-
- 进度：
+
+ 进度:
{{ item.finishCrs ?? item.learnedNumber ?? 0 }}/{{
item.sumCrs ?? item.taskNumber ?? 0
@@ -184,7 +184,7 @@
}
}
.item-swipe-action {
- margin: 32rpx 22rpx;
+ margin: 22rpx 20rpx;
overflow: hidden;
:deep(.uv-swipe-action-item__right__button__wrapper) {
@@ -193,21 +193,20 @@
}
.item {
- height: 170rpx;
display: flex;
.img_div {
position: relative;
- width: 224rpx;
- height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
overflow: hidden;
- border-radius: 22rpx;
-
+ border-radius: 16rpx;
+
.img {
- width: 224rpx;
- height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
}
-
+
.subscript {
position: absolute;
right: 0;
@@ -259,12 +258,15 @@
font-size: 22rpx;
color: #666;
margin-bottom: 22rpx;
-
line-height: 24rpx;
flex-wrap: nowrap;
height: 24rpx;
overflow: hidden;
}
+ .nowrap{
+ flex-wrap: nowrap;
+ display: flex;
+ }
}
}
diff --git a/src/pages/index/components/class_scroll.vue b/src/pages/index/components/class_scroll.vue
index ad235a0f..10ea912e 100644
--- a/src/pages/index/components/class_scroll.vue
+++ b/src/pages/index/components/class_scroll.vue
@@ -1,6 +1,6 @@
-
+
-
+
@@ -11,28 +11,6 @@
-
-
@@ -116,7 +94,7 @@
accmStdyCnt: ''
}
];
- const class_list = ref([...init_class_data]);
+ const class_list = ref([]);
const skeleton = [
{
type: 'flex',
@@ -125,7 +103,7 @@
{
type: 'avatar',
num: 1,
- style: 'marginRight: 22rpx;width: 200rpx;height:150rpx;border-radius:16rpx;'
+ style: 'marginRight: 22rpx;width: 256rpx;height:144rpx;border-radius:16rpx;'
},
{
type: 'line',
@@ -137,6 +115,8 @@
}
];
const get_data = () => {
+
+ class_list.value = [...init_class_data]
fetchFunction().then((res) => {
if (props.name === 'hot_class') {
} else {
@@ -170,32 +150,33 @@
background-color: #ffffff;
border-radius: 22rpx;
box-shadow: #eaeaea 0 0 6rpx;
- padding: 32rpx 22rpx 36rpx 26rpx;
+ padding: 32rpx 20rpx 36rpx 34rpx;
}
.item_div {
- width: 562rpx;
+ // width: 562rpx;
+ width: calc(562rpx + 56rpx);
// display: block;
}
.item {
display: flex;
- width: 562rpx;
+ width: calc(562rpx + 56rpx);
.left {
border-radius: 16rpx;
overflow: hidden;
- width: 200rpx;
- height: 150rpx;
+ width: 256rpx;
+ height: 144rpx;
.img {
- width: 200rpx;
- height: 150rpx;
+ width: 256rpx;
+ height: 144rpx;
}
}
.right {
overflow: hidden;
flex: 1;
- padding-left: 22rpx;
+ padding-left: 16rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
diff --git a/src/pages/learningTasks/components/content-item.vue b/src/pages/learningTasks/components/content-item.vue
index 9fa7823b..61daaf21 100644
--- a/src/pages/learningTasks/components/content-item.vue
+++ b/src/pages/learningTasks/components/content-item.vue
@@ -10,16 +10,16 @@
{{ item.taskName }}
- 起止时间：
+ 起止时间:
{{ item.startTm?.substr(0, 10) }}至{{ item.endTm?.substr(0, 10) }}
- 完成人数：
+ 完成人数:
{{ item.taskFinishSums ?? 0 }}/{{ item.taskSums ?? 0 }}
- 进度：
+ 进度:
{{ item.finishCrs ?? item.learnedNumber ?? 0 }}/{{ item.sumCrs ?? item.taskNumber ?? 0 }}门课程
@@ -102,19 +102,18 @@
}
.item {
padding-top: 16rpx;
- padding-bottom: 16rpx;
+ padding-bottom: 12rpx;
display: flex;
.img_div {
position: relative;
- width: 224rpx;
- height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
overflow: hidden;
- border-radius: 22rpx;
-
+ border-radius: 16rpx;
.img {
- width: 224rpx;
- height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
}
.subscript {
diff --git a/src/pages/learningTasks/details.vue b/src/pages/learningTasks/details.vue
index 8f83cba3..ecb36513 100644
--- a/src/pages/learningTasks/details.vue
+++ b/src/pages/learningTasks/details.vue
@@ -27,7 +27,7 @@
- 起止时间:
+ 起止时间:
{{ detailData.startTm?.substr(0, 10) }}至{{ detailData.endTm?.substr(0, 10) }}
@@ -49,11 +49,11 @@
- 完成人数:
+ 完成人数:
{{ detailData.taskFinishSums ?? 0 }}/{{ detailData.taskSums ?? 0 }}
- 进度:
+ 进度:
{{ detailData.finishCrs ?? 0 }}/{{ detailData.sumCrs ?? 0 }}门课程
@@ -490,13 +490,10 @@
}
.scroll-div {
background: linear-gradient(180deg, #ebf2fe 0%, #f3f7fe 6%, #f9fbff 12%, #f4f6f8 100%);
-
- // background: linear-gradient(180deg, #ebf2fe 0%, #f3f7fe 6%, #fafbfc 12%, #fafbfc 100%);
border-radius: 16rpx;
margin-top: -20rpx;
z-index: 2;
box-shadow: 0 0 10rpx #f9fbff;
-
border: 2rpx solid #f9f9fa;
margin: 0 auto;
width: calc(100% - 52rpx);
@@ -529,7 +526,7 @@
}
.detail_div {
- height: 250rpx;
+ height: 210rpx;
z-index: 2;
width: 100%;
padding: 36rpx 26rpx 20rpx 26rpx;
@@ -556,8 +553,10 @@
border-radius: 0 0 0 28rpx;
}
.left > .img {
- width: 224rpx;
- height: 168rpx;
+ // width: 224rpx;
+ // height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
border-radius: 16rpx;
overflow: hidden;
}
diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue
index 4165298a..f83e2191 100644
--- a/src/pages/me/index.vue
+++ b/src/pages/me/index.vue
@@ -210,6 +210,7 @@
});
// 签到打开
const checkInClick = () => {
+
checkInRef.value.open(
user_info.checkInToday === 1,
user_info.checkInDays,
@@ -217,6 +218,8 @@
(status, days, pointsList = [], badgesList = []) => {
user_info.checkInToday = status ? 1 : 2;
user_info.checkInDays = days;
+ statistics_data['get_statistics_data'](true); // 强制获取统计数据
+
handlePointsBadgePopup(pointsList, badgesList);
}
);
@@ -254,11 +257,11 @@
this.currentRankName = points_data.currentRankName;
}
},
- get_statistics_data: async function () {
+ get_statistics_data: async function (status=false) {
try {
const time_now = Date.now();
let points_data = common.getValue('points_data') || {};
- if (time_now - this.request_time > 300) {
+ if (time_now - this.request_time > 300 && status) {
this.request_time = time_now;
// 获取最新数据
const res = await queryCurrentStatus();
diff --git a/src/pages/messageNotification/index.vue b/src/pages/messageNotification/index.vue
index 2e2b8f86..e3168931 100644
--- a/src/pages/messageNotification/index.vue
+++ b/src/pages/messageNotification/index.vue
@@ -1,5 +1,13 @@
-
+
@@ -32,9 +40,6 @@
{{ item.msgTm?.substr(0, 16) }}
-
@@ -44,7 +49,7 @@
diff --git a/src/pages/preview/components/previewCourse.vue b/src/pages/preview/components/previewCourse.vue
index e992c787..73232dc2 100644
--- a/src/pages/preview/components/previewCourse.vue
+++ b/src/pages/preview/components/previewCourse.vue
@@ -51,19 +51,20 @@
}
.item {
- height: 170rpx;
- margin: 32rpx 22rpx;
+ // height: 170rpx;
+ margin: 22rpx 22rpx;
display: flex;
.img_div {
position: relative;
- width: 224rpx;
- height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
overflow: hidden;
- border-radius: 22rpx;
-
+ border-radius: 16rpx;
.img {
- width: 224rpx;
- height: 168rpx;
+ // width: 224rpx;
+ // height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
}
.subscript {
diff --git a/src/pages/traRecord/components/examRecordItem.vue b/src/pages/traRecord/components/examRecordItem.vue
index 3b8e1857..800a52d9 100644
--- a/src/pages/traRecord/components/examRecordItem.vue
+++ b/src/pages/traRecord/components/examRecordItem.vue
@@ -118,20 +118,19 @@
margin: 17rpx 20rpx;
background-color: #fff;
border-radius: 16rpx;
- padding: 32rpx 22rpx;
+ padding: 22rpx 22rpx;
.details_div {
display: flex;
.img_div {
position: relative;
- width: 224rpx;
- height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
overflow: hidden;
- border-radius: 22rpx;
-
+ border-radius: 16rpx;
.img {
- width: 224rpx;
- height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
}
.subscript {
@@ -179,7 +178,7 @@
display: flex;
align-items: center;
overflow: hidden;
- height: 116rpx;
+ height: 92rpx;
background-color: #f9fbff;
border-radius: 8rpx;
justify-content: space-around;
diff --git a/src/pages/traRecord/components/practiceRecordItem.vue b/src/pages/traRecord/components/practiceRecordItem.vue
index 3cc55c59..69682278 100644
--- a/src/pages/traRecord/components/practiceRecordItem.vue
+++ b/src/pages/traRecord/components/practiceRecordItem.vue
@@ -120,20 +120,19 @@
margin: 17rpx 20rpx;
background-color: #fff;
border-radius: 16rpx;
- padding: 32rpx 22rpx;
+ padding: 22rpx 22rpx;
.details_div {
display: flex;
.img_div {
position: relative;
- width: 224rpx;
- height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
overflow: hidden;
- border-radius: 22rpx;
-
+ border-radius: 16rpx;
.img {
- width: 224rpx;
- height: 168rpx;
+ width: 256rpx;
+ height: 144rpx;
}
.subscript {
@@ -181,7 +180,7 @@
display: flex;
align-items: center;
overflow: hidden;
- height: 116rpx;
+ height: 92rpx;
background-color: #f9fbff;
border-radius: 8rpx;
justify-content: space-around;