Merge remote-tracking branch 'origin/master'

6020d299 · zhangyanni · ae02840e · ba94713a · 6020d299
Commit 6020d299 authored Dec 17, 2020 by zhangyanni
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

peoplehome.vue src/views/peoplehomepage/peoplehome.vue +1 -1

No files found.
--- a/src/views/peoplehomepage/peoplehome.vue
+++ b/src/views/peoplehomepage/peoplehome.vue
@@ -482,7 +482,7 @@
            },
            //勋章
            getInitInfo() {
-                api.getMedalInfoById(this.userInfo.empId).then((res) => {
+                api.getMedalInfoById(this.$route.query.id?this.$route.query.id:this.userInfo.empId).then((res) => {
                    if (res.code == 0) {
                        this.detailInfo = res.result;
                    } else {