hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-08 10:26:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into zcwy-dev

Browse Source 
# Conflicts:
#	src/views/project/ProjectDetails.vue
This commit is contained in:
zhangsir
2024-01-29 17:36:14 +08:00
parent 3dbaf72d10 da879dee65
commit c2f6b8d0ee
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/project/ProjectDetails.vue
View File

@@ -4,7 +4,7 @@
<div class="pdname"> <div class="pdname">
{{ data.name }} {{ data.name }}
<el-popover v-show="data.remark" ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300" <el-popover v-if="data.remark" ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300"
:content="data.remark"> :content="data.remark">
<template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template> <template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template>
</el-popover> </el-popover>

8
vite.config.js
View File

@@ -167,7 +167,13 @@ export default defineConfig(({ command, mode }) =>
},'/vote/editVoteInvolvedAndBrowse': { },'/vote/editVoteInvolvedAndBrowse': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true, changeOrigin: true,
} },'/stu/project/process': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},'/stu/project/rank_list/point_list': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
} }
} }
}) })