From b3fb6a36b4f2e76002f24c15a15c6abb2794d9e4 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Fri, 10 Jun 2022 10:33:13 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=94=BE=E5=BC=80=E5=85=A8=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/share/MyList.vue | 6 +++--- src/views/share/ToList.vue | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/share/MyList.vue b/src/views/share/MyList.vue index 752c330f..45d53a83 100644 --- a/src/views/share/MyList.vue +++ b/src/views/share/MyList.vue @@ -25,7 +25,7 @@ - + @@ -171,7 +171,7 @@ data(){ return { isRead: '', - tabName:'course', + tabName:'all', keyword:'', courseIndex:null, qaIndex:null, diff --git a/src/views/share/ToList.vue b/src/views/share/ToList.vue index 07d27634..1a720ce4 100644 --- a/src/views/share/ToList.vue +++ b/src/views/share/ToList.vue @@ -18,7 +18,7 @@ - +
@@ -160,7 +160,7 @@ export default { return { isSearh:false, isRead: '', - tabName: 'course', + tabName: 'all', keyword: '', courseIndex: null, qaIndex: null, From 155f0fc3feed227b3d6562312f7f5b31d12969de Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Fri, 10 Jun 2022 10:51:41 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/article/Detail.vue | 2 +- src/views/portal/case/Detail.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/portal/article/Detail.vue b/src/views/portal/article/Detail.vue index f6eb7b41..c753ea75 100644 --- a/src/views/portal/article/Detail.vue +++ b/src/views/portal/article/Detail.vue @@ -28,7 +28,7 @@
-
+
diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue index f6655f71..a6a7586e 100644 --- a/src/views/portal/case/Detail.vue +++ b/src/views/portal/case/Detail.vue @@ -352,7 +352,7 @@ export default { .case-summary{ margin-top: 10px; font-size: 15px; - color: #454545; + color: #121212; word-break:break-all; line-height: 25px; } From c35f1e8f79c618fa74347031a1fa27eaf60f8c83 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Fri, 10 Jun 2022 11:30:48 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PdfPreview/view.vue | 3 --- src/components/Portal/interactBar.vue | 26 ++++++++++++++++++++--- src/store/getters.js | 2 ++ src/store/index.js | 4 +++- src/store/modules/pdf.js | 30 +++++++++++++++++++++++++++ src/views/portal/case/Detail.vue | 8 +++---- 6 files changed, 62 insertions(+), 11 deletions(-) create mode 100644 src/store/modules/pdf.js 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..0a89c830 100644 --- a/src/components/Portal/interactBar.vue +++ b/src/components/Portal/interactBar.vue @@ -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,'收藏了我发布的'); } 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/portal/case/Detail.vue b/src/views/portal/case/Detail.vue index a6a7586e..8e56385f 100644 --- a/src/views/portal/case/Detail.vue +++ b/src/views/portal/case/Detail.vue @@ -39,19 +39,19 @@
{{ caseDetail.summary }}
- +
- +
- +
返回顶部 @@ -352,7 +352,7 @@ export default { .case-summary{ margin-top: 10px; font-size: 15px; - color: #121212; + color: #454545; word-break:break-all; line-height: 25px; } From 0947f6de98ede75f5406c4b78ff393ef0ef10064 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Fri, 10 Jun 2022 12:08:36 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E6=94=BE=E5=A4=A7=E7=BC=A9=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Portal/interactBar.vue | 2 +- src/views/portal/case/Detail.vue | 34 ++++++++++++++++++++------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue index 0a89c830..5bb87b80 100644 --- a/src/components/Portal/interactBar.vue +++ b/src/components/Portal/interactBar.vue @@ -497,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/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue index 8e56385f..af8e106c 100644 --- a/src/views/portal/case/Detail.vue +++ b/src/views/portal/case/Detail.vue @@ -50,11 +50,21 @@
-
- -
-
- 返回顶部 +
+
+
+ + +
+
+
+
+ +
+
+ 返回顶部 +
+
@@ -65,7 +75,7 @@
-
+
@@ -153,7 +163,6 @@ import { mapGetters } from 'vuex'; import portalHeader from '@/components/PortalHeader.vue'; import portalFooter from '@/components/PortalFooter.vue'; import pdfPreview from '@/components/PdfPreview/view.vue'; - import interactBar from '@/components/Portal/interactBar.vue'; import comments from '@/components/Portal/comments.vue'; import apiCase from '@/api/modules/cases.js'; @@ -172,6 +181,7 @@ export default { }, data() { return { + zoomShow:true, isTopBoxShow:true, toUsers:[], ankingList:[], @@ -204,6 +214,9 @@ export default { ); }, methods: { + zoomBox(){ + this.zoomShow = !this.zoomShow; + }, jumpRouter(item) { // console.log(item) location.href =`${this.webBaseUrl}/case/detail?id=${item.id}` @@ -238,7 +251,7 @@ export default { } } if(pdfPreview.getBoundingClientRect().top < 0) { - document.querySelector('#pdfTopBox').style.cssText = `position: fixed;bottom:0;width:${contentDiv-9}px`; + document.querySelector('#pdfTopBox').style.cssText = `position: fixed;bottom:0;box-shadow: -3px 3px 10px 10px rgba(90, 119, 186, .2);width:${contentDiv-9}px;`; } else { document.querySelector('#pdfTopBox').style.cssText = "position:static"; } @@ -325,6 +338,9 @@ export default {