diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/Bank/BankCardDto.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/Bank/BankCardDto.cs index 8e0fe990..82e5df09 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/Bank/BankCardDto.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/Bank/BankCardDto.cs @@ -10,7 +10,10 @@ namespace Yi.Framework.Bbs.Application.Contracts.Dtos.Bank { public class BankCardDto:EntityDto { - + /// + /// 满期限时间,可空 + /// + public DateTime? FulltermTime { get; set; } public DateTime? LastDepositTime { get; set; } public DateTime CreationTime { get; set; } @@ -31,10 +34,6 @@ namespace Yi.Framework.Bbs.Application.Contracts.Dtos.Bank public decimal MaxStorageMoney { get; set; } - /// - /// 满期限时间,可空 - /// - public DateTime? Fullterm { get; set; } /// /// 银行卡状态 diff --git a/Yi.Bbs.Vue3/src/apis/bankApi.js b/Yi.Bbs.Vue3/src/apis/bankApi.js index 517bc4e8..ab7b626c 100644 --- a/Yi.Bbs.Vue3/src/apis/bankApi.js +++ b/Yi.Bbs.Vue3/src/apis/bankApi.js @@ -29,13 +29,12 @@ export function applyingBankCard() { export function drawMoney(cardId) { return request({ url: `/bank/draw/${cardId}`, - method: "put", - data: data, + method: "put" }); } // 存款 -export function delUser(cardId,moneyNum) { +export function depositMoney(cardId,moneyNum) { return request({ url: `/bank/deposit/${cardId}/${moneyNum}`, method: "put" diff --git a/Yi.Bbs.Vue3/src/components/ArticleContentInfo.vue b/Yi.Bbs.Vue3/src/components/ArticleContentInfo.vue index b10187aa..26d5edf8 100644 --- a/Yi.Bbs.Vue3/src/components/ArticleContentInfo.vue +++ b/Yi.Bbs.Vue3/src/components/ArticleContentInfo.vue @@ -92,7 +92,6 @@ const props = defineProps(['code']) let codeCopyDic=[]; const addCopyEvent=()=>{ const copySpans = document.querySelectorAll('.copy'); -console.log(copySpans,"copySpans"); // 为每个 copy span 元素添加点击事件 copySpans.forEach(span => { diff --git a/Yi.Bbs.Vue3/src/hooks/useAuths.js b/Yi.Bbs.Vue3/src/hooks/useAuths.js index e9b86ab7..8b03190a 100644 --- a/Yi.Bbs.Vue3/src/hooks/useAuths.js +++ b/Yi.Bbs.Vue3/src/hooks/useAuths.js @@ -147,6 +147,7 @@ const currentUserInfo=computed(()=>{ useUserStore().updateToken(token); try { // 存储用户信息 + await useUserStore().getInfo(); // 用户信息 // 登录成功后 路由跳转 // 如果有记录当前跳转页面 diff --git a/Yi.Bbs.Vue3/src/layout/AppHeader.vue b/Yi.Bbs.Vue3/src/layout/AppHeader.vue index 130e4031..32001fe0 100644 --- a/Yi.Bbs.Vue3/src/layout/AppHeader.vue +++ b/Yi.Bbs.Vue3/src/layout/AppHeader.vue @@ -48,10 +48,17 @@
+ + +
钱钱:{{money}}
+ + + +
@@ -86,12 +96,13 @@ import useUserStore from "@/stores/user.js"; import useConfigStore from "@/stores/config"; import useAuths from "@/hooks/useAuths"; import { Session } from "@/utils/storage"; - +import { storeToRefs } from 'pinia' const { isLogin, clearStorage } = useAuths(); const configStore = useConfigStore(); const router = useRouter(); const route = useRoute(); const userStore = useUserStore(); +const { money } = storeToRefs(userStore) const activeIndex = ref("1"); const searchText = ref(""); const handleSelect = (key, keyPath) => { @@ -142,6 +153,16 @@ const handleGithubClick = () => {