|
|
@@ -33,7 +33,7 @@
|
|
|
<div class="index-aside aside" :class="{ 'sticky top': isActive }">
|
|
|
<div class="signin-tip sidebar-block signin">
|
|
|
<div class="first-line">
|
|
|
- <button @click="signIn" v-if="dataInfo.signStatus == 0" class="btn">
|
|
|
+ <button @click="signIn" v-if="userInfo.signStatus == 0" class="btn">
|
|
|
立即签到
|
|
|
</button>
|
|
|
<button v-else class="btn signed-btn">今日已签到</button>
|
|
|
@@ -41,54 +41,38 @@
|
|
|
</div>
|
|
|
<div class="signin-tip sidebar-block">
|
|
|
<div class="avatar">
|
|
|
- <el-avatar :size="65" :src="avatarUrl"></el-avatar>
|
|
|
- <span class="name">{{ dataInfo.userName }}</span>
|
|
|
+ <el-avatar :size="65" :src="avatar"></el-avatar>
|
|
|
+ <span class="name">{{ userInfo.userName }}</span>
|
|
|
</div>
|
|
|
<div class="info">
|
|
|
<div class="info-item">
|
|
|
<div class="item-title">部门:</div>
|
|
|
- <div :title="dataInfo.deptName" class="item-content">{{ dataInfo.deptName }}</div>
|
|
|
+ <div :title="userInfo.deptName" class="item-content">{{ userInfo.deptName }}</div>
|
|
|
</div>
|
|
|
<div class="info-item">
|
|
|
<div class="item-title">积分:</div>
|
|
|
<div class="item-content blue">
|
|
|
- {{ dataInfo.surplusIntegral }}
|
|
|
+ {{ userInfo.surplusIntegral }}
|
|
|
</div>
|
|
|
</div>
|
|
|
- <!-- <div class="info-item">
|
|
|
- <div class="item-title">排行:</div>
|
|
|
- <div class="item-content blue">{{ dataInfo.nowtop }}</div>
|
|
|
- </div> -->
|
|
|
- <!-- <div class="info-item">
|
|
|
- <div class="item-title">勋章:</div>
|
|
|
- <div class="item-content blue">{{ dataInfo.medalCount }}枚</div>
|
|
|
- </div> -->
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="sidebar-block sticky-block">
|
|
|
<div class="avatar">
|
|
|
- <el-avatar :size="65" :src="avatarUrl"></el-avatar>
|
|
|
- <span class="name">{{ dataInfo.userName }}</span>
|
|
|
+ <el-avatar :size="65" :src="avatar"></el-avatar>
|
|
|
+ <span class="name">{{ userInfo.userName }}</span>
|
|
|
</div>
|
|
|
<div class="info">
|
|
|
<div class="info-item">
|
|
|
<div class="item-title">部门:</div>
|
|
|
- <div :title="dataInfo.deptName" class="item-content" style="line-height: 1.5rem;">{{ dataInfo.deptName }}</div>
|
|
|
+ <div :title="userInfo.deptName" class="item-content" style="line-height: 1.5rem;">{{ userInfo.deptName }}</div>
|
|
|
</div>
|
|
|
<div class="info-item">
|
|
|
<div class="item-title">积分:</div>
|
|
|
<div class="item-content blue">
|
|
|
- {{ dataInfo.surplusIntegral }}
|
|
|
+ {{ userInfo.surplusIntegral }}
|
|
|
</div>
|
|
|
</div>
|
|
|
- <!-- <div class="info-item">
|
|
|
- <div class="item-title">排行:</div>
|
|
|
- <div class="item-content blue">{{ dataInfo.nowtop }}</div>
|
|
|
- </div> -->
|
|
|
- <!-- <div class="info-item">
|
|
|
- <div class="item-title">勋章:</div>
|
|
|
- <div class="item-content blue">{{ dataInfo.medalCount }}枚</div>
|
|
|
- </div> -->
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -96,7 +80,8 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
-import { sign, signInfo,useInfo } from "@/api/allApi";
|
|
|
+import { mapGetters } from 'vuex'
|
|
|
+import { sign, signInfo } from "@/api/allApi";
|
|
|
import calendar from '@/components/Calendar'
|
|
|
export default {
|
|
|
components: {
|
|
|
@@ -108,15 +93,15 @@ export default {
|
|
|
integral:'',
|
|
|
markDate: [],
|
|
|
isActive: false,
|
|
|
- dataInfo: {},
|
|
|
- avatarUrl:
|
|
|
- "https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png",
|
|
|
dataList: [],
|
|
|
};
|
|
|
},
|
|
|
+ computed: {
|
|
|
+ // 将 getter 映射到当前组件的计算属性
|
|
|
+ ...mapGetters(['userInfo','avatar'])
|
|
|
+ },
|
|
|
created() {
|
|
|
this.getSignInfo();
|
|
|
- this.getUserInfo();
|
|
|
},
|
|
|
methods: {
|
|
|
// 点击日期
|
|
|
@@ -127,12 +112,6 @@ export default {
|
|
|
changeMonth(date) {
|
|
|
console.log(date);
|
|
|
},
|
|
|
- getUserInfo() {
|
|
|
- useInfo().then((response) => {
|
|
|
- this.dataInfo = response.data.data;
|
|
|
- this.avatarUrl = this.dataInfo.httpFile + this.dataInfo.headImage;
|
|
|
- });
|
|
|
- },
|
|
|
getSignInfo() {
|
|
|
signInfo().then((response) => {
|
|
|
this.markDate = response.data.data.signDays;
|
|
|
@@ -148,7 +127,7 @@ export default {
|
|
|
type: 'success'
|
|
|
});
|
|
|
this.getSignInfo();
|
|
|
- this.getUserInfo();
|
|
|
+ this.$store.dispatch('GetUserInfo');
|
|
|
});
|
|
|
},
|
|
|
// 保存滚动值,这是兼容的写法
|