Merge branch 'develop' into manage-release

This commit is contained in:
wyx
2023-03-06 15:35:45 +08:00
2 changed files with 4 additions and 5 deletions

1
.env
View File

@@ -3,7 +3,6 @@ VITE_BASE_H5=/fe-student-h5
VITE_BASE_API=
VITE_OUTPUT_DIR=./dist
VITE_FILE_PATH=/upload/
VITE_FILE_PATH_AVATAR=/upload
VITE_BASE_LOGIN_URL=//u-pre.boe.com/web/
VITE_PROXY_URL=http://43.143.139.204/manageApi

View File

@@ -143,7 +143,7 @@
<div class="bottom">
<div v-for="(row, i) in commontList" :key="i" style="margin-bottom: 24px;">
<div class="header">
<img :src="row.studentAvatar" alt="" srcset="" class="avator">
<img :src="row.studentAvatar.includes('upload') ? row.studentAvatar : fielPath+row.studentAvatar" alt="" srcset="" class="avator">
<div class="id">{{ row.createName }}</div>
<div class="showCareer">{{row.studentJobName}}</div>
<div class="idThink"></div>
@@ -184,10 +184,10 @@
<div v-if="row.children.length!==0" :style="{height:spreadReply==i ? 'auto' : 210 +'px',overflow:'hidden',position: 'relative'}">
<div v-for="(replay, j) in row.children" :key="j">
<div class="reply">
<img :src="replay.studentAvatar" alt="" srcset="" class="sameava avaone">
<img :src="replay.studentAvatar.includes('upload') ? replay.studentAvatar : fielPath+replay.studentAvatar" alt="" srcset="" class="sameava avaone">
<div class="sameuser">{{ replay.studentName }}</div>
<div class="centerreply">回复</div>
<img :src="replay.targetStudentAvatar" alt="" srcset="" class="sameava avaone">
<img :src="replay.targetStudentAvatar.includes('upload') ? replay.targetStudentAvatar : fielPath+replay.targetStudentAvatar" alt="" srcset="" class="sameava avaone">
<div class="sameuser">{{ replay.targetStudentName }}</div>
<div class="replytime">{{ replay.createTime }}</div>
</div>
@@ -324,7 +324,7 @@ import UploadPostImg from "@/components/img/UploadPostImg.vue";
const router = useRouter();
const refInput =ref()
const fielPath = ref(import.meta.env.VITE_FILE_PATH_AVATAR);
const fielPath = ref(import.meta.env.VITE_FILE_PATH);
const getFocus = () => {
refInput.value.focus()
}