Skip to content

H
h5-base
Commit 3bb886e0 authored by chenyishuai@singsingenglish.com's avatar chenyishuai@singsingenglish.com
Browse files
Options

617

parent c347d5b3
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 46 deletions
build/postcss.config.js 0 → 100644
View file @ 3bb886e0
module.exports = {
plugins: [
require('autoprefixer')
]
}
\ No newline at end of file
config/dev.env.js
View file @ 3bb886e0
'use strict'; 'use strict';
const merge = require('webpack-merge'); const merge = require('webpack-merge');
const prodEnv = require('./prod.env'); const prodEnv = require('./prod.env');
const ip = 'http://10.1.22.107:8085/' const ip = 'http://10.1.23.212:8085/'
// const ip = 'http://192.168.31.185:8085/' // const ip = 'http://192.168.31.185:8085/'
module.exports = merge(prodEnv, { module.exports = merge(prodEnv, {
NODE_ENV: '"development"', NODE_ENV: '"development"',
......
config/index.js
View file @ 3bb886e0
...@@ -20,7 +20,7 @@ module.exports = { ...@@ -20,7 +20,7 @@ module.exports = {
} }
}, },
// Various Dev Server settings // Various Dev Server settings
host: '10.1.22.107', // can be overwritten by process.env.HOST host: '10.1.23.212', // can be overwritten by process.env.HOST
// host: '192.168.31.185', // can be overwritten by process.env.HOST // host: '192.168.31.185', // can be overwritten by process.env.HOST
// host: 'localhost', // can be overwritten by process.env.HOST // host: 'localhost', // can be overwritten by process.env.HOST
port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
......
package-lock.json
View file @ 3bb886e0
...@@ -1616,6 +1616,30 @@ ...@@ -1616,6 +1616,30 @@
"unset-value": "^1.0.0" "unset-value": "^1.0.0"
} }
}, },
"caller-callsite": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
"integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
"dev": true,
"requires": {
"callsites": "^2.0.0"
}
},
"caller-path": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
"integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
"dev": true,
"requires": {
"caller-callsite": "^2.0.0"
}
},
"callsites": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
"integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
"dev": true
},
"camel-case": { "camel-case": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
...@@ -2127,15 +2151,15 @@ ...@@ -2127,15 +2151,15 @@
"dev": true "dev": true
}, },
"cosmiconfig": { "cosmiconfig": {
"version": "4.0.0", "version": "5.2.1",
"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
"integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==", "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
"dev": true, "dev": true,
"requires": { "requires": {
"import-fresh": "^2.0.0",
"is-directory": "^0.3.1", "is-directory": "^0.3.1",
"js-yaml": "^3.9.0", "js-yaml": "^3.13.1",
"parse-json": "^4.0.0", "parse-json": "^4.0.0"
"require-from-string": "^2.0.1"
}, },
"dependencies": { "dependencies": {
"esprima": { "esprima": {
...@@ -2145,9 +2169,9 @@ ...@@ -2145,9 +2169,9 @@
"dev": true "dev": true
}, },
"js-yaml": { "js-yaml": {
"version": "3.12.0", "version": "3.13.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
"integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"dev": true, "dev": true,
"requires": { "requires": {
"argparse": "^1.0.7", "argparse": "^1.0.7",
...@@ -4905,6 +4929,16 @@ ...@@ -4905,6 +4929,16 @@
"import-from": "^2.1.0" "import-from": "^2.1.0"
} }
}, },
"import-fresh": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
"integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
"dev": true,
"requires": {
"caller-path": "^2.0.0",
"resolve-from": "^3.0.0"
}
},
"import-from": { "import-from": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz", "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
...@@ -7298,12 +7332,12 @@ ...@@ -7298,12 +7332,12 @@
} }
}, },
"postcss-load-config": { "postcss-load-config": {
"version": "2.0.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.0.0.tgz", "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz",
"integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==", "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"cosmiconfig": "^4.0.0", "cosmiconfig": "^5.0.0",
"import-cwd": "^2.0.0" "import-cwd": "^2.0.0"
} }
}, },
...@@ -7416,9 +7450,9 @@ ...@@ -7416,9 +7450,9 @@
}, },
"dependencies": { "dependencies": {
"ajv": { "ajv": {
"version": "6.5.3", "version": "6.10.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
"integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==", "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
"dev": true, "dev": true,
"requires": { "requires": {
"fast-deep-equal": "^2.0.1", "fast-deep-equal": "^2.0.1",
...@@ -9280,12 +9314,6 @@ ...@@ -9280,12 +9314,6 @@
"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
"dev": true "dev": true
}, },
"require-from-string": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
"dev": true
},
"require-main-filename": { "require-main-filename": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
......
package.json
View file @ 3bb886e0
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
"vuex": "^3.0.1" "vuex": "^3.0.1"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "^7.1.2", "autoprefixer": "^7.2.6",
"babel-core": "^6.22.1", "babel-core": "^6.22.1",
"babel-helper-vue-jsx-merge-props": "^2.0.3", "babel-helper-vue-jsx-merge-props": "^2.0.3",
"babel-loader": "^7.1.1", "babel-loader": "^7.1.1",
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
"ora": "^1.2.0", "ora": "^1.2.0",
"portfinder": "^1.0.13", "portfinder": "^1.0.13",
"postcss-import": "^11.0.0", "postcss-import": "^11.0.0",
"postcss-loader": "^2.0.8", "postcss-loader": "^2.1.6",
"postcss-url": "^7.2.1", "postcss-url": "^7.2.1",
"rimraf": "^2.6.0", "rimraf": "^2.6.0",
"semver": "^5.3.0", "semver": "^5.3.0",
......
src/components/collection/audio.vue
View file @ 3bb886e0
...@@ -15,12 +15,8 @@ ...@@ -15,12 +15,8 @@
<div class="title">{{showObj.audio[showObj.audioIndex].title}}</div> <div class="title">{{showObj.audio[showObj.audioIndex].title}}</div>
<div class="tips">{{showObj.audio[showObj.audioIndex].sub_title}}</div> <div class="tips">{{showObj.audio[showObj.audioIndex].sub_title}}</div>
</div> </div>
<div <div :class="{'image-block':true}" ref="imageBlock" @click="imgPop=true">
:class="{'image-block':true,swin:true,noanimation:!playFlag}" <img ref="imgItem" :src="showObj.audio[showObj.audioIndex].url">
ref="imageBlock"
@click="imgPop=true"
>
<img :src="showObj.audio[showObj.audioIndex].url">
</div> </div>
<div> <div>
<div class="btn-group hp"> <div class="btn-group hp">
...@@ -111,6 +107,7 @@ export default { ...@@ -111,6 +107,7 @@ export default {
range: 0, range: 0,
tapToVideo: tapToVideo, tapToVideo: tapToVideo,
playFlag: false, playFlag: false,
transformStatus:'',
offset: 0, offset: 0,
timer: null, timer: null,
playType: Number(localStorage.getItem("playType")) | 0 playType: Number(localStorage.getItem("playType")) | 0
...@@ -165,9 +162,9 @@ export default { ...@@ -165,9 +162,9 @@ export default {
// if(getComputedStyle(this.$refs.imageBlock).transform!='none'){ // if(getComputedStyle(this.$refs.imageBlock).transform!='none'){
// this.$refs.imageBlock.style.transform.concat('',getComputedStyle(this.$refs.imageBlock).transform) // this.$refs.imageBlock.style.transform.concat('',getComputedStyle(this.$refs.imageBlock).transform)
// } // }
this.$refs.audio.play(); this.$refs.audio.play();
// console.log(getComputedStyle(this.$refs.imageBlock).transform) // swin:true
// console.log(getComputedStyle(this.$refs.imageBlock).transform)
}, },
lastOne() { lastOne() {
if (this.showObj.audioIndex > 0) { if (this.showObj.audioIndex > 0) {
...@@ -220,6 +217,7 @@ export default { ...@@ -220,6 +217,7 @@ export default {
// console.log(220) // console.log(220)
let audio = this.$refs.audio; let audio = this.$refs.audio;
this.playFlag = true; this.playFlag = true;
this.$refs.imgItem.classList.add('swin')
this.timer = setInterval(() => { this.timer = setInterval(() => {
let min = null; let min = null;
if (parseInt(audio.currentTime / 60) < 10) { if (parseInt(audio.currentTime / 60) < 10) {
...@@ -267,13 +265,12 @@ export default { ...@@ -267,13 +265,12 @@ export default {
onStop() { onStop() {
this.$refs.audio.pause(); this.$refs.audio.pause();
this.playFlag = false; this.playFlag = false;
// debugger var iTransform = getComputedStyle(this.$refs.imgItem).transform;
// console.log(this.$refs.imageBlock) var cTransform = getComputedStyle(this.$refs.imageBlock).transform;
// console.log(this.$refs.imageBlock.style.cssText) this.$refs.imageBlock.style.transform = cTransform === 'none'
// this.$refs.imageBlock.style.transform = getComputedStyle(this.$refs.imageBlock).transform ? iTransform
// console.log(getComputedStyle(this.$refs.imageBlock).transform) : iTransform.concat(' ', cTransform);
// this.$refs.imageBlock.style.width = 10+'px' this.$refs.imgItem.classList.remove('swin');
// this.$refs.imageBlock.transform
}, },
close() { close() {
this.showObj.show = false; this.showObj.show = false;
...@@ -557,6 +554,7 @@ export default { ...@@ -557,6 +554,7 @@ export default {
border: 4px solid rgba(255, 255, 255, 1); border: 4px solid rgba(255, 255, 255, 1);
img { img {
width: 100%; width: 100%;
border-radius: 999 * @toVw;
} }
} }
.title-block { .title-block {
...@@ -1137,6 +1135,7 @@ export default { ...@@ -1137,6 +1135,7 @@ export default {
border: 4px solid rgba(255, 255, 255, 1); border: 4px solid rgba(255, 255, 255, 1);
img { img {
width: 100%; width: 100%;
border-radius: 999 * @toVw;
} }
} }
.title-block { .title-block {
......
src/components/newLesson/audio.vue
View file @ 3bb886e0
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
{{showObj.audio[index].tips}} {{showObj.audio[index].tips}}
</div> </div>
</div> </div>
<div :class="{'image-block':true,swin:true,noanimation:!playFlag}" ref="imageBlock" @click="imgPop=true"> <div :class="{'image-block':true}" ref="imageBlock" @click="imgPop=true">
<img :src="showObj.audio[index].image"> <img ref="imgItem" :src="showObj.audio[index].image">
</div> </div>
<div> <div>
<div class="title-block hp"> <div class="title-block hp">
...@@ -294,6 +294,12 @@ ...@@ -294,6 +294,12 @@
} }
this.$refs.audio.pause(); this.$refs.audio.pause();
this.playFlag = false this.playFlag = false
var iTransform = getComputedStyle(this.$refs.imgItem).transform;
var cTransform = getComputedStyle(this.$refs.imageBlock).transform;
this.$refs.imageBlock.style.transform = cTransform === 'none'
? iTransform
: iTransform.concat(' ', cTransform);
this.$refs.imgItem.classList.remove('swin');
}, },
lastOne(){ lastOne(){
this.$sa.track('watchClick',{ this.$sa.track('watchClick',{
...@@ -372,6 +378,7 @@ ...@@ -372,6 +378,7 @@
playing(){ playing(){
let audio = this.$refs.audio; let audio = this.$refs.audio;
this.playFlag = true; this.playFlag = true;
this.$refs.imgItem.classList.add('swin')
this.timer = setInterval(() => { this.timer = setInterval(() => {
let min = null; let min = null;
if(parseInt(audio.currentTime / 60)<10){ if(parseInt(audio.currentTime / 60)<10){
...@@ -672,6 +679,7 @@ ...@@ -672,6 +679,7 @@
border:4px solid rgba(255,255,255,1); border:4px solid rgba(255,255,255,1);
img{ img{
width: 100%; width: 100%;
border-radius: 999 * @toVw;
} }
} }
.title-block{ .title-block{
...@@ -937,6 +945,7 @@ ...@@ -937,6 +945,7 @@
border:4px solid rgba(255,255,255,1); border:4px solid rgba(255,255,255,1);
img{ img{
width: 100%; width: 100%;
border-radius: 999 * @toVw;
} }
} }
.title-block{ .title-block{
......
src/main.js
View file @ 3bb886e0
...@@ -41,9 +41,9 @@ Vue.component('scroll', scroll); ...@@ -41,9 +41,9 @@ Vue.component('scroll', scroll);
/* eslint-disable no-new */ /* eslint-disable no-new */
if(process.env.NODE_ENV != 'production'){ // if(process.env.NODE_ENV != 'production'){
var vConsole = new VConsole(); // var vConsole = new VConsole();
} // }
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
next() next()
......
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