From cb2e79e8374725da81b19c518405f1b91c86e601 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 07 四月 2022 14:27:54 +0800
Subject: [PATCH] Merge branch 'master' of D:\workspace\ztqt with conflicts.
---
config/index.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/index.js b/config/index.js
index da68a8d..d087506 100644
--- a/config/index.js
+++ b/config/index.js
@@ -47,10 +47,10 @@
build: {
// Template for index.html
- index: path.resolve(__dirname, '../dist/index.html'),
+ index: path.resolve(__dirname, '../zhongtaiweb/index.html'),
// Paths
- assetsRoot: path.resolve(__dirname, '../dist'),
+ assetsRoot: path.resolve(__dirname, '../zhongtaiweb'),
assetsSubDirectory: 'static',
// assetsSubDirectory: 'dataShow/static',
--
Gitblit v1.9.2