u币规则

src/components/Portal/interactBar.vue

@@ -551,6 +551,19 @@ export default {
                      this.messageSave(this.data.id,this.data.title,this.userInfo.name,curUser.name,curUser.aid,'分享给我的');
                    }
                  }
+                 let event = {
+                  key: "Share",//后台的事件key  
+                  title: "被分享",//事件的标题
+                  parameters:"",//用户自定义参数 name:value,name:value
+                  content: '被分享',//事件的内容
+                  objId: this.data.id,//关联的id
+                  objType: this.type,//关联的类型
+                  objInfo: this.data.title,
+                  aid: this.data.sysCreateAid, //当前登录人的id
+                  aname: this.data.sysCreateBy,//当前人的姓名
+                  status: 1 //状态，直接写1
+                }
+                this.$store.dispatch("userTrigger", event);
                }else{
                  this.$message.warning("您已分享给对方，分享失败")
                }

src/components/PortalFloatTools.vue

@@ -136,7 +136,7 @@ export default {
     }
   },
   computed: {
-      ...mapGetters(['identity'])
+      ...mapGetters(['identity','userInfo'])
   },
   methods: {
     saveSuccess(){
@@ -162,6 +162,20 @@ export default {
                   message:'提交意见成功'
                 });
                 this.feedbackDlgShow=false;
+
+                let event = {
+                  key: "Feedback",//后台的事件key  
+                  title: "意见反馈",//事件的标题
+                  parameters:"",//用户自定义参数 name:value,name:value
+                  content: '意见反馈',//事件的内容
+                  // objId: this.data.id,//关联的id
+                  // objType: this.type,//关联的类型
+                  // objInfo: this.data.title,
+                  aid: this.userInfo.aid, //当前登录人的id
+                  aname: this.userInfo.name,//当前人的姓名
+                  status: 1 //状态，直接写1
+                }
+                this.$store.dispatch("userTrigger", event);
               } else {
                 this.$message({
                   type:'error',

src/views/Index.vue

@@ -12,10 +12,13 @@
         </swiper>   
       </div> 
       <div class="personal-panel">
-        <img style="width:68px;height:68px" src="/images/Avatarman.png" alt="">
+        <div class="personal-img">
-        <p class="personal-name">王明 10156597</p>
+          <author-img :avatar="userInfo.avatar" :aid="userInfo.aid" :sex="userInfo.sex"></author-img>
-        <p class="personal-info">信息技术研发中心|APP应用本部</p>
+        </div>
-        <div class="personal-box"><span>代办</span><span>3个待处理</span></div>
+        <!-- <img style="width:68px;height:68px" src="/images/Avatarman.png" alt=""> -->
+        <p class="personal-name">{{userInfo.name}} {{userInfo.userNo}}</p>
+        <p class="personal-info">{{userInfo.departName}}</p>
+        <div class="personal-box"><span>代办</span><span>3个待处理</span><img class="personal-box-img" src="/images/homeWu/agency.png" alt="" srcset=""></div>
         <ul class="personal-ul">
           <li>
             <span class="label">累计学习</span>
@@ -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{
       

src/views/ucurrency/Index.vue

@@ -134,9 +134,9 @@
                 <p class="table-title portal-title-tow"><span></span>学习</p>
                 <el-table
                     :data="tableData"
-                style="width: 100%;height:320px;overflow-y: auto;">
+                    style="width: 100%">
                     <el-table-column
-                    prop="date"
+                        prop="name"
                         label="分类"
                         width="180">
                     </el-table-column>
@@ -144,13 +144,52 @@
                         prop="name"
                         label="描述"
                         width="180">
+                        <template slot-scope="scope">
+                            <!-- {{scope.row}} -->
+                            <p v-for="(rem,index) in scope.row.hear" :key="index">{{rem}}</p>
+                        </template>
                     </el-table-column>
                     <el-table-column
                         prop="address"
                         label="经验值/U币">
+                        <template slot-scope="scope">
+                            <p v-for="(val,index) in scope.row.value" :key="index">{{val}}</p>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                    prop="upperlimit"
+                    label="每日上限">
+                </el-table-column>
+              </el-table>
+            </div>
+            <div class="box-table">
+                <p class="table-title portal-title-tow"><span></span>知识贡献</p>
+                <el-table
+                    :data="tableList"
+                    style="width: 100%">
+                    <el-table-column
+                        prop="name"
+                        label="分类"
+                        width="180">
+                    </el-table-column>
+                    <el-table-column
+                        prop="name"
+                        label="描述"
+                        width="180">
+                        <template slot-scope="scope">
+                            <!-- {{scope.row}} -->
+                            <p v-for="(rem,index) in scope.row.hear" :key="index">{{rem}}</p>
+                        </template>
                     </el-table-column>
                     <el-table-column
                         prop="address"
+                        label="经验值/U币">
+                        <template slot-scope="scope">
+                            <p v-for="(val,index) in scope.row.value" :key="index">{{val}}</p>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                    prop="upperlimit"
                     label="每日上限">
                 </el-table-column>
               </el-table>
@@ -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,
               }

src/views/user/Noteedit.vue

@@ -4,6 +4,7 @@
          <div class="edit-hear">
             <h3>笔记编辑</h3>
             <span>{{isShowTip}}</span>
+            <span class="his-info pointer">历史记录</span>
          </div>
          <div class="edit-content">
             <div class="note-tit">
@@ -20,7 +21,7 @@
                <el-radio :label="9">公开</el-radio>
                <el-radio :label="1">私密</el-radio>
             </el-radio-group>
-            <el-button @click="comeback">取消</el-button>
+            <el-button style="margin-right:40%" @click="comeback">取消</el-button>
             <el-button type="primary" @click="savedata" >确定</el-button>
          </div>
       </div>
@@ -31,7 +32,7 @@
          <div class="histinfo" v-for="(item,idx) in histdata" :key="idx">
             <div class="hist-top">
                编辑了笔记
-               <span>2022/4/5  22:42:32</span>
+               <span>{{item.sysCreateTime}}</span>
             </div>
             <div class="hist-cont">
                <div class="hist-tit">
@@ -46,7 +47,6 @@
                </div>
             </div>
          </div>
-         
       </div>
       
    </div>
@@ -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;
-   }
 }
 
 </style>