Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
80c158ec7b
|
@ -3,3 +3,4 @@
|
|||
|
||||
# 使用【本地环境]接口地址
|
||||
VITE_API_URL=http://localhost:8080
|
||||
# VITE_API_URL=http://192.168.31.134:8080
|
||||
|
|
|
@ -25,7 +25,7 @@ for (let i = 0; i < totalBooks; i++) {
|
|||
<div class="search-suggest-combobox">
|
||||
<div class="input-search">
|
||||
<input placeholder="马嘉祺" />
|
||||
<button>搜索</button>
|
||||
<button >搜索</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="screen-outer">
|
||||
|
|
|
@ -22,6 +22,9 @@
|
|||
<el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
|
||||
</el-upload>
|
||||
</el-form-item>
|
||||
<el-form-item label="书籍类别" prop="category">
|
||||
<el-input v-model="dataForm.category" placeholder=""></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="书籍介绍" prop="introduction">
|
||||
<el-input v-model="dataForm.introduction" placeholder=""></el-input>
|
||||
</el-form-item>
|
||||
|
@ -77,7 +80,8 @@ const dataForm = reactive({
|
|||
description: '',
|
||||
store: '',
|
||||
createTime: '',
|
||||
updateTime: ''
|
||||
updateTime: '',
|
||||
category:''
|
||||
})
|
||||
|
||||
const init = (id?: number) => {
|
||||
|
|
|
@ -37,6 +37,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column prop="introduction" label="书籍介绍" header-align="center" align="center"></el-table-column>
|
||||
<el-table-column prop="description" label="书籍详情" header-align="center" align="center"></el-table-column>
|
||||
<el-table-column prop="category" label="书籍类别" header-align="center" align="center"></el-table-column>
|
||||
<el-table-column prop="store" label="库存" header-align="center" align="center"></el-table-column>
|
||||
<el-table-column prop="createTime" label="创建时间" header-align="center" align="center"></el-table-column>
|
||||
<el-table-column prop="updateTime" label="修改时间" header-align="center" align="center"></el-table-column>
|
||||
|
|
|
@ -11,17 +11,11 @@
|
|||
<el-input v-model="dataForm.avatar" placeholder=""></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="书本币" prop="balance">
|
||||
<el-input v-model="dataForm.balance" placeholder=""></el-input>
|
||||
<el-input disabled="true" v-model="dataForm.balance" placeholder=""></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="禁用状态" prop="status">
|
||||
<el-input v-model="dataForm.status" placeholder=""></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="创建时间" prop="createTime">
|
||||
<el-input v-model="dataForm.createTime" placeholder=""></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="修改时间" prop="updateTime">
|
||||
<el-input v-model="dataForm.updateTime" placeholder=""></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="visible = false">取消</el-button>
|
||||
|
|
|
@ -5,7 +5,10 @@
|
|||
<el-input v-model="state.queryForm.username" placeholder="用户名"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item prop="status">
|
||||
<el-input v-model="state.queryForm.status" placeholder="禁用状态"></el-input>
|
||||
<el-select v-model="state.queryForm.status" placeholder="禁用状态">
|
||||
<el-option label="0" value="0"></el-option>
|
||||
<el-option label="1" value="1"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button icon="Search" type="primary" @click="getDataList()">查询</el-button>
|
||||
|
@ -27,9 +30,8 @@
|
|||
<el-table v-loading="state.dataListLoading" :data="state.dataList" border class="layout-table" @selection-change="selectionChangeHandle">
|
||||
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
|
||||
<el-table-column prop="username" label="用户名" header-align="center" align="center"></el-table-column>
|
||||
<el-table-column prop="password" label="密码" header-align="center" align="center"></el-table-column>
|
||||
<el-table-column prop="balance" label="书本币" header-align="center" align="center"></el-table-column>
|
||||
<el-table-column prop="status" label="禁用状态" header-align="center" align="center"></el-table-column>
|
||||
<el-table-column prop="balance" label="书本币" header-align="center" align="center"></el-table-column>
|
||||
<ma-dict-column prop="status" label="禁用状态" dict-type="user_status" header-align="center" align="center"></ma-dict-column>
|
||||
<el-table-column prop="createTime" label="创建时间" header-align="center" align="center"></el-table-column>
|
||||
<el-table-column prop="updateTime" label="修改时间" header-align="center" align="center"></el-table-column>
|
||||
<el-table-column label="操作" fixed="right" header-align="center" align="center" width="150">
|
||||
|
|
Loading…
Reference in New Issue
Block a user