合并冲突

2025-05-19 14:41:18 +08:00
parent 864fe9cb1f 13bd58a932
commit 4bd20d9037
13 changed files with 1017 additions and 758 deletions
--- a/static/config/index.js
+++ b/static/config/index.js
@@ -7,7 +7,6 @@
  // api接口请求地址
  window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com';         // 线上正式环境
  //window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9200/pb';  //川
-  //window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.110:9200/pb';  //本地

  // cdn地址 = 域名 + 版本号
  window.SITE_CONFIG['domain'] = './'; // 域名