fe / ufo-platform-fe · Commits

Go to a project

Authored by htoooth
Commit a5ad6bc8f16dcdf62009373cf173b6c167bb0a88 2 parents f73ea2e8 a2015bdc

Merge branch 'master' of http://git.yoho.cn/fe/ufo-platform-fe

Inline Side-by-side
Showing 15 changed files with 350 additions and 228 deletions
.idea
# Created by https://www.gitignore.io/api/node,webstorm,netbeans,sublimetext,vim
### Node ###
# Logs
logs
*.log
npm-debug.log*
# Runtime data
pids
*.pid
*.seed
# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov
# Coverage directory used by tools like istanbul
coverage
# nyc test coverage
.nyc_output
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt
# node-waf configuration
.lock-wscript
# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release
# Dependency directories
node_modules
jspm_packages
# Optional npm cache directory
.npm
# Optional REPL history
.node_repl_history
### WebStorm ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
.idea/
.DS_Store
node_modules/
.project
# User-specific stuff:
.idea/workspace.xml
.idea/tasks.xml
.idea/dictionaries
.idea/vcs.xml
.idea/jsLibraryMappings.xml
# Sensitive or high-churn files:
.idea/dataSources.ids
.idea/dataSources.xml
.idea/dataSources.local.xml
.idea/sqlDataSources.xml
.idea/dynamic.xml
.idea/uiDesigner.xml
# Gradle:
.idea/gradle.xml
.idea/libraries
# Mongo Explorer plugin:
.idea/mongoSettings.xml
## File-based project format:
*.iws
## Plugin-specific files:
# IntelliJ
/out/
# mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
### WebStorm Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
# *.iml
# modules.xml
### NetBeans ###
nbproject/private/
nbbuild/
dist/
nbdist/
nbactions.xml
.nb-gradle/
### SublimeText ###
# cache files for sublime text
*.tmlanguage.cache
*.tmPreferences.cache
*.stTheme.cache
# workspace files are user-specific
*.sublime-workspace
# project files should be checked into the repository, unless a significant
# proportion of contributors will probably not be using SublimeText
# *.sublime-project
# sftp configuration file
sftp-config.json
### TSD ###
typings/
### Vim ###
# swap
[._]*.s[a-w][a-z]
[._]s[a-w][a-z]
# session
Session.vim
# temporary
.netrwhist
*~
# auto-generated tag files
tags
### TSD ###
typings/
### VS Code ###
.vscode/
### YOHO ###
dist
dist/*
src/config/*.tmp
src/config/env.js
npm-debug.log
\ No newline at end of file
.eslintcache
.stylelintcache
*.log.*
nbproject/*
.DS_Store
.devhost
.happypack/*
.scannerwork
package-lock.json
... ...
phantomjs_cdnurl=http://npm.taobao.org/mirrors/phantomjs
sass_binary_site=https://npm.taobao.org/mirrors/node-sass/
registry=http://npm.yohops.com
... ...
<template>
<div class="miniapp">
<home-page></home-page>
</div>
</template>
<script>
import home from './views/home'
export default {
data() {
return {
};
},
mounted() {
},
beforeDestroy() {
},
methods: {
},
components: {
'home-page': home
}
};
</script>
<style>
.miniapp {
display: inline-block;
margin-top: 30px;
margin-bottom: 30px;
}
</style>
<template>
<div>
<sort-page></sort-page>
</div>
</template>
<script>
import sort from './views/sort'
export default {
data() {
return {
};
},
mounted() {
},
beforeDestroy() {
},
methods: {
},
components: {
'sort-page': sort
}
};
</script>
\ No newline at end of file
export default "development";
\ No newline at end of file
... ...
import Vue from 'vue';
import iView from 'iview';
import 'iview/dist/styles/iview.css';
import emitter from './mixins/emitter';
Vue.use(iView);
Vue.mixin(emitter);
export default (App) => {
return new Vue({
el: '#app',
render: h => h(App)
});
}
... ...
import App from './views/coupon/index.vue';
import createApp from './create-app'
createApp(App)
\ No newline at end of file
... ...
import Vue from 'vue';
import iView from 'iview';
import Vuex from 'vuex';
import Util from './libs/util';
import App from './app-home.vue';
import 'iview/dist/styles/iview.css';
import emitter from './mixins/emitter';
import App from './views/home/index.vue';
import createApp from './create-app'
Vue.use(Vuex);
Vue.use(iView);
Vue.mixin(emitter);
const store = new Vuex.Store({
state: {
},
getters: {
},
mutations: {
},
actions: {
}
});
new Vue({
el: '#app',
store: store,
render: h => h(App)
});
\ No newline at end of file
createApp(App)
\ No newline at end of file
... ...
import Vue from 'vue';
import iView from 'iview';
import Vuex from 'vuex';
import Util from './libs/util';
import App from './app-sort.vue';
import 'iview/dist/styles/iview.css';
import emitter from './mixins/emitter';
import App from './views/sort/index.vue';
import createApp from './create-app'
Vue.use(Vuex);
Vue.use(iView);
Vue.mixin(emitter);
const store = new Vuex.Store({
state: {
},
getters: {
},
mutations: {
},
actions: {
}
});
new Vue({
el: '#app',
store: store,
render: h => h(App)
});
\ No newline at end of file
createApp(App)
\ No newline at end of file
... ...
<template>
</template>
<script>
export default {
}
</script>
<style>
</style>
... ...
<style scoped>
.index {
width: 100%;
position: absolute;
top: 0;
bottom: 0;
left: 0;
text-align: center;
}
</style>
<template>
<div class="index">
<miniapp title="UFO首页">
<template>
<template v-for="i in list">
<smartfloor :item="i" :key="i.resContentId"></smartfloor>
<divide></divide>
</template>
</template>
</miniapp>
</div>
</template>
<script>
import miniapp from 'components/miniapp'
import smartfloor from 'components/smart-floor'
import divide from 'components/divide'
import util from '@/libs/util'
import ResourceService from '@/service/resource-service'
export default {
data() {
return {
list: [],
resId: null
}
},
mounted() {
this.resId = util.getQueryString('id');
this.resourceService = new ResourceService();
this.init();
},
methods: {
init() {
this.resourceService.info(this.resId).then(result => {
this.list = result;
})
}
},
components: {
miniapp,
smartfloor,
divide
}
};
</script>
\ No newline at end of file
... ...
<style scoped>
.index {
width: 100%;
position: absolute;
top: 0;
bottom: 0;
left: 0;
text-align: center;
}
</style>
<template>
<div class="index">
<miniapp title="UFO首页">
<template>
<template v-for="i in list">
<smartfloor :item="i" :key="i.resContentId"></smartfloor>
<divide></divide>
</template>
</template>
</miniapp>
<div class="miniapp">
<home-page></home-page>
</div>
</template>
<script>
import miniapp from 'components/miniapp'
import smartfloor from 'components/smart-floor'
import divide from 'components/divide'
import util from '@/libs/util'
import ResourceService from '@/service/resource-service'
import home from './home.vue'
export default {
data() {
return {
list: [],
resId: null
}
};
},
mounted() {
this.resId = util.getQueryString('id');
this.resourceService = new ResourceService();
this.init();
},
beforeDestroy() {
},
methods: {
init() {
this.resourceService.info(this.resId).then(result => {
this.list = result;
})
}
},
components: {
miniapp,
smartfloor,
divide
'home-page': home
}
};
</script>
\ No newline at end of file
</script>
<style>
.miniapp {
display: inline-block;
margin-top: 30px;
margin-bottom: 30px;
}
</style>
... ...
<style scoped>
.index {
width: 100%;
position: absolute;
top: 0;
bottom: 0;
left: 0;
text-align: center;
}
</style>
<template>
<div class="index">
<miniapp title="UFO分类页" :bg="bg">
<template>
<template v-for="i in list">
<smartfloor :item="i" :key="i.id"></smartfloor>
<divide></divide>
</template>
</template>
</miniapp>
<div>
<sort-page></sort-page>
</div>
</template>
<script>
import miniapp from 'components/miniapp'
import smartfloor from 'components/smart-floor'
import divide from 'components/divide'
import util from '@/libs/util'
import ResourceApi from '@/api/resource-api'
import sort from './sort.vue'
export default {
data() {
return {
list: [{
id: 2,
type: 2
}, {
id: 4,
type: 4
}],
resId: null,
bg: require('assets/sort_title.png')
}
};
},
mounted() {
this.resId = util.getQueryString('id');
this.resourceApi = new ResourceApi();
this.init();
},
beforeDestroy() {
},
methods: {
init() {
this.resourceApi.info(this.resId).then(result => {
console.log(result);
})
}
},
components: {
miniapp,
smartfloor,
divide
'sort-page': sort
}
};
</script>
\ No newline at end of file
... ...
<style scoped>
.index {
width: 100%;
position: absolute;
top: 0;
bottom: 0;
left: 0;
text-align: center;
}
</style>
<template>
<div class="index">
<miniapp title="UFO分类页" :bg="bg">
<template>
<template v-for="i in list">
<smartfloor :item="i" :key="i.id"></smartfloor>
<divide></divide>
</template>
</template>
</miniapp>
</div>
</template>
<script>
import miniapp from 'components/miniapp'
import smartfloor from 'components/smart-floor'
import divide from 'components/divide'
import util from '@/libs/util'
import ResourceApi from '@/api/resource-api'
export default {
data() {
return {
list: [{
id: 2,
type: 2
}, {
id: 4,
type: 4
}],
resId: null,
bg: require('assets/sort_title.png')
}
},
mounted() {
this.resId = util.getQueryString('id');
this.resourceApi = new ResourceApi();
this.init();
},
methods: {
init() {
this.resourceApi.info(this.resId).then(result => {
console.log(result);
})
}
},
components: {
miniapp,
smartfloor,
divide
}
};
</script>
\ No newline at end of file
... ...
... ... @@ -37,9 +37,16 @@ module.exports = merge(webpackBaseConfig, {
template: './src/template/index.ejs',
inject: false,
chunks: ['vendors', 'app-sort']
}),
new HtmlWebpackPlugin({
filename: '../coupon.html',
template: './src/template/index.ejs',
inject: false,
chunks: ['vendors', 'coupon']
})
],
devServer: {
openPage: 'index_home.html',
proxy: {
'/ufoPlatform/resource/**': {
target: 'http://java-ufo-platform.test3.ingress.dev.yohocorp.com',
... ...