Skip to content

I
integral-mall
Commit 33ccd922 by chenyu
Options

Merge branch 'feature/组件引入' of http://git.gicdev.com/integralMall/integral-mall

parents 1781c243 d3473474
Showing with 32 additions and 23 deletions
build/webpack.base.conf.js
......@@ -82,7 +82,8 @@ module.exports = {
'vue': 'Vue',
'vue-router': 'VueRouter',
'vuex': 'Vuex',
// 'axios': 'axios'
'axios': 'axios',
'element-ui': 'ELEMENT'
},
node: {
// prevent webpack from injecting useless setImmediate polyfill because Vue
......
config/index.js
......@@ -9,7 +9,7 @@ module.exports = {
// Paths
assetsSubDirectory: 'static',
assetsPublicPath: '/',
assetsPublicPath: '/integral-mall',
// proxyTable: {},
proxyTable: {
......@@ -32,7 +32,7 @@ module.exports = {
// Various Dev Server settings
host: 'localhost', // can be overwritten by process.env.HOST
port: 8002, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
autoOpenBrowser: false,
errorOverlay: true,
notifyOnErrors: true,
poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
......
index.html
......@@ -21,31 +21,42 @@
<body>
<div id="app"></div>
<!-- 库引用cdn -->
<script src='//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js'></script>
<!-- <script src='//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/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/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 -->
<script src="//web-1251519181.file.myqcloud.com/components/header.2.0.58.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js"></script>
<script src='//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js'></script>
<!-- <script src="//web-1251519181.file.myqcloud.com/components/header.2.0.58.js"></script> -->
<!-- <script src="//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js"></script> -->
<!-- <script src="//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js"></script> -->
<!-- <script src='//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js'></script> -->
<!-- 数据对话选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js"></script><!-- 门店选择器 -->
<!-- <script src="//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.js"></script> -->
<!-- 门店选择器 -->
<!-- <script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js"></script> -->
<!-- <script src="//web-1251519181.file.myqcloud.com/components/member-info.1.0.01.js"></script> -->
<script src="//web-1251519181.file.myqcloud.com/components/card.2.0.21.js"></script><!-- 卡券选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.24.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/people.2.0.26.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-card.2.0.30.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js"></script>
<!-- 卡券选择器 -->
<!-- <script src="//web-1251519181.file.myqcloud.com/components/card.2.0.21.js"></script> -->
<!-- <script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.24.js"></script> -->
<!-- <script src="//web-1251519181.file.myqcloud.com/components/people.2.0.26.js"></script> -->
<!-- <script src="//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js"></script> -->
<!-- <script src="//web-1251519181.file.myqcloud.com/components/store-card.2.0.30.js"></script> -->
<!-- 会员分组 -->
<script src="//web-1251519181.file.myqcloud.com/components/member-group.2.2.32.js"></script>
<!-- 埋点 -->
<script src="//web-1251519181.file.myqcloud.com/components/track.1.0.4.js"></script>
<!-- <script src="//web-1251519181.file.myqcloud.com/components/member-group.2.2.32.js"></script> -->
<!-- <script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/space.2.0.00.js"></script> -->
<!-- built files will be auto injected -->
<!-- 组件引用cdn -->
<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>
<!-- 4.0组件 -->
<script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/track.1.0.4.js"></script>
</body>
</html>
src/main.js
......@@ -8,13 +8,10 @@ import App from './App';
import router from './router';
import axios from 'axios';
import VueAxios from 'vue-axios';
import ElementUI from 'element-ui';
import store from './store';
import 'element-ui/lib/theme-chalk/index.css';
import './assets/theme/index.css';
import '../static/fonts/iconfont.js';
import limit from '@/utils/limiting';
Vue.use(ElementUI);
Vue.use(VueAxios, axios);
// import vueGicStoreLinkage from '@gic-test/vue-gic-store-linkage';
// Vue.use(vueGicStoreLinkage);
......
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