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

edit

This commit is contained in:
faiz 2024-04-24 15:04:21 +08:00
parent a2a2d2d270
commit d82f1069fe
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,12 +305,12 @@
</el-col>
<el-col v-if="!isAdd" :span="8">
<el-form-item label="技术服务费支付状态：" label-width="142px">
<span>{{merData.is_service == 1?merData.ot_service_cost-merData.service_cost>0 ? '已缴' : '待缴':'无'}}</span>
<span>{{merData.is_service == 1?merData.ot_service_cost-merData.service_cost>0 ? '待缴' : '已缴':'无'}}</span>
</el-form-item>
</el-col>
<el-col v-if="!isAdd" :span="8">
<el-form-item label="上架费支付状态：">
<span>{{merData.is_goods == 1?merData.ot_goods_cost-merData.goods_cost>0 ? '已缴' : '待缴':'无'}}</span>
<span>{{merData.is_goods == 1?merData.ot_goods_cost-merData.goods_cost>0 ? '待缴' : '已缴':'无'}}</span>
</el-form-item>
</el-col>
</el-row>

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

@ -175,7 +175,9 @@
费用余额：保证金：{{merData.margin== 0 ? '无' : merData.margin}}，技术服务费：{{merData.service_cost == 0 ? '无' : merData.service_cost}}，上架费：{{merData.goods_cost == 0 ? '无' : merData.goods_cost}}
</div>
<div class="section item" style="border: none;">
支付状态：保证金：{{merData.ot_margin-merData.margin>=0 ? '已缴' : '待缴' }}，技术服务费：{{merData.ot_service_cost-merData.service_cost>=0 ? '已缴' : '待缴'}}，上架费：{{merData.ot_goods_cost-merData.goods_cost>=0 ? '已缴' : '待缴'}}
支付状态：保证金：{{merData.is_margin == 1?merData.ot_margin-merData.margin>0 ? '待缴' : '已缴':'无' }}，
技术服务费：{{merData.is_service == 1?merData.ot_service_cost-merData.service_cost>0 ? '待缴' : '已缴':'无'}}，
上架费：{{merData.is_goods == 1?merData.ot_goods_cost-merData.goods_cost>0 ? '待缴' : '已缴':'无'}}
</div>
</div>
<div class="section">

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

@ -143,7 +143,7 @@
<span>{{scope.row.is_soldier == 1 ? '是' : '否'}}</span>
</template>
</el-table-column>
<el-table-column prop="real_name" label="法人姓名" min-width="150" />
<el-table-column prop="ext.idcard.name" label="法人姓名" min-width="150" />
<el-table-column prop="status" label="推荐" min-width="100">
<template slot-scope="scope">
<el-switch