diff --git a/src/api/phase2/stat.js b/src/api/phase2/stat.js
index c5e1f257..c6cf704f 100644
--- a/src/api/phase2/stat.js
+++ b/src/api/phase2/stat.js
@@ -69,11 +69,14 @@ const userCoinList = function(aid,days) {
* 勋章信息
* 页面上不能修改，删除
*/
- const userMedalConfig = function() {
- return ajax.get(baseURL,'/xboe/m/stat/medalinfo/list');
+// const userMedalConfig = function() {
+// return ajax.get(baseURL,'/xboe/m/stat/medalinfo/config');
+// }
+// get 获取勋章配置，返回的是列表
+const userMedalConfig = function() {
+ return ajax.get(baseURL,'/xboe/m/stat/medal/config');
}
-
export default {
sendEvent,
userTotal,
diff --git a/src/components/Portal/comments.vue b/src/components/Portal/comments.vue
index 3a47d8fc..30682be4 100644
--- a/src/components/Portal/comments.vue
+++ b/src/components/Portal/comments.vue
@@ -505,7 +505,7 @@
title: "发表评论",//事件的标题
parameters:"",//用户自定义参数 name:value,name:value
content: "每发表一个评论",//事件的内容
- objId: this.resolveId,//关联的id
+ objId: this.objId,//关联的id
objType: this.objType,//关联的类型
objInfo: "评论",
aid: this.userInfo.aid, //当前登录人的id
diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue
index eb8ae606..8027a71e 100644
--- a/src/components/Portal/interactBar.vue
+++ b/src/components/Portal/interactBar.vue
@@ -349,6 +349,19 @@ export default {
// }
this.isPraise=true;
this.$message({message:'点赞成功',type:'success'})
+ let event = {
+ key: "Praise",//后台的事件key 发布文章且审核通过
+ title: "点赞",//事件的标题
+ parameters:"",//用户自定义参数 name:value,name:value
+ content: "点赞"+this.data.title,//事件的内容
+ 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{
console.log('点赞失败：'+res.message);
}
diff --git a/src/components/UcHeader/Index.vue b/src/components/UcHeader/Index.vue
index d4ddbeb1..2aa4fb42 100644
--- a/src/components/UcHeader/Index.vue
+++ b/src/components/UcHeader/Index.vue
@@ -18,7 +18,11 @@
{{userInfo.name}}
{{orgInfo}}
- 编辑资料
+
+ 编辑资料
@@ -27,10 +31,11 @@
-
+
+ 学员
+ 教师
+ 管理员
+
@@ -227,8 +232,9 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
}
.content-bottom{
margin-top: 30px;
+ display: flex;
.medal{
- float: left;
+ // float: left;
img{
width: 36px;
height: 40px;
@@ -240,31 +246,11 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
.medalbutt{
color: #333333;
font-size: 14px;
- float: left;
- margin-top: 10px;
- }
- .grade{
- float: left;
- margin-top: 10px;
- div{
- margin-left: 22px;
- font-weight: 600;
- float: left;
- width: 70px;
- height: 30px;
- text-align: center;
- line-height: 30px;
- color: #9D6110 ;
- background: url('../../../public/images/lvbg.png') no-repeat;
- }
- span{
- font-size: 14px;
- color: #A3680A;
- line-height: 32px;
- margin-left: 13px;
-
- }
+ margin-right: 40px;
+ // float: left;
+ margin-top: 6px;
}
+
}
.personalData{
@@ -289,6 +275,24 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
.content-top{
margin-top: 15px;
line-height: 25px;
+ .grade{
+ display: inline-block;
+ div{
+ font-weight: 600;
+ float: left;
+ width: 58px;
+ height: 24px;
+ text-align: center;
+ line-height: 34px;
+ color: #9D6110 ;
+ }
+ span{
+ font-size: 14px;
+ color: #A3680A;
+ line-height: 32px;
+
+ }
+ }
h6{
color: #333333;
font-size: 26px;
@@ -302,10 +306,13 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
margin-right: 24px;
}
.editbutt{
+ width: 97px;
+ height: 30px;
+ line-height: 10px;
+ border-radius: 4px;
+ border: 1px solid #387DF7;
font-size: 14px;
- color: #333333;
-
-
+ color: #387DF7;
}
}
}
@@ -341,16 +348,20 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
}
.identity{
padding: 5px 10px;
- border: 1px solid #fcfcfc;
- border-radius: 8px;
+ width: 76px;
+ height: 30px;
+ // border: 1px solid #fcfcfc;
+ border-radius: 4px;
cursor: pointer;
- background-color: #ffffff;
+ font-size: 14px;
+ color: #9D6110;;
+ background-color: rgba($color: #FFECC7, $alpha: 0.54);
margin: 5px;
}
.active{
- background-color: #ffb30f;
+ background-color: #F99000;
color: #FFFFFF;
- border: 1px solid #ffb30f;
+ // border: 1px solid #ffb30f;
}
.uc-alert{
margin: 10px;
diff --git a/src/views/medal/Index.vue b/src/views/medal/Index.vue
index 9f95e5cc..ca3ea63b 100644
--- a/src/views/medal/Index.vue
+++ b/src/views/medal/Index.vue
@@ -33,27 +33,29 @@
+ width="80">
-
+ 
+
+ width="80">
+ LV{{scope.row.level}}
@@ -99,32 +101,30 @@
dialogVisible:false,
medalList:[],
medal:{},
- tableData:[]
+ tableData:[],
+ medalConfig:[],
+ rules:[],
}
},
mounted() {
- this.getMedal()
+ this.getMedal();
+ this.getConfig();
},
methods:{
+ getConfig() {// 获取勋章配置
+ apiStat.userMedalConfig().then(res=>{
+ if(res.status == 200) {
+ this.medalConfig = res.result;
+ }
+ })
+ },
goView(item) {
this.dialogVisible = true;
this.medal = item;
- apiStat.userMedalConfig().then(res=>{
- if(res.status == 200) {
-
- }
- })
- for (let index = 0; index < item.medalLevel; index++) {
- this.tableData.push({
- medalIcon:item.medalIcon,
- medalLevel:index,
- medalName:item.medalName,
- level:index,
- remark:item.requirement,
- num:'todo'
- })
- }
+ let data = this.medalConfig.find(it=>it.id ==item.medalId);
+ this.rules = JSON.parse(data.rules);
+ console.log(data,'data');
},
getMedal() {
apiStat.userMedal(this.userInfo.aid).then(res=>{
@@ -192,6 +192,9 @@
background-color: #387DF7;
margin-top: 7px;
}
+ .el-step__line{
+ background-color: #387DF7;
+ }
}
::v-deep .el-step__title.is-finish{
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index 94de006e..a9db208e 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -494,7 +494,7 @@ export default {
title: "完成课程评分",//事件的标题
parameters:"",//用户自定义参数 name:value,name:value
content: "给课程评分",//事件的内容
- objId: this.resolveId,//关联的id
+ objId: this.courseInfo.id,//关联的id
objType: 1,//关联的类型
objInfo: this.courseInfo.name,
aid: this.userInfo.aid, //当前登录人的id