bonus
/
Zlpt_Portal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-songyang'

This commit is contained in:
songyang 2023-12-09 22:59:13 +08:00
parent 74d44e2965 84f2b56ece
commit dbf31c9cb1
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/layout/header.vue
View File

@ -44,9 +44,9 @@
const inputRef: any = ref(null) const inputRef: any = ref(null)
// 输入框下方历史搜索记录 // 输入框下方历史搜索记录
const searchHistoryList = computed(() => { // const searchHistoryList = computed(() => {
return store.searchHistoryList.slice(0, 4) // return store.searchHistoryList.slice(0, 1)
}) // })
// 搜索按钮 // 搜索按钮
const searchKeywordBtn = () => { const searchKeywordBtn = () => {
@ -136,7 +136,11 @@
<button class="search-btn" @click="searchKeywordBtn">搜索</button> <button class="search-btn" @click="searchKeywordBtn">搜索</button>
<div class="ipt-down"> <div class="ipt-down">
<a v-for="item in searchHistoryList" :key="item" @click="handleHistory(item)"> <a
v-for="item in store.searchHistoryList.slice(0, 4)"
:key="item"
@click="handleHistory(item)"
class="history-box">
{{ item }} {{ item }}
</a> </a>
</div> </div>
@ -271,15 +275,20 @@
.ipt-down { .ipt-down {
position: absolute; position: absolute;
bottom: 20px; bottom: 15px;
left: 21%; left: 22%;
overflow: hidden; overflow: hidden;
a { a {
max-width: 140px;
padding: 0 10px; padding: 0 10px;
color: #727272; color: #727272;
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;
overflow: hidden;
display: inline-block;
white-space: nowrap;
text-overflow: ellipsis;
} }
} }
} }

8
src/views/register.vue
View File

@ -188,11 +188,15 @@
<el-col :span="8"> <el-col :span="8">
<div style="width: 100%"> <div style="width: 100%">
<el-button <el-button
style="width: 100%;" style="width: calc(100% - 8px); margin-left: 8px"
type="primary" type="primary"
@click="getCodeInfo" @click="getCodeInfo"
:disabled="getCodeBtnDisabled"> :disabled="getCodeBtnDisabled">
{{ getCodeBtnDisabled ? `${residuSeconds}秒后重新发送` : '获取验证码' }} {{
getCodeBtnDisabled
? `${residuSeconds}秒后重新发送`
: '获取验证码'
}}
</el-button> </el-button>
</div> </div>
</el-col> </el-col>