From 88a310dd71b7fe77ef72cf2a1ccf69540e9a7441 Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Tue, 23 Apr 2024 17:33:01 +0800
Subject: [PATCH] edit

---
 src/views/merchant/application/merInfo.vue    |  4 +-
 .../merchant/list/handle/merEditForm.vue      | 38 ++++++++++++-------
 src/views/merchant/list/handle/merInfo.vue    | 16 ++++----
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/src/views/merchant/application/merInfo.vue b/src/views/merchant/application/merInfo.vue
index d76ff28..acd9334 100644
--- a/src/views/merchant/application/merInfo.vue
+++ b/src/views/merchant/application/merInfo.vue
@@ -235,10 +235,10 @@
               <div>实际经营地址：</div>
               <div class="value">{{merData.biz.address_true}}</div>
             </li>
-            <li class="item">
+            <!-- <li class="item">
               <div>实际经营范围：</div>
               <div class="value">{{merData.biz.businessScope}}</div>
-            </li>
+            </li> -->
           </ul>
         </div>
       </el-tab-pane>
diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index c095276..5cb68e4 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -300,34 +300,36 @@
             <el-row :gutter="24" class="mt20">
               <el-col v-if="!isAdd":span="8">
                 <el-form-item label="保证金支付状态：">
-                  <span>{{merData.ot_margin-merData.margin>=0 ? '已缴' : '待缴' }}</span>
+                  <span>{{merData.is_margin == 1?merData.ot_margin-merData.margin>0 ? '待缴' : '已缴':'无' }}</span>
                 </el-form-item>
               </el-col>
               <el-col v-if="!isAdd" :span="8">
                 <el-form-item label="技术服务费支付状态：" label-width="142px">
-                  <span>{{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.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>
             <el-row :gutter="24" class="mt20">
               <el-col v-if="!isAdd" :span="8">
-                <el-form-item label="保证金余额：">
-                  <span>{{merData.ot_margin-merData.margin}}</span>
+                <el-form-item label="保证金应缴费用：">
+                  <span>{{merData.is_margin == 1?(merData.ot_margin<+merData.margin)?merData.margin:(merData.ot_margin-merData.margin):'0'}}</span>
                 </el-form-item>
               </el-col>
               <el-col v-if="!isAdd" :span="8">
-                <el-form-item label="技术服务费余额：">
-                  <span>{{merData.ot_service_cost-merData.service_cost}}</span>
+                <el-form-item label="技术服务费应缴费用：" label-width="150px">
+                  <span>{{merData.is_service == 1?(merData.ot_service_cost<+merData.service_cost)?merData.service_cost:(merData.ot_service_cost-merData.service_cost):'0'}}</span>
+                  <!-- <span>{{merData.ot_service_cost-merData.service_cost}}</span> -->
                 </el-form-item>
               </el-col>
               <el-col v-if="!isAdd" :span="8">
-                <el-form-item label="上架费余额：">
-                  <span>{{merData.ot_goods_cost-merData.goods_cost}}</span>
+                <el-form-item label="上架费应缴费用：">
+                  <span>{{merData.is_goods == 1?(merData.ot_goods_cost<+merData.goods_cost)?merData.goods_cost:(merData.ot_goods_cost-merData.goods_cost):'0'}}</span>
+                  <!-- <span>{{merData.ot_goods_cost-merData.goods_cost}}</span> -->
                 </el-form-item>
               </el-col>
           </el-row>
@@ -448,22 +450,32 @@
               </el-form-item>
             </el-col>
             <el-col v-if="!isAdd" :span="12">
-              <el-form-item label="联系人：" prop="real_name">
+              <el-form-item label="联系人：" prop="ext.com.contact" v-if="merData.ext&&merData.ext.com">
                 <el-input
                   type="text"
                   size="small"
                   placeholder="请填写联系人"
-                  v-model="merData.real_name"
+                  v-model="merData.ext.com.contact"
                   class="selWidth"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="联系电话：" prop="mer_phone">
+              <el-form-item label="联系电话：" prop="ext.com.mobile" v-if="merData.ext&&merData.ext.com">
                 <el-input
                   size="small"
                   placeholder="请填写联系电话"
-                  v-model="merData.mer_phone"
+                  v-model="merData.ext.com.mobile"
+                  class="selWidth"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="对接人身份证号：" prop="ext.com.number" v-if="merData.ext&&merData.ext.com">
+                <el-input
+                  size="small"
+                  placeholder="请填写联系电话"
+                  v-model="merData.ext.com.number"
                   class="selWidth"
                 />
               </el-form-item>
diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue
index 6311ffe..b34cffe 100644
--- a/src/views/merchant/list/handle/merInfo.vue
+++ b/src/views/merchant/list/handle/merInfo.vue
@@ -70,29 +70,29 @@
             </li> -->
           </ul>
           <div class="title" style="margin-top: 10px;">银行卡信息</div>
-          <ul class="list" v-if="merData.ext">
+          <ul class="list" v-if="merData.financial_bank">
             <li class="item">
               <div>名称：</div>
               <div class="value">
-                {{merData.ext.bank&&merData.ext.bank.bankName}}
+                {{merData.financial_bank.name}}
               </div>
             </li>
             <li class="item">
               <div>开户银行：</div>
               <div class="value">
-                {{merData.ext.bank&&merData.ext.bank.bankCard}}
+                {{merData.financial_bank.bank}}
               </div>
             </li>
             <li class="item">
               <div>开户卡号：</div>
               <div class="value">
-                {{merData.ext.bank&&merData.ext.bank.bankBranchName}}
+                {{merData.financial_bank.bank_code}}
               </div>
             </li>
             <li class="item">
               <div>联行号：</div>
               <div class="value">
-                {{merData.ext.bank&&merData.ext.bank.CNAPS}}
+                {{merData.financial_bank.inter_bank}}
               </div>
             </li>
           </ul>
@@ -169,13 +169,13 @@
             </li>  -->
           </ul>
           <div class="section item" style="border: none;">
-            费用额度：保证金{{merData.is_margin == 0 ? '无' : merData.ot_margin}}，技术服务费{{merData.is_service == 0 ? '无' : merData.ot_service_cost}}，上架费{{merData.is_goods == 0 ? '无' : merData.ot_goods_cost}}
+            费用额度：保证金：{{merData.is_margin == 0 ? '无' : merData.ot_margin}}，技术服务费：{{merData.is_service == 0 ? '无' : merData.ot_service_cost}}，上架费：{{merData.is_goods == 0 ? '无' : merData.ot_goods_cost}}
           </div>
           <div class="section item" style="border: none;">
-            费用余额：保证金{{merData.margin}}，技术服务费{{merData.service_cost == 0 ? '无' : merData.service_cost}}，上架费{{merData.goods_cost == 0 ? '无' : merData.goods_cost}}
+            费用余额：保证金：{{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.is_margin == 1 ? '待缴' : merData.is_margin == 0 ? '无' : '已缴' }}，技术服务费{{merData.is_service == 1 ? '待缴' : merData.is_service == 0 ? '无' : '已缴' }}，上架费{{merData.is_goods == 1 ? '待缴' : merData.is_goods == 0 ? '无' : '已缴' }}
+            支付状态：保证金：{{merData.ot_margin-merData.margin>=0 ? '已缴' : '待缴' }}，技术服务费：{{merData.ot_service_cost-merData.service_cost>=0 ? '已缴' : '待缴'}}，上架费：{{merData.ot_goods_cost-merData.goods_cost>=0 ? '已缴' : '待缴'}}
           </div>
         </div>
         <div class="section">