wanma-benteng
/
new-admin-view
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改：商户列表显示品牌信息，不在显示保证金和备注信息

This commit is contained in:
wuhui_zzw 2024-06-04 14:45:46 +08:00
parent 2a17b73814
commit 19964f6528
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/views/merchant/list/index.vue
View File

@ -111,7 +111,12 @@
<el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="small" highlight-current-row class="switchTable"> <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="small" highlight-current-row class="switchTable">
<el-table-column prop="mer_id" label="ID" min-width="60" align="center"/> <el-table-column prop="mer_id" label="ID" min-width="60" align="center"/>
<el-table-column prop="mer_name" :label="merchantTitle + '名称'" min-width="150" align="center"/> <el-table-column prop="mer_name" :label="merchantTitle + '名称'" min-width="150" align="center"/>
<el-table-column prop="real_name" :label="merchantTitle + '姓名'" min-width="150" align="center"/> <el-table-column prop="real_name" label="负责人信息" min-width="150" align="center">
<template slot-scope="scope">
{{ scope.row.real_name || ''}}<br />
{{ scope.row.mer_phone || ''}}
</template>
</el-table-column>
<el-table-column prop="status" label="推荐" min-width="100" align="center"> <el-table-column prop="status" label="推荐" min-width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
@ -125,7 +130,7 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="status" label="开启/关闭" min-width="100" align="center"> <el-table-column prop="status" label="开启/关闭" min-width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-model="scope.row.status" v-model="scope.row.status"
@ -139,14 +144,18 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="create_time" label="创建时间" min-width="150" align="center"/> <el-table-column prop="create_time" label="创建时间" min-width="150" align="center"/>
<el-table-column prop="margin" label="保证金" min-width="150" align="center"> <!--<el-table-column prop="margin" label="保证金" min-width="150" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{scope.row.is_margin == 1 ? '未支付' : scope.row.is_margin == 0 ? '无' : '已支付'}}</span>-->
<!-- </template>-->
<!--</el-table-column>-->
<el-table-column prop="margin" label="品牌" min-width="150" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.is_margin == 1 ? '未支付' : scope.row.is_margin == 0 ? '无' : '已支付'}}</span> <span v-if="scope.row.brand">{{ scope.row.brand.title || '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="sort" label="排序" min-width="100" align="center"/> <el-table-column prop="sort" label="排序" min-width="100" align="center"/>
<el-table-column prop="mark" label="备注" min-width="200" align="center"/> <!--<el-table-column prop="mark" label="备注" min-width="200" align="center"/>-->
<el-table-column label="操作" min-width="150" fixed="right" align="center"> <el-table-column label="操作" min-width="150" fixed="right" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <router-link <!-- <router-link