From 8859d8ab65aa89c1b03e990886aae6fd48ab00f8 Mon Sep 17 00:00:00 2001
From: 22 <22@22.com>
Date: Wed, 10 Apr 2024 18:23:04 +0800
Subject: [PATCH 1/3] .

---
 src/views/merchant/application/merInfo.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/merchant/application/merInfo.vue b/src/views/merchant/application/merInfo.vue
index ed7149d..a1047ba 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">
@@ -35,8 +36,7 @@
             </li>
           </ul>
         </div>
-      </el-tab-pane>
-      <el-tab-pane label="企业信息" name="business">
+
         <div class="section">
           <ul class="list">
             <li class="item">
@@ -219,6 +219,10 @@
               <div>实际经营地址：</div>
               <div class="value">{{merData.biz.address_true}}</div>
             </li>
+            <li class="item">
+              <div>实际经营范围：</div>
+              <div class="value">{{merData.biz.businessScope}}</div>
+            </li>
           </ul>
         </div>
       </el-tab-pane>
@@ -245,7 +249,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"

From b1326ff2c0ee0f21c4dfe02dafda1cb12dc56f8b Mon Sep 17 00:00:00 2001
From: 22 <22@22.com>
Date: Wed, 10 Apr 2024 18:23:54 +0800
Subject: [PATCH 2/3] ..

---
 .env.development |  4 ++--
 vue.config.js    | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.env.development b/.env.development
index 1940fd8..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.32: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.32: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/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

From ca3d25d7a47961c3e0ccc47805f5aacd1135a88b Mon Sep 17 00:00:00 2001
From: 22 <22@22.com>
Date: Wed, 10 Apr 2024 18:28:18 +0800
Subject: [PATCH 3/3] ..

---
 src/views/merchant/application/merInfo.vue | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/views/merchant/application/merInfo.vue b/src/views/merchant/application/merInfo.vue
index a1047ba..e5e4277 100644
--- a/src/views/merchant/application/merInfo.vue
+++ b/src/views/merchant/application/merInfo.vue
@@ -12,28 +12,14 @@
                 {{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>