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;