Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat

2025-12-09 10:56:44 +08:00 · 2022-09-13 20:50:53 +08:00
parent a6680bfbb3 9a2e3a2d2e
commit a4641ab931
32 changed files with 1051 additions and 82 deletions
--- a/public/images/daochubg.png
+++ b/public/images/daochubg.png
--- a/public/images/luSketch.png
+++ b/public/images/luSketch.png
--- a/public/images/medal.png
+++ b/public/images/medal.png
--- a/public/images/weiSketch.png
+++ b/public/images/weiSketch.png
--- a/src/api/modules/userhobby.js
+++ b/src/api/modules/userhobby.js
@@ -0,0 +1,54 @@
+// import ajax from '@/utils/xajax.js'
+import ajax from '../cesource/index.js'
+
+
+/**
+ * 用户采集的添加
+ * @param{
+ *    type 类型 1表课程分类
+ *    refId 关联的id
+ *    refCode 关联的code
+ * }
+ * */
+const save=function (data){
+  return ajax.postJson('/xboe/subgroup/m/userhobby/save',data);
+}
+
+/**
+ * 同兴趣人匹配查询
+ * 参数：下面那个接口的返回值直接传
+ * */
+const list=function (data){
+  return ajax.postJson('/xboe/subgroup/m/userhobby/list',data);
+}
+
+/**
+ * 获取用户兴趣关联的id
+ * */
+const info=function (){
+  return ajax.get('/xboe/subgroup/m/userhobby/info');
+}
+
+/**
+ * 修改用户兴趣爱好兴趣爱好，
+ * 参数是上一个接口 info查出来的返回值
+ * */
+const update=function (data){
+  return ajax.postJson('/xboe/subgroup/m/userhobby/update',data);
+}
+
+/**
+ * 删除
+ * */
+const del=function (id){
+  return ajax.get('/xboe/subgroup/m/userhobby/delete?id='+id);
+}
+
+export default {
+  save,
+  list,
+  info,
+  update,
+  del
+}
+
--- a/src/api/modules/userstart.js
+++ b/src/api/modules/userstart.js
@@ -1,4 +1,4 @@
-import ajax from '@/utils/xajax.js'
+import ajax from '../event/index.js'



@@ -9,7 +9,7 @@ import ajax from '@/utils/xajax.js'
 * }
 * */
 const user=function (query){
-  return ajax.post('/xboe/stat/m/user/current/user',query);
+  return ajax.postJson('/xboe/stat/m/user/current',query);
 }

 /**
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -8,8 +8,8 @@ import ajax from '@/utils/xajax.js'
 * name 姓名
 * userNo 工号
 * departId 部门ID
- * } query 
- * @returns 
+ * } query
+ * @returns
 */
 const list=function(query) {
    return ajax.get('/xboe/sys/user/page',{params:query});
@@ -19,8 +19,8 @@ const list=function(query) {
 * 通过用户名查询用户信息(该接口限定使用场景为先查本地库后查旧系统)
 * @param {
 * 用户名
- * } name 
- * @returns 
+ * } name
+ * @returns
 */
 const searchLoginName = function(name) {
    return ajax.get('/xboe/sys/user/search-loginname?loginName='+name);
@@ -28,8 +28,8 @@ const searchLoginName = function(name) {

 /**
 * 根据多个人员的id，得到用户的信息（简要信息）
- * @param {账号ID数组} ids 
- * @returns 
+ * @param {账号ID数组} ids
+ * @returns
 */
 const getByIds = function(ids) {
    return ajax.postJson('/xboe/sys/user/ids',ids);
@@ -37,8 +37,8 @@ const getByIds = function(ids) {

 /**
 * 根据loginName，得到用户的信息（简要信息）
- * @param {用户名} loginName 
- * @returns 
+ * @param {用户名} loginName
+ * @returns
 */
 const getByLoginName = function(loginName) {
    return ajax.get('/xboe/sys/user/loginname?loginName='+loginName);
@@ -46,7 +46,7 @@ const getByLoginName = function(loginName) {

 /**
 * 根据name，得到用户的信息（简要信息）
- * @param {用户姓名} name 
+ * @param {用户姓名} name
 * @returns 返回列表
 */
 const findByName = function(name) {
@@ -55,18 +55,35 @@ const getByLoginName = function(loginName) {

 /**
 * 得到用户详情（详细信息）
- * @param {*} id 
- * @returns 
+ * @param {*} id
+ * @returns
 */
 const detail = function(id) {
    return ajax.get('/xboe/sys/user/detail?id='+id);
 }

+/**
+ * 修改用户信息
+ * 参数是下面的返回值里的user
+ * */
+const update=function (data){
+  return ajax.get('/xboe/sys/user/update',data);
+}
+
+/**
+ * 新的用户详情
+ * */
+const detailUser=function (id){
+  return ajax.get('/xboe/sys/user/detail-user?id='+id);
+}
+
 export default{
    list,
    searchLoginName,
    getByIds,
    getByLoginName,
    findByName,
-    detail
+    detail,
+  detailUser,
+  update
 }
--- a/src/assets/styles/portal-index.scss
+++ b/src/assets/styles/portal-index.scss
@@ -152,4 +152,8 @@
    100% {
        bottom: 200px;
    }
+}
+.el-button--primary{
+    background-color: #387DF7;
+    border-color: #387DF7;
 }
--- a/src/components/UcHeader/Index.vue
+++ b/src/components/UcHeader/Index.vue
@@ -44,17 +44,17 @@
        </div>
        <div class="learning-border" ></div>
         <div class="learning-info" style="margin-left:22px">
-           <div class="learning-qus">当月学习时长</div>
+           <div class="learning-qus">当月学习天数</div>
           <div class="learning-an"><span>12.7</span>小时</div>
        </div>
         <div class="learning-info">
-           <div class="learning-qus">累计学习时长</div>
-           <div class="learning-an"><span>120.7.7</span>小时</div>
+           <div class="learning-qus">累计学习天数</div>
+           <div class="learning-an"><span>120.7.7</span>天</div>
        </div>
         <div class="learning-border" ></div>
         <div class="learning-info" style="margin-left:22px">
           <div class="learning-qus">我的U币（累计）</div>
-           <div class="learning-an"><span>120.7.7</span>小时</div>
+           <div class="learning-an"><span>120.7.7</span>天</div>
        </div>
        <div class="list">
          BOE 排行榜 >>
@@ -115,6 +115,7 @@
 <script>
 import {userAvatarText,cutFullName} from "@/utils/tools.js";
  import { mapGetters } from 'vuex'
+  import apiUserstart from '@/api/modules/userstart.js'
  export default {
    name: 'UcHeader',
    computed:{
@@ -140,8 +141,17 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
      //let testName='京东方科技集团股份有限公司/北京中祥英科技有限公司/技术中心';
      //this.orgInfo=cutFullName(testName,1);
      this.orgInfo=cutFullName(this.userInfo.departFullName,1);
+      this.getInfo();
    },
    methods:{
+      getInfo(){
+        // let data = {
+        //   statType:'10,11'
+        // }
+        // apiUserstart.user(data).then(res=>{
+          
+        // })
+      },
      setCurIdentity(iden){
        this.$store.dispatch('SetCurIdentity',iden);
      },
--- a/src/components/UserCenter/menu.vue
+++ b/src/components/UserCenter/menu.vue
@@ -13,7 +13,7 @@
      <el-menu
        :default-active="activeMenu"
        router
-        active-text-color="#00aaff"
+        active-text-color="#3379FB"
        :default-openeds="['manageTodo','manageFinish','teacherTodo','teacherFinish','myqa', 'mystudy', 'course', 'exam', 'u001', 'u002', 'u003', 'u004']"
        class="el-menu-vertical"
        @open="handleOpen"
@@ -210,13 +210,17 @@
        </el-submenu>
        <!--user-->
       
-        <el-menu-item index="/need/waitaudited">
+        <!-- <el-menu-item >
          <svg-icon icon-class="myubi"></svg-icon>
        <span slot="title">我的U币</span>
-      </el-menu-item>
-       <el-menu-item index="/need/waitaudited">
-          <svg-icon icon-class="myxunzhang"></svg-icon>
-        <span slot="title">我的勋章</span>
+      </el-menu-item> -->
+      <el-menu-item index="/user/ucurrency" v-show="curIdentity == 1">
+          <svg-icon :icon-class="activeMenu == '/user/ucurrency'?'myubi-active':'myubi'"></svg-icon>
+          <span slot="title">我的U币</span>
+        </el-menu-item>
+       <el-menu-item index="/user/medal">
+          <svg-icon :icon-class="activeMenu == '/user/medal'?'myxunzhang-active':'myxunzhang'"></svg-icon>
+          <span slot="title">我的勋章</span>
      </el-menu-item>
        <el-submenu index="mystudy" v-show="curIdentity == 1">
          <template slot="title">
@@ -243,13 +247,13 @@
          <!-- <span slot="title" class="textl">历史记录</span>
          </el-menu-item> -->
        </el-submenu>
-          <el-menu-item index="/need/waitaudited">
+        <el-menu-item index="/user/Mynotes">
          <svg-icon icon-class="mybiji"></svg-icon>
        <span slot="title">我的笔记</span>
      </el-menu-item>
        <el-menu-item index="/user/myassess" v-show="curIdentity == 1">
          <!-- <i class="el-icon-menu"></i> -->
-          <svg-icon icon-class="myceping"></svg-icon>
+          <svg-icon :icon-class="activeMenu == '/user/myassess'?'myceping-active':'myceping'"></svg-icon>
          <span slot="title">我的测评</span>
        </el-menu-item>
        <el-submenu index="myqa" v-show="curIdentity == 1">
@@ -269,7 +273,7 @@
        </el-submenu>
        <el-menu-item index="/article/mylist" v-show="curIdentity == 1">
          <!-- <i class="el-icon-menu"></i> -->
-          <svg-icon icon-class="myart"></svg-icon>
+          <svg-icon :icon-class="activeMenu == '/user/favorites'?'myart':'myart-active'"></svg-icon>
          <span slot="title">我的文章</span>
        </el-menu-item>
       <el-submenu index="/article/contactme">
@@ -293,7 +297,7 @@

       
        <el-menu-item index="/user/favorites" v-show="curIdentity == 1">
-          <svg-icon icon-class="stra"></svg-icon>
+          <svg-icon :icon-class="activeMenu == '/user/favorites'?'stra-active':'stra'"></svg-icon>
          <span slot="title">我的收藏</span>
        </el-menu-item>
       
@@ -360,15 +364,13 @@ export default {
    activeMenu() {
      const route = this.$route;
      const { meta, path } = route;
-      console.log(meta);
      if(meta.title == '添加受众' || meta.title == '查看受众'){
        meta.activeMenu = '/manage/ugroups'
      }
      if (meta.activeMenu) {
        return meta.activeMenu;
      }
-     
-
+      console.log(path,'path');
      return path;
    },
  },
--- a/src/data/pages.js
+++ b/src/data/pages.js
@@ -72,6 +72,8 @@ export const pages=[
  {title:'个人',path:'/user',hidden:false,children:[
    {title:'我的分享',path:'myshare',component:'share/MyList',hidden:false},
    {title:'分享给我的',path:'toshare',component:'share/ToList',hidden:false},
+    {title:'我的笔记',path:'Mynotes',component:'user/Mynotes',hidden:true},
+    {title:'编辑笔记',path:'Mynotes',component:'user/Noteedit',hidden:true},
    {title:'我的测评',path:'myassess',component:'user/MyAssess',hidden:true},
    {title:'我的收藏',path:'favorites',component:'user/MyFavorites',hidden:false},
    {title:'我的关注',path:'follows',component:'user/MyFollow',hidden:false},
@@ -79,7 +81,9 @@ export const pages=[
    {title:'个人设置',path:'setting',component:'user/Setting',hidden:false},
    {title:'我的消息',path:'message',component:'user/Message',hidden:false},
    {title:'开发工具下载',path:'tools',component:'tools/Index',hidden:false},
-    {title:'课程开发教程',path:'developtoolsdown',component:'tools/DeveloptoolsDown',hidden:true}
+    {title:'课程开发教程',path:'developtoolsdown',component:'tools/DeveloptoolsDown',hidden:true},
+    {title:'我的U币',path:'ucurrency',component:'ucurrency/Index',hidden:true},
+    {title:'我的勋章',path:'medal',component:'medal/Index',hidden:true}
  ]}
 ]

--- a/src/icons/svg/home-answer.svg
+++ b/src/icons/svg/home-answer.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="32px" viewBox="0 0 28 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 5</title>
+    <defs>
+        <linearGradient x1="16.2168629%" y1="8.69510057%" x2="75.0166219%" y2="93.277672%" id="linearGradient-1">
+            <stop stop-color="#639FFF" offset="0%"></stop>
+            <stop stop-color="#8BC8FF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="22.他人主页-动态备份" transform="translate(-763.000000, -341.000000)">
+            <g id="编组-21" transform="translate(146.000000, 341.000000)">
+                <g id="编组-29" transform="translate(617.000000, 0.000000)">
+                    <path d="M19.1316064,18.6916095 C20.414299,18.6916095 22.0565334,18.1331761 24.9284596,20.8314872 C25.0247586,20.9219646 25.765127,21.9019152 27.149565,23.7713391 C27.807764,24.6583848 27.6205252,25.9107957 26.7325761,26.5677739 C26.3888346,26.8221023 25.9726301,26.9595673 25.545031,26.96 L18,26.96 L18,26.96 C16.9210709,21.4477397 17.298273,18.6916095 19.1316064,18.6916095 Z" id="三角形" fill="#649FFF"></path>
+                    <ellipse id="椭圆形" fill="url(#linearGradient-1)" cx="14.5" cy="15" rx="12.5" ry="13"></ellipse>
+                    <rect id="矩形" fill="#FFFFFF" opacity="0.498512631" x="10" y="12.4" width="2" height="4.16" rx="1"></rect>
+                    <rect id="矩形备份-2" fill="#FFFFFF" opacity="0.498512631" x="16" y="12.4" width="2" height="4.16" rx="1"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/icons/svg/home-article.svg
+++ b/src/icons/svg/home-article.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26px" height="32px" viewBox="0 0 26 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 5</title>
+    <defs>
+        <linearGradient x1="18.6372428%" y1="0%" x2="85.7988166%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#5C97FF" offset="0%"></stop>
+            <stop stop-color="#91CFFF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="22.他人主页-动态备份" transform="translate(-888.000000, -341.000000)">
+            <g id="编组-21" transform="translate(146.000000, 341.000000)">
+                <g id="编组-27" transform="translate(742.000000, 0.000000)">
+                    <rect id="矩形" fill="url(#linearGradient-1)" x="2" y="2" width="22" height="26" rx="4"></rect>
+                    <line x1="7.27422142" y1="8.71032699" x2="19.5" y2="8.5" id="路径-59" stroke="#C0DAFF" stroke-width="2" stroke-linecap="round"></line>
+                    <line x1="7.27422142" y1="14.710327" x2="19.5" y2="14.5" id="路径-59备份" stroke="#C0DAFF" stroke-width="2" stroke-linecap="round"></line>
+                    <line x1="7.27422142" y1="20.710327" x2="16.5" y2="20.5" id="路径-59备份-2" stroke="#C0DAFF" stroke-width="2" stroke-linecap="round"></line>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/icons/svg/home-book.svg
+++ b/src/icons/svg/home-book.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 5</title>
+    <defs>
+        <linearGradient x1="55.2577877%" y1="2.78092619%" x2="44.5221274%" y2="93.6949416%" id="linearGradient-1">
+            <stop stop-color="#609BFF" offset="0%"></stop>
+            <stop stop-color="#8AC8FF" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="52.685884%" y2="72.470279%" id="linearGradient-2">
+            <stop stop-color="#609BFF" offset="0%"></stop>
+            <stop stop-color="#8CCAFF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="22.他人主页-动态备份" transform="translate(-1123.000000, -341.000000)">
+            <g id="编组-21" transform="translate(146.000000, 341.000000)">
+                <g id="编组-31" transform="translate(977.000000, 0.000000)">
+                    <path d="M2,29.0245398 L2,5.87463047 L2,5.87463047 C7.9183053,3.19759188 12.3936852,3.38773261 15.4261397,6.44505265 C15.8409878,7.5031412 16.0309131,14.0833048 15.9959159,26.1855436 C15.2019737,27.9397003 12.5847294,28.67005 8.14418312,28.3765926 C6.39268401,28.1730406 4.90290452,28.6339695 3.67484465,29.7593793 C3.267815,30.1326695 2.63526737,30.1047162 2.26236493,29.6973316 C2.09416239,29.5135755 2.00060272,29.2736544 2,29.0245398 Z" id="路径-58" fill="url(#linearGradient-1)" transform="translate(9.000000, 18.000000) scale(-1, 1) translate(-9.000000, -18.000000) "></path>
+                    <path d="M16,28.6886036 L16,6.69485922 C16.0007482,6.31658083 16.2148816,5.97110178 16.5541811,5.80384577 C21.8573503,3.14192506 26.1480032,3.4261356 29.4261397,6.65647739 C29.8409878,7.70581201 30.0309131,14.2315357 29.9959159,26.2336485 C29.2771564,27.8269199 26.6975035,28.4780408 22.2569572,28.1870114 C20.4072263,27.8576928 18.885115,28.2643109 17.6906232,29.4068655 C17.2926946,29.789845 16.6596787,29.7761083 16.2777188,29.3772034 C16.1002067,29.1918163 16.0007744,28.9452714 16,28.6886036 Z" id="路径-58" fill="url(#linearGradient-2)"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/icons/svg/home-case.svg
+++ b/src/icons/svg/home-case.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="30px" height="32px" viewBox="0 0 30 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 5</title>
+    <defs>
+        <linearGradient x1="10.4646798%" y1="3.92289046%" x2="90.7234539%" y2="87.3752585%" id="linearGradient-1">
+            <stop stop-color="#649FFF" offset="0%"></stop>
+            <stop stop-color="#89C7FF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="22.他人主页-动态备份" transform="translate(-388.000000, -341.000000)">
+            <g id="编组-21" transform="translate(146.000000, 341.000000)">
+                <g id="编组-25" transform="translate(242.000000, 0.000000)">
+                    <rect id="矩形" fill="url(#linearGradient-1)" x="4" y="2" width="24" height="26" rx="4"></rect>
+                    <line x1="2.43072372" y1="8.5" x2="6.71643801" y2="8.5" id="路径-57" stroke="#C0DAFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></line>
+                    <line x1="2.43072372" y1="14.5" x2="6.71643801" y2="14.5" id="路径-57备份" stroke="#C0DAFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></line>
+                    <line x1="2.43072372" y1="20.5" x2="6.71643801" y2="20.5" id="路径-57备份-2" stroke="#C0DAFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></line>
+                    <path d="M17,21 C20.8659932,21 24,17.8659932 24,14 C24,12.1137444 21.5815894,12.4285503 20.3684461,11.1697961 C19.0951799,9.84865866 18.9797376,7 17,7 C13.1340068,7 10,10.1340068 10,14 C10,17.8659932 13.1340068,21 17,21 Z" id="椭圆形" fill="#C0DAFF"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/icons/svg/home-course.svg
+++ b/src/icons/svg/home-course.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 5</title>
+    <defs>
+        <linearGradient x1="85.8354706%" y1="70.4621812%" x2="17.0018706%" y2="23.38935%" id="linearGradient-1">
+            <stop stop-color="#8CCAFF" offset="0%"></stop>
+            <stop stop-color="#609CFF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="22.他人主页-动态备份" transform="translate(-257.000000, -341.000000)">
+            <g id="编组-21" transform="translate(146.000000, 341.000000)">
+                <g id="编组-24" transform="translate(111.000000, 0.000000)">
+                    <rect id="矩形备份-40" stroke="#FFFFFF" stroke-width="1.5" fill="url(#linearGradient-1)" x="0.75" y="2.75" width="30.5" height="24.5" rx="5"></rect>
+                    <polygon id="三角形" fill="#FFFFFF" opacity="0.622464135" transform="translate(17.470588, 14.916667) rotate(-270.000000) translate(-17.470588, -14.916667) " points="17.4705882 11.1519608 22.3455882 18.6813725 12.5955882 18.6813725"></polygon>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/icons/svg/home-dynamic.svg
+++ b/src/icons/svg/home-dynamic.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="30px" height="32px" viewBox="0 0 30 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 5</title>
+    <defs>
+        <linearGradient x1="18.5275919%" y1="16.3477214%" x2="74.855281%" y2="94.6558739%" id="linearGradient-1">
+            <stop stop-color="#619DFF" offset="0%"></stop>
+            <stop stop-color="#96CFFF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="22.他人主页-动态备份" transform="translate(-151.000000, -341.000000)">
+            <g id="编组-21" transform="translate(146.000000, 341.000000)">
+                <g id="编组-5" transform="translate(5.000000, 0.000000)">
+                    <path d="M7.20100934,10.6485162 C9.20681983,6.42935766 12.0613795,3.88077952 15.7646885,3.00278184 C17.8105682,2.88745524 18.7207361,6.39361041 18.7207361,6.88524442 C18.7207361,7.37687843 25.0989856,7.14300847 28.7789818,11.8807208 C29.9660153,14.2637355 25.9991145,16.0586359 25.6978963,17.2989688 C25.3966782,18.5393018 25.8476532,29.550602 22.3520481,28.6001246 C18.856443,27.6496471 18.9575743,27.1719981 18.7207361,27.1719981 C18.483898,27.1719981 11.1711448,30.028251 9.18607705,28.6001246 C7.20100934,27.1719981 6.35469468,26.2639083 6.91053618,23.3524153 C7.46637769,20.4409224 2,19.8598599 2,15.5742081 C2,12.7171069 3.73366978,11.0752096 7.20100934,10.6485162 Z" id="路径-51" fill="url(#linearGradient-1)"></path>
+                    <polyline id="路径-56" stroke="#FFFFFF" opacity="0.619914464" points="10 12 13 14.8891378 10 17"></polyline>
+                    <circle id="椭圆形" fill="#FFFFFF" opacity="0.616527012" cx="18.5" cy="14.5" r="1.5"></circle>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/icons/svg/home-follow.svg
+++ b/src/icons/svg/home-follow.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="32px" viewBox="0 0 24 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 5</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#65A0FF" offset="0%"></stop>
+            <stop stop-color="#88C6FF" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-2">
+            <stop stop-color="#65A1FF" offset="0%"></stop>
+            <stop stop-color="#8DCBFF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="22.他人主页-动态备份" transform="translate(-1005.000000, -341.000000)">
+            <g id="编组-21" transform="translate(146.000000, 341.000000)">
+                <g id="编组-30" transform="translate(859.000000, 0.000000)">
+                    <path d="M12.5,26.7518344 C18.96875,26.7518344 24,28.2327157 24,23.3124269 C24,18.3921381 18.8512746,12 12.5,12 C6.14872538,12 1,18.2484615 1,23.3124269 C1,28.3763923 6.03125,26.7518344 12.5,26.7518344 Z" id="椭圆形" fill="url(#linearGradient-1)"></path>
+                    <circle id="椭圆形" fill="url(#linearGradient-2)" cx="12.5" cy="8.5" r="6.5"></circle>
+                    <line x1="13.5" y1="19.2648095" x2="13.5" y2="22.4648095" id="路径-60" stroke="#FFFFFF" stroke-width="3" opacity="0.374163673" stroke-linecap="round"></line>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/icons/svg/home-note.svg
+++ b/src/icons/svg/home-note.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="30px" height="32px" viewBox="0 0 30 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 5</title>
+    <defs>
+        <linearGradient x1="10.4646798%" y1="3.92289046%" x2="89.3168344%" y2="85.9126679%" id="linearGradient-1">
+            <stop stop-color="#609BFF" offset="0%"></stop>
+            <stop stop-color="#8BC9FF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="22.他人主页-动态备份" transform="translate(-515.000000, -341.000000)">
+            <g id="编组-21" transform="translate(146.000000, 341.000000)">
+                <g id="编组-26" transform="translate(369.000000, 0.000000)">
+                    <rect id="矩形" fill="url(#linearGradient-1)" x="4" y="2" width="24" height="26" rx="4"></rect>
+                    <line x1="2.43072372" y1="8.5" x2="6.71643801" y2="8.5" id="路径-57" stroke="#C0DAFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></line>
+                    <line x1="2.43072372" y1="14.5" x2="6.71643801" y2="14.5" id="路径-57备份" stroke="#C0DAFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></line>
+                    <line x1="2.43072372" y1="20.5" x2="6.71643801" y2="20.5" id="路径-57备份-2" stroke="#C0DAFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></line>
+                    <path d="M16.9319141,6.15682785 L17.0288296,6.15682785 L17.0288296,6.15682785 C18.0798741,6.15682785 18.9319141,7.00886782 18.9319141,8.05991238 L18.9319141,20.9700603 C18.9320169,21.1032618 18.9188131,21.2361405 18.8925331,21.3667239 C18.7674851,21.9872253 18.5902587,22.4678465 18.3608539,22.8085873 C18.1062083,23.1868189 17.6622002,23.5784656 17.0288296,23.9835276 C16.3845337,23.5214279 15.943251,23.1297812 15.7049814,22.8085873 C15.5052213,22.5393051 15.2918115,22.1087877 15.0647521,21.5170349 C14.9770382,21.2887037 14.9320426,21.0462026 14.9319141,20.8016032 L14.9319141,8.15682785 C14.9319141,7.05225835 15.8273446,6.15682785 16.9319141,6.15682785 Z" id="矩形" fill="#9DC6FF" transform="translate(16.931914, 15.070178) rotate(-322.000000) translate(-16.931914, -15.070178) "></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/icons/svg/home-qa.svg
+++ b/src/icons/svg/home-qa.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="30px" height="32px" viewBox="0 0 30 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 5</title>
+    <defs>
+        <linearGradient x1="26.351778%" y1="11.8481117%" x2="68.1781633%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#629DFF" offset="0%"></stop>
+            <stop stop-color="#87C5FF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="22.他人主页-动态备份" transform="translate(-644.000000, -341.000000)">
+            <g id="编组-21" transform="translate(146.000000, 341.000000)">
+                <g id="编组-28" transform="translate(498.000000, 0.000000)">
+                    <circle id="椭圆形" fill="url(#linearGradient-1)" cx="15" cy="15" r="13"></circle>
+                    <text id="？" font-family="PingFangSC-Regular, PingFang SC" font-size="20" font-weight="normal" fill="#C0DAFF">
+                        <tspan x="10" y="23">？</tspan>
+                    </text>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/icons/svg/myubi-active.svg
+++ b/src/icons/svg/myubi-active.svg
--- a/src/icons/svg/qita-active.svg
+++ b/src/icons/svg/qita-active.svg
@@ -2,9 +2,8 @@
 <svg width="25px" height="25px" viewBox="0 0 25 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>其他通知</title>
    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="9.个人中心-我的u币" transform="translate(-30.000000, -720.000000)">
-            <rect fill="#F2F5F7" x="0" y="0" width="1920" height="1262"></rect>
-            <g id="其他通知" transform="translate(30.000000, 720.342178)" stroke="#2D75FF" stroke-width="2">
+        <g id="9.个人中心-我的u币" transform="translate(-30.000000, -720.000000)" stroke="#2D75FF" stroke-width="2">
+            <g id="其他通知" transform="translate(30.000000, 720.342178)">
                <path d="M2.82033944,16.9192254 L2.82033944,7.40311312 C2.82033944,6.85082837 3.26805469,6.40311312 3.82033944,6.40311312 L7.53910662,6.40311312 L7.53910662,6.40311312 L14.2258083,2.79565438 C14.7118688,2.53342601 15.3184767,2.71487773 15.580705,3.20093814 C15.6594094,3.34682265 15.7006148,3.50998376 15.7006148,3.67574461 L15.7006148,20.3819624 C15.7006148,20.9342471 15.2528996,21.3819624 14.7006148,21.3819624 C14.545369,21.3819624 14.3922553,21.345817 14.2533994,21.2763887 L7.53910662,17.9192254 L7.53910662,17.9192254 L3.82033944,17.9192254 C3.26805469,17.9192254 2.82033944,17.4715101 2.82033944,16.9192254 Z" id="路径-35"></path>
                <line x1="7.53910662" y1="17.9192254" x2="7.53910662" y2="6.40311312" id="路径-36"></line>
                <line x1="18.6085223" y1="6.75527879" x2="22.7433173" y2="2.62048376" id="路径-37"></line>
--- a/src/icons/svg/qita.svg
+++ b/src/icons/svg/qita.svg
@@ -2,10 +2,8 @@
 <svg width="25px" height="25px" viewBox="0 0 25 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>其他通知</title>
    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="9.个人中心-我的u币" transform="translate(-130.000000, -720.000000)">
-            <rect fill="#F2F5F7" x="0" y="0" width="1920" height="1262"></rect>
-            <rect id="矩形备份-7" fill="#FFFFFF" x="85" y="308" width="227" height="782" rx="4"></rect>
-            <g id="其他通知" transform="translate(130.000000, 720.342178)" stroke="#666666" stroke-width="2">
+        <g id="9.个人中心-我的u币" transform="translate(-130.000000, -720.000000)" stroke="#666666" stroke-width="2">
+            <g id="其他通知" transform="translate(130.000000, 720.342178)">
                <path d="M2.82033944,16.9192254 L2.82033944,7.40311312 C2.82033944,6.85082837 3.26805469,6.40311312 3.82033944,6.40311312 L7.53910662,6.40311312 L7.53910662,6.40311312 L14.2258083,2.79565438 C14.7118688,2.53342601 15.3184767,2.71487773 15.580705,3.20093814 C15.6594094,3.34682265 15.7006148,3.50998376 15.7006148,3.67574461 L15.7006148,20.3819624 C15.7006148,20.9342471 15.2528996,21.3819624 14.7006148,21.3819624 C14.545369,21.3819624 14.3922553,21.345817 14.2533994,21.2763887 L7.53910662,17.9192254 L7.53910662,17.9192254 L3.82033944,17.9192254 C3.26805469,17.9192254 2.82033944,17.4715101 2.82033944,16.9192254 Z" id="路径-35"></path>
                <line x1="7.53910662" y1="17.9192254" x2="7.53910662" y2="6.40311312" id="路径-36"></line>
                <line x1="18.6085223" y1="6.75527879" x2="22.7433173" y2="2.62048376" id="路径-37"></line>
--- a/src/icons/svg/stra-active.svg
+++ b/src/icons/svg/stra-active.svg
@@ -2,9 +2,8 @@
 <svg width="26px" height="20px" viewBox="0 0 26 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>星形 2</title>
    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="9.个人中心-我的u币" transform="translate(-30.000000, -915.000000)">
-            <rect fill="#F2F5F7" x="0" y="0" width="1920" height="1262"></rect>
-            <g id="星形-2" transform="translate(30.433916, 913.854102)" stroke="#2D75FF" stroke-width="2">
+        <g id="9.个人中心-我的u币" transform="translate(-30.000000, -915.000000)" stroke="#2D75FF" stroke-width="2">
+            <g id="星形-2" transform="translate(30.433916, 913.854102)">
                <path d="M11.5660845,2.25955146 L14.4761356,8.15595911 L18.9923867,8.81220881 L20.9832078,9.10149205 L16.2746461,13.6912053 L17.3861868,20.1719845 L11.5660845,17.1121756 L9.5278186,18.1837554 L6.74016431,19.649312 L5.74598218,20.1719845 L6.8575228,13.6912053 L2.14896114,9.10149205 L8.65603332,8.15595911 L11.5660845,2.25955146 Z" id="星形"></path>
            </g>
        </g>
--- a/src/icons/svg/stra.svg
+++ b/src/icons/svg/stra.svg
@@ -2,10 +2,8 @@
 <svg width="26px" height="20px" viewBox="0 0 26 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>星形 2</title>
    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="9.个人中心-我的u币" transform="translate(-130.000000, -915.000000)">
-            <rect fill="#F2F5F7" x="0" y="0" width="1920" height="1262"></rect>
-            <rect id="矩形备份-7" fill="#FFFFFF" x="85" y="308" width="227" height="782" rx="4"></rect>
-            <g id="星形-2" transform="translate(130.433916, 913.854102)" stroke="#666666" stroke-width="2">
+        <g id="9.个人中心-我的u币" transform="translate(-130.000000, -915.000000)" stroke="#666666" stroke-width="2">
+            <g id="星形-2" transform="translate(130.433916, 913.854102)">
                <path d="M11.5660845,2.25955146 L14.4761356,8.15595911 L18.9923867,8.81220881 L20.9832078,9.10149205 L16.2746461,13.6912053 L17.3861868,20.1719845 L11.5660845,17.1121756 L9.5278186,18.1837554 L6.74016431,19.649312 L5.74598218,20.1719845 L6.8575228,13.6912053 L2.14896114,9.10149205 L8.65603332,8.15595911 L11.5660845,2.25955146 Z" id="星形"></path>
            </g>
        </g>
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -149,6 +149,13 @@ export const constantRoutes = [{
    name: 'userMsg',
    meta: { title: '我的消息', icon: 'dashboard', noCache: true, affix: false },
 },
+{
+    path: '/homePage',
+    hidden: true,
+    component: (resolve) => require(['@/views/homepage/Index'], resolve),
+    name: 'homePage',
+    meta: { title: '主页', icon: 'dashboard', noCache: true, affix: false },
+},
 {
    path: '/comments',
    hidden: true,
--- a/src/views/homepage/Index.vue
+++ b/src/views/homepage/Index.vue
@@ -0,0 +1,109 @@
+<template>
+    <div class="home-page">
+        <top></top>
+        <div style="height:54px"></div>
+        <UcHeader></UcHeader>
+        <div class="home-page-box">
+            <div class="home-page-left">
+                <el-tabs v-model="activeName" @tab-click="handleClick">
+                    <el-tab-pane name="first">
+                        <span slot="label"><svg-icon icon-class="home-dynamic" style="font-size: 30px;"></svg-icon> <span class="tabs-info">动态</span></span>
+                        动态
+                    </el-tab-pane>
+                    <el-tab-pane name="second">
+                        <span slot="label"><svg-icon icon-class="home-course" style="font-size: 30px;"></svg-icon><span class="tabs-info">课程</span></span>
+                        课程
+                    </el-tab-pane>
+                    <el-tab-pane name="case">
+                        <span slot="label"><svg-icon icon-class="home-case" style="font-size: 30px;"></svg-icon><span class="tabs-info">案例</span></span>
+                        案例
+                    </el-tab-pane>
+                    <el-tab-pane name="note">
+                        <span slot="label"><svg-icon icon-class="home-note" style="font-size: 30px;"></svg-icon><span class="tabs-info">笔记</span></span>
+                        笔记
+                    </el-tab-pane>
+                    <el-tab-pane name="qa">
+                        <span slot="label"><svg-icon icon-class="home-qa" style="font-size: 30px;"></svg-icon><span class="tabs-info">提问</span></span>
+                        提问
+                    </el-tab-pane>
+                    <el-tab-pane name="answer">
+                        <span slot="label"><svg-icon icon-class="home-answer" style="font-size: 30px;"></svg-icon><span class="tabs-info">回答</span></span>
+                        回答
+                    </el-tab-pane>
+                    <el-tab-pane name="fourth">
+                        <span slot="label"><svg-icon icon-class="home-article" style="font-size: 30px;"></svg-icon><span class="tabs-info">文章</span></span>
+                        文章
+                    </el-tab-pane>
+                    <el-tab-pane name="fourth">
+                        <span slot="label"><svg-icon icon-class="home-follow" style="font-size: 30px;"></svg-icon><span class="tabs-info">关注</span></span>
+                        关注
+                    </el-tab-pane>
+                    <el-tab-pane name="book">
+                        <span slot="label"><svg-icon icon-class="home-book" style="font-size: 30px;"></svg-icon><span class="tabs-info">书籍</span></span>
+                        书籍
+                    </el-tab-pane>
+                </el-tabs>
+                <div style="width:200px"></div>
+            </div>
+            <div class="home-page-right">
+                <ul>
+                    <li>456</li>
+                    <li></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+  </template>
+  
+  <script>
+    // import top from './components/TopNav/Index.vue'
+    import top from '../../layout/components/TopNav/Index.vue'
+    import UcHeader from '@/components/UcHeader/Index.vue'
+
+    export default{
+        components:{top,UcHeader},
+        data(){
+            return{
+                activeName:'',
+            }
+        },
+      methods:{
+        handleClick() {
+
+        }
+       }
+      }
+  </script>
+  
+  <style lang="scss" scoped>
+     .home-page{
+        .home-page-box{
+            padding: 24px 84px;
+            display: flex;
+            .home-page-left{
+                width: 100%;
+                background: #FFFFFF;
+                border-radius: 4px;
+                padding: 25px 47px;
+                // display: flex;
+                .svg-icon{
+                    vertical-align: middle;
+                }
+                .tabs-info{
+                    font-size: 16px;
+                    color: #333333;
+                    margin-left: 4px;
+                }
+            }
+            .home-page-right{
+                padding: 40px 52px;
+                box-sizing: border-box;
+                width: 396px;
+                background: #fff;
+                border-radius: 4px;
+                margin-left: 25px;
+            }
+        }
+     }
+  </style>
+  
--- a/src/views/medal/Index.vue
+++ b/src/views/medal/Index.vue
@@ -0,0 +1,101 @@
+<template>
+    <div class="medal-box">
+      <h6 class="medal-title">我的勋章 <span class="text">勋章规则 ></span> </h6>
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="全部勋章" name="first">
+            <div class="medal-list" >
+                <div class="medal-index" v-for="item in 5">
+                    <img src="/images/medal.png" alt="" srcset="">
+                    <p class="index-title">持之以恒</p> 
+                    <p class="index-text">您已超过367人</p>
+                    <el-button class="btn" type="primary">查看详情</el-button>
+                </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="学习勋章" name="second">学习勋章</el-tab-pane>
+          <el-tab-pane label="社交勋章" name="third">社交勋章</el-tab-pane>
+          <el-tab-pane label="成就勋章" name="fourth">成就勋章</el-tab-pane>
+      </el-tabs>
+    </div>
+  </template>
+  
+  <script>
+      export default{
+          data(){
+              return{
+                activeName:'first'
+              }
+          },
+      methods:{
+       
+        handleClick() {
+
+        }
+       }
+      }
+  </script>
+  
+  <style lang="scss" scoped>
+     .medal-box{
+        padding: 30px 70px;
+        .medal-list{
+            display: flex;
+            flex-wrap: wrap;
+        }
+        .medal-index{
+            
+            width: 144px;
+            margin: 40px 60px 0 60px;
+            text-align: center;
+            .index-title{
+                margin-top: 26px;
+                font-size: 18px;
+                font-weight: 600;
+                color: #333333;
+            }
+            .index-text{
+                font-size: 14px;
+                font-weight: 400;
+                color: #666666;
+                margin-top: 10px;
+                margin-bottom: 24px;
+            }
+            .btn{
+                width: 140px;
+            }
+        }
+        .medal-title{
+            margin: 0;
+            font-size: 18px;
+            font-family: PingFangSC-Semibold, PingFang SC;
+            font-weight: 600;
+            color: #333333;
+            margin-bottom: 24px;
+            .text{
+                font-size: 14px;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
+                color: #333333;
+                margin-left: 12px;
+            }
+        }
+        ::v-deep .el-tabs__item{
+            height: 46px;
+            font-size: 18px;
+            color: #666666;
+            padding: 0 30px;
+        }
+        ::v-deep .el-tabs__item.is-active{
+
+        }
+        ::v-deep .el-tabs__nav-wrap::after{
+            background-color: #fff !important;
+        }
+        ::v-deep .el-tabs__active-bar{
+            height: 4px;
+            width: 80px;
+            border-radius: 4px;
+        }
+     }
+  </style>
+  
--- a/src/views/ucurrency/Index.vue
+++ b/src/views/ucurrency/Index.vue
@@ -0,0 +1,34 @@
+<template>
+    <div class="u-currency">
+      我 的  u 币
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <h6>我的U币 <span>U币规则 ></span> </h6>
+        </el-col>
+        <el-col :span="12">
+        
+        </el-col>
+        </el-row>
+    </div>
+  </template>
+  
+  <script>
+      export default{
+          data(){
+              return{
+  
+              }
+          },
+      methods:{
+       
+       }
+      }
+  </script>
+  
+  <style lang="scss" scoped>
+     .u-currency{
+        padding: 30px 30px;
+        
+     }
+  </style>
+  
--- a/src/views/user/Mynotes.vue
+++ b/src/views/user/Mynotes.vue
@@ -0,0 +1,338 @@
+<template>
+    <div style="padding: 38px 42px;">
+        <div class="note-hear">
+            <h3>我的笔记</h3>
+            <div>
+                <el-button>导入</el-button>
+                <el-button @click="dialogVisible = true">导出</el-button>
+            </div>
+        </div>
+        <div class="note-sift">
+                 <el-date-picker
+                 class="el-buttons"
+                v-model="value1"
+                type="daterange"
+               >
+                </el-date-picker>
+                <!-- <i class="el-icon-arrow-down"></i> -->
+            <el-button class="el-buttons">全部课程 <i class="el-icon-arrow-down"></i></el-button>
+            <el-button class="el-buttons">发布时间 <i class="el-icon-arrow-down"></i></el-button>
+            <el-button class="el-buttons">点赞次数 <i class="el-icon-arrow-down"></i></el-button>
+        </div>
+        <div class="note-tab">
+            <div class="tabcontent">
+                <span :class=" num == 1 ? 'tab-textactive':''" >全部</span>
+                <span :class=" num == 2 ? 'tab-textactive':''" >线上笔记</span>
+                <span :class=" num == 3 ? 'tab-textactive':''" >导入笔记</span>
+            </div>
+        </div>
+        <div class="note-all" v-if="num == 1">
+           <div class="note-all-info">
+              <div class="all-title">
+                 <h3> 《高效能人士的7个习惯》</h3>
+                  <div><img src="../../../public/images/coteplay.png" alt="">8:40</div>
+                  <span>私密</span>
+                  <h6>2022/05/21 16:28</h6>
+              </div>
+              <div class="all-content">
+                  我见过的策划们，不管是甲方企业的，还是广告代理都经常犯三大错误：找一个营销理论，做策略时直接向上套。不管是什么行业、企业处在什么发展阶段，都要照着这个理论的要求，做策略时直接向上套。不管是什么行业、企业处在什么来实。不管是么行业、企业处在什什么行业、企业处在发展发发发施营销传播，写PPT时 也要照着这个理论的框架来写。施营销传播，写PPT时 也要照着这个理论的框架来写施营销传播，写PPT时 也要照论。
+              </div>
+              <div class="all-footer">
+                  <div>
+                  <div class="textbut-box">
+                  <interactBar nodeWidth="60px" :readonly="true"  :type="4" :data="qa" @addAnswers="qaAnswer(qa)" :shares="true" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar>
+                    <el-button style=" margin-right: 10px;" class="textbut" type="text"> <i class="el-icon-delete"></i> 删除</el-button><el-button class="textbut" type="text"> <i class="el-icon-edit"></i> 编辑</el-button>
+                  </div>
+                  </div>
+              </div>
+           </div>
+            <div class="note-all-info">
+              <div class="all-title">
+                 <h3> 《高效能人士的7个习惯》</h3>
+                  <!-- <div><img src="../../../public/images/coteplay.png" alt="">8:40</div>
+                  <span>私密</span> -->
+                  <div class="daoru">导入</div>
+                  <h6>2022/05/21 16:28</h6>
+              </div>
+              <div class="all-content">
+                  我见过的策划们，不管是甲方企业的，还是广告代理都经常犯三大错误：找一个营销理论，做策略时直接向上套。不管是什么行业、企业处在什么发展阶段，都要照着这个理论的要求，做策略时直接向上套。不管是什么行业、企业处在什么来实。不管是么行业、企业处在什什么行业、企业处在发展发发发施营销传播，写PPT时 也要照着这个理论的框架来写。施营销传播，写PPT时 也要照着这个理论的框架来写施营销传播，写PPT时 也要照论。
+              </div>
+              <div class="all-footer">
+                  <div>
+                  <div class="textbut-box">
+                  <!-- <interactBar nodeWidth="60px" :readonly="true"  :type="4" :data="qa" @addAnswers="qaAnswer(qa)" :shares="true" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar> -->
+                    <el-button style=" margin-right: 10px;" class="textbut" type="text"> <i class="el-icon-delete"></i> 删除</el-button><el-button class="textbut" type="text"> <i class="el-icon-edit"></i> 编辑</el-button>
+                  </div>
+                  </div>
+              </div>
+           </div>
+           <div class="note-all-info">
+              <div class="all-title">
+                 <h3> 《高效能人士的7个习惯》</h3>
+                  <!-- <div><img src="../../../public/images/coteplay.png" alt="">8:40</div>
+                  <span>私密</span> -->
+                  <div class="daoru">导入</div>
+                  <h6>2022/05/21 16:28</h6>
+              </div>
+              <div class="all-content">
+                 <img src="../../../public/images/course.png" alt="">
+                 <img src="" alt="">
+                 <img src="" alt="">
+              </div>
+              <div class="all-footer">
+                  <div>
+                  <div class="textbut-box">
+                  <!-- <interactBar nodeWidth="60px" :readonly="true"  :type="4" :data="qa" @addAnswers="qaAnswer(qa)" :shares="true" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar> -->
+                    <el-button style=" margin-right: 10px;" class="textbut" type="text"> <i class="el-icon-delete"></i> 删除</el-button><el-button @click="edit" class="textbut" type="text"> <i class="el-icon-edit"></i> 编辑</el-button>
+                  </div>
+                  </div>
+              </div>
+           </div>
+        </div>
+
+
+     <el-dialog
+        width="860px"
+        title="王明"
+        :visible.sync="dialogVisible"
+        :before-close="handleClose">
+        
+
+        <div class="Exportbox">
+           <div class="Export-info" style="border-bottom: 1px solid #ddd;padding-bottom:30px;margin-bottom:35px">
+               <div class="all-title">
+                 <h3> 《高效能人士的7个习惯》</h3>
+                  <div><img src="../../../public/images/coteplay.png" alt="">8:40</div>
+                  <h6>2022/05/21 16:28</h6>
+              </div>
+              <div class="all-content">
+                  我见过的策划们，不管是甲方企业的，还是广告代理都经常犯三大错误：找一个营销理论，做策略时直接向上套。不管是什么行业、企业处在什么发展阶段，都要照着这个理论的要求，做策略时直接向上套。不管是什么行业、企业处在什么来实。不管是么行业、企业处在什什么行业、企业处在发展发发发施营销传播，写PPT时 也要照着这个理论的框架来写。施营销传播，写PPT时 也要照着这个理论的框架来写施营销传播，写PPT时 也要照论。
+              </div>
+           </div>
+             <div class="Export-info" style="border-bottom: 1px solid #ddd;padding-bottom:30px;margin-bottom:35px">
+               <div class="all-title">
+                 <h3> 《高效能人士的7个习惯》</h3>
+                  <div><img src="../../../public/images/coteplay.png" alt="">8:40</div>
+                  <h6>2022/05/21 16:28</h6>
+              </div>
+              <div class="all-content">
+                  我见过的策划们，不管是甲方企业的，还是广告代理都经常犯三大错误：找一个营销理论，做策略时直接向上套。不管是什么行业、企业处在什么发展阶段，都要照着这个理论的要求，做策略时直接向上套。不管是什么行业、企业处在什么来实。不管是么行业、企业处在什什么行业、企业处在发展发发发施营销传播，写PPT时 也要照着这个理论的框架来写。施营销传播，写PPT时 也要照着这个理论的框架来写施营销传播，写PPT时 也要照论。
+              </div>
+           </div>
+             <div class="Export-info" style="border-bottom: 1px solid #ddd;padding-bottom:30px;margin-bottom:35px">
+               <div class="all-title">
+                 <h3> 《高效能人士的7个习惯》</h3>
+                  <div><img src="../../../public/images/coteplay.png" alt="">8:40</div>
+                  <h6>2022/05/21 16:28</h6>
+              </div>
+              <div class="all-content">
+                  我见过的策划们，不管是甲方企业的，还是广告代理都经常犯三大错误：找一个营销理论，做策略时直接向上套。不管是什么行业、企业处在什么发展阶段，都要照着这个理论的要求，做策略时直接向上套。不管是什么行业、企业处在什么来实。不管是么行业、企业处在什什么行业、企业处在发展发发发施营销传播，写PPT时 也要照着这个理论的框架来写。施营销传播，写PPT时 也要照着这个理论的框架来写施营销传播，写PPT时 也要照论。
+              </div>
+           </div>
+        </div>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button @click="dialogVisible = false">打 印</el-button>
+            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+        </span>
+     </el-dialog>
+
+    </div>
+</template>
+
+<script>
+import interactBar from '@/components/Portal/interactBar.vue';
+export default {
+    components:{interactBar},
+  data(){
+      return{
+           value1: '起止时间',
+           num :1,
+            dialogVisible: false,
+      }
+      
+
+  },
+  methods: {
+      handleClose(done) {
+        
+
+         
+      },
+      edit(){
+          router.push()
+      }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.Export-info:last-child{
+    border: none;
+}
+::v-deep.dr-dialog{
+    max-width: 870px !important;
+}
+ .all-title{
+           height: 50px;
+           .daoru{
+                width: 80px;
+                height: 30px;
+                border-radius: 4px;
+                border: 1px solid #3379FB;
+           }
+           h6{
+               margin: 0;
+               float: right;
+               font-size: 14px;
+               color: #999999;
+               font-weight: 400;
+           }
+           h3{
+              font-size: 18px;
+              font-weight: 600;
+              color: #333333;
+              margin: 0;
+              float: left;
+           }
+           span{
+               width: 53px;
+               height: 22px;
+               border-radius: 10px;
+               border: 1px solid #3379FB;
+               font-size: 14px;
+               font-weight: 400;
+               color: #3379FB;
+               text-align:center;
+               margin-top: 5px;
+               display: inline-block;
+           }
+           div{
+                width: 120px;
+                height: 30px;
+                border-radius: 4px;
+                border: 1px solid #3379FB;
+                font-size: 14px;
+                font-weight: 400;
+                color: #387DF7;
+                line-height: 30px;
+                text-align: center;
+                float: left;
+                margin: 0 20px;
+                img{
+                    width: 10px;
+                    // height: 16px;
+                    padding-top: 6px;
+                    vertical-align: top;
+                    margin-right: 12px;
+                }
+           }
+       }
+
+
+::v-deep.el-dialog__header{
+    background: url('/images/daochubg.png') 100% / 100% !important;
+}
+.textbut-box{
+    // position: absolute;
+    // right: 0;
+    display: flex;
+}
+.textbut{
+        font-size: 12px;
+        font-weight: 400;
+        color: #6E7B84 !important;
+       
+}
+.note-all{
+    width: 100%;
+    .note-all-info{
+       border-bottom: 1px solid #ddd;
+       padding-top: 35px;
+       .all-footer{
+           height: 10px;
+           padding-bottom: 45px;
+           width: 100%;
+           div{
+               float: right;
+           }
+       }
+       .all-content{
+           font-size: 14px;
+           font-weight: 400;
+           color: #333333;
+           img{
+               width: 140px;
+               height: 175px;
+               margin-right: 23px;
+           }
+       }
+      
+    }
+}
+.tabcontent{
+    span{
+         margin-right: 45px;
+        padding: 0 6px;
+        text-align: center;
+        padding-bottom: 14px;
+        display: inline-block;
+    }
+}
+
+.tab-textactive{
+    border-bottom: 3px solid #3379FB;
+    transform: all 0.3s;
+}
+.note-tab{
+    height: 40px;
+    margin-top: 20px;
+    border-bottom: 1px solid #ddd;
+}
+.el-buttons{
+    width: 160px !important;
+    height: 40px;
+    border-radius: 4px;
+    // margin-left: 20px;
+}
+.el-buttons:hover{
+    background-color: #fff !important;
+    border: 1px solid #ddd !important;
+    color: #0059FF !important;
+}
+.el-buttons:focus{
+    background-color: #fff !important;
+    color: #0059FF !important;
+    border: 1px solid #ddd !important;
+}
+.note-sift{
+    button{
+        width: 160px;
+        height: 40px;
+        border-radius: 4px;
+        margin-left: 20px;
+    }
+}
+.note-hear{
+    width: 100%;
+    height: 50px;
+    h3{
+        margin: 0;
+        float: left;
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 30px;
+    }
+    div{
+        float: right;
+        button{
+            width: 140px;
+            font-size: 14px;
+            height: 40px;
+            border-radius: 4px;
+            border: 1px solid rgba(153,153,153,0.2);
+        }
+    }
+}
+</style>
--- a/src/views/user/Noteedit.vue
+++ b/src/views/user/Noteedit.vue
@@ -0,0 +1,15 @@
+<template>
+   <div>
+      
+   </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
--- a/src/views/user/Setting.vue
+++ b/src/views/user/Setting.vue
@@ -15,17 +15,17 @@
           <el-input v-model="form.name" disabled></el-input>
        </el-form-item>
        <el-form-item label="性别">
-           <el-radio-group v-model="form.gender">
-              <el-radio-button label="男" :value="1"></el-radio-button>
-              <el-radio-button label="女" :value="2"></el-radio-button>
+           <el-radio-group v-model="form.gender" disabled>
+              <el-radio-button :label="1">男</el-radio-button>
+              <el-radio-button :label="2">女</el-radio-button>
            </el-radio-group>
        </el-form-item>
        <el-form-item label="所属部门">
-             <span class="depart">BOE/企划中心/数据资产部</span>
+             <span class="depart">{{form.departName}}</span>
        </el-form-item>
         <el-form-item label="生日">
              <el-date-picker
-                v-model="form.birthday"
+                v-model="form.birthday" disabled
                type="date"
                placeholder="选择日期">
              </el-date-picker>
@@ -37,7 +37,7 @@
           <el-input v-model="form.account.email" disabled></el-input>
        </el-form-item>
         <el-form-item label="我的签名">
-           <el-input  type="textarea" :rows="2" disabled></el-input>
+           <el-input  type="textarea" :rows="2"></el-input>
        </el-form-item>
        <div class="dynamic-range">
          <span>动态可见范围</span>
@@ -46,24 +46,18 @@
           <el-radio v-model="radio" label="3">最近三个月动态</el-radio>
        </div>
         <h4>兴趣爱好</h4>
-         <div class="interest">
-           <span style="float:left;">领导力</span>
-           <el-checkbox-group v-model="checkboxGroup1" style="float:left;">
-            <el-checkbox-button size="medium" v-for="city in cities" :label="city" :key="city">{{city}}</el-checkbox-button>
+         <div class="interest" v-for="(sys,index) in sysTypeListMap" :key="sys.id">
+           <span>{{sys.name}}</span>
+           <el-checkbox-group v-model="checkboxGroup" v-if="sys.children.length > 0" @change="handleClick($event)">
+            <el-checkbox-button size="medium" v-for="ch in sys.children" :label="ch.id" :key="ch.id">{{ch.name}}</el-checkbox-button>
          </el-checkbox-group>
+            <!-- <ul class="interest-index">
+              <li v-for="ch in sys.children" :label="ch.id" :key="ch.id">{{ch.name}}</li>
+            </ul> -->
+         </div>
+         <div style="text-align: center;margin-top:56px">
+          <el-button type="primary" @click="saveHobby()">更改</el-button>
         </div>
-         <!-- <div class="interest">
-           <span style="float:left;">专业力</span>
-           <el-checkbox-group v-model="checkboxGroup1" style="float:left;">
-            <el-checkbox-button size="medium" v-for="city in cities" :label="city" :key="city">{{city}}</el-checkbox-button>
-          </el-checkbox-group>
-         </div> -->
-         <!-- <div class="interest">
-           <span style="float:left;">兴趣爱好</span>
-           <el-checkbox-group v-model="checkboxGroup1" style="float:left;">
-            <el-checkbox-button size="medium" v-for="city in cities" :label="city" :key="city">{{city}}</el-checkbox-button>
-          </el-checkbox-group>
-         </div> -->
      </div>
    </el-form>
    <el-dialog
@@ -114,11 +108,12 @@
 </template>

 <script>
-  import { mapGetters } from 'vuex';
+  import { mapGetters, mapActions } from 'vuex';
  import userApi from "@/api/system/user";
  import accountApi from "@/api/account";
  import apiPassword from '@/api/boe/login.js'
  import imageUpload from '@/components/ImageUpload/index.vue';
+  import apiUserhobby from "@/api/modules/userhobby.js"
   const cityOptions = ['上海', '北京', '广州', '深圳'];
  export default{
    components:{imageUpload},
@@ -161,7 +156,7 @@
      };
      return {
        cities: cityOptions,
-        checkboxGroup1: ['上海'],
+        checkboxGroup: [],
        radio: '1',
        form:{
          account:{}
@@ -177,13 +172,14 @@
          confirmPass: [
            { validator: validatePass3, trigger: 'blur' }
          ]
-        }
+        },
+        sysTypeListMap:[]
      }
    },
    computed: {
+      
      ...mapGetters(['userInfo']),
      avatar(){
-        console.log(this.userInfo,'this.userInfo')
        if(this.userInfo.avatar){
          if(this.userInfo.avatar.indexOf('http')==-1){
            return this.baseUrl+this.userInfo.avatar
@@ -208,25 +204,60 @@
      }
    },
    mounted(){
-      //console.log(this.userInfo,'this.userInfo')
      if(this.userInfo.avatar){
        this.avatarUrl = this.avatar;
      }
      this.load();
+      this.getInfo();
+      this.getSysTypeTree().then(rs => {
+        this.sysTypeListMap = rs;
+      });
    },
    methods:{
+      getInfo() { //获取用户兴趣关联的id
+        apiUserhobby.info().then(res=>{
+          if(res.status == 200) {
+            let data = res.result.map(item => item.refId);
+            this.checkboxGroup = data;
+          }
+        })
+      },
+      handleClick(e){
+      },
+      saveHobby(){
+        let data = []
+        if(this.checkboxGroup.length  == 0) {
+          this.$message.error('请选择爱好！')
+          return
+        }
+        this.checkboxGroup.forEach(item=>{
+          data.push({
+            type:1,
+            refId:item
+          })
+        })
+        apiUserhobby.update(data).then(res=>{
+          if(res.status == 200) {
+             this.$message.success('更改成功！')
+          } else {
+            this.$message.error("更改失败！")
+          }
+        })
+      },
+      ...mapActions({
+            getResOwnerTree: 'resOwner/getResOwnerTree',
+            loadResOwners: 'resOwner/loadResOwners',
+            getSysTypeTree: 'sysType/getSysTypeTree',
+            loadSysTypes: 'sysType/loadSysTypes'
+        }),
      load(){
        userApi.detail(this.userInfo.aid).then(res=>{
-          //console.log(res)
          if(res.status==200){
-            //console.log(res)
-            //console.log(res.result,'res.result')
            this.form=res.result
          }
        });
      },
      openAvatar(){
-        //console.log(this.avatarUrl,'this.avatarUrl');
        this.dialogVisibleAvatar=true
      },
      openPassword(){
@@ -275,30 +306,67 @@
 </script>

 <style lang="scss" scoped>
-::v-deep .el-checkbox-button.is-focus .el-checkbox-button__inner{
-  border-color:rgba(151,151,151,0.3) !important;
-}
+
 ::v-deep .el-checkbox-button--medium .el-checkbox-button__inner{
-  padding: 10px 50px !important;
+  // padding: 10px 40px !important;
+  width: 146px;
+  height: 44px;
+  line-height: 24px;
 }
 ::v-deep .el-checkbox-button.is-checked .el-checkbox-button__inner {
  background-color: rgba(0,0,0,0) !important;
  color: #387DF8 !important;
 }
+::v-deep .el-checkbox-button.is-focus .el-checkbox-button__inner{
+  // border-color:#fff !important;
+  outline: none;
+}
+// ::v-deep .el-checkbox-button.is-focus{
+//   border-color:none !important;
+//   outline: none !important;
+// }
+::v-deep .el-checkbox-button:first-child .el-checkbox-button__inner{
+  border-left:none; 
+}
 .el-checkbox-button, .el-checkbox-button__inner {
   margin-right: 40px;
   background: #FFFFFF;
   border-radius: 4px;
   box-shadow: none;
   border-left: 1px solid rgba(151,151,151,0.3);
-   
+  box-shadow: 1px 0 0 0 #fff;
 }
 .interest{
+  display: flex;
  padding-left: 20px;
+  .interest-index{
+    flex: 84%;
+    display: flex;
+    li{
+      width: 146px;
+      height: 44px;
+      background: #FFFFFF;
+      border-radius: 4px;
+      border: 1px solid rgba(151,151,151,0.3);
+      margin-bottom: 20px;
+      line-height: 44px;
+    }
+    
+  }
+  
  span{
+    // width: 80px;
+    // flex: 1;
    margin-right: 17px;
    color: #333333;
    font-size: 14px;
+    margin-bottom: 20px;
+  }
+  .el-checkbox-group{
+    flex: 84%;
+    .el-checkbox-button{
+      margin-bottom: 20px;
+    }
  }
 }
 .dynamic-range{
@@ -319,6 +387,16 @@
    background-color: #fff;
    box-sizing: border-box;
    padding: 60px 0px 0px 205px;
+    ::v-deep .el-radio-button__inner{
+      background: #F4F4F4 !important;
+      border-radius: 4px !important;
+    }
+    ::v-deep .el-radio-button__orig-radio:checked+.el-radio-button__inner{
+      color: #FFF;
+      background-color: #387DF7 !important;
+      border-color: #387DF7;
+      box-shadow: -1px 0 0 0 #387DF7;
+    }
    .informationItem{
      // &:first-of-type{
      //   margin-top: 10px;