diff --git a/public/images/back(1).png b/public/images/back(1).png new file mode 100644 index 00000000..5a6c7510 Binary files /dev/null and b/public/images/back(1).png differ diff --git a/public/images/back.png b/public/images/back.png index 5a6c7510..8c8efe12 100644 Binary files a/public/images/back.png and b/public/images/back.png differ diff --git a/public/images/contact(1).png b/public/images/contact(1).png new file mode 100644 index 00000000..acbc315d Binary files /dev/null and b/public/images/contact(1).png differ diff --git a/public/images/contact.png b/public/images/contact.png index acbc315d..ace95772 100644 Binary files a/public/images/contact.png and b/public/images/contact.png differ diff --git a/public/images/essay(1).png b/public/images/essay(1).png new file mode 100644 index 00000000..c553a3b6 Binary files /dev/null and b/public/images/essay(1).png differ diff --git a/public/images/essay.png b/public/images/essay.png index c553a3b6..fd558b39 100644 Binary files a/public/images/essay.png and b/public/images/essay.png differ diff --git a/public/images/explo(1).png b/public/images/explo(1).png new file mode 100644 index 00000000..30801297 Binary files /dev/null and b/public/images/explo(1).png differ diff --git a/public/images/explo.png b/public/images/explo.png index 30801297..beeea701 100644 Binary files a/public/images/explo.png and b/public/images/explo.png differ diff --git a/public/images/issue(1).png b/public/images/issue(1).png new file mode 100644 index 00000000..c2bcdb7a Binary files /dev/null and b/public/images/issue(1).png differ diff --git a/public/images/issue.png b/public/images/issue.png index c2bcdb7a..d1ba0709 100644 Binary files a/public/images/issue.png and b/public/images/issue.png differ diff --git a/public/images/opinion(1).png b/public/images/opinion(1).png new file mode 100644 index 00000000..d473c1f3 Binary files /dev/null and b/public/images/opinion(1).png differ diff --git a/public/images/opinion.png b/public/images/opinion.png index d473c1f3..311eb815 100644 Binary files a/public/images/opinion.png and b/public/images/opinion.png differ diff --git a/src/api/phase2/note.js b/src/api/phase2/note.js index fef48e8e..8b962c21 100644 --- a/src/api/phase2/note.js +++ b/src/api/phase2/note.js @@ -61,12 +61,6 @@ const history=function (noteId){ return ajax.get(baseURL,'/xboe/subgroup/m/noteinfo/modify/history?noteId='+noteId); } -/** - * 分页查询我发布的，收藏的，点赞的笔记 弃用 - * */ -const pagelist=function (query){ - return ajax.get(baseURL,'/xboe/subgroup/m/noteinfo/pagelist',query); -} /** * 我的笔记 @@ -123,6 +117,21 @@ const exportPdf=function (data){ return ajax.postJson(baseURL,'/xboe/subgroup/m/noteinfo/exportPdf',data); } +/** + * 我的笔记收藏和分享都是这一个，目前只有收藏 + * @param{ + * paegIndex + * pageSize + * dataType 1收藏 2分享 + * orderType 排序顺序 顺序倒叙 + * orderField 排序字段 + * keyword 关键字查询 + * } + * */ +const pagelist=function (query){ + return ajax.post('/xboe/subgroup/m/noteinfo/pagelist',query); +} + export default { save, detail, diff --git a/src/assets/styles/portal.scss b/src/assets/styles/portal.scss index 81a6f8ca..6dcb0b5c 100644 --- a/src/assets/styles/portal.scss +++ b/src/assets/styles/portal.scss @@ -10,7 +10,7 @@ body { .xcontent{ // width: 1000px; // margin: 0px auto; - // margin: 0px 5%; + margin: 0px 5%; } .index-course{ // width: 25%; diff --git a/src/assets/styles/uc.scss b/src/assets/styles/uc.scss index c94a5406..ad3162fb 100644 --- a/src/assets/styles/uc.scss +++ b/src/assets/styles/uc.scss @@ -1,3 +1,64 @@ /** * 用户中心的一些通用样式，定义在这里面 - */ \ No newline at end of file + */ + .uc-center-page{ + font-size: 18px; + font-weight: 600; + color: #333333; + line-height: 36px; + margin-right: 44px; + } + .uc-center-one-title{ + font-size: 18px; + font-weight: 600; + color: #333333; + } + .uc-center-title{ + font-size: 16px; + font-weight: 600; + color: #333333; + } + .uc-center-time{ + font-size: 14px; + color: #666666; + } + .uc-center-icon{ + font-size: 12px; + color: #999999; + } + .el-message-box{ + width: 502px; + height: 282px; + } + .el-message-box__header{ + display: none; + } + .el-message-box__content{ + text-align: center; + margin-top: 86px; + padding: 0; + font-weight: 600; + color: #333333; + font-size: 22px; + .el-message-box__status{ + display: none; + } + } + .el-message-box__btns{ + margin-top: 60px; + text-align: center; + .el-button{ + width: 140px; + height: 40px; + border-radius: 4px; + border: 1px solid #387DF7; + + } + + } + .el-message-box__btns button:nth-child(1) { + color: #387DF7; +} + .el-message-box__btns button:nth-child(2) { + margin-left:20px; +} diff --git a/src/components/NoteUpload/index.vue b/src/components/NoteUpload/index.vue index 84bcfe18..9956f847 100644 --- a/src/components/NoteUpload/index.vue +++ b/src/components/NoteUpload/index.vue @@ -24,6 +24,7 @@ --> - + @@ -105,6 +106,10 @@ type: Boolean, default: false }, + isClear:{ + type: Boolean, + default: false + } }, data() { return { @@ -119,6 +124,13 @@ } }; }, + watch: { + isClear(val) { + if(!val) { + this.clearFiles(); + } + } + }, computed: { // 是否显示提示 showTip() { @@ -145,8 +157,10 @@ }, }, methods: { + clearFiles() { + this.$refs["myUpload"].clearFiles(); + }, handleUploadRemove(file) { - console.log(file,'file'); this.$emit("remove",file); }, // 上传前校检格式和大小 @@ -220,7 +234,6 @@ } }, created() { - this.fileList = this.list; }, }; diff --git a/src/components/Portal/noteComment.vue b/src/components/Portal/noteComment.vue index 0aee5e76..3fa35f60 100644 --- a/src/components/Portal/noteComment.vue +++ b/src/components/Portal/noteComment.vue @@ -28,7 +28,7 @@
- +
@@ -63,7 +63,7 @@
- +
@@ -176,6 +176,10 @@ readonly:{ type:Boolean, default:false + }, + name:{ + type:String, + default:'' } }, components:{showTime,authorInfo,interactBar}, @@ -324,6 +328,7 @@ let ids=[]; let allList=[]; res.result.list.forEach(item=>{ + item.title = this.name; item.replyList = []; item.avatar=''; item.orgInfo=''; @@ -334,6 +339,7 @@ ids.push(item.sysCreateAid); if(item.replyList && item.replyList!=''){ item.replyList.forEach(reply=>{ + reply.title=this.name; reply.avatar=''; reply.orgInfo=''; reply.name=''; @@ -412,6 +418,7 @@ if(res.status==200){ // this.list.unshift(res.result); // this.sex = + res.result.title = this.name; res.result.sex=null; res.result.isAll=false; this.list.unshift(res.result); diff --git a/src/components/PortalFloatTools.vue b/src/components/PortalFloatTools.vue index 4596702b..5c6e8a8c 100644 --- a/src/components/PortalFloatTools.vue +++ b/src/components/PortalFloatTools.vue @@ -6,32 +6,32 @@
- 做课程 +
- 提问题 +
- 写文章 +
- 提意见 +
- 联系我们 +
- 返回顶部 +
-
+
- + diff --git a/src/views/exam/MyExamTask.vue b/src/views/exam/MyExamTask.vue index 035cc29c..9d762ea6 100644 --- a/src/views/exam/MyExamTask.vue +++ b/src/views/exam/MyExamTask.vue @@ -1,8 +1,9 @@