Skip to content

M
marketing
Commit c60972d1 by zhangmeng
Options

chore:修改了组件的cdn引入

parent 27b331ab
Showing with 49 additions and 57 deletions
.eslintrc.js
......@@ -23,7 +23,12 @@ module.exports = {
rules: {
// allow async-await
'generator-star-spacing': 'off',
"prettier/prettier": "error",
'prettier/prettier': [
'error',
{
endOfLine: 'auto'
}
],
"no-console": process.env.NODE_ENV === "production" ? 2 : 0,
"no-alert": process.env.NODE_ENV === "production" ? 2 : 0, //禁止使用alert confirm prompt
"no-debugger": process.env.NODE_ENV === "production" ? 2 : 0,
......
build/webpack.base.conf.js
......@@ -83,6 +83,12 @@ module.exports = {
}
]
},
externals: {
'vue': 'Vue',
'vue-router': 'VueRouter',
'vuex': 'Vuex',
// 'axios': 'axios'
},
node: {
// prevent webpack from injecting useless setImmediate polyfill because Vue
// source contains it (although only uses it if it's native).
......
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.570142dbac874805954309f6148bb92c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.fc6b7e10cb9b79ccb999.js></script><script type=text/javascript src=/marketing/static/js/app.db46833bbc52c4de920e.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.b29a8a61b591c9bf360de6dcf8f4f777.css rel=stylesheet></head><body><div id=app></div><script src=http://web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=http://web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=http://web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=http://web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=http://web-1251519181.file.myqcloud.com/components/header.2.0.00.js></script><script src=http://web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=http://web-1251519181.file.myqcloud.com/components/card.2.0.00.js></script><script src=http://web-1251519181.file.myqcloud.com/components/store.2.0.00.js></script><script src=http://web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=http://web-1251519181.file.myqcloud.com/components/member-group.2.0.00.js></script><script src=http://web-1251519181.file.myqcloud.com/components/store-card.2.0.00.js></script><script src=http://web-1251519181.file.myqcloud.com/components/confirm-people.2.0.00.js></script><script src=http://web-1251519181.file.myqcloud.com/components/people.2.0.00.js></script><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.195599a21f32417e94aa.js></script><script type=text/javascript src=/marketing/static/js/app.2876fb009a610643e260.js></script></body></html>
\ No newline at end of file
dist/static/js/app.2876fb009a610643e260.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.db46833bbc52c4de920e.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.195599a21f32417e94aa.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.fc6b7e10cb9b79ccb999.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
......@@ -3,17 +3,31 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<!-- <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> -->
<link rel="shortcut icon" href="./static/img/favicon.ico">
<title>GIC后台</title>
<link rel="stylesheet" type="text/css" href="static/css/iconfont.css">
<link rel="stylesheet" type="text/css" href="static/css/common.css">
<!-- element 皮肤 -->
<!-- <link rel="stylesheet" type="text/css" href="http://web-1251519181.file.myqcloud.com/lib/elementUI/theme.1.0.1/index.css"> -->
</head>
<body>
<div id="app"></div>
<!-- built files will be auto injected -->
<!-- <script src="https://web-1251519181.cos.ap-shanghai.myqcloud.com/header.2.0.00.js"></script>
<script src="https://web-1251519181.cos.ap-shanghai.myqcloud.com/people.2.0.00.js"></script> -->
<!-- 库引用cdn -->
<script src="http://web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js"></script>
<!-- <script src="http://web-1251519181.file.myqcloud.com/lib/axios/index.0.19.0-beta.1.js"></script> -->
<script src="http://web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js"></script>
<script src="http://web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js"></script>
<script src="http://web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js"></script>
<!-- 组件引用cdn -->
<script src="http://web-1251519181.file.myqcloud.com/components/header.2.0.00.js"></script>
<script src="http://web-1251519181.file.myqcloud.com/components/footer.2.0.02.js"></script>
<script src="http://web-1251519181.file.myqcloud.com/components/card.2.0.00.js"></script>
<script src="http://web-1251519181.file.myqcloud.com/components/store.2.0.00.js"></script>
<script src="http://web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js"></script>
<script src="http://web-1251519181.file.myqcloud.com/components/member-group.2.0.00.js"></script>
<script src="http://web-1251519181.file.myqcloud.com/components/store-card.2.0.00.js"></script>
<script src="http://web-1251519181.file.myqcloud.com/components/confirm-people.2.0.00.js"></script>
<script src="http://web-1251519181.file.myqcloud.com/components/people.2.0.00.js"></script>
</body>
</html>
src/config/index.js
const config = {
development: {
// api: '/dmApi/'
api: 'http://gicdev.demogic.com/'
},
production: {
// api: 'https://hope.demogic.com/',
api: window.location.protocol + '//' + window.location.host + '/' || ''
}
};
export default {
api: config[process.env['NODE_ENV']]['api']
api: process.env['NODE_ENV'] === 'development' ? 'http://gicdev.demogic.com/' :(window.location.protocol + '//' + window.location.host + '/' || '')
};
src/main.js
import Vue from 'vue';
import App from './App';
import router from './router';
import store from './store';
import { axios } from './service/api/index';
import directives from './directives';
import ElementUI from 'element-ui';
import vueGicHeader from '../components/dm-header.js';
import vueGicFooter from '@gic-test/vue-gic-footer';
import vueGicAsideMenu from '@/components/aside-menu';
import vueGicCard from '@gic-test/vue-gic-card';
import vueGicStore from '@gic-test/vue-gic-store';
import vueGicStoreLinkage from '@gic-test/vue-gic-store-linkage/src/lib';
import vueGicStoreGroup from '@gic-test/vue-gic-store-group';
import vueGicPeople from '@gic-test/vue-gic-people/src/lib';
import vueGicConfirmPeople from '@gic-test/vue-gic-confirm-people/src/lib';
import vueGicImgPreview from '@gic-test/vue-gic-img-preview';
import vueGicMemberGroup from '@gic-test/vue-gic-member-group/src/lib';
import { gicStoreCard } from '@gic-test/vue-gic-store-new/src/lib';
import packele from 'packele';
Vue.config.productionTip = false;
Vue.use(packele);
Vue.use(ElementUI);
Vue.use(vueGicHeader);
Vue.use(vueGicFooter);
Vue.use(vueGicAsideMenu);
Vue.use(vueGicCard);
Vue.use(vueGicStore);
Vue.use(vueGicStoreLinkage);
Vue.use(vueGicStoreGroup);
Vue.use(vueGicPeople);
Vue.use(vueGicConfirmPeople);
Vue.use(vueGicImgPreview);
Vue.use(vueGicMemberGroup);
Vue.use(gicStoreCard);
Vue.prototype.axios = axios;
Vue.prototype.axios.withCredentials = true;
Object.keys(directives).map(item => Vue.directive(item, directives[item]));
window.$bus = new Vue();
let flag = false;
Vue.prototype.$tips = function({ message = '提示', type = 'success' }) {
......@@ -49,6 +25,8 @@ Vue.prototype.$tips = function({ message = '提示', type = 'success' }) {
flag = false;
}, 1000);
};
/* eslint-disable no-new */
new Vue({
el: '#app',
......
src/service/api/index.js
import Vue from 'vue';
import axios from 'axios';
import config from '@/config';
import { log } from '@/utils';
import qs from 'qs';
import Router from 'vue-router';
const router = new Router();
import axios from 'axios';
const router = new VueRouter();
// 加载最小时间
const MINI_TIME = 300;
......@@ -18,12 +15,15 @@ let _apiHost = config.api;
// 请求组（判断当前请求数）
let _requests = [];
//创建一个请求实例
const instance = axios.create({
baseURL: _apiHost,
timeout: TIME_OUT_MAX,
headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
});
axios.defaults.baseURL = _apiHost;
console.log(axios.defaults)
// 创建一个请求实例
// const axios = axios.create({
// baseURL: _apiHost,
// timeout: TIME_OUT_MAX,
// headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
// });
/**
* 添加请求，显示loading
* @param {请求配置} config
......@@ -112,7 +112,7 @@ const requests = (url, data = {}, contentTypeIsJSON = false, isSilence = false,
pushRequest(_random);
}, MINI_TIME);
}
instance(_opts)
axios(_opts)
.then(res => {
clearTimeout(_timer);
popRequest(_random);
......@@ -134,4 +134,4 @@ const requests = (url, data = {}, contentTypeIsJSON = false, isSilence = false,
});
};
export { instance as axios, requests };
export { axios, requests };
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