From c3adc31148ea6aee46e4393c2f4fcde5c5944329 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 24 Apr 2024 09:15:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=BF=90=E8=90=A5?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=20-=20=E7=BB=91=E5=AE=9A=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E6=97=B6=20=E5=95=86=E6=88=B7=E4=BB=85=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=89=8D20=E4=B8=AA=E5=95=86=E6=88=B7=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E9=83=A8=E5=88=86=E5=95=86=E6=88=B7=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                 | 8 ++++----
 src/router/modules/marketing.js                  | 2 --
 src/views/marketing/agent/agent/template/mer.vue | 1 +
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.env.development b/.env.development
index 310f352..7d858ae 100644
--- a/.env.development
+++ b/.env.development
@@ -3,12 +3,12 @@ ENV = 'development'
 # http://192.168.1.43:8324/admin
 # http://mer.crmeb.net/admin
 # base api
-VUE_APP_BASE_API = 'https://bt.test.cdlfjy.com'
-#VUE_APP_BASE_API = 'https://mp.scwmbh.cn'
+#VUE_APP_BASE_API = 'https://bt.test.cdlfjy.com'
+VUE_APP_BASE_API = 'https://mp.scwmbh.cn'
 
 # socket 连接地址
-VUE_APP_WS_URL = 'ws://bt.test.cdlfjy.com'
-#VUE_APP_WS_URL = 'ws://mp.scwmbh.cn'
+#VUE_APP_WS_URL = 'ws://bt.test.cdlfjy.com'
+VUE_APP_WS_URL = 'ws://mp.scwmbh.cn'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
diff --git a/src/router/modules/marketing.js b/src/router/modules/marketing.js
index f4dfe49..3eaaed8 100644
--- a/src/router/modules/marketing.js
+++ b/src/router/modules/marketing.js
@@ -568,8 +568,6 @@ const marketingRouter =
             },
             component: () => import('@/views/marketing/agent/config/index')
           },
-
-
         ]
       },
       {
diff --git a/src/views/marketing/agent/agent/template/mer.vue b/src/views/marketing/agent/agent/template/mer.vue
index 99cd3f4..9c63307 100644
--- a/src/views/marketing/agent/agent/template/mer.vue
+++ b/src/views/marketing/agent/agent/template/mer.vue
@@ -105,6 +105,7 @@ export default {
       // 参数补充
       params.merchant_type = _this.merchant_type || 0;
       params.status = 1;
+      params.limit = 1000;
       // 发起请求
       merchantListApi(params).then((res) => {
         if(res.status == 200) _this.list = res.data.list;