Skip to content

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

4.24

parent 22f4a0b3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 27 deletions
dev/index.html
View file @ 3059d100
......@@ -6,4 +6,4 @@
overflow: hidden;
position: fixed;
background: #f4f4f4;
}</style><link href=static/css/app.f016ba765d8b5ed4f51f80904de686cd.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.490165ba554b750960c8.js></script><script type=text/javascript src=static/js/vendor.17e5a2aa52ade559a92c.js></script><script type=text/javascript src=static/js/app.489b6fc96dcec28933c7.js></script></body></html>
\ No newline at end of file
}</style><link href=static/css/app.f016ba765d8b5ed4f51f80904de686cd.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.66649acb9c6c847a6d90.js></script><script type=text/javascript src=static/js/vendor.17e5a2aa52ade559a92c.js></script><script type=text/javascript src=static/js/app.489b6fc96dcec28933c7.js></script></body></html>
\ No newline at end of file
dev/static/js/0.c64ebb84a20389d05ca9.js deleted 100644 → 0
View file @ 22f4a0b3
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/0.c742c3834b87982a00ff.js 0 → 100644
View file @ 3059d100
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/16.26a9709871520a9ec7b7.js deleted 100644 → 0
View file @ 22f4a0b3
This diff is collapsed.
dev/static/js/16.ed5384504484bbcabd12.js 0 → 100644
View file @ 3059d100
This diff is collapsed.
dev/static/js/6.6e0eb5837541d266375f.js → dev/static/js/6.6d0f5dfb2f78e9726f70.js
View file @ 3059d100
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/manifest.490165ba554b750960c8.js → dev/static/js/manifest.66649acb9c6c847a6d90.js
View file @ 3059d100
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,f){for(var b,o,d,i=0,u=[];i<c.length;i++)o=c[i],n[o]&&u.push(n[o][0]),n[o]=0;for(b in t)Object.prototype.hasOwnProperty.call(t,b)&&(e[b]=t[b]);for(a&&a(c,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)d=r(r.s=f[i]);return d};var c={},n={35:0};function r(a){if(c[a])return c[a].exports;var n=c[a]={i:a,l:!1,exports:{}};return e[a].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var a=n[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,r){a=n[e]=[c,r]});a[2]=c;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"c64ebb84a20389d05ca9",1:"5957001eea30fb7dfb71",2:"16245f5bcb88b5b640bf",3:"cb0e919d300a9a3004be",4:"40ccdf99fbcc9c94ba7d",5:"35c21a9a684a2d8d4534",6:"6e0eb5837541d266375f",7:"078dcc048e072f594d95",8:"171ad2d0bb154c78ab7f",9:"1c9fa255f310bb8b4e6a",10:"7ee33d51aede03d926f0",11:"ce77bd250e489483340e",12:"5bb1519d95fb708106bb",13:"43f421c3eb64a990eab2",14:"e918345baacdc3d391bf",15:"e89ab9ff03d59f4e5f9f",16:"26a9709871520a9ec7b7",17:"03884613461070c0d522",18:"c64d73a608befb9174d1",19:"19c2c1ab5f332872664e",20:"4d03512be3a553567e4a",21:"b644a689bc2d4448de66",22:"745c1006843f340293d6",23:"86d0c93bb0fbf0ba3de4",24:"afb3e5a1f610d054d5c9",25:"e812e07cad278df1a1b8",26:"b4406470b13f68492997",27:"583040ea68d3ff135d64",28:"8cc4eeaaf96c01468092",29:"ad4b46fab1994ed7162c",30:"9c8059c86b001e208880",31:"ba8fdeff65da8bae41c1",32:"1a9d2b3e922c1bb2c4a9"}[e]+".js";var b=setTimeout(o,12e4);function o(){f.onerror=f.onload=null,clearTimeout(b);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=o,t.appendChild(f),c},r.m=e,r.c=c,r.d=function(e,a,c){r.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},r.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(a,"a",a),a},r.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},r.p="",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,f){for(var b,o,d,i=0,u=[];i<c.length;i++)o=c[i],n[o]&&u.push(n[o][0]),n[o]=0;for(b in t)Object.prototype.hasOwnProperty.call(t,b)&&(e[b]=t[b]);for(a&&a(c,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)d=r(r.s=f[i]);return d};var c={},n={35:0};function r(a){if(c[a])return c[a].exports;var n=c[a]={i:a,l:!1,exports:{}};return e[a].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var a=n[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,r){a=n[e]=[c,r]});a[2]=c;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"c742c3834b87982a00ff",1:"5957001eea30fb7dfb71",2:"16245f5bcb88b5b640bf",3:"cb0e919d300a9a3004be",4:"40ccdf99fbcc9c94ba7d",5:"35c21a9a684a2d8d4534",6:"6d0f5dfb2f78e9726f70",7:"078dcc048e072f594d95",8:"171ad2d0bb154c78ab7f",9:"1c9fa255f310bb8b4e6a",10:"7ee33d51aede03d926f0",11:"ce77bd250e489483340e",12:"5bb1519d95fb708106bb",13:"43f421c3eb64a990eab2",14:"e918345baacdc3d391bf",15:"e89ab9ff03d59f4e5f9f",16:"ed5384504484bbcabd12",17:"03884613461070c0d522",18:"c64d73a608befb9174d1",19:"19c2c1ab5f332872664e",20:"4d03512be3a553567e4a",21:"b644a689bc2d4448de66",22:"745c1006843f340293d6",23:"86d0c93bb0fbf0ba3de4",24:"afb3e5a1f610d054d5c9",25:"e812e07cad278df1a1b8",26:"b4406470b13f68492997",27:"583040ea68d3ff135d64",28:"8cc4eeaaf96c01468092",29:"ad4b46fab1994ed7162c",30:"9c8059c86b001e208880",31:"ba8fdeff65da8bae41c1",32:"1a9d2b3e922c1bb2c4a9"}[e]+".js";var b=setTimeout(o,12e4);function o(){f.onerror=f.onload=null,clearTimeout(b);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=o,t.appendChild(f),c},r.m=e,r.c=c,r.d=function(e,a,c){r.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},r.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(a,"a",a),a},r.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},r.p="",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/index.html
View file @ 3059d100
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style>*{
-webkit-overflow-scrolling:touch;
}</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.3dbd975d03379dbfec8d568c8a897d31.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></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/manifest.b6bdcbe0c1f2b1e5e3c1.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.47e0ad0c3f0de448dc49.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.8d4f18b24c657ca33744.js></script></body></html>
\ No newline at end of file
}</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.f2515516694b3ef95ea28339d90df7cd.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></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/manifest.86d22d0827a6b2456e9f.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.47e0ad0c3f0de448dc49.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.8d4f18b24c657ca33744.js></script></body></html>
\ No newline at end of file
dist/static/js/0.269bb80d0fb5727b0b99.js deleted 100644 → 0
View file @ 22f4a0b3
This diff is collapsed.
dist/static/js/0.68e149a93b64e6209f7f.js 0 → 100644
View file @ 3059d100
This diff is collapsed.
dist/static/js/32.25b16b01e9e738d6b6de.js deleted 100644 → 0
View file @ 22f4a0b3
This diff is collapsed.
dist/static/js/32.e565a1ad0432d8c1ec31.js 0 → 100644
View file @ 3059d100
This diff is collapsed.
dist/static/js/5.1b5f13468ab262967bc0.js 0 → 100644
View file @ 3059d100
This diff is collapsed.
dist/static/js/5.64438abfd8068212971e.js deleted 100644 → 0
View file @ 22f4a0b3
This diff is collapsed.
dist/static/js/manifest.86d22d0827a6b2456e9f.js 0 → 100644
View file @ 3059d100
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,f,r){for(var o,d,b,i=0,u=[];i<n.length;i++)d=n[i],a[d]&&u.push(a[d][0]),a[d]=0;for(o in f)Object.prototype.hasOwnProperty.call(f,o)&&(e[o]=f[o]);for(c&&c(n,f,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=t(t.s=r[i]);return b};var n={},a={35:0};function t(c){if(n[c])return n[c].exports;var a=n[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,t),a.l=!0,a.exports}t.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var n=new Promise(function(n,t){c=a[e]=[n,t]});c[2]=n;var f=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,t.nc&&r.setAttribute("nonce",t.nc),r.src=t.p+"static/js/"+e+"."+{0:"68e149a93b64e6209f7f",1:"bb2a302a4beab9344041",2:"98e78476b2bf208770ca",3:"de9003ad0cd58d4933e6",4:"9e8aa6a3c22b79f2c73a",5:"1b5f13468ab262967bc0",6:"4f660985e9ee5cd662e1",7:"83fc9932263c5b565ced",8:"bfa832d63f77d0d127ee",9:"245ee811d4a3ba944f78",10:"f8fb30dbb5264e6f2d22",11:"746a87de7ea3f73b88d5",12:"50545fc8db8a460df1a4",13:"4f7e7350f0ebcb13a353",14:"ef760d2a9b835c95953e",15:"f9fabe9d7c33c807d49f",16:"984684a7f02744037054",17:"19b25a1d0d45b4615402",18:"8fdc15c78d35f18205ff",19:"a55a285dc45a3f867e89",20:"98917db55f67fdea7e67",21:"3f31027b2bc9b31c23ef",22:"d0a6cb8b6a3d435048d8",23:"433fe98378cc42391942",24:"1198e7fee7b6e7141dc3",25:"e5861d8c07fc8bedff04",26:"d37b4f618cff8640d548",27:"776139f253dd23ce2dad",28:"301bc88b7a29858e77ae",29:"b592a072a8ae796cf8c2",30:"4202878b9ec667c575e2",31:"18b0f89153e4d4f91de2",32:"e565a1ad0432d8c1ec31"}[e]+".js";var o=setTimeout(d,12e4);function d(){r.onerror=r.onload=null,clearTimeout(o);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return r.onerror=r.onload=d,f.appendChild(r),n},t.m=e,t.c=n,t.d=function(e,c,n){t.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:n})},t.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(c,"a",c),c},t.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},t.p="https://static-cdn.changchangenglish.com/new-sing/",t.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.b6bdcbe0c1f2b1e5e3c1.js deleted 100644 → 0
View file @ 22f4a0b3
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(c,r,f){for(var d,o,b,i=0,u=[];i<c.length;i++)o=c[i],a[o]&&u.push(a[o][0]),a[o]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(n&&n(c,r,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=t(t.s=f[i]);return b};var c={},a={35:0};function t(n){if(c[n])return c[n].exports;var a=c[n]={i:n,l:!1,exports:{}};return e[n].call(a.exports,a,a.exports,t),a.l=!0,a.exports}t.e=function(e){var n=a[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var c=new Promise(function(c,t){n=a[e]=[c,t]});n[2]=c;var r=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,t.nc&&f.setAttribute("nonce",t.nc),f.src=t.p+"static/js/"+e+"."+{0:"269bb80d0fb5727b0b99",1:"bb2a302a4beab9344041",2:"98e78476b2bf208770ca",3:"de9003ad0cd58d4933e6",4:"9e8aa6a3c22b79f2c73a",5:"64438abfd8068212971e",6:"4f660985e9ee5cd662e1",7:"83fc9932263c5b565ced",8:"bfa832d63f77d0d127ee",9:"245ee811d4a3ba944f78",10:"f8fb30dbb5264e6f2d22",11:"746a87de7ea3f73b88d5",12:"50545fc8db8a460df1a4",13:"4f7e7350f0ebcb13a353",14:"ef760d2a9b835c95953e",15:"f9fabe9d7c33c807d49f",16:"984684a7f02744037054",17:"19b25a1d0d45b4615402",18:"8fdc15c78d35f18205ff",19:"a55a285dc45a3f867e89",20:"98917db55f67fdea7e67",21:"3f31027b2bc9b31c23ef",22:"d0a6cb8b6a3d435048d8",23:"433fe98378cc42391942",24:"1198e7fee7b6e7141dc3",25:"e5861d8c07fc8bedff04",26:"d37b4f618cff8640d548",27:"776139f253dd23ce2dad",28:"301bc88b7a29858e77ae",29:"b592a072a8ae796cf8c2",30:"4202878b9ec667c575e2",31:"18b0f89153e4d4f91de2",32:"25b16b01e9e738d6b6de"}[e]+".js";var d=setTimeout(o,12e4);function o(){f.onerror=f.onload=null,clearTimeout(d);var n=a[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return f.onerror=f.onload=o,r.appendChild(f),c},t.m=e,t.c=c,t.d=function(e,n,c){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:c})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="https://static-cdn.changchangenglish.com/new-sing/",t.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/index.vue
View file @ 3059d100
......@@ -8,7 +8,7 @@
<div class="index">
<div class="padTop">
<div class="banner-block" >
<div class="unBanner" ref="toShopD" @click="toShop()" v-if="userCourse.goods_id>0">
<div class="unBanner" ref="toShopD" @click="toShop()" v-if="userCourse.goods_id!=undefined&&userCourse.goods_id>0">
<img class="bgimg" :src="imgUrl.indexBanener1" alt="">
<div class="content">
<div class="title">
......@@ -24,8 +24,7 @@
</div>
</div>
</div>
<div class="Banner" id="capture33" v-if="userCourse.start_periods_id>-1">
<!-- <div class="Banner" id="capture33" > -->
<div class="Banner" id="capture33" v-if="userCourse.start_periods_id!=undefined&&userCourse.start_periods_id>-1">
<img class="bgimg" :src="imgUrl.indexBanener2" alt="">
<div class="content" >
<img class="qr" :src="bannerData.qr" alt="">
......@@ -207,7 +206,7 @@ export default {
if(this.bannerData.active_start_at){
window.location.href = 'https://appaNQLfktH3717.h5.xiaoeknow.com/content_page/eyJ0eXBlIjozLCJyZXNvdXJjZV90eXBlIjo4LCJyZXNvdXJjZV9pZCI6IiIsInByb2R1Y3RfaWQiOiJwXzVjYjQyMDgzYTA2NDNfMXF0OUFGbnoiLCJhcHBfaWQiOiJhcHBhTlFMZmt0SDM3MTcifQ'
}else{
debugger
// debugger
window.location.href = link
}
}else{
......@@ -262,7 +261,8 @@ export default {
this.bannerData = res
this.$refs.bottomTab.setBtn()
}else{
if(res.is_start_active==1){
if(res.is_start_active!=undefined&&res.is_start_active==1){
// debugger
// 已开课
if(res.teacher_qr){
this.bannerData.qr = res.teacher_qr
......@@ -297,7 +297,7 @@ export default {
this.canvasData = dataURL
}).catch(res=>{alert(res);console.log()});
})
}else if(res.is_start_active==0){
}else if(res.is_start_active!=undefined&&res.is_start_active==0){
if(res.teacher_qr){
this.bannerData.qr = res.teacher_qr
}
......@@ -307,8 +307,9 @@ export default {
this.userCourse = Object.assign({},res)
localStorage.setItem('userCourse',JSON.stringify(this.userCourse));
this.$refs.bottomTab.setBtn()
// debugger
}else if(res.automation_id.length){
// debugger
this.bannerData = res
this.userCourse = Object.assign({},res)
localStorage.setItem('userCourse',JSON.stringify(this.userCourse));
......@@ -317,8 +318,6 @@ export default {
this.$router.push({
name: "map",
query: {
periods_id: res.start_periods_id,
course_type: res.start_periods_course_type
}
});
}
......
src/components/map/secMap.vue
View file @ 3059d100
......@@ -630,11 +630,11 @@ export default {
// this.payFlag=true;
// });
},
jsApiCall: function () {
jsApiCall() {
let that = this;
WeixinJSBridge.invoke(
'getBrandWCPayRequest',
this.jsApiParameters,
that.jsApiParameters,
function (res) {
// that.orderFlag = true;
if (res.err_msg === 'get_brand_wcpay_request:ok') {
......
src/components/public/bottomTab.vue
View file @ 3059d100
......@@ -6,7 +6,7 @@
</div>
启蒙
</div>
<div v-if="userCourse2.start_periods_id>-1||userCourse2.automation_id" :class="{actived:$route.name === 'map'||$route.name === 'secMap'}" @click="toUrl('map')">
<div v-if="userCourse2.start_periods_id!=null||userCourse2.automation_id" :class="{actived:$route.name === 'map'||$route.name === 'secMap'}" @click="toUrl('map')">
<div class="map img">
<img :src="imgurl.indexBottom" alt>
</div>
......@@ -35,8 +35,8 @@ export default {
},
mounted() {
// debugger
let userCourse2 = JSON.parse(localStorage.getItem("userCourse"));
this.userCourse2 = userCourse2
// let userCourse2 = JSON.parse(localStorage.getItem("userCourse"));
// this.userCourse2 = userCourse2
// console.log(this.userCourse2)
},
methods: {
......@@ -50,8 +50,10 @@ export default {
buttonType: "切换按钮",
buttonName: "切换到上课"
});
// debugger
if(this.userCourse2.start_periods_id){
console.log(this.userCourse2)
if(this.userCourse2.start_periods_id!=null&&this.userCourse2.start_periods_course_type!=null){
// debugger
this.$router.push({
name: "map",
query: {
......@@ -61,7 +63,7 @@ export default {
});
}else{
this.$router.push({
name: "map"
name: "secMap"
});
}
......
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