合并冲突

2021-07-08 21:10:45 +08:00
parent 7c7ef0c56c 9caac69769
commit 6aba9c3cd5
18 changed files with 1679 additions and 1068 deletions
@@ -7,6 +7,7 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 const devIp = '192.168.10.248'
+const devIp = '192.168.10.30'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -22,11 +23,11 @@ const theme = 'theme-one' // 主题(theme-one浅蓝色,theme-two深蓝色)
 const processPort = '17210'
 /*****************************************************************

- <<<<<<<<< 主题修改 >>>>>>>>>
+<<<<<<<<< 主题修改 >>>>>>>>>

- 1. 主题分为theme-one,theme-two两种
- 2. 修改assets/styles/style.less文件,注释theme-one/theme-two
- 3. 将上方theme改为theme-one/theme-two
+1. 主题分为theme-one,theme-two两种
+2. 修改assets/styles/style.less文件,注释theme-one/theme-two
+3. 将上方theme改为theme-one/theme-two

 *****************************************************************/
 // 生产环境配置