diff --git a/src/components/PdfPreview/view.vue b/src/components/PdfPreview/view.vue index 138dbe09..26ad41cb 100644 --- a/src/components/PdfPreview/view.vue +++ b/src/components/PdfPreview/view.vue @@ -64,9 +64,6 @@ export default { type: Boolean, default: false, }, - data:{ - type:Object, - }, boxShow:{ type: Boolean, default: true, diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue index 96687311..12f68ec2 100644 --- a/src/components/Portal/interactBar.vue +++ b/src/components/Portal/interactBar.vue @@ -43,12 +43,12 @@
- + {{ data.views}}
- +
@@ -141,6 +141,10 @@ export default { theme:{ type:Number, default:1 + }, + unicom:{ + type:Boolean, + default:false } }, data(){ @@ -159,7 +163,7 @@ export default { }, computed:{ - ...mapGetters(['userInfo']), + ...mapGetters(['userInfo','praisesUnicom','favoritesUnicom']), showAlign(){ if(this.align=='left'){ @@ -170,6 +174,12 @@ export default { } }, watch:{ + praisesUnicom(newVal){ + this.isPraise = newVal; + }, + favoritesUnicom(newVal){ + this.isFavorite = newVal; + }, data(newVal,oldVal){ // console.log(newVal,'newVal'); // if(newVal && newVal.id!=''){ @@ -178,7 +188,6 @@ export default { } }, created(){ - }, mounted() { if(this.data && this.data.id && !this.readonly){ @@ -266,7 +275,6 @@ export default { this.shareShow=true; }, addPraise(){ - if(this.type==0){ console.log('未设置type值,1表课程,2表文章，3表案例，4表问答') return; @@ -296,6 +304,9 @@ export default { this.data.praises--; } this.isPraise=false; + if(this.unicom) { + this.$store.dispatch("unicomPraises",false) + } this.$message({message:'取消点赞',type:'success'}) }else{ console.log('取消失败：'+res.message); @@ -308,6 +319,9 @@ export default { if(res.result){ this.data.praises++; } + if(this.unicom) { + this.$store.dispatch("unicomPraises",true) + } if(this.type!=1&&this.type!=5){ this.messageSave(this.data.id,this.data.title,this.userInfo.name,this.data.sysCreateBy,this.data.sysCreateAid,'点赞了我的'); } @@ -356,6 +370,9 @@ export default { if(res.result){ this.data.favorites--; } + if(this.unicom) { + this.$store.dispatch("unicomFavorites",false) + } this.$message({message:'已取消收藏',type:'success'}); //this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功，false代表已存在 }else{ @@ -370,6 +387,9 @@ export default { if(res.result){ this.data.favorites++; } + if(this.unicom) { + this.$store.dispatch("unicomFavorites",true) + } if(this.type===2||this.type===4){ this.messageSave(this.data.id,this.data.title,this.userInfo.name,this.data.sysCreateBy,this.data.sysCreateAid,'收藏了我发布的'); } @@ -477,11 +497,11 @@ export default { } apiShares.save(postData).then(rs=>{ $this.shareShow=false; - $this.data.shares++; if(rs.status!=200){ this.$message.error("分享失败") }else{ if(rs.result){ + $this.data.shares++; this.$message.success("分享成功") if(this.type!=3){ if(this.type==1){ diff --git a/src/icons/svg/eyes.svg b/src/icons/svg/eyes.svg new file mode 100644 index 00000000..3331f89c --- /dev/null +++ b/src/icons/svg/eyes.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/store/getters.js b/src/store/getters.js index 96c8389f..45352469 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -21,5 +21,7 @@ const getters = { userMsg:state => state.user.msg, messagesBeReviewed:state => state.user.messagesBeReviewed, studyTaskCount:state => state.user.studyTaskCount, + praisesUnicom:state =>state.pdf.praisesUnicom, + favoritesUnicom:state =>state.pdf.favoritesUnicom, } export default getters diff --git a/src/store/index.js b/src/store/index.js index c8f8a46f..a5f50166 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -9,6 +9,7 @@ import portal from './modules/portal' import getters from './getters' import sysType from './modules/sysType' import resOwner from './modules/resOwner' +import pdf from './modules/pdf' Vue.use(Vuex) @@ -21,7 +22,8 @@ const store = new Vuex.Store({ settings, portal, sysType, - resOwner + resOwner, + pdf }, getters }) diff --git a/src/store/modules/pdf.js b/src/store/modules/pdf.js new file mode 100644 index 00000000..7a79c01e --- /dev/null +++ b/src/store/modules/pdf.js @@ -0,0 +1,30 @@ + +const state = { + praisesUnicom: false, + favoritesUnicom: false, +} + +const mutations = { + SET_praisesUnicom: (state, iden) => { + state.praisesUnicom = iden + }, + SET_favoritesUnicom: (state, iden) => { + state.favoritesUnicom = iden + }, +} + +const actions = { + unicomPraises({ commit }, data) { + commit('SET_praisesUnicom', data) + }, + unicomFavorites({ commit }, data) { + commit('SET_favoritesUnicom', data) + } +} + +export default { + state, + mutations, + actions +} + diff --git a/src/views/course/WaitAudit.vue b/src/views/course/WaitAudit.vue index a0891550..4b5fdd85 100644 --- a/src/views/course/WaitAudit.vue +++ b/src/views/course/WaitAudit.vue @@ -73,6 +73,11 @@ + + +