Skip to content

C
clique-web
Commit f94ee4f0 by caoyanzhi
Options

update: 组件引入调整

parent b7d8e74c
Showing with 28 additions and 12 deletions
build/webpack.base.conf.js
...@@ -32,9 +32,11 @@ module.exports = { ...@@ -32,9 +32,11 @@ module.exports = {
}, },
// 新增配置 cdn 忽略不需要打包的库 // 新增配置 cdn 忽略不需要打包的库
externals: { externals: {
'vue': 'Vue', vue: 'Vue',
axios: 'axios',
vuex: 'Vuex',
'vue-router': 'VueRouter', 'vue-router': 'VueRouter',
'vuex': 'Vuex' 'element-ui': 'ELEMENT',
}, },
// end // end
resolve: { resolve: {
......
build/webpack.dev.conf.js
...@@ -42,7 +42,12 @@ const devWebpackConfig = merge(baseWebpackConfig, { ...@@ -42,7 +42,12 @@ const devWebpackConfig = merge(baseWebpackConfig, {
quiet: true, // necessary for FriendlyErrorsPlugin quiet: true, // necessary for FriendlyErrorsPlugin
watchOptions: { watchOptions: {
poll: config.dev.poll, poll: config.dev.poll,
} },
before(app, server) {
app.get(/^(?!\/gic-clique).*$/, (req, res) => {
res.redirect('/gic-clique/');
})
},
}, },
plugins: [ plugins: [
new webpack.DefinePlugin({ new webpack.DefinePlugin({
......
config/index.js
...@@ -9,7 +9,7 @@ module.exports = { ...@@ -9,7 +9,7 @@ module.exports = {
// Paths // Paths
assetsSubDirectory: 'static', assetsSubDirectory: 'static',
assetsPublicPath: '/', assetsPublicPath: '/gic-clique',
proxyTable: {},//proxyConfig.proxyList, proxyTable: {},//proxyConfig.proxyList,
// Various Dev Server settings // Various Dev Server settings
......
index.html
...@@ -8,13 +8,21 @@ ...@@ -8,13 +8,21 @@
<body style="background-color: #f0f2f5;min-width: 1400px;"> <body style="background-color: #f0f2f5;min-width: 1400px;">
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
<script>
(function() {
var src = '/component/static/import-component.js?timestrap='+ new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
document.write('<script src="//'+ host + src +'"><\/script>')
})()
</script>
<!-- 库引用cdn --> <!-- 库引用cdn -->
<script src="//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js"></script> <!-- <script src="//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js"></script>
<script src="//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js"></script> <script src="//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js"></script>
<script src="//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js"></script> <script src="//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js"></script>
<script src="//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js"></script> <script src="//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js"></script> -->
<!-- 组件引用cdn --> <!-- 组件引用cdn -->
<script src="//web-1251519181.file.myqcloud.com/components/header.2.0.57.js"></script> <!-- <script src="//web-1251519181.file.myqcloud.com/components/header.2.0.57.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/group-people.2.0.08.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/group-people.2.0.08.js"></script>
...@@ -23,6 +31,6 @@ ...@@ -23,6 +31,6 @@
<script src="//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/input.2.0.00.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/input.2.0.00.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/export.1.0.1.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/export.1.0.1.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.46.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.46.js"></script> -->
</body> </body>
</html> </html>
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
"dependencies": { "dependencies": {
"@riophae/vue-treeselect": "0.0.29", "@riophae/vue-treeselect": "0.0.29",
"@tinymce/tinymce-vue": "^1.0.8", "@tinymce/tinymce-vue": "^1.0.8",
"element-ui": "^2.3.9", "element-ui": "^2.15.6",
"file-saver": "^1.3.8", "file-saver": "^1.3.8",
"script-loader": "^0.7.2", "script-loader": "^0.7.2",
"tinymce": "^4.8.3", "tinymce": "^4.8.3",
"vue": "^2.5.2", "vue": "2.6.6",
"vue-clipboard2": "^0.2.0", "vue-clipboard2": "^0.2.0",
"vue-router": "^3.0.1", "vue-router": "^3.0.1",
"xlsx": "^0.13.0" "xlsx": "^0.13.0"
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
"less": "^3.0.4", "less": "^3.0.4",
"less-loader": "^4.1.0", "less-loader": "^4.1.0",
"node-notifier": "^5.1.2", "node-notifier": "^5.1.2",
"node-sass": "^4.9.0", "node-sass": "^4.14.1",
"onchange": "^5.2.0", "onchange": "^5.2.0",
"optimize-css-assets-webpack-plugin": "^3.2.0", "optimize-css-assets-webpack-plugin": "^3.2.0",
"ora": "^1.2.0", "ora": "^1.2.0",
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
"vue-axios": "^2.1.1", "vue-axios": "^2.1.1",
"vue-loader": "^13.3.0", "vue-loader": "^13.3.0",
"vue-style-loader": "^3.0.1", "vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.5.2", "vue-template-compiler": "2.6.6",
"vuedraggable": "^2.16.0", "vuedraggable": "^2.16.0",
"vuex": "^3.0.1", "vuex": "^3.0.1",
"webpack": "^3.6.0", "webpack": "^3.6.0",
......
src/router/index.js
...@@ -35,6 +35,7 @@ if (window.sessionStorage.getItem('token')) { ...@@ -35,6 +35,7 @@ if (window.sessionStorage.getItem('token')) {
export const constantRouterMap = [ export const constantRouterMap = [
{ {
path: '/', path: '/',
redirect: '/companyGroup',
name: 'index', name: 'index',
component: _import('index', 'index'), component: _import('index', 'index'),
children: [ children: [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment