Merge branch 'test' of 47.94.45.65:angelo/web-retail-admin into base-online

This commit is contained in:
woody 2025-06-18 17:15:50 +08:00
commit 21d33236c1
4 changed files with 6 additions and 6 deletions

View File

@ -11,7 +11,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>fave.png"> <link rel="icon" href="<%= BASE_URL %>logo.png">
<title> <title>
<%= webpackConfig.name %> <%= webpackConfig.name %>
</title> </title>

BIN
public/logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
src/assets/images/logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

@ -64,7 +64,7 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'结算等级'" prop="pkMaxAwards"> <el-form-item :label="'结算等级'" prop="pkMaxAwards">
<el-select <el-select
v-model="queryParams.pkMaxAwards" v-model="queryParams.pkgettleGrade"
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"
> >
@ -466,9 +466,9 @@
width="180" width="180"
/> />
<el-table-column <el-table-column
v-if="menuList[4].checked == true && allTxt.pkMaxAwardsVal" v-if="menuList[4].checked == true && allTxt.pkgettleGradeval"
align="center" align="center"
prop="pkMaxAwardsVal" prop="pkgettleGradeval"
:label="'结算等级'" :label="'结算等级'"
width="180" width="180"
/> />
@ -775,7 +775,7 @@ export default {
id: 4, id: 4,
text: '结算等级', text: '结算等级',
checked: true, checked: true,
prop: 'pkMaxAwardsVal' prop: 'pkgettleGradeval'
}, },
{ {
id: 5, id: 5,
@ -869,7 +869,7 @@ export default {
phone: '', // phone: '', //
changeNumber: '', // changeNumber: '', //
pkRegisterGrade: '', // pkRegisterGrade: '', //
pkMaxAwards: '', // pkgettleGrade: '', //
pkAwards: '', // pkAwards: '', //
vertexId: '', // vertexId: '', //
teamId: '', // teamId: '', //