diff --git a/.env.development b/.env.development
index 57fae11..035d736 100644
--- a/.env.development
+++ b/.env.development
@@ -3,11 +3,11 @@ ENV = 'development'
 # http://192.168.1.43:8324/admin
 # http://mer.crmeb.net/admin
 # base api
-VUE_APP_BASE_API = 'http://192.168.1.224:8324'
+VUE_APP_BASE_API = 'http://192.168.1.131:8080'
 # VUE_APP_BASE_API = 'https://plus.hwms.shop'
 
 # socket 连接地址
-VUE_APP_WS_URL = 'ws://192.168.1.224:8324'
+VUE_APP_WS_URL = 'ws://192.168.1.131:8080'
 # VUE_APP_WS_URL = 'ws://plus.hwms.shop'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
diff --git a/src/views/merchant/application/index.vue b/src/views/merchant/application/index.vue
index 472c5cb..b24c3e2 100644
--- a/src/views/merchant/application/index.vue
+++ b/src/views/merchant/application/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="divBox">
     <div class="selCard">
-      <el-form :model="tableFrom" ref="searchForm" size="small" label-width="85px" :inline="true">
+      <el-form :model="tableFrom" ref="searchForm" size="small" label-width="90px" :inline="true">
         <el-form-item label="状态：" prop="status">
           <el-select
             v-model="tableFrom.status"
@@ -92,10 +92,10 @@
         <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="inti_numbe" label="发起人编号" min-width="100" />
+        <el-table-column prop="com.inti_numbe" label="发起人编号" min-width="100" />
         <el-table-column prop="com.inti_mobile" label="发起人编号" min-width="100" />
         <el-table-column prop="create_time" label="申请时间" min-width="150" />
-        <el-table-column prop="create_time" label="资质图片" min-width="150">
+        <!-- <el-table-column prop="create_time" label="资质图片" min-width="150">
           <template slot-scope="scope">
             <div class="demo-image__preview">
               <el-image
@@ -107,7 +107,7 @@
               />
             </div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="状态" min-width="150">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.status == 1" type="success">通过</el-tag>
diff --git a/src/views/merchant/application/merApplicationDetail.vue b/src/views/merchant/application/merApplicationDetail.vue
index 6a5b5fe..b933965 100644
--- a/src/views/merchant/application/merApplicationDetail.vue
+++ b/src/views/merchant/application/merApplicationDetail.vue
@@ -143,7 +143,7 @@ export default {
         this.$refs.editForm.resetData();
         this.$refs.editForm.activeName = 'detail';
       }else{
-        this.$refs.merInfo.activeName = 'detail';
+        this.$refs.merInfo.activeName = 'business';
       }
       this.$emit('closeDrawer');
     },
diff --git a/src/views/merchant/application/merInfo.vue b/src/views/merchant/application/merInfo.vue
index e5e4277..7e39dd3 100644
--- a/src/views/merchant/application/merInfo.vue
+++ b/src/views/merchant/application/merInfo.vue
@@ -23,7 +23,7 @@
           </ul>
         </div>
 
-        <div class="section">
+        <div class="section" v-if="merData.com">
           <ul class="list">
             <li class="item">
               <div>企业名称</div>
@@ -79,7 +79,7 @@
                 {{ merData.com.inti_number}}
               </div>
             </li>
-            <li class="item item100">
+            <li class="item">
               <div>发起人手持介绍信照片:</div>
               <div class="value">
                 <el-image v-for="(url,i) in  merData.com.init_image"
@@ -90,6 +90,26 @@
                 </el-image>
               </div>
             </li>
+            <li class="item">
+              <div>资质图片:</div>
+              <div class="value">
+              <el-image
+                v-for="(item, index) in merData.images"
+                :key="index"
+                style="width: 100px; height: 100px"
+                :src="item"
+                :preview-src-list="merData.images"
+              />
+            </div>
+              <!-- <div class="value">
+                <el-image v-for="(url,i) in  merData.com.init_image"
+                  :key="i"
+                  style="width: 100px; height: 100px"
+                  :src="url" 
+                  :preview-src-list="merData.com.init_image">
+                </el-image>
+              </div> -->
+            </li>
             <li class="item item100">
               <div>是否惠美乡村店铺:</div>
               <div class="value">
@@ -128,7 +148,7 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="身份证信息" name="account">
-        <div class="section">
+        <div class="section" v-if="merData.idcard">
           <div class="title">身份证信息</div>
           <ul class="list">
             <li class="item">
@@ -171,7 +191,7 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="营业执照信息" name="biz">
-        <div class="section">
+        <div class="section" v-if="merData.biz">
           <div class="title">营业执照信息</div>
           <ul class="list">
             <li class="item">
@@ -213,7 +233,7 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="银行卡信息" name="bank">
-        <div class="section">
+        <div class="section" v-if="merData.bank">
           <div class="title">银行卡信息</div>
           <ul class="list">
             <li class="item">
@@ -277,7 +297,7 @@ export default {
       loading: true,
       merId: '',
       direction: 'rtl',
-      activeName: 'detail',
+      activeName: 'business',
       timeVal: [],
       tableDataLog: {
         data: [],
diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index 584e4a3..3b0252c 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="divBox">
     <div class="selCard">
-      <el-form :model="tableFrom" ref="searchForm" size="small" label-width="85px" :inline="true">
+      <el-form :model="tableFrom" ref="searchForm" size="small" label-width="105px" :inline="true">
         <el-form-item label="选择时间：">
           <el-date-picker
             v-model="timeVal"
@@ -27,7 +27,7 @@
             <el-option label="非自营" value="0" />
           </el-select>
         </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
@@ -42,6 +42,18 @@
               :value="item.value"
             />
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="是否惠美乡村：" prop="is_huimei">
+          <el-select v-model="tableFrom.is_huimei" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)">
+            <el-option label="是" value="1" />
+            <el-option label="否" value="0" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否退伍军人：" prop="is_soldier">
+          <el-select v-model="tableFrom.is_soldier" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)">
+            <el-option label="是" value="1" />
+            <el-option label="否" value="0" />
+          </el-select>
         </el-form-item>
         <el-form-item label="店铺类型：" prop="type_id">
           <el-select
@@ -106,6 +118,8 @@
       >
         <el-table-column prop="mer_id" label="ID" min-width="60" />
         <el-table-column prop="mer_name" label="店铺名称" min-width="150" />
+        <el-table-column prop="mer_name" label="企业名称" min-width="150" />
+        <el-table-column prop="type_name" label="店铺类型" min-width="150" />
         <el-table-column prop="is_huimei" label="是否惠美乡村" min-width="100">
           <template slot-scope="scope">
             <span>{{scope.row.is_huimei == 1 ? '是' : '否'}}</span>
@@ -143,6 +157,12 @@
             />
           </template>
         </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.inti_numbe" label="发起人编号" min-width="100" />
+        <el-table-column prop="ext.com.inti_mobile" label="发起人编号" min-width="100" />
         <el-table-column prop="create_time" label="创建时间" min-width="150" />
         <el-table-column prop="margin" label="保证金" min-width="150">
           <template slot-scope="scope">
diff --git a/vue.config.js b/vue.config.js
index c5ff437..bdb5366 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -38,13 +38,13 @@ module.exports = {
       errors: true
     },
     before: require('./mock/mock-server.js')
-    proxy: {
-      '/api': {             //接口地址 以 api开头的都走下面的配置
-        target: 'http://192.168.1.224:8324',    //代理目标地址为后端服务器地址
-        ws: true,                           //是否支持 websocket 请求 支持
-        changeOrigin: true,                   //是否启用跨域 
-      }
-    }
+    // proxy: {
+    //   '/api': {             //接口地址 以 api开头的都走下面的配置
+    //     target: 'http://192.168.1.224:8324',    //代理目标地址为后端服务器地址
+    //     ws: true,                           //是否支持 websocket 请求 支持
+    //     changeOrigin: true,                   //是否启用跨域 
+    //   }
+    // }
   },
   configureWebpack: {
     // provide the app's title in webpack's name field, so that
@@ -109,7 +109,7 @@ module.exports = {
             .plugin('ScriptExtHtmlWebpackPlugin')
             .after('html')
             .use('script-ext-html-webpack-plugin', [{
-            // `runtime` must same as runtimeChunk name. default is `runtime`
+              // `runtime` must same as runtimeChunk name. default is `runtime`
               inline: /runtime\..*\.js$/
             }])
             .end()