From d82f1069fe11cbf2d817b95358755813dd2ddcfc Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Wed, 24 Apr 2024 15:04:21 +0800
Subject: [PATCH] edit

---
 src/views/merchant/list/handle/merEditForm.vue | 4 ++--
 src/views/merchant/list/handle/merInfo.vue     | 4 +++-
 src/views/merchant/list/index.vue              | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index 40a589d..f7908e2 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -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>
diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue
index b34cffe..072c6a4 100644
--- a/src/views/merchant/list/handle/merInfo.vue
+++ b/src/views/merchant/list/handle/merInfo.vue
@@ -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">
diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index c29bb90..2117511 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -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