xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'abp' of https://gitee.com/ccnetcore/Yi into abp

Browse Source
This commit is contained in:
橙子
2023-12-15 00:11:25 +08:00
parent ba97bd3eb5 7d9e6f3a23
commit 964523c84c
6 changed files with 101 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Yi.Bbs.Vue3/.env.development
View File

@@ -1,5 +1,5 @@
# 接口前缀
VITE_APP_BASEAPI="/api-dev"
# VITE_APP_URL="http://123.207.63.87:19001/api/app"
VITE_APP_URL="http://localhost:19001/api/app"
VITE_APP_URL="http://123.207.63.87:19001/api/app"
# VITE_APP_URL="http://localhost:19001/api/app"
VITE_APP_ENV_NAME = "dev"

0
Yi.Bbs.Vue3/src/assets/logo.ico → Yi.Bbs.Vue3/src/assets/common/icons/logo.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

177
Yi.Bbs.Vue3/src/components/AvatarInfo.vue
View File

@@ -1,131 +1,144 @@
<template >
<div class="avatar">
<div class="avatar-left">
<el-avatar :size="props.size" :src="iconUrl" />
<template>
<div class="avatar">
<div class="avatar-left">
<el-avatar :size="props.size" :src="iconUrl" />
<div v-if="props.isSelf">
<div class="nick"> {{ userInfo.nick }}</div>
</div>
<div v-if="props.isSelf">
<div class="nick">{{ userInfo.nick }}</div>
</div>
<div v-if="!props.isSelf">
<div class="nick" :class="{ mt_1: props.time != 'undefined' }"> {{ userInfo.nick }}</div>
<div class="remarks" v-if="props.time"> {{ props.time }}</div>
<div class="remarks">
<slot name="bottom" />
</div>
</div>
<div class="info" v-if="!props.isSelf">
<el-tag class="ml-2" type="warning">V8</el-tag>
<el-tag class="ml-2" type="danger">会员</el-tag>
</div>
<div v-if="!props.isSelf">
<div class="nick" :class="{ mt_1: props.time != 'undefined' }">
{{ userInfo.nick }}
</div>
<el-button v-if="props.showWatching" type="primary" size="default" icon="Plus">关注</el-button>
<div class="remarks" v-if="props.time">{{ props.time }}</div>
<div class="remarks">
<slot name="bottom" />
</div>
</div>
<div class="info" v-if="!props.isSelf">
<el-tag class="ml-2" type="warning">V8</el-tag>
<el-tag class="ml-2" type="danger">会员</el-tag>
</div>
</div>
<el-button
v-if="props.showWatching"
type="primary"
size="default"
icon="Plus"
>关注</el-button
>
</div>
</template>
<script setup>
import useUserStore from '@/stores/user'
import { reactive, watch, onMounted, computed, ref } from 'vue';
import useUserStore from "@/stores/user";
import { reactive, watch, onMounted, computed, ref } from "vue";
//userInfo
//{icon,name,role,id},根据判断userInfo是否等于未定义，来觉得是当前登录用户信息，还是其他人信息
const props = defineProps(['size', 'showWatching', 'time', 'userInfo', 'isSelf'])
const props = defineProps([
"size",
"showWatching",
"time",
"userInfo",
"isSelf",
]);
const userStore = useUserStore();
const userInfo = reactive({
icon: "",
nick: "",
role: [],
id: ""
icon: "",
nick: "",
role: [],
id: "",
});
const iconUrl=ref('/src/assets/logo.ico');
const iconUrl = ref("../../src/assets/common/icons/logo.ico");
const iconUrlHandler = () => {
if (userInfo.icon == null || userInfo.icon == undefined || userInfo.icon == '') {
return '/src/assets/logo.ico';
}
return `${import.meta.env.VITE_APP_BASEAPI}/file/${userInfo.icon}`;
}
if (
userInfo.icon == null ||
userInfo.icon == undefined ||
userInfo.icon == ""
) {
return "../../src/assets/common/icons/logo.ico";
}
return `${import.meta.env.VITE_APP_BASEAPI}/file/${userInfo.icon}`;
};
watch(userStore, (n) => {
if (props.userInfo == undefined) {
userInfo.nick = n.name;
}
if (props.userInfo == undefined) {
userInfo.nick = n.name;
}
});
})
watch(() => props, (n) => {
watch(
() => props,
(n) => {
Init();
}, { deep: true })
},
{ deep: true }
);
onMounted(() => {
Init();
})
Init();
});
const Init = () => {
//使用传入值
if (props.userInfo != undefined) {
userInfo.icon = props.userInfo.icon;
userInfo.nick = props.userInfo.nick;
userInfo.role = props.userInfo.role;
userInfo.id = props.userInfo.id;
iconUrl.value=iconUrlHandler(userInfo.icon)
}
//使用当前登录用户
else {
userInfo.icon = userStore.icon;
userInfo.nick = userStore.name;
userInfo.role = userStore.role;
userInfo.id = userStore.id;
iconUrl.value=userInfo.icon;
}
}
//使用传入值
if (props.userInfo != undefined) {
userInfo.icon = props.userInfo.icon;
userInfo.nick = props.userInfo.nick;
userInfo.role = props.userInfo.role;
userInfo.id = props.userInfo.id;
iconUrl.value = iconUrlHandler(userInfo.icon);
}
//使用当前登录用户
else {
userInfo.icon = userStore.icon;
userInfo.nick = userStore.name;
userInfo.role = userStore.role;
userInfo.id = userStore.id;
iconUrl.value = iconUrlHandler(userInfo.icon);
}
};
</script>
<style scoped>
.mt_1 {
margin-top: 0.5rem;
margin-top: 0.5rem;
}
.nick {
font-weight: bold;
font-weight: bold;
}
.info {
margin-top: 0.6rem;
margin-left: 1rem;
margin-top: 0.6rem;
margin-left: 1rem;
}
.info .el-tag {
margin-right: 1rem;
margin-right: 1rem;
}
.el-icon {
color: white;
color: white;
}
.avatar {
display: flex;
justify-content: space-between;
display: flex;
justify-content: space-between;
}
.avatar-left {
display: flex;
justify-content: flex-start;
align-items: center;
display: flex;
justify-content: flex-start;
align-items: center;
}
.el-avatar {
margin-right: 1.2rem;
margin-right: 1.2rem;
}
.remarks {
padding-top: 0.5rem;
color: #8C8C8C;
padding-top: 0.5rem;
color: #8c8c8c;
}
</style>
</style>

3
Yi.Bbs.Vue3/src/permission.js
View File

@@ -41,7 +41,8 @@ router.beforeEach((to, from, next) => {
// 在免登录白名单，直接进入
next();
} else {
next(`/login?redirect=${to.path}&unTourist=true`); // 否则全部重定向到登录页
next();
// next(`/login?redirect=${to.path}&unTourist=true`); // 否则全部重定向到登录页
NProgress.done();
}
}

3
Yi.Bbs.Vue3/src/stores/user.js
View File

@@ -45,9 +45,8 @@ const useUserStore = defineStore("user", {
const user = res.user;
const avatar =
user.icon == "" || user.icon == null
? "/src/assets/logo.ico"
? "../../src/assets/common/icons/logo.ico"
: import.meta.env.VITE_APP_BASEAPI + "/file/" + user.icon;
if (res.roleCodes && res.roleCodes.length > 0) {
// 验证返回的roles是否是一个非空数组
this.roles = res.roleCodes;

5
Yi.Bbs.Vue3/src/views/Login.vue
View File

@@ -26,7 +26,7 @@
</el-form>
<RouterLink to="/register"> 没有账号？前往注册</RouterLink>
<button class="login-btn" @click="login(loginFormRef)">登 录</button>
<button class="login-btn" @click="guestlogin">游客临时登录</button>
<button class="login-btn" @click="guestlogin">访客</button>
</div>
<div class="divider">
@@ -76,9 +76,6 @@ const loginForm = reactive({
code: "",
});
const guestlogin = async () => {
loginForm.userName = "guest";
loginForm.password = "123456";
await userStore.login(loginForm);
const redirect = route.query?.redirect ?? "/index";
router.push(redirect);
};