Merge branch 'feature/组件引入'

build/webpack.base.conf.js

@@ -35,7 +35,9 @@ module.exports = {
   externals: {
     'vue': 'Vue',
     'vue-router': 'VueRouter',
-    'vuex': 'Vuex'
+    'vuex': 'Vuex',
+    'axios': 'axios',
+    'element-ui': 'ELEMENT',
   },
   resolve: {
     extensions: ['.js', '.vue', '.json'],

index.html

@@ -19,23 +19,32 @@
   <div id="app"></div>
 
   <!-- 公共库引用 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/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/header.2.0.58.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-new.2.0.29.js"></script>
+  <script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.29.js"></script> -->
   <!-- 新版卡券门店选择器 -->
-  <script src="//web-1251519181.file.myqcloud.com/components/store-card.2.0.24.js"></script>
+  <!-- <script src="//web-1251519181.file.myqcloud.com/components/store-card.2.0.24.js"></script>
   <script src="//web-1251519181.file.myqcloud.com/components/people.2.0.38.js"></script>
-  <!-- <script src="//web-1251519181.file.myqcloud.com/components/datepicker.2.0.00.js"></script> -->
   <script src="//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.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/card.2.0.02.js"></script>
   <script src="//web-1251519181.file.myqcloud.com/components/selector.1.1.91.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/export-excel.2.0.24.js"></script> -->
+  <!-- 组件引用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.10.js"></script>
   <script src="//web-1251519181.file.myqcloud.com/components/track.1.0.4.js"></script>
 </body>

src/main.js

@@ -8,7 +8,7 @@
  */
 import promise from 'es6-promise';
 promise.polyfill();
-// import Vue from 'vue';
+import Vue from 'vue';
 import App from './App';
 import router from './router';
 import {
@@ -17,14 +17,12 @@ import {
 import VueAxios from 'vue-axios';
 import axios from 'axios';
 import store from './store/store';
-/* eslint-disable */
-import 'element-ui/lib/theme-chalk/index.css';
-import * as types from './store/types';
+// import * as types from './store/types';
 import '../theme/index.css';
 import '../static/css/index.less';
 import '../static/font/iconfont.css';
 import '../static/font/iconfont.js';
-require('../static/font/iconfont.js');
+// require('../static/font/iconfont.js');
 import filters from './filters/index.js';
 import VeLine from 'v-charts/lib/line.common';
 import VeHistogram from 'v-charts/lib/histogram.common';
@@ -45,7 +43,7 @@ Vue.axios.interceptors.request.use(
 );
 Vue.axios.interceptors.response.use(
   response => {
-    if (response.status == 200 && response.data.errorCode == 1) {}
+    // if (response.status == 200 && response.data.errorCode == 1) {}
     return response;
   },
   error => {