Commit 41c24d83 authored by Jeff's avatar Jeff

更新规则

parent d332ef57
...@@ -11,7 +11,7 @@ charset = utf-8 ...@@ -11,7 +11,7 @@ charset = utf-8
indent_style = space indent_style = space
#缩进数量可选整数值2 or 4,或者tab #缩进数量可选整数值2 or 4,或者tab
indent_size = 4 indent_size = 2
#换行符的格式 换行符,lf、cr和crlf #换行符的格式 换行符,lf、cr和crlf
end_of_line = lf end_of_line = lf
......
...@@ -30,23 +30,13 @@ module.exports = { ...@@ -30,23 +30,13 @@ module.exports = {
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off', 'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
indent: [ indent: [
'error', 'error',
4, 2,
{ {
SwitchCase: 1, SwitchCase: 1,
flatTernaryExpressions: true flatTernaryExpressions: true
} }
], ],
'comma-dangle': ['error', 'never'], 'comma-dangle': ['error', 'never'],
quotes: ['error', 'single'], quotes: ['error', 'single']
'vue/max-attributes-per-line': [
'error',
{
singleline: 1,
multiline: {
max: 1,
allowFirstLine: false
}
}
]
} }
} }
...@@ -14,19 +14,19 @@ ...@@ -14,19 +14,19 @@
import CommonHeader from '@/components/header/index.vue' import CommonHeader from '@/components/header/index.vue'
import ModalLayer from '@/components/modal/modalLayer.vue' import ModalLayer from '@/components/modal/modalLayer.vue'
export default { export default {
components: { components: {
CommonHeader, CommonHeader,
ModalLayer, ModalLayer,
SideNav: () => import('@/components/sideNav/index.vue'), SideNav: () => import('@/components/sideNav/index.vue'),
RightPanel: () => import('@/components/rightPanel/index.vue') RightPanel: () => import('@/components/rightPanel/index.vue')
}, },
data() { data() {
return {} return {}
}, },
async created() { async created() {
let result = await this.$http.get('/webapi/home/banner?type=1&category=18') let result = await this.$http.get('/webapi/home/banner?type=1&category=18')
console.log('result:', result) console.log('result:', result)
} }
} }
</script> </script>
......
...@@ -16,19 +16,19 @@ ...@@ -16,19 +16,19 @@
<script> <script>
export default { export default {
components: { components: {
tipPanel: () => import('@/components/header/tipPanel.vue') tipPanel: () => import('@/components/header/tipPanel.vue')
}, },
data() { data() {
return {} return {}
}, },
created() {}, created() {},
mounted() {}, mounted() {},
methods: { methods: {
showModal() { showModal() {
this.$modal.show('selectModal') this.$modal.show('selectModal')
}
} }
}
} }
</script> </script>
......
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
<script> <script>
export default { export default {
data() { data() {
return {} return {}
}, },
created() {}, created() {},
mounted() {} mounted() {}
} }
</script> </script>
......
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
<script> <script>
export default { export default {
data() { data() {
return {} return {}
}, },
methods: {} methods: {}
} }
</script> </script>
......
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
<script> <script>
export default { export default {
data() { data() {
return {} return {}
}, },
methods: {} methods: {}
} }
</script> </script>
......
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
<script> <script>
import CompleteContent from './completeContent' import CompleteContent from './completeContent'
export default { export default {
components: { components: {
CompleteContent CompleteContent
}, },
data() { data() {
return {} return {}
}, },
methods: {} methods: {}
} }
</script> </script>
......
...@@ -9,14 +9,14 @@ ...@@ -9,14 +9,14 @@
import CompleteModal from '@/components/modal/completeModal' import CompleteModal from '@/components/modal/completeModal'
import SelectModal from '@/components/modal/selectModal' import SelectModal from '@/components/modal/selectModal'
export default { export default {
components: { components: {
CompleteModal, CompleteModal,
SelectModal SelectModal
}, },
data() { data() {
return {} return {}
}, },
methods: {} methods: {}
} }
</script> </script>
......
...@@ -12,14 +12,14 @@ ...@@ -12,14 +12,14 @@
<script> <script>
export default { export default {
data() { data() {
return {} return {}
}, },
methods: { methods: {
close() { close() {
this.$modal.hide('selectModal') this.$modal.hide('selectModal')
}
} }
}
} }
</script> </script>
......
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
<script> <script>
import SelectContent from './selectContent' import SelectContent from './selectContent'
export default { export default {
components: { components: {
SelectContent SelectContent
}, },
data() { data() {
return {} return {}
}, },
methods: {} methods: {}
} }
</script> </script>
......
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
<script> <script>
export default { export default {
data() { data() {
return {} return {}
}, },
created() {}, created() {},
mounted() {} mounted() {}
} }
</script> </script>
......
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
<script> <script>
export default { export default {
data() { data() {
return {} return {}
}, },
created() {}, created() {},
mounted() {} mounted() {}
} }
</script> </script>
......
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
<script> <script>
export default { export default {
data() { data() {
return {} return {}
}, },
created() {}, created() {},
mounted() {} mounted() {}
} }
</script> </script>
......
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
</template> </template>
<script> <script>
export default { export default {
methods: { methods: {
changeVideo() { changeVideo() {
this.$emit('changeVideo') this.$emit('changeVideo')
}
} }
}
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
...@@ -19,28 +19,28 @@ ...@@ -19,28 +19,28 @@
</template> </template>
<script> <script>
export default { export default {
filters: { filters: {
formatTime(duration) { formatTime(duration) {
if (duration <= 0) return '00:00' if (duration <= 0) return '00:00'
if (!duration) return '--:--' if (!duration) return '--:--'
let min = ~~(duration / 60) let min = ~~(duration / 60)
min = (min + '').length === 1 ? '0' + min : min min = (min + '').length === 1 ? '0' + min : min
let sec = Math.floor(duration % 60) let sec = Math.floor(duration % 60)
sec = (sec + '').length === 1 ? '0' + sec : sec sec = (sec + '').length === 1 ? '0' + sec : sec
min = min || '00' min = min || '00'
sec = sec || '00' sec = sec || '00'
return min + ':' + sec return min + ':' + sec
} }
}, },
props: ['duration', 'nowTime'], // eslint-disable-line props: ['duration', 'nowTime'], // eslint-disable-line
data() { data() {
return {} return {}
}, },
methods: { methods: {
play() { play() {
this.$emit('play') this.$emit('play')
}
} }
}
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
...@@ -8,55 +8,55 @@ ...@@ -8,55 +8,55 @@
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
state: 'pluse', state: 'pluse',
times: 0, times: 0,
canPlay: false canPlay: false
} }
},
mounted() {
this.$bus.on('videoPlayer.play', (data) => {
if (data.time !== undefined) {
this.currentTime(data.time)
}
if (data.play) {
this.play()
} else {
this.pause()
}
})
this.$nextTick(() => {
this.$refs.videoDom.addEventListener('canplay', this.canPlayFunc)
this.$refs.videoDom.addEventListener('ended', () => {
this.$emit('ended')
})
})
},
beforeDestroy() {
this.$refs.videoDom.removeEventListener('canplay')
this.$refs.videoDom.removeEventListener('ended')
},
methods: {
canPlayFunc() {
this.canPlay = true
let from = this.$parent.$options.name || 'videoPlayer'
this.$bus.emit(`${from}.canPlay`, this.$refs.videoDom.duration)
}, },
mounted() { play() {
this.$bus.on('videoPlayer.play', (data) => { if (!this.canPlay) return
if (data.time !== undefined) { this.$refs.videoDom.play()
this.currentTime(data.time) this.$emit('currentTime', this.$refs.videoDom.currentTime)
}
if (data.play) {
this.play()
} else {
this.pause()
}
})
this.$nextTick(() => {
this.$refs.videoDom.addEventListener('canplay', this.canPlayFunc)
this.$refs.videoDom.addEventListener('ended', () => {
this.$emit('ended')
})
})
}, },
beforeDestroy() { pause() {
this.$refs.videoDom.removeEventListener('canplay') if (!this.canPlay) return
this.$refs.videoDom.removeEventListener('ended') this.$refs.videoDom.pause()
}, },
methods: { currentTime(time) {
canPlayFunc() { if (!this.canPlay) return
this.canPlay = true this.$refs.videoDom.currentTime = time
let from = this.$parent.$options.name || 'videoPlayer'
this.$bus.emit(`${from}.canPlay`, this.$refs.videoDom.duration)
},
play() {
if (!this.canPlay) return
this.$refs.videoDom.play()
this.$emit('currentTime', this.$refs.videoDom.currentTime)
},
pause() {
if (!this.canPlay) return
this.$refs.videoDom.pause()
},
currentTime(time) {
if (!this.canPlay) return
this.$refs.videoDom.currentTime = time
}
} }
}
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
...@@ -18,7 +18,7 @@ Vue.config.productionTip = false ...@@ -18,7 +18,7 @@ Vue.config.productionTip = false
Vue.prototype.$http = axios Vue.prototype.$http = axios
new Vue({ new Vue({
router, router,
store, store,
render: (h) => h(App) render: (h) => h(App)
}).$mount('#app') }).$mount('#app')
...@@ -3,27 +3,27 @@ ...@@ -3,27 +3,27 @@
import { register } from 'register-service-worker' import { register } from 'register-service-worker'
if (process.env.NODE_ENV === 'production') { if (process.env.NODE_ENV === 'production') {
register(`${process.env.BASE_URL}service-worker.js`, { register(`${process.env.BASE_URL}service-worker.js`, {
ready() { ready() {
console.log('App is being served from cache by a service worker.\n' + 'For more details, visit https://goo.gl/AFskqB') console.log('App is being served from cache by a service worker.\n' + 'For more details, visit https://goo.gl/AFskqB')
}, },
registered() { registered() {
console.log('Service worker has been registered.') console.log('Service worker has been registered.')
}, },
cached() { cached() {
console.log('Content has been cached for offline use.') console.log('Content has been cached for offline use.')
}, },
updatefound() { updatefound() {
console.log('New content is downloading.') console.log('New content is downloading.')
}, },
updated() { updated() {
console.log('New content is available; please refresh.') console.log('New content is available; please refresh.')
}, },
offline() { offline() {
console.log('No internet connection found. App is running in offline mode.') console.log('No internet connection found. App is running in offline mode.')
}, },
error(error) { error(error) {
console.error('Error during service worker registration:', error) console.error('Error during service worker registration:', error)
} }
}) })
} }
...@@ -7,42 +7,42 @@ import screenshotPanel from '../components/rightPanel/screenshotPanel.vue' ...@@ -7,42 +7,42 @@ import screenshotPanel from '../components/rightPanel/screenshotPanel.vue'
Vue.use(VueRouter) Vue.use(VueRouter)
const routes = [ const routes = [
{ {
path: '/', path: '/',
name: 'Bao3', name: 'Bao3',
component: Bao3 component: Bao3
}, },
{ {
path: '/about', path: '/about',
name: 'About', name: 'About',
// route level code-splitting // route level code-splitting
// this generates a separate chunk (about.[hash].js) for this route // this generates a separate chunk (about.[hash].js) for this route
// which is lazy-loaded when the route is visited. // which is lazy-loaded when the route is visited.
component: () => import(/* webpackChunkName: "about" */ '../views/About.vue') component: () => import(/* webpackChunkName: "about" */ '../views/About.vue')
}, },
{ {
path: '/cutter', path: '/cutter',
name: 'Cutter', name: 'Cutter',
component: () => import(/* webpackChunkName: "bao1" */ '../views/videoCutter.vue') component: () => import(/* webpackChunkName: "bao1" */ '../views/videoCutter.vue')
}, },
{ {
path: '/videoConverter', path: '/videoConverter',
name: 'VideoConverter', name: 'VideoConverter',
component: () => import(/* webpackChunkName: "bao2" */ '../views/videoConverter.vue') component: () => import(/* webpackChunkName: "bao2" */ '../views/videoConverter.vue')
}, },
{ {
path: '/screenshot', path: '/screenshot',
components: { components: {
default: Screenshot, default: Screenshot,
panel: screenshotPanel panel: screenshotPanel
}
} }
}
] ]
const router = new VueRouter({ const router = new VueRouter({
mode: 'history', mode: 'history',
base: process.env.BASE_URL, base: process.env.BASE_URL,
routes routes
}) })
export default router export default router
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// getter调用示例:this.$store.getters['test'] // getter调用示例:this.$store.getters['test']
const state = { const state = {
_test: 1 _test: 1
} }
const getters = { const getters = {
test: (state) => state._test test: (state) => state._test
} }
const mutations = {} const mutations = {}
...@@ -14,8 +14,8 @@ const mutations = {} ...@@ -14,8 +14,8 @@ const mutations = {}
const actions = {} const actions = {}
export default { export default {
state, state,
getters, getters,
mutations, mutations,
actions actions
} }
...@@ -7,8 +7,8 @@ import moduleA from './modules/moduleA' ...@@ -7,8 +7,8 @@ import moduleA from './modules/moduleA'
Vue.use(Vuex) Vue.use(Vuex)
export default new Vuex.Store({ export default new Vuex.Store({
...global, ...global,
modules: { modules: {
moduleA moduleA
} }
}) })
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// getter调用示例:this.$store.getters['moduleA/moduleState'] // getter调用示例:this.$store.getters['moduleA/moduleState']
const state = { const state = {
_moduleState: 'moduleState' _moduleState: 'moduleState'
} }
const getters = { const getters = {
moduleState: (state) => state._moduleState moduleState: (state) => state._moduleState
} }
const mutations = {} const mutations = {}
...@@ -14,9 +14,9 @@ const mutations = {} ...@@ -14,9 +14,9 @@ const mutations = {}
const actions = {} const actions = {}
export default { export default {
namespaced: true, namespaced: true,
state, state,
getters, getters,
mutations, mutations,
actions actions
} }
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
<script> <script>
export default { export default {
data() { data() {
return {} return {}
}, },
created() {}, created() {},
mounted() {} mounted() {}
} }
</script> </script>
......
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
<script> <script>
export default { export default {
data() { data() {
return {} return {}
}, },
created() {}, created() {},
mounted() {} mounted() {}
} }
</script> </script>
......
...@@ -15,14 +15,14 @@ ...@@ -15,14 +15,14 @@
<script> <script>
export default { export default {
name: 'Screenshot', name: 'Screenshot',
data() { data() {
return { return {
srcUrl: null srcUrl: null
} }
}, },
created() {}, created() {},
mounted() {} mounted() {}
} }
</script> </script>
......
...@@ -81,57 +81,57 @@ ...@@ -81,57 +81,57 @@
<script> <script>
export default { export default {
name: 'VideoConverter', name: 'VideoConverter',
components: {}, components: {},
props: {}, props: {},
data() { data() {
return { return {
taskList: [] taskList: []
} }
},
computed: {},
watch: {},
created() {
for (let i = 1; i < 10; i++) {
this.taskList.push({
cover: '',
name: '视频片段' + i,
duration: '10:00',
state: 0,
progress: 60,
outputFormat: 'mp4'
})
}
},
methods: {
addVideo() {
this.taskList.push({
cover: '',
name: '视频片段' + (this.taskList.length + 1),
duration: '10:00',
state: 0,
progress: 60,
outputFormat: 'mp4'
})
}, },
computed: {}, stopTask(item) {
watch: {}, item.state = 0
created() {
for (let i = 1; i < 10; i++) {
this.taskList.push({
cover: '',
name: '视频片段' + i,
duration: '10:00',
state: 0,
progress: 60,
outputFormat: 'mp4'
})
}
}, },
methods: { clearTask(item) {
addVideo() { let index = this.taskList.indexOf(item)
this.taskList.push({ if (index > -1) {
cover: '', this.taskList.splice(index, 1)
name: '视频片段' + (this.taskList.length + 1), }
duration: '10:00', },
state: 0, clearAllTasks() {
progress: 60, this.taskList = []
outputFormat: 'mp4' },
}) startAllTasks() {
}, this.taskList.forEach((task) => {
stopTask(item) { task.state = 1
item.state = 0 })
},
clearTask(item) {
let index = this.taskList.indexOf(item)
if (index > -1) {
this.taskList.splice(index, 1)
}
},
clearAllTasks() {
this.taskList = []
},
startAllTasks() {
this.taskList.forEach((task) => {
task.state = 1
})
}
} }
}
} }
</script> </script>
......
...@@ -31,55 +31,55 @@ import VideoChange from '@/components/videoCutter/videoChange.vue' ...@@ -31,55 +31,55 @@ import VideoChange from '@/components/videoCutter/videoChange.vue'
import VideoControl from '@/components/videoCutter/videoControl.vue' import VideoControl from '@/components/videoCutter/videoControl.vue'
export default { export default {
name: 'VideoCutter', name: 'VideoCutter',
components: { components: {
VideoPlayer, VideoPlayer,
VideoChange, VideoChange,
VideoControl VideoControl
},
data() {
return {
name: '',
nowTime: 0,
duration: 0,
playing: false,
canPlay: false
}
},
created() {},
mounted() {
this.$bus.on('videoCutter.canPlay', this.canPlayFunc)
},
methods: {
changeVideo() {
console.log('todo change video, <-----lilei')
},
canPlayFunc(data) {
this.duration = data
this.canPlay = true
}, },
data() { videoPlay() {
return { if (!this.canPlay) return
name: '', let ob = {}
nowTime: 0, if (this.playing) {
duration: 0, ob.play = false
playing: false, } else {
canPlay: false ob.play = true
if (this.nowTime >= this.duration) {
ob.time = 0
} }
}
this.playing = !this.playing
this.$bus.emit('videoPlayer.play', ob)
}, },
created() {}, changeTime(data) {
mounted() { console.log(data)
this.$bus.on('videoCutter.canPlay', this.canPlayFunc)
}, },
methods: { playEnd() {
changeVideo() { this.playing = false
console.log('todo change video, <-----lilei') this.nowTime = this.duration
},
canPlayFunc(data) {
this.duration = data
this.canPlay = true
},
videoPlay() {
if (!this.canPlay) return
let ob = {}
if (this.playing) {
ob.play = false
} else {
ob.play = true
if (this.nowTime >= this.duration) {
ob.time = 0
}
}
this.playing = !this.playing
this.$bus.emit('videoPlayer.play', ob)
},
changeTime(data) {
console.log(data)
},
playEnd() {
this.playing = false
this.nowTime = this.duration
}
} }
}
} }
</script> </script>
......
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