From c39bf92d3f10f3e5b88c1cf1eac5970d2545cf9c Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Thu, 18 Apr 2024 11:07:04 +0800
Subject: [PATCH] add

---
 src/views/merchant/list/handle/merDetails.vue  |  3 +++
 src/views/merchant/list/handle/merEditForm.vue |  3 +++
 src/views/merchant/list/handle/merInfo.vue     | 13 +++++++++++--
 src/views/product/productExamine/editAttr.vue  | 12 ++++++++----
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/views/merchant/list/handle/merDetails.vue b/src/views/merchant/list/handle/merDetails.vue
index 9ba2fc7..88c101d 100644
--- a/src/views/merchant/list/handle/merDetails.vue
+++ b/src/views/merchant/list/handle/merDetails.vue
@@ -175,6 +175,9 @@ export default {
           name:'',
           bank:'',
           bank_code:'',
+        },
+        ext:{
+          com:{}
         }
       }
       this.isEdit = false;
diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index bbbbb75..ccde5bc 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -516,6 +516,9 @@ export default {
         mer_name: [
           { required: true, message: '请输入商户名称', trigger: 'blur' }
         ],
+        'ext.com.contact': [
+          { required: true, message: '请输入企业名称', trigger: 'blur' }
+        ],
         mer_account: [
           { required: true, message: '请输入商户账号', trigger: 'blur' }
         ],
diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue
index 1d1e0f0..9014ca1 100644
--- a/src/views/merchant/list/handle/merInfo.vue
+++ b/src/views/merchant/list/handle/merInfo.vue
@@ -115,7 +115,7 @@
                 <span class="info info-red">(注：此处如未设置手续费，系统会自动读取商户分类下对应手续费；此处已设置，则优先以此处设置为准)</span>
               </div>
             </li>
-            <li class="item">
+            <!-- <li class="item">
               <div>店铺保证金：</div>
               <div class="value">
                 {{merData.is_margin == 0 ? '无' : merData.ot_margin}}
@@ -166,8 +166,17 @@
             <li v-if="merData.is_margin != 0" class="item">
               <div>保证金余额：</div>
               <div class="value">{{merData.margin}}</div>
-            </li> 
+            </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}}
+          </div>
+          <div class="section item" style="border: none;">
+            费用余额：保证金{{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 ? '无' : '已缴' }}
+          </div>
         </div>
         <div class="section">
           <div class="title">审核信息</div>
diff --git a/src/views/product/productExamine/editAttr.vue b/src/views/product/productExamine/editAttr.vue
index 3acf29b..ecfe174 100644
--- a/src/views/product/productExamine/editAttr.vue
+++ b/src/views/product/productExamine/editAttr.vue
@@ -110,8 +110,8 @@
                 </el-table-column>
                 <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
                   <template slot-scope="scope">
-                    <el-input v-if="formThead[iii].title==='商品编号'" v-model="scope.row[iii]" type="text" class="priceBox" />
-                    <el-input v-else  @input="handleCost(scope.row,iii)" :disabled="formThead[iii].title === '占比'" v-model="scope.row[iii]" class="priceBox" controls-position="right"/>
+                    <el-input @input="handleCost(scope.row,iii)" :disabled="formThead[iii].title === '占比'" v-model="scope.row[iii]" type="text" class="priceBox" />
+                    <!-- <el-input v-else  @input="handleCost(scope.row,iii)" :disabled="formThead[iii].title === '占比'" v-model="scope.row[iii]" class="priceBox" controls-position="right"/> -->
                   </template>
                 </el-table-column>
                 <template v-if="formValidate.extension_type === 1">
@@ -149,8 +149,9 @@
                 </el-table-column>
                 <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
                   <template slot-scope="scope">
-                    <el-input v-if="formThead[iii].title==='商品编号'" v-model="scope.row[iii]" type="text" class="priceBox" />
-                    <el-input v-else  @input="handleCost(scope.row,iii)" :disabled="formThead[iii].title === '占比'" v-model="scope.row[iii]" class="priceBox" controls-position="right"/>
+                    <el-input @input="handleCost(scope.row,iii)" :disabled="formThead[iii].title === '占比'" v-model="scope.row[iii]" type="text" class="priceBox" />
+                    <!-- <el-input v-if="formThead[iii].title==='商品编号'" v-model="scope.row[iii]" type="text" class="priceBox" /> -->
+                    <!-- <el-input v-else  @input="handleCost(scope.row,iii)" :disabled="formThead[iii].title === '占比'" v-model="scope.row[iii]" class="priceBox" controls-position="right"/> -->
                   </template>
                 </el-table-column>
                 <template v-if="formValidate.extension_type === 1">
@@ -378,6 +379,9 @@ export default {
         case 'growth':
           val.growth=val.growth.replace(/[^\d]/g,'')
           break;
+        case 'bar_code':
+          val.bar_code = val.bar_code.replace(/[\W]/g,'')
+          break;
       }
     },
     batchDel() {