diff --git a/src/views/merchant/application/merInfo.vue b/src/views/merchant/application/merInfo.vue
index a5eeb9f..0dde55d 100644
--- a/src/views/merchant/application/merInfo.vue
+++ b/src/views/merchant/application/merInfo.vue
@@ -110,12 +110,12 @@
                 </el-image>
               </div> -->
             </li>
-            <li class="item item100">
+            <!-- <li class="item item100">
               <div>是否惠美乡村店铺:</div>
               <div class="value">
                 {{ merData.com.is_huimei? '是': '否'}}
               </div>
-            </li>
+            </li> -->
             <!-- <li class="item item100">
               <div>惠美乡村红头文件:</div>
               <div class="value">
diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index 961c168..430e994 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -87,7 +87,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="12">
+            <!-- <el-col :span="12">
               <el-form-item label="是否惠美乡村：" prop="is_huimei">
                 <el-switch
                   v-model="merData.is_huimei"
@@ -98,7 +98,7 @@
                   inactive-text="否"
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="12">
               <el-form-item label="是否军人：" prop="is_soldier">
                 <el-switch
diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue
index a7561a1..4b707b2 100644
--- a/src/views/merchant/list/handle/merInfo.vue
+++ b/src/views/merchant/list/handle/merInfo.vue
@@ -21,10 +21,10 @@
               <div>商户类型：</div>
               <div class="value">{{merData.is_trader == 1 ? "自营" : "非自营"}}</div>
             </li>
-            <li class="item">
+            <!-- <li class="item">
               <div>是否为惠美乡村:</div>
               <div class="value">{{merData.is_huimei == 1 ? "是" : "否"}}</div>
-            </li>
+            </li> -->
             <li class="item">
               <div>是否为军人:</div>
               <div class="value">{{merData.is_soldier == 1 ? "是" : "否"}}</div>
diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index bfb8a96..fc0857a 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -33,7 +33,7 @@
             <el-option label="非自营" value="0" />
           </el-select>
         </el-form-item>
-        <el-form-item label="是否惠美乡村：" prop="is_huimei">
+        <!-- <el-form-item label="是否惠美乡村：" prop="is_huimei">
           <el-select
             v-model="tableFrom.is_huimei"
             placeholder="请选择"
@@ -44,7 +44,7 @@
             <el-option label="是" value="1" />
             <el-option label="否" value="0" />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="是否退伍军人：" prop="is_soldier">
           <el-select
             v-model="tableFrom.is_soldier"
@@ -103,27 +103,27 @@
             clearable
           />
         </el-form-item>
-        <el-form-item label="姓名关键字：" prop="keyword">
+        <el-form-item label="姓名关键字：" prop="name">
           <el-input
-            v-model="tableFrom.keyword"
+            v-model="tableFrom.name"
             @keyup.enter.native="getList(1)"
             placeholder="请输入法人/对接人姓名"
             class="selWidth"
             clearable
           />
         </el-form-item>
-        <el-form-item label="对接人电话:" prop="keyword">
+        <el-form-item label="对接人电话:" prop="phone">
           <el-input
-            v-model="tableFrom.keyword"
+            v-model="tableFrom.phone"
             @keyup.enter.native="getList(1)"
             placeholder="请输入对接人电话"
             class="selWidth"
             clearable
           />
         </el-form-item>
-        <el-form-item label="对接人身份证：" prop="keyword">
+        <el-form-item label="对接人身份证：" prop="id_card">
           <el-input
-            v-model="tableFrom.keyword"
+            v-model="tableFrom.id_card"
             @keyup.enter.native="getList(1)"
             placeholder="请输入对接人身份证"
             class="selWidth"
@@ -163,7 +163,7 @@
       <div class="mb20">
         <el-tabs
           v-if="headeNum.length > 0"
-          v-model="tableFrom.status"
+          v-model="isStatus"
           @tab-click="getList(1), getHeadNum()"
         >
           <el-tab-pane
@@ -194,11 +194,11 @@
           label="店铺类型"
           min-width="150"
         />
-        <el-table-column prop="is_huimei" label="是否惠美乡村" min-width="100">
+        <!-- <el-table-column prop="is_huimei" label="是否惠美乡村" min-width="100">
           <template slot-scope="scope">
             <span>{{ scope.row.is_huimei == 1 ? "是" : "否" }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="is_soldier" label="是否军人" min-width="80">
           <template slot-scope="scope">
             <span>{{ scope.row.is_soldier == 1 ? "是" : "否" }}</span>
@@ -240,7 +240,7 @@
             />
           </template>
         </el-table-column>
-        <!-- <el-table-column prop="lock" label="退店(开启/关闭)" min-width="120">
+        <el-table-column prop="lock" label="退店(开启/关闭)" min-width="120">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.lock"
@@ -252,7 +252,7 @@
               @click.native="onchangeIsClose(scope.row, 'lock')"
             />
           </template>
-        </el-table-column> -->
+        </el-table-column>
         <el-table-column prop="real_name" label="对接人姓名" min-width="100" />
         <el-table-column prop="mer_phone" label="对接人电话" min-width="100" />
         <el-table-column
@@ -290,7 +290,7 @@
         <el-table-column label="操作" min-width="180" fixed="right">
           <template slot-scope="scope">
             <el-button
-              v-if="tableFrom.status === '1'"
+              v-if="isStatus=== '1'"
               type="text"
               size="small"
               @click="onLogo(scope.row.mer_id)"
@@ -315,7 +315,7 @@
               >详情</el-button
             >
             <el-button
-              v-if="tableFrom.status === '0'"
+              v-if="isStatus === '0'"
               type="text"
               size="small"
               @click="handleDelete(scope.row.mer_id, scope.$index)"
@@ -400,11 +400,11 @@ export default {
           type: "0",
           title: "已关闭商户",
         },
-        // {
-        //   count: "",
-        //   type: "2",
-        //   title: "已退店商户",
-        // },
+        {
+          count: "",
+          type: "2",
+          title: "已退店商户",
+        },
       ],
       tableData: {
         data: [],
@@ -422,7 +422,11 @@ export default {
         type_id: "",
         city_code: "",
         city: "",
+        phone:'',
+        name:'',
+        mark:''
       },
+      isStatus:'1',
       autoUpdate: true,
       merId: "",
       drawer: false,
@@ -516,6 +520,7 @@ export default {
         .then((res) => {
           this.headeNum[0]["count"] = res.data.valid;
           this.headeNum[1]["count"] = res.data.invalid;
+          this.headeNum[2]["count"] = res.data.lock;
         })
         .catch((res) => {});
     },
@@ -541,6 +546,11 @@ export default {
     // 列表
     getList(num) {
       this.listLoading = true;
+      if(this.isStatus==2){
+        this.tableFrom = {...this.tableFrom,lock:'1',status:''}
+      }else{
+        this.tableFrom = {...this.tableFrom,status:this.isStatus,lock:''}
+      }
       this.tableFrom.page = num ? num : this.tableFrom.page;
       merchantListApi(this.tableFrom)
         .then((res) => {
diff --git a/src/views/product/productExamine/index.vue b/src/views/product/productExamine/index.vue
index 2eab045..0e349ac 100644
--- a/src/views/product/productExamine/index.vue
+++ b/src/views/product/productExamine/index.vue
@@ -18,7 +18,7 @@
             @change="getList(1)"
           />
         </el-form-item>
-        <el-form-item label="商户名称：" prop="mer_id">
+        <el-form-item label="店铺名称：" prop="mer_id">
           <el-select
             v-model="tableFrom.mer_id"
             clearable
@@ -168,7 +168,7 @@
             clearable
           />
         </el-form-item>
-        <el-form-item label="是否惠美乡村：" prop="is_huimei">
+        <!-- <el-form-item label="是否惠美乡村：" prop="is_huimei">
           <el-select
             v-model="tableFrom.is_huimei"
             placeholder="请选择"
@@ -179,7 +179,7 @@
             <el-option label="是" value="1" />
             <el-option label="否" value="0" />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="审核状态：" prop="is_audited">
           <el-select
             v-model="tableFrom.is_audited"
@@ -231,7 +231,7 @@
         />
       </el-tabs>
       <div class="mt5 mb20">
-        <!-- <el-button v-show="tableFrom.type === '6'" size="small" :disabled="multipleSelection.length==0" @click="batch">批量审核</el-button> -->
+        <el-button v-show="tableFrom.type === '11'" size="small" :disabled="multipleSelection.length==0" @click="batch">批量审核</el-button>
         <el-button
           size="small"
           :disabled="multipleSelection.length == 0"
@@ -276,7 +276,7 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column
-          v-if="Number(tableFrom.type) < 7"
+          v-if="Number(tableFrom.type) < 7 || Number(tableFrom.type) == 11"
           key="2"
           type="selection"
           width="55"
@@ -350,15 +350,15 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="商户名称" min-width="100">
+        <el-table-column label="店铺名称" min-width="100">
           <template slot-scope="scope">
             <span>{{
               scope.row.merchant ? scope.row.merchant.mer_name : ""
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="merchant.mark" label="商家备注" min-width="100" />
-        <el-table-column label="是否惠美乡村店铺" min-width="80">
+        <el-table-column prop="remark" label="商家备注" min-width="100" />
+        <!-- <el-table-column label="是否惠美乡村店铺" min-width="80">
           <template slot-scope="scope">
             <span>{{ scope.row.merchant.is_huimei ? "是" : "否" }}</span>
           </template>
@@ -367,7 +367,7 @@
           <template slot-scope="scope">
             <span>{{ scope.row.is_huimei ? "是" : "否" }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="price" label="商品售价" min-width="80" />
         <el-table-column prop="sales" label="销量" min-width="70" />
         <el-table-column prop="stock" label="库存" min-width="70" />
diff --git a/src/views/product/productExamine/info.vue b/src/views/product/productExamine/info.vue
index d69a2e5..a66ff2e 100644
--- a/src/views/product/productExamine/info.vue
+++ b/src/views/product/productExamine/info.vue
@@ -10,7 +10,7 @@
     :before-close="handleClose"
     class="projectInfo"
   >
-    <div class="acea-row mt10">
+    <div class="acea-row mt10" v-if="isShow">
       <span class="sp"
         >店铺名称：{{
           projectData.merchant && projectData.merchant.mer_name
@@ -47,7 +47,7 @@
         >上传拒绝原因：{{ projectData.refusal }}</span
       >
     </div>
-    <div class="acea-row">
+    <div class="acea-row" v-if="isShow">
       <span class="sp">商品id：{{ projectData.product_id }}</span>
       <span class="sp">商品名称：{{ projectData.store_name }}</span>
       <span class="sp"
@@ -72,9 +72,9 @@
       </span>
       <span class="sp">商品简介：{{ projectData.store_info }}</span>
       <span class="sp">商品备注：{{ projectData.remark }}</span>
-      <span class="sp"
+      <!-- <span class="sp"
         >是否惠美乡村：{{ projectData.is_huimei ? "是" : "否" }}</span
-      >
+      > -->
       <span class="sp100">
         商品封面图：
         <div class="demo-image__preview">
@@ -962,17 +962,21 @@ export default {
       };
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
-          this.isShow
-            ? (this.ruleForm.id = this.proId)
-            : (this.ruleForm.id = this.ids);
-          let params = {
-            ...this.ruleForm,
-            status:
-              this.ruleForm.status == -1
-                ? -1
-                : mode[this.projectData.status].status,
-          };
-          mode[this.projectData.status]
+          let params = {};
+            if(this.isShow){
+              params = {
+                ...this.ruleForm,
+                id:this.proId,
+                status:this.ruleForm.status == -1? -1: mode[this.projectData.status].status,
+              };
+            }else{
+              params = {
+                ...this.ruleForm,
+                id:this.ids,
+                status:this.ruleForm.status == -1? -1:1
+              };
+            }
+          mode[this.isShow?this.projectData.status:11]
             .api(params)
             .then((res) => {
               this.$message.success(res.message);
diff --git a/src/views/product/productExamine/proDetails.vue b/src/views/product/productExamine/proDetails.vue
index 704e953..88c27fc 100644
--- a/src/views/product/productExamine/proDetails.vue
+++ b/src/views/product/productExamine/proDetails.vue
@@ -713,7 +713,7 @@
             <div class="section">
               <ul class="list">
                 <li class="item">
-                  <div class="item-title">商户名称：</div>
+                  <div class="item-title">店铺名称：</div>
                   <div class="value">{{ productData.merchant.mer_name }}</div>
                 </li>
                 <li class="item">
@@ -728,6 +728,10 @@
                   <div class="item-title">店铺类型：</div>
                   <div class="value">{{ productData.merchant.type_name }}</div>
                 </li>
+                <li class="item">
+                  <div class="item-title">企业名称：</div>
+                  <div class="value">{{productData.merchant && productData.merchant.ext.com &&productData.merchant.ext.com.name}}</div>
+                </li>
               </ul>
             </div>
           </el-tab-pane>
@@ -827,12 +831,12 @@
             <div class="section">
               <ul class="list">
                 <li class="audit" v-if="productData.refusal">
-                  <div class="item-title">审核拒绝原因：</div>
+                  <div class="item-title">{{productData.status==0?'锁定原因':'审核拒绝原因'}}：</div>
                   <div style="margin-left: 100px" class="value">
                     <pre>{{ productData.refusal || "" }}</pre>
                   </div>
                 </li>
-                <li class="item item100">
+                <li class="item item100" v-if="productData.status!=0">
                   <div class="item-title">佐证图片：</div>
                   <el-image
                     v-for="(item, index) in productData.status_img"
diff --git a/src/views/user/list/userDetails.vue b/src/views/user/list/userDetails.vue
index e8958d8..d4e54dc 100644
--- a/src/views/user/list/userDetails.vue
+++ b/src/views/user/list/userDetails.vue
@@ -78,10 +78,10 @@
               <div class="title">铸源星余额</div>
               <div>{{psInfo.integral}}</div>
             </li>
-            <li class="item">
+            <!-- <li class="item">
               <div class="title">用户成长值</div>
               <div>{{psInfo.member_value}}</div>
-            </li>
+            </li> -->
           </ul>
         </div>
        </div>