Skip to content

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

529

parent 34d4b5f0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 23 deletions
dev/index.html
View file @ 11ac573a
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
overflow: hidden; overflow: hidden;
position: fixed; position: fixed;
background: #f4f4f4; background: #f4f4f4;
}</style><link href=static/css/app.a33637a3392be2fde512aa6031b6e4df.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script type=text/javascript src=static/js/manifest.77c345b4015c363e13ca.js></script><script type=text/javascript src=static/js/vendor.08bb4c1de1fdf5bf85a2.js></script><script type=text/javascript src=static/js/app.f78bebe7c61fc4c48778.js></script></body></html> }</style><link href=static/css/app.a33637a3392be2fde512aa6031b6e4df.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script src=static/vconsole/vconsole.min.js></script><script type=text/javascript src=static/js/manifest.edfe325dfe17e62b37e6.js></script><script type=text/javascript src=static/js/vendor.08bb4c1de1fdf5bf85a2.js></script><script type=text/javascript src=static/js/app.fb1aa763c7e89a030485.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dev/static/js/19.5920f35de99ca1063740.js 0 → 100644
View file @ 11ac573a
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/19.6e02aba0dfc5ee490daf.js deleted 100644 → 0
View file @ 34d4b5f0
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/6.9e6e8baf26d0d174d1e1.js deleted 100644 → 0
View file @ 34d4b5f0
This diff is collapsed.
dev/static/js/6.ceafa7963e847706ceac.js 0 → 100644
View file @ 11ac573a
This diff is collapsed.
dev/static/js/app.f78bebe7c61fc4c48778.js deleted 100644 → 0
View file @ 34d4b5f0
This diff is collapsed.
dev/static/js/app.fb1aa763c7e89a030485.js 0 → 100644
View file @ 11ac573a
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/manifest.77c345b4015c363e13ca.js → dev/static/js/manifest.edfe325dfe17e62b37e6.js
View file @ 11ac573a
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,r){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in t)Object.prototype.hasOwnProperty.call(t,d)&&(e[d]=t[d]);for(c&&c(a,t,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=n(n.s=r[i]);return b};var a={},f={37:0};function n(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=f[e]=[a,n]});c[2]=a;var t=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,n.nc&&r.setAttribute("nonce",n.nc),r.src=n.p+"static/js/"+e+"."+{0:"b8d329232924c52f21f9",1:"2af48a38a0a5ba4de8d7",2:"320fe507d344efb0c388",3:"fb9eacc4cab1241045b3",4:"498fdae1cf375720d0fd",5:"665e1536f07d3a98174d",6:"9e6e8baf26d0d174d1e1",7:"f1db37c6902f5aa481c6",8:"7e892d51e7f0ecc38875",9:"e9c88acab2565bf7629c",10:"fd3d73f3ae4cf823f641",11:"824d4ca021e7d0fc13e1",12:"40360dcce0a769c5019c",13:"a49a6fe121412551f160",14:"a0a3bf1f6c6d07ebc4bd",15:"707d58743fc9a74249e6",16:"122a88228eaf23a73c64",17:"9498402cbdfb14710ef2",18:"9d8477aa7d6551b11988",19:"6e02aba0dfc5ee490daf",20:"efc022c1cddf26b4e76e",21:"b5fbe416a6ed0a351765",22:"5711cb64898166468a42",23:"c4f7239d893424072548",24:"74105ee90759eb3a1c0c",25:"710a83363e346f356722",26:"0dcd222d813e24c1c38a",27:"adcf10f7b58e924a2943",28:"06b0ca68e1b4e7a0be92",29:"5cbdfdcf0859e7be0f3e",30:"089b631d6b1ef3203f55",31:"5add3cb58a0305fc7b52",32:"b5826e79a4bff96ab34e",33:"d9c1dd5f78efa0809ec7",34:"8b89d32c134f24882103"}[e]+".js";var d=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(d);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=o,t.appendChild(r),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="",n.oe=function(e){throw e}}([]); !function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,r){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in t)Object.prototype.hasOwnProperty.call(t,d)&&(e[d]=t[d]);for(c&&c(a,t,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=n(n.s=r[i]);return b};var a={},f={37:0};function n(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=f[e]=[a,n]});c[2]=a;var t=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,n.nc&&r.setAttribute("nonce",n.nc),r.src=n.p+"static/js/"+e+"."+{0:"b8d329232924c52f21f9",1:"2af48a38a0a5ba4de8d7",2:"320fe507d344efb0c388",3:"fb9eacc4cab1241045b3",4:"498fdae1cf375720d0fd",5:"665e1536f07d3a98174d",6:"ceafa7963e847706ceac",7:"f1db37c6902f5aa481c6",8:"7025b47d4db60fc25cb8",9:"e9c88acab2565bf7629c",10:"fd3d73f3ae4cf823f641",11:"824d4ca021e7d0fc13e1",12:"40360dcce0a769c5019c",13:"a49a6fe121412551f160",14:"a0a3bf1f6c6d07ebc4bd",15:"707d58743fc9a74249e6",16:"122a88228eaf23a73c64",17:"9498402cbdfb14710ef2",18:"9d8477aa7d6551b11988",19:"5920f35de99ca1063740",20:"efc022c1cddf26b4e76e",21:"b5fbe416a6ed0a351765",22:"5711cb64898166468a42",23:"c4f7239d893424072548",24:"74105ee90759eb3a1c0c",25:"710a83363e346f356722",26:"0dcd222d813e24c1c38a",27:"adcf10f7b58e924a2943",28:"06b0ca68e1b4e7a0be92",29:"5cbdfdcf0859e7be0f3e",30:"089b631d6b1ef3203f55",31:"5add3cb58a0305fc7b52",32:"b5826e79a4bff96ab34e",33:"d9c1dd5f78efa0809ec7",34:"8b89d32c134f24882103"}[e]+".js";var d=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(d);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=o,t.appendChild(r),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="",n.oe=function(e){throw e}}([]);
\ No newline at end of file \ No newline at end of file
index.html
View file @ 11ac573a
...@@ -24,6 +24,6 @@ ...@@ -24,6 +24,6 @@
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
<script src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script> <script src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
<!-- <script src="static/vconsole/vconsole.min.js"></script> --> <script src="static/vconsole/vconsole.min.js"></script>
</body> </body>
</html> </html>
src/components/activity/liuyi.vue
View file @ 11ac573a
...@@ -202,7 +202,7 @@ export default { ...@@ -202,7 +202,7 @@ export default {
that.pointStatus = "4"; that.pointStatus = "4";
// that.playFlag = false // that.playFlag = false
// clearInterval(lightBegin); // clearInterval(lightBegin);
}, 4000); }, 5000);
setTimeout(function() { setTimeout(function() {
that.show = true; that.show = true;
this.$sa.track("viewprizewindow", {}); this.$sa.track("viewprizewindow", {});
...@@ -223,7 +223,7 @@ export default { ...@@ -223,7 +223,7 @@ export default {
// }, 200); // }, 200);
setTimeout(function() { setTimeout(function() {
that.pointStatus = "3"; that.pointStatus = "3";
}, 4000); }, 5000);
setTimeout(function() { setTimeout(function() {
that.show = true; that.show = true;
this.$sa.track("viewprizewindow", {}); this.$sa.track("viewprizewindow", {});
......
src/components/index.vue
View file @ 11ac573a
...@@ -266,7 +266,7 @@ import { ...@@ -266,7 +266,7 @@ import {
getAutomationCouponApi getAutomationCouponApi
} from "../service/api"; } from "../service/api";
import { IndexImage } from "../util/imgUrl"; import { IndexImage } from "../util/imgUrl";
import cookie from "../util/cookie"; import localStorageFn from "../util/localStorage";
import icon_point from '../assets/activity/icon_arrow@2x.png' import icon_point from '../assets/activity/icon_arrow@2x.png'
import icon_point2 from '../assets/newLesson/icon_point@2x.png' import icon_point2 from '../assets/newLesson/icon_point@2x.png'
import bottomTab from "./public/bottomTab"; import bottomTab from "./public/bottomTab";
...@@ -274,6 +274,7 @@ import commom from "../util/common"; ...@@ -274,6 +274,7 @@ import commom from "../util/common";
import audioPage from './collection/audio' import audioPage from './collection/audio'
import html2canvas from 'html2canvas' import html2canvas from 'html2canvas'
import { Toast,Popup } from 'vant'; import { Toast,Popup } from 'vant';
// import localStorage from '../util/localStorage';
export default { export default {
name: "index", name: "index",
components: { components: {
...@@ -336,10 +337,13 @@ export default { ...@@ -336,10 +337,13 @@ export default {
mounted() { mounted() {
window.scrollTo(0,0); window.scrollTo(0,0);
let that = this let that = this
cookie.delete('liuyi') // localStorageFn.set('liuyi',true)
// debugger
// cookie.delete('liuyi')
this.unlook = localStorage.getItem('unlook'); this.unlook = localStorage.getItem('unlook');
// localStorage.setItem('liuyi',0)
// console.log(this.pt) // console.log(this.pt)
// console.log(document.body.clientWidth) // console.log(localStorageFn.get('liuyi'),61)
if(document.body.clientWidth>700){ if(document.body.clientWidth>700){
that.orientationchange=true that.orientationchange=true
} }
...@@ -484,11 +488,14 @@ export default { ...@@ -484,11 +488,14 @@ export default {
// localStorage.setItem('activity'); // localStorage.setItem('activity');
// } // }
console.log(course) console.log(course)
if(!res.length&&Date.parse(new Date())<Date.parse(new Date('2019-6-4 00:00:00'))&&!course.automation_id){ // console.log(Date.parse(new Date()))
console.log(cookie.get('liuyi')) // console.log(Date.parse(new Date('2019/6/4')))
if(!cookie.get('liuyi')){ if(!res.length&&Date.parse(new Date())<Date.parse(new Date('2019/6/4'))&&!course.automation_id){
console.log('490')
if(localStorageFn.get('liuyi')==0){
console.log('492')
this.liuyucoolie = true this.liuyucoolie = true
cookie.set('liuyi',1,1) localStorageFn.set('liuyi',1)
this.$sa.track("view61window", { this.$sa.track("view61window", {
is_view_course: is_view_course is_view_course: is_view_course
}); });
...@@ -498,7 +505,7 @@ export default { ...@@ -498,7 +505,7 @@ export default {
//六一活动 //六一活动
if(Date.parse(new Date())>Date.parse(new Date('2019-6-4 00:00:00'))){ if(Date.parse(new Date())>Date.parse(new Date('2019-6-4 00:00:00'))){
this.liuyuActivity = false this.liuyuActivity = false
cookie.set('liuyi',false) localStorageFn.set('liuyi',1)
} }
} }
if(res.goods_id&&!res.automation_id){ if(res.goods_id&&!res.automation_id){
......
src/components/map/secMap.vue
View file @ 11ac573a
...@@ -510,9 +510,10 @@ export default { ...@@ -510,9 +510,10 @@ export default {
// console.log(res) // console.log(res)
if (!res.coupon_list.length &&Date.parse(new Date()) < Date.parse(new Date("2019-6-4 00:00:00"))){ if (!res.coupon_list.length &&Date.parse(new Date()) < Date.parse(new Date("2019-6-4 00:00:00"))){
console.log(cookie.get("liuyi")); console.log(cookie.get("liuyi"));
if (!cookie.get("liuyi")) { if (localStorageFn.get('liuyi')==0) {
this.liuyucoolie = true; this.liuyucoolie = 1;
cookie.set("liuyi", 1, 1); cookie.set("liuyi", 1, 1);
localStorageFn.set('liuyi',1)
this.$sa.track("view61window", { this.$sa.track("view61window", {
s_view_course: is_view_course s_view_course: is_view_course
}); });
......
src/main.js
View file @ 11ac573a
...@@ -9,7 +9,7 @@ import VueClipboard from 'vue-clipboard2' ...@@ -9,7 +9,7 @@ import VueClipboard from 'vue-clipboard2'
import sa from'sa-sdk-javascript'; import sa from'sa-sdk-javascript';
import 'mint-ui/lib/style.css' import 'mint-ui/lib/style.css'
import scroll from "./base/scroll/scroll" import scroll from "./base/scroll/scroll"
// import VConsole from "../static/vConsole/vConsole.min.js" import VConsole from "../static/vConsole/vConsole.min.js"
import { Popup,Lazyload} from 'vant'; import { Popup,Lazyload} from 'vant';
Vue.config.productionTip = false; Vue.config.productionTip = false;
Vue.prototype.$sa = sa; Vue.prototype.$sa = sa;
...@@ -32,9 +32,9 @@ Vue.component('scroll', scroll); ...@@ -32,9 +32,9 @@ Vue.component('scroll', scroll);
// Vue.use(Lazyload); // Vue.use(Lazyload);
/* 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) => {
// chrome // chrome
document.body.scrollTop = 0 document.body.scrollTop = 0
......
src/util/localStorage.js 0 → 100644
View file @ 11ac573a
export default{
set(key, value) {
localStorage.setItem(key,value)
localStorage.setItem('overtime',new Date(new Date(new Date().toLocaleDateString()).getTime()+24*60*60*1000-1).getTime())
// console.log()
},
get:function(key){
if(new Date().getTime()>localStorage.getItem('overtime')){
localStorage.setItem(key,0)
return localStorage.getItem(key)
}else{
return localStorage.getItem(key)
}
},
delete:function(name){
this.set(name,'',-1);
}
}
\ No newline at end of file
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