diff --git a/.env.development b/.env.development
index 2bc26f5..57fae11 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.199:8080'
+VUE_APP_BASE_API = 'http://192.168.1.224:8324'
 # VUE_APP_BASE_API = 'https://plus.hwms.shop'
 
 # socket 连接地址
-VUE_APP_WS_URL = 'ws://192.168.1.199:8080'
+VUE_APP_WS_URL = 'ws://192.168.1.224:8324'
 # 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/merInfo.vue b/src/views/merchant/application/merInfo.vue
index f6f6855..e5e4277 100644
--- a/src/views/merchant/application/merInfo.vue
+++ b/src/views/merchant/application/merInfo.vue
@@ -1,7 +1,8 @@
 <template>
   <div>
     <el-tabs type="border-card" v-model="activeName">
-      <!-- <el-tab-pane label="基本信息" name="detail">
+      <el-tab-pane label="企业信息" name="business">
+        
         <div class="section">
           <div class="title">基础信息</div>
           <ul class="list">
@@ -11,100 +12,77 @@
                 {{merData.mer_name}}
               </div>
             </li>
-            <li class="item">
-              <div>商户分类：</div>
-              <div class="value">
-                {{merData.category_name}}
-              </div>
-            </li>
             <li class="item">
               <div>店铺类型：</div>
               <div class="value">{{merData.type_name}}</div>
             </li>
-            <li class="item">
-              <div>商户状态：</div>
-              <div class="value">{{merData.status == 1 ? "开启" : "关闭"}}</div>
-            </li>
             <li class="item">
               <div>更新时间：</div>
               <div class="value">{{merData.update_time}}</div>
             </li>
-            <li class="item">
-              <div>备注：</div>
-              <div class="value">{{merData.mark}}</div>
-            </li>
           </ul>
         </div>
-      </el-tab-pane> -->
-      <el-tab-pane label="企业信息" name="business">
+
         <div class="section">
           <ul class="list">
             <li class="item">
-              <div>店铺名称：</div>
+              <div>企业名称</div>
               <div class="value">
-                {{merData.mer_name}}
-              </div>
-            </li>
-            <li class="item">
-              <div>店铺类型：</div>
-              <div class="value">{{merData.type_name}}</div>
-            </li>
-            <li class="item">
-              <div>企业名称：</div>
-              <div class="value">
-                <!-- {{merData.com.name}} -->
+                {{merData.com.name}}
               </div>
             </li>  
             <li class="item">
-              <div>企业类型：</div>
+              <div>企业类型</div>
               <div class="value">
-                {{merData.com&&merData.com.type}}
+                {{merData.com.type}}
               </div>
             </li>  
             <li class="item">
-              <div>更新时间：</div>
-              <div class="value">{{merData.update_time}}</div>
+              <div>客服电话:</div>
+              <div class="value">
+                {{ merData.com.service}}
+              </div>
             </li>
             <li class="item">
               <div>企业对接人姓名：</div>
               <div class="value">
-                {{ merData.com&&merData.com.contact}}
+                {{ merData.com.contact}}
               </div>
             </li>
             <li class="item">
               <div>企业对接人联系电话：</div>
               <div class="value">
-                {{ merData.com&&merData.com.mobile}}
+                {{ merData.com.mobile}}
               </div>
             </li>
             <li class="item">
               <div>企业对接人编号:</div>
               <div class="value">
-                {{ merData.com&&merData.com.number}}
+                {{ merData.com.number}}
               </div>
             </li>
             <li class="item">
               <div>发起人:</div>
               <div class="value">
-                {{ merData.com&&merData.com.initiator}}
+                {{ merData.com.initiator}}
               </div>
             </li>
             <li class="item">
               <div>发起人电话:</div>
               <div class="value">
-                {{ merData.com&&merData.com.inti_mobile}}
+                {{ merData.com.inti_mobile}}
               </div>
             </li>
             <li class="item item100">
               <div>发起人编号:</div>
               <div class="value">
-                {{ merData.com&&merData.com.inti_number}}
+                {{ merData.com.inti_number}}
               </div>
             </li>
             <li class="item item100">
               <div>发起人手持介绍信照片:</div>
               <div class="value">
-                <el-image v-for="(url,i) in  merData.com&&merData.com.init_image"
+                <el-image v-for="(url,i) in  merData.com.init_image"
                   :key="i"
                   style="width: 100px; height: 100px"
                   :src="url" 
@@ -115,13 +93,13 @@
             <li class="item item100">
               <div>是否惠美乡村店铺:</div>
               <div class="value">
-                {{ merData.com&&merData.com.is_huimei? '是': '否'}}
+                {{ merData.com.is_huimei? '是': '否'}}
               </div>
             </li>
             <li class="item item100">
               <div>惠美乡村红头文件:</div>
               <div class="value">
-                <el-image v-for="(url,i) in  merData.com&&merData.com.image_huimei"
+                <el-image v-for="(url,i) in  merData.com.image_huimei"
                   :key="i"
                   style="width: 100px; height: 100px"
                   :src="url" 
@@ -132,13 +110,13 @@
             <li class="item item100">
               <div>是否退伍军人:</div>
               <div class="value">
-                {{ merData.com&&merData.com.is_soldier? '是': '否'}}
+                {{ merData.com.is_soldier? '是': '否'}}
               </div>
             </li>
             <li class="item item100">
               <div>退伍军人证件照:</div>
               <div class="value">
-                <el-image v-for="(url,i) in  merData.com&&merData.com.image_soldier"
+                <el-image v-for="(url,i) in  merData.com.image_soldier"
                   :key="i"
                   style="width: 100px; height: 100px"
                   :src="url" 
@@ -228,10 +206,8 @@
               <div class="value">{{merData.biz.address_true}}</div>
             </li>
             <li class="item">
-              <div>经营范围：</div>
-              <div class="value">
-                {{merData.bank.bankCardUserName}}
-              </div>
+              <div>实际经营范围：</div>
+              <div class="value">{{merData.biz.businessScope}}</div>
             </li>
           </ul>
         </div>
@@ -259,7 +235,7 @@
               <div class="value">{{merData.bank.bankBranchName}}</div>
             </li>
             <li class="item">
-              <div>开户许可证(或基本存款信息)：</div>
+              <div>银行卡照片：</div>
               <div class="value">
                 <el-image v-for="(url,i) in  merData.bank.bankCardImg"
                   :key="i"
@@ -269,10 +245,6 @@
                 </el-image>
               </div>
             </li>
-            <li class="item">
-              <div>联行号：</div>
-              <div class="value">{{merData.bank.bankBranchName}}</div>
-            </li>
           </ul>
         </div>
       </el-tab-pane>
@@ -305,7 +277,7 @@ export default {
       loading: true,
       merId: '',
       direction: 'rtl',
-      activeName: 'business',
+      activeName: 'detail',
       timeVal: [],
       tableDataLog: {
         data: [],
diff --git a/vue.config.js b/vue.config.js
index dd9aec7..c5ff437 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