-
{{ ca.authorInfo.orgInfo }}
+
{{ ca.authorInfo.orgInfo }}
@@ -425,6 +425,12 @@
+
+
+
+ 登录勋章显示,根据UI显示修改
+
+
@@ -448,19 +454,11 @@
import articleImage from '@/components/Article/articleImage.vue';
import InterestCollection from '@/components/Portal/interestCollection.vue'
import GuideBox from '@/components/Portal/guideBox.vue'
- import {
- toScore,
- cutFullName,
- formatUserNumber,
- cutOrgNamePath
- } from '@/utils/tools.js';
- import {
- swiper,
- swiperSlide,
- } from 'vue-awesome-swiper';
+ import { toScore,formatUserNumber,cutOrgNamePath} from '@/utils/tools.js';
+ import {swiper,swiperSlide} from 'vue-awesome-swiper';
import apiPlace from "@/api/phase2/place.js"
import authorImg from '@/components/Portal/authorImg.vue';
- import apiStart from '@/api/phase2/stat.js'
+ import apiStat from '@/api/phase2/stat.js'
import apiIndex from '@/api/phase2/index.js'
import apiUserhobby from "@/api/phase2/userhobby.js"
export default {
@@ -480,9 +478,25 @@
},
created() {
this.$store.dispatch('refrashStudyTaskCount');
+ //判断是否弹出登录勋章,设置截止日期
+ var nowDate = new Date();
+ var endDate = new Date('2022-11-18');//先设置时间是11月18日
+ if(nowDate
{
+ if(rs.status==200){
+ if(rs.result.show){
+ //弹出勋章
+ $this.showLoginMedal=true;
+ }
+ }
+ })
+ }
+
},
data() {
return {
+ showLoginMedal:false,//是否显示登录勋章
lastStudy:{},
overlayShow:false,
userData: { uvalue:0, totalStudyHour:0 },
@@ -504,10 +518,10 @@
// noSwiping: true,
},
swiperOption: {
- autoplay:{
+ autoplay:{
delay:2000,
disableOnInteraction:false, //解决滑动后不能轮播的问题
- },
+ },
speed: 3000, //切换速度,即slider自动滑动开始到结束的时间(单位ms)
loop: true, //循环切换
peed: 300, //循环速度
@@ -522,7 +536,7 @@
prevEl: '.swiper-button-prev',
},
},
-
+
couname: '',
isNext: true,
pageIndex: 1,
@@ -667,7 +681,7 @@
return this.webBaseUrl+'/images/listblue0'+(index+1)+'.png';
},
getLevel() { //获取经验值和等级
- apiStart.getUserStatTotalInfo(this.userInfo.aid).then(res => {
+ apiStat.getUserStatTotalInfo(this.userInfo.aid).then(res => {
if (res.status == 200) {
this.userData = res.result;
//console.log(this.userData,'this.userData')
@@ -855,7 +869,7 @@
list.forEach((item, index) => {
res.result.some(author => {
if (author.aid == item.authorId) {
- author.orgInfo = cutFullName(author.orgInfo, 1);
+ author.orgInfo = cutOrgNamePath(author.orgInfo, 1);
item.authorInfo = author;
return true;