hz/student-h5
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/student-h5.git synced 2025-12-11 11:56:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat:合并冲突

Browse Source
This commit is contained in:
lixg
2023-01-18 14:31:57 +08:00
parent c260d99bcd
commit b8adfe3a0a
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vue.config.js
View File

@@ -1,17 +1,13 @@
/* /*
* @Author: 李晓鸽 lixg@dongwu-inc.com * @Author: 李晓鸽 lixg@dongwu-inc.com
* @Date: 2022-11-21 18:45:34 * @Date: 2022-11-21 18:45:34
* @LastEditors: 李晓鸽 lixg@dongwu-inc.com * @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-11-21 18:47:18 * @LastEditTime: 2023-01-18 14:31:17
* @FilePath: \stu_h5\vue.config.js * @FilePath: \stu_h5\vue.config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
const { defineConfig } = require('@vue/cli-service') const { defineConfig } = require('@vue/cli-service')
module.exports = defineConfig({ module.exports = defineConfig({
<<<<<<< HEAD
publicPath: process.env.VITE_BASE,
=======
ppublicPath: process.env.VITE_BASE, ppublicPath: process.env.VITE_BASE,
>>>>>>> 3a3701f5d9f534c1d1d845c8bb92acd13581de53
transpileDependencies: true transpileDependencies: true
}) })