zhouchijian
/
fe-drone-ci
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change config

This commit is contained in:
Pan 2017-04-23 22:43:05 +08:00
parent a7b09a2a01
commit e0695d422a
8 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/dev-server.js
View File

@ -1,8 +1,7 @@
require('./check-versions')(); // 检查 Node 和 npm 版本
var config = require('../config');
if (!process.env.NODE_ENV) {
process.env.NODE_ENV = config.dev.env;
// process.env.NODE_ENV = JSON.parse(config.dev.env.NODE_ENV)
process.env.NODE_ENV = JSON.parse(config.dev.env.NODE_ENV)
}
var opn = require('opn')

9
build/webpack.base.conf.js
View File

@ -6,14 +6,7 @@ var vueLoaderConfig = require('./vue-loader.conf');
function resolve(dir) {
return path.join(__dirname, '..', dir)
}
var src = path.resolve(__dirname, '../src');
var env = process.env.NODE_ENV
// check env & config/index.js to decide weither to enable CSS Sourcemaps for the
// various preprocessor loaders added to vue-loader at the end of this file
var cssSourceMapDev = (env === 'development' && config.dev.cssSourceMap)
var cssSourceMapProd = (env === 'production||sit' && config.build.productionSourceMap)
var useCssSourceMap = cssSourceMapDev || cssSourceMapProd
module.exports = {
entry: {
@ -22,7 +15,7 @@ module.exports = {
output: {
path: config.build.assetsRoot,
filename: '[name].js',
publicPath: process.env.NODE_ENV === 'production||sit' ? config.build.assetsPublicPath : config.dev.assetsPublicPath
publicPath: process.env.NODE_ENV !== 'development' ? config.build.assetsPublicPath: config.dev.assetsPublicPath
},
resolve: {
extensions: ['.js', '.vue', '.json'],

6
config/index.js
View File

@ -8,8 +8,8 @@ module.exports = {
index: path.resolve(__dirname, '../dist/index.html'),
assetsRoot: path.resolve(__dirname, '../dist'),
assetsSubDirectory: '',
assetsPublicPath: '/',
staticPath:'',
assetsPublicPath: './',
staticPath:'./',
productionSourceMap: true,
// Gzip off by default as many popular static hosts such as
// Surge or Netlify already gzip all static assets for you.
@ -28,8 +28,8 @@ module.exports = {
port: 9527,
autoOpenBrowser: true,
assetsSubDirectory: 'static',
staticPath:'/static',
assetsPublicPath: '/',
staticPath:'/static/',
proxyTable: {},
// CSS Sourcemaps off by default because relative paths are "buggy"
// with this option, according to the CSS-Loader README

2
config/prod.env.js
View File

@ -1,5 +1,5 @@
module.exports = {
NODE_ENV: '"production"',
BASE_API: '"https://api-prod',
BASE_API: '"https://api-prod"',
APP_ORIGIN: '"https://wallstreetcn.com"'
};

4
index.html
View File

@ -8,8 +8,8 @@
<title>Juicy</title>
</head>
<body>
<script src=<%= htmlWebpackPlugin.options.path %>/jquery.min.js></script>
<script src=<%= htmlWebpackPlugin.options.path %>/tinymce1.3/tinymce.min.js></script>
<script src=<%= htmlWebpackPlugin.options.path %>jquery.min.js></script>
<script src=<%= htmlWebpackPlugin.options.path %>tinymce1.3/tinymce.min.js></script>
<div id="app"></div>
<!-- built files will be auto injected -->
</body>

2
src/router/index.js
View File

@ -67,7 +67,7 @@ const Form2 = resolve => require(['../views/example/form2'], resolve);
Vue.use(Router);
export default new Router({
mode: 'history',
// mode: 'history', //后端支持可开
scrollBehavior: () => ({ y: 0 }),
routes: [
{ path: '/login', component: Login, hidden: true },

14
src/views/components/mixin.vue
View File

@ -2,17 +2,23 @@
<div class="components-container">
<div class='component-item'>
<MDinput name="name" v-model="title" required :maxlength="100">
标题
标题
</MDinput>
<code class='code-part'>Material Design 的input</code>
</div>
<div class='component-item'>
<PanThumb image='https://wpimg.wallstcn.com/577965b9-bb9e-4e02-9f0c-095b41417191'>
<PanThumb image='https://wpimg.wallstcn.com/577965b9-bb9e-4e02-9f0c-095b41417191'>
上海花裤衩
</PanThumb>
<code class='code-part'>图片hover效果</code>
</PanThumb>
<code class='code-part'>图片hover效果</code>
</div>
<div class='component-item'>
<el-button v-waves type="primary">水波纹效果</el-button>
<code class='code-part'>水波纹 v-directive</code>
</div>
</div>
</template>
<script>

36
src/views/login/index.vue
View File

@ -97,29 +97,29 @@
});
},
afterQRScan() {
const hash = window.location.hash.slice(1);
const hashObj = getQueryObject(hash);
const originUrl = window.location.origin;
history.replaceState({}, '', originUrl);
const codeMap = {
wechat: 'code',
tencent: 'code'
};
const codeName = hashObj[codeMap[this.auth_type]];
if (!codeName) {
alert('第三方登录失败');
} else {
this.$store.dispatch('LoginByThirdparty', codeName).then(() => {
this.$router.push({ path: '/' });
});
}
// const hash = window.location.hash.slice(1);
// const hashObj = getQueryObject(hash);
// const originUrl = window.location.origin;
// history.replaceState({}, '', originUrl);
// const codeMap = {
// wechat: 'code',
// tencent: 'code'
// };
// const codeName = hashObj[codeMap[this.auth_type]];
// if (!codeName) {
// alert('第三方登录失败');
// } else {
// this.$store.dispatch('LoginByThirdparty', codeName).then(() => {
// this.$router.push({ path: '/' });
// });
// }
}
},
created() {
window.addEventListener('hashchange', this.afterQRScan);
// window.addEventListener('hashchange', this.afterQRScan);
},
destroyed() {
window.removeEventListener('hashchange', this.afterQRScan);
// window.removeEventListener('hashchange', this.afterQRScan);
}
}
</script>