diff --git a/src/api/phase2/note.js b/src/api/phase2/note.js index 7d4b2c34..c5612563 100644 --- a/src/api/phase2/note.js +++ b/src/api/phase2/note.js @@ -106,8 +106,8 @@ const ids=function (data){ * } * */ const exportExcel=function (data){ - // return ajax.postJsonToFile(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data); - return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data); + return ajax.postJsonToFile(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data); + // return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data); } /** diff --git a/src/api/phase2/stat.js b/src/api/phase2/stat.js index ffd539b9..d1c927f5 100644 --- a/src/api/phase2/stat.js +++ b/src/api/phase2/stat.js @@ -48,6 +48,20 @@ const userDynamicList = function(data) { return ajax.post(baseURL,'/xboe/m/stat/userdynamic/list',data); } +/** + * 用户动态，分页查询 + * + * @param { + pageIndex, + pageSize, + contentType:'',内容类型 + aid 数组 + } data + */ +const userDynamicfollows = function(data) { + return ajax.postJson(baseURL,'/xboe/m/stat/userdynamic/follows',data); +} + /** * 获取用户全部勋章 * @param {String} aid 用户的id @@ -131,6 +145,7 @@ const getRanking = function(queryData) { } + export default { sendEvent, userTotal, @@ -142,5 +157,6 @@ export default { dynamicHide, exportUserCoinRecord, getRanking, - getUserStatTotalInfo + getUserStatTotalInfo, + userDynamicfollows } diff --git a/src/components/Article/editItems.vue b/src/components/Article/editItems.vue index 9d378067..3d08d0f2 100644 --- a/src/components/Article/editItems.vue +++ b/src/components/Article/editItems.vue @@ -3,7 +3,7 @@ - +
diff --git a/src/components/HomePage/homePage.vue b/src/components/HomePage/homePage.vue index e2efd0ca..865a539d 100644 --- a/src/components/HomePage/homePage.vue +++ b/src/components/HomePage/homePage.vue @@ -119,6 +119,7 @@ apiFollow.remove(this.pageId).then(res=>{ if(res.status == 200) { this.isFollowHas = false; + this.$message.success("取消关注成功"); } else { this.$message.error(res.message); } @@ -157,7 +158,7 @@ toFollow() { apiFollow.save(this.pageId).then(res=>{ if(res.status == 200) { - this.$message.success(res.message); + this.$message.success("关注成功"); this.followHas(); } else { this.$message.error(res.message); diff --git a/src/components/Portal/guideBox.vue b/src/components/Portal/guideBox.vue index c2a71051..dcf221ae 100644 --- a/src/components/Portal/guideBox.vue +++ b/src/components/Portal/guideBox.vue @@ -57,7 +57,7 @@ disableOnInteraction: false , delay: 2000, }, - speed: 1000, //切换速度，即slider自动滑动开始到结束的时间（单位ms） + speed: 2000, //切换速度，即slider自动滑动开始到结束的时间（单位ms） loop:true, //循环切换 observe:true, peed: 300,//循环速度 diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index 24d76a4e..94df2a76 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -362,7 +362,8 @@ text-align: center; // margin: 0 87px; height: 72px; display: flex; - background: rgba(255,255,255,0.12); + background: rgba(255,255,255,0.1); + border: 1px solid rgba(61,61,61,0.15); backdrop-filter: blur(10px); } .portal-top{ diff --git a/src/components/Qa/addQuestion.vue b/src/components/Qa/addQuestion.vue index d424743b..c8ba149b 100644 --- a/src/components/Qa/addQuestion.vue +++ b/src/components/Qa/addQuestion.vue @@ -10,7 +10,7 @@ - + diff --git a/src/views/Index.vue b/src/views/Index.vue index 9771b970..e9a2ddb1 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -1298,24 +1298,26 @@ ::v-deep .swiper-pagination{ line-height: 25px; height: 32px; - background: rgba(0,0,0,0.5); border-radius: 19px; // background: rgba($color: #000000, $alpha: 0.1); width: auto; - left:48%; + left:45%; padding: 0 20px; border-radius: 19px; .swiper-pagination-bullet{ - background: #000; width: 24px; height: 2px; - background: rgba($color: #fff, $alpha: 0.5); + background: #fff; + opacity: 1 !important; + // background: rgba($color: #fff, $alpha: 0.5); border-radius: 2px; } .swiper-pagination-bullet-active{ height: 2px; + opacity: 1 !important; width: 24px; - background: rgba($color: #fff, $alpha: 0.8); + background: #387DF7; + // background: rgba($color: #fff, $alpha: 0.8); border-radius: 2px; } .swiper-container{ diff --git a/src/views/portal/article/Detail.vue b/src/views/portal/article/Detail.vue index ac94a534..bedbdfed 100644 --- a/src/views/portal/article/Detail.vue +++ b/src/views/portal/article/Detail.vue @@ -80,10 +80,10 @@
-
+ - -
+ + diff --git a/src/views/portal/article/Index.vue b/src/views/portal/article/Index.vue index c0cfd636..b3eda535 100644 --- a/src/views/portal/article/Index.vue +++ b/src/views/portal/article/Index.vue @@ -100,10 +100,10 @@ -
+ - -
+ + diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue index a45495e6..9006bcdc 100644 --- a/src/views/portal/case/Detail.vue +++ b/src/views/portal/case/Detail.vue @@ -151,10 +151,10 @@ -
+ - -
+ + diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue index 656a21ac..026cf613 100644 --- a/src/views/portal/case/Index.vue +++ b/src/views/portal/case/Index.vue @@ -16,7 +16,7 @@
- + 组织领域
@@ -33,7 +33,7 @@
- + 专业分类
@@ -174,10 +174,10 @@
-
+ - -
+ +
@@ -776,7 +776,7 @@ export default { font-size: 18px; font-weight: 600; color: #333333; - width: 73%; + width: 67%; display: -webkit-box; overflow: hidden; word-break: break-all; diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 3224c44d..f8600b40 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -23,7 +23,8 @@ 全部 录播课 - 线下课 + 线下课 +
学习项目 @@ -39,6 +40,7 @@ 全部 {{item.name}} +
U选小课堂 @@ -148,7 +150,7 @@ {{ item.name }} - + {{ item.name }} @@ -195,7 +197,7 @@ {{ item.name }} - + {{ item.name }} @@ -242,7 +244,7 @@ {{ item.courseName }} - + {{ item.courseName }}
@@ -267,10 +269,10 @@
-
+ - -
+ + @@ -874,6 +876,18 @@ export default {