This commit is contained in:
gyq 2024-06-07 18:26:54 +08:00
parent 7266dd9309
commit 2056413f58
4 changed files with 7 additions and 19 deletions

View File

@ -1,9 +1,9 @@
ENV = 'development'
# 接口地址
VUE_APP_BASE_API = 'http://192.168.2.42:8000'
# VUE_APP_BASE_API = 'http://192.168.2.42:8000'
# VUE_APP_BASE_API = 'http://192.168.2.133:8000'
# VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
# VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn'
# VUE_APP_BASE_API = 'http://192.168.2.96:8000'
VUE_APP_WS_API = 'ws://192.168.2.128:8000'

View File

@ -2,8 +2,8 @@ ENV = 'production'
# 如果使用 Nginx 代理后端接口,那么此处需要改为 '/',文件查看 Docker 部署篇Nginx 配置
# 接口地址,注意协议,如果你没有配置 ssl需要将 https 改为 http
# VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn'
VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn'
# VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
# VUE_APP_BASE_API = 'http://192.168.2.98:8000'
# 如果接口是 http 形式, wss 需要改为 ws
VUE_APP_WS_API = 'wss://123.56.110.252

View File

@ -24,7 +24,7 @@
</el-form>
</div>
<div class="head-container">
<el-table :data="tableData.data" v-loading="tableData.loading">
<el-table :data="tableData.data" v-loading="tableData.loading" row-key="id">
<el-table-column label="用户名" prop="nickname">
<template v-slot="scope">
<div style="display: flex;align-items: center;">
@ -63,8 +63,10 @@
<template v-slot="scope">
<div style="display: flex;gap: 10px;">
<el-button type="text" @click="$refs.HistoryModal.show(scope.row.id)">查看记录</el-button>
<el-button type="text" v-if="scope.row.status == 0" disabled>已取完</el-button>
<el-button type="text" @click="$refs.addModal.show(scope.row)"
v-if="scope.row.status == 1">取酒</el-button>
<el-button type="text" v-if="scope.row.status == 2" disabled>已过期</el-button>
</div>
</template>
</el-table-column>

View File

@ -79,20 +79,6 @@ export default {
align-items: center;
padding: 14px;
&:hover {
cursor: pointer;
.info {
.name {
color: #39D47A;
}
.intro {
color: #39D47A;
}
}
}
.icon {
width: 40px;
height: 40px;