From 9a48d09805eea0f6dd61ac7ced43bddb4efebe4d Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Mon, 22 Apr 2024 17:44:31 +0800
Subject: [PATCH] 1

---
 src/views/merchant/application/index.vue      | 10 ++---
 src/views/merchant/application/merInfo.vue    | 12 ++---
 .../merchant/list/handle/merEditForm.vue      | 45 +++++++++++--------
 src/views/merchant/list/index.vue             |  8 ++--
 src/views/product/productExamine/info.vue     | 20 ++++++---
 .../product/productExamine/proDetails.vue     |  6 +--
 6 files changed, 57 insertions(+), 44 deletions(-)

diff --git a/src/views/merchant/application/index.vue b/src/views/merchant/application/index.vue
index 83d8345..39f7913 100644
--- a/src/views/merchant/application/index.vue
+++ b/src/views/merchant/application/index.vue
@@ -28,7 +28,7 @@
             style="width: 280px"
           />
         </el-form-item>
-        <el-form-item label="商户分类：" prop="category_id">
+        <!-- <el-form-item label="商户分类：" prop="category_id">
           <el-select
             v-model="tableFrom.category_id"
             clearable
@@ -43,7 +43,7 @@
               :value="item.value"
             />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="店铺类型：" prop="type_id">
           <el-select
             v-model="tableFrom.type_id"
@@ -103,10 +103,10 @@
         <el-table-column prop="type_name" label="店铺类型" min-width="150" />
         <el-table-column prop="com.contact" label="对接人姓名" min-width="100" />
         <el-table-column prop="com.mobile" label="对接人电话" min-width="100" />
-        <el-table-column prop="com.number" label="对接人编号" min-width="100" />
-        <el-table-column prop="com.initiator" label="发起人姓名" min-width="100" />
+        <el-table-column prop="com.number" label="对接人身份证号" min-width="120" />
+        <!-- <el-table-column prop="com.initiator" label="发起人姓名" min-width="100" />
         <el-table-column prop="com.inti_number" label="发起人编号" min-width="100" />
-        <el-table-column prop="com.inti_mobile" label="发起人电话" min-width="100" />
+        <el-table-column prop="com.inti_mobile" label="发起人电话" min-width="100" /> -->
         <el-table-column prop="biz.city" label="所属城市" min-width="100" />
         <el-table-column prop="create_time" label="申请时间" min-width="150" />
         <!-- <el-table-column prop="create_time" label="资质图片" min-width="150">
diff --git a/src/views/merchant/application/merInfo.vue b/src/views/merchant/application/merInfo.vue
index f4206c9..d76ff28 100644
--- a/src/views/merchant/application/merInfo.vue
+++ b/src/views/merchant/application/merInfo.vue
@@ -7,7 +7,7 @@
           <div class="title">基础信息</div>
           <ul class="list">
             <li class="item">
-              <div>商户名称：</div>
+              <div>店铺名称：</div>
               <div class="value">
                 {{merData.mer_name}}
               </div>
@@ -37,12 +37,12 @@
                 {{merData.com.type}}
               </div>
             </li>  
-            <li class="item">
+            <!-- <li class="item">
               <div>客服电话:</div>
               <div class="value">
                 {{ merData.com.service}}
               </div>
-            </li>
+            </li> -->
             <li class="item">
               <div>企业对接人姓名：</div>
               <div class="value">
@@ -56,12 +56,12 @@
               </div>
             </li>
             <li class="item">
-              <div>企业对接人编号:</div>
+              <div>企业对接人身份证号:</div>
               <div class="value">
                 {{ merData.com.number}}
               </div>
             </li>
-            <li class="item">
+            <!-- <li class="item">
               <div>发起人:</div>
               <div class="value">
                 {{ merData.com.initiator}}
@@ -89,7 +89,7 @@
                   :preview-src-list="merData.com.init_image">
                 </el-image>
               </div>
-            </li>
+            </li> -->
             <li class="item">
               <div>资质图片:</div>
               <div class="value">
diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index 0e1e414..c095276 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -44,25 +44,6 @@
                 />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="商户分类：" prop="category_id">
-               <el-select
-                  size="small"
-                  v-model="merData.category_id"
-                  placeholder="请选择"
-                  class="selWidth"
-                >
-                  <el-option
-                    v-for="item in merCateList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                />
-                </el-select>
-              </el-form-item>
-            </el-col>
             <el-col :span="12">
               <el-form-item label="商户类型：" prop="is_trader">
                 <el-radio-group
@@ -105,6 +86,32 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="是否惠美乡村：" prop="is_huimei">
+                <el-switch
+                  v-model="merData.is_huimei"
+                  :active-value="1"
+                  :inactive-value="0"
+                  :width="50"
+                  active-text="是"
+                  inactive-text="否"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否军人：" prop="is_soldier">
+                <el-switch
+                  v-model="merData.is_soldier"
+                  :active-value="1"
+                  :inactive-value="0"
+                  :width="50"
+                  active-text="是"
+                  inactive-text="否"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="排序：" prop="sort">
diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index 306df5d..c29bb90 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="real_name" label="法人姓名" min-width="150" />
         <el-table-column prop="status" label="推荐" min-width="100">
           <template slot-scope="scope">
             <el-switch
@@ -172,10 +172,10 @@
         </el-table-column>
         <el-table-column prop="ext.com.contact" label="对接人姓名" min-width="100" />
         <el-table-column prop="ext.com.mobile" label="对接人电话" min-width="100" />
-        <el-table-column prop="ext.com.number" label="对接人编号" min-width="100" />
-        <el-table-column prop="ext.com.initiator" label="发起人姓名" min-width="100" />
+        <el-table-column prop="ext.com.number" label="对接人身份证号" min-width="120" />
+        <!-- <el-table-column prop="ext.com.initiator" label="发起人姓名" min-width="100" />
         <el-table-column prop="ext.com.inti_number" label="发起人编号" min-width="100" />
-        <el-table-column prop="ext.com.inti_mobile" label="发起人电话" min-width="100" />
+        <el-table-column prop="ext.com.inti_mobile" label="发起人电话" min-width="100" /> -->
         <el-table-column prop="ext.biz.city" label="所属城市" min-width="100" />
         <el-table-column prop="create_time" label="创建时间" min-width="150" />
         <el-table-column prop="margin" label="保证金" min-width="150">
diff --git a/src/views/product/productExamine/info.vue b/src/views/product/productExamine/info.vue
index bcf9ff7..8b8f511 100644
--- a/src/views/product/productExamine/info.vue
+++ b/src/views/product/productExamine/info.vue
@@ -11,8 +11,8 @@
   >
     <div class="acea-row">
       <span class="sp">店铺名称：{{ projectData.merchant&&projectData.merchant.mer_name }}</span>
-          <span class="sp">入住企业名称：</span>
-          <span class="sp">店铺联系人: {{ projectData.merchant&&projectData.merchant.service_phone }}</span>
+          <span class="sp">入住企业名称：{{ projectData.merchant&&projectData.merchant.mer_name }}</span>
+          <span class="sp">店铺联系人: {{ projectData.merchant&&projectData.merchant.real_name }}</span>
           <span class="sp">
             营业执照：
             <div class="demo-image__preview">
@@ -24,7 +24,7 @@
             </div>
           </span>
 
-          <span class="sp">联系人电话：{{ projectData.unit_name }}</span>
+          <span class="sp">联系人电话：{{ projectData.merchant&&projectData.merchant.service_phone }}</span>
           <span class="sp" v-if="projectData.refusal">上传拒绝原因：{{ projectData.refusal }}</span>
 
     </div>
@@ -147,7 +147,7 @@
           </div>
         </span>
         <span class="upload">
-          <div class="upload_left">销售授权及其他：</div>
+          <div class="upload_left">销售授权及品牌方营业执照：</div>
           <div class="upload_right">
             <div
               v-for="(item,index) in qualification.authorizedList"
@@ -165,7 +165,7 @@
           </div>
         </span>
         <span class="upload">
-          <div class="upload_left">商品检测报告：</div>
+          <div class="upload_left">商品检测报告及备案：</div>
           <div class="upload_right">
             <div
               v-for="(item,index) in qualification.commodityList"
@@ -183,7 +183,7 @@
           </div>
         </span>
         <span class="upload">
-          <div class="upload_left">其他资质：</div>
+          <div class="upload_left">助农文件及其他资质：</div>
           <div class="upload_right">
             <div
               v-for="(item,index) in qualification.otherList"
@@ -364,7 +364,13 @@
               <el-table-column align="center" label="图片" min-width="80">
                 <template slot-scope="scope">
                   <div class="upLoadPicBox">
-                    <div class="pictrue tabPic"><img :src="scope.row.image"></div>
+                    <div class="pictrue tabPic">
+                      <el-image
+                      style="width: 60px; height: 60px"
+                      :src="scope.row.image"
+                      :preview-src-list="[scope.row.image]"
+                    />
+                    </div>
                   </div>
                 </template>
               </el-table-column>
diff --git a/src/views/product/productExamine/proDetails.vue b/src/views/product/productExamine/proDetails.vue
index ffe75ac..fbd92f9 100644
--- a/src/views/product/productExamine/proDetails.vue
+++ b/src/views/product/productExamine/proDetails.vue
@@ -596,7 +596,7 @@
           </div>
         </span>
         <span class="upload">
-          <div class="upload_left">销售授权及其他：</div>
+          <div class="upload_left">销售授权及品牌方营业执照：</div>
           <div class="upload_right">
             <div
               v-for="(item,index) in qualification.authorizedList"
@@ -614,7 +614,7 @@
           </div>
         </span>
         <span class="upload">
-          <div class="upload_left">商品检测报告：</div>
+          <div class="upload_left">商品检测报告及备案：</div>
           <div class="upload_right">
             <div
               v-for="(item,index) in qualification.commodityList"
@@ -632,7 +632,7 @@
           </div>
         </span>
         <span class="upload">
-          <div class="upload_left">其他资质：</div>
+          <div class="upload_left">助农文件及其他资质：</div>
           <div class="upload_right">
             <div
               v-for="(item,index) in qualification.otherList"