From d288ee46765ddc4e289b1fb9eabd44f2920d361a Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Mon, 26 Sep 2022 12:30:00 +0800 Subject: [PATCH] =?UTF-8?q?u=E5=B8=81=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/images/homeWu/agency.png | Bin 0 -> 2680 bytes src/components/Portal/interactBar.vue | 13 ++++ src/components/PortalFloatTools.vue | 16 ++++- src/views/Index.vue | 35 ++++++++-- src/views/ucurrency/Index.vue | 91 ++++++++++++++++++++------ src/views/user/Noteedit.vue | 31 ++++++--- 6 files changed, 149 insertions(+), 37 deletions(-) create mode 100644 public/images/homeWu/agency.png diff --git a/public/images/homeWu/agency.png b/public/images/homeWu/agency.png new file mode 100644 index 0000000000000000000000000000000000000000..10b3865edb0383bd827cb8a68165c3469f099a71 GIT binary patch literal 2680 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
- -

王明 10156597

-

信息技术研发中心|APP应用本部

-
代办3个待处理
+
+ +
+ +

{{userInfo.name}} {{userInfo.userNo}}

+

{{userInfo.departName}}

+
代办3个待处理
  • 累计学习 @@ -410,10 +413,11 @@ export default { name: 'index', components: {AuthorImg, portalHeader,ad, portalFooter, articleImage, portalFloatTools, authorInfo, interactRowBar, interactBar, courseImage }, computed: { - ...mapGetters(['userInfo']) + // ...mapGetters(['userInfo']) }, data() { return { + userInfo:{}, ankingList:[], Popularity:[], scorelist:[], @@ -468,6 +472,7 @@ export default { }; }, mounted() { + this.userInfo = this.$store.getters.userInfo; this.getCourseData(1); this.getCaseData(); this.getArticleData(); @@ -528,9 +533,7 @@ export default { couresreso(){ let key = 'index'; apiPlace.detail(key).then(res=>{ - console.log(res) let lmj = JSON.parse(res.result.content) - console.log(lmj) this.resonimg = lmj // console.log(this.resonimg) }) @@ -822,6 +825,15 @@ export default { padding: 38px 47px 31px 32px; text-align: center; color: #fff; + .personal-img{ + width: 68px; + height: 68px; + margin: 0 auto; + ::v-deep .el-avatar{ + width: 68px; + height: 68px; + } + } .personal-name{ font-weight: 600; font-size: 18px; @@ -843,6 +855,15 @@ export default { padding: 19px 14px 19px 22px; display: flex; justify-content: space-between; + position: relative; + .personal-box-img{ + position: absolute; + width: 24px; + height: 24px; + left:10px; + top:-8px; + + } } .personal-ul{ diff --git a/src/views/ucurrency/Index.vue b/src/views/ucurrency/Index.vue index 6f022656..d4a31064 100644 --- a/src/views/ucurrency/Index.vue +++ b/src/views/ucurrency/Index.vue @@ -133,27 +133,66 @@

    学习

    - - - - - - - + + + + + + + + + - + +
    +
    +

    知识贡献

    + + + + + + + + + + + +
    @@ -178,7 +217,19 @@ return{ getUType, dialogVisible:false, - tableData:[], + tableData:[ + {name:'试听学习',hear:['每日累计学习10分钟','每日累计学习20分钟','每日累计学习30分钟','每日累计学习45分钟','每日累计学习60分钟',],value:[10,20,30,40,50],upperlimit:50}, + {name:'案例学习',hear:['完成一个案例的阅读（最低三分钟）',],value:[5],upperlimit:30}, + {name:'文章学习',hear:['完成一个文章的阅读（最低2分钟）',],value:[5],upperlimit:30}, + ], + tableList:[ + {name:'发布音视频课程',hear:['完成一个案音视频课',],value:[60],upperlimit:null}, + {name:'面授课记录',hear:['有一个完成的面授课记录（<4h）','有一个完成的面授课记录（>=4h）'],value:[40,60],upperlimit:null}, + {name:'发布文章',hear:['每发布1篇文章',],value:[40],upperlimit:null}, + {name:'发布案例',hear:['每发布1篇案例',],value:[50],upperlimit:null}, + {name:'发布笔记',hear:['每发布公开笔记1篇',],value:[5],upperlimit:30}, + {name:'发表评论',hear:['在课程，问答，案例中发表1个评论',],value:[2],upperlimit:20}, + ], uCoinRecord:[], chart:null, } diff --git a/src/views/user/Noteedit.vue b/src/views/user/Noteedit.vue index de94f3b0..dacea67a 100644 --- a/src/views/user/Noteedit.vue +++ b/src/views/user/Noteedit.vue @@ -4,6 +4,7 @@

    笔记编辑

    {{isShowTip}} + 历史记录
    @@ -20,7 +21,7 @@ 公开 私密 - 取消 + 取消 确定
    @@ -31,7 +32,7 @@
    编辑了笔记 - 2022/4/5 22:42:32 + {{item.sysCreateTime}}
    @@ -46,7 +47,6 @@
    -
@@ -151,10 +151,21 @@ export default { height: 300px; } .edti-hist{ + position: absolute; + right: -10px; + top:-20px; + width: 380px; + padding-left: 30px; + box-sizing: border-box; margin: 0; font-size: 18px; font-weight: 600; color: #333333; + background: #FFFFFF; + box-shadow: -9px 2px 25px 0px rgba(119,119,119,0.16); + min-height: 400px; + overflow-y: auto; + border-radius: 4px; .histinfo{ // background: #F2F5F7; .hist-cont{ @@ -261,12 +272,19 @@ export default { } .box{ + position: relative; width: 100%; height: 100%; display: flex; .edit-box{ flex: 1; padding-right: 30px; + .his-info{ + float: right; + font-weight: 600 !important; + color: #333333 !important; + font-size: 18px; + } .edit-hear{ height: 40px; border-bottom: 1px solid #ddd; @@ -288,12 +306,7 @@ export default { } } } - .edti-hist{ - width: 478px; - // background-color: #F2F5F7; - padding-left: 30px; - box-sizing: border-box; - } + } \ No newline at end of file