faiz
/
hy-shop-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
faiz 2024-04-22 09:54:44 +08:00
parent 6c8a70ade9
commit 91d68c97f0
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/merchant/application/index.vue
View File

@ -98,7 +98,7 @@
>
<el-table-column prop="mer_intention_id" label="ID" min-width="60" />
<el-table-column prop="mer_name" label="店铺名称" min-width="150" />
<el-table-column prop="ext.com.contact" label="企业名称" min-width="150" />
<el-table-column prop="com.name" label="企业名称" min-width="150" />
<!-- <el-table-column prop="category_name" label="商户分类" min-width="150" /> -->
<el-table-column prop="type_name" label="店铺类型" min-width="150" />
<el-table-column prop="com.contact" label="对接人姓名" min-width="100" />

2
src/views/merchant/list/handle/merEditForm.vue
View File

@ -38,7 +38,7 @@
<el-form-item label="企业名称：" prop="ext.com.contact" v-if="merData.ext&&merData.ext.com">
<el-input
size="small"
v-model="merData.ext.com.contact"
v-model="merData.ext.com.name"
placeholder="请填写企业名称"
class="selWidth"
/>

6
src/views/merchant/list/handle/merInfo.vue
View File

@ -14,7 +14,7 @@
<li class="item" v-if="merData.ext">
<div>企业名称：</div>
<div class="value">
{{merData.ext.com?merData.ext.com.contact:'无'}}
{{merData.ext.com?merData.ext.com.name:'无'}}
</div>
</li>
<li class="item">
@ -236,14 +236,14 @@
<div class="value">{{merData.mer_password}}</div>
</li>
<li class="item">
<!-- <li class="item">
<div>联系人：</div>
<div class="value">{{merData.real_name}}</div>
</li>
<li class="item">
<div>联系电话：</div>
<div class="value">{{merData.mer_phone}}</div>
</li>
</li> -->
<!-- <li class="item">
<div>绑定手机号：</div>
<div class="value">{{merData.real_name}}</div>

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

@ -131,8 +131,8 @@
>
<el-table-column prop="mer_id" label="ID" min-width="60" />
<el-table-column prop="mer_name" label="店铺名称" min-width="150" />
<el-table-column prop="ext.com.contact" label="企业名称" min-width="150" />
<el-table-column prop="type_name" label="店铺类型" min-width="150" />
<el-table-column prop="ext.com.name" label="企业名称" min-width="150" />
<el-table-column prop="merchantType.type_name" label="店铺类型" min-width="150" />
<el-table-column prop="is_huimei" label="是否惠美乡村" min-width="100">
<template slot-scope="scope">
<span>{{scope.row.is_huimei == 1 ? '是' : '否'}}</span>