Skip to content

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

4.24

parent 55a66900
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 14 deletions
dev/index.html
View file @ 931d4b2f
...@@ -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.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.be98459d64ca6843f30a.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> }</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.08a805af25ced15fb941.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 \ No newline at end of file
dev/static/js/6.c65829cf4f070117f271.js deleted 100644 → 0
View file @ 55a66900
This diff is collapsed.
dev/static/js/6.d9acbd7c15e1d0ec1648.js 0 → 100644
View file @ 931d4b2f
This diff is collapsed.
dev/static/js/manifest.be98459d64ca6843f30a.js → dev/static/js/manifest.08a805af25ced15fb941.js
View file @ 931d4b2f
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,f,t){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 f)Object.prototype.hasOwnProperty.call(f,b)&&(e[b]=f[b]);for(a&&a(c,f,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)d=r(r.s=t[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 f=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,r.nc&&t.setAttribute("nonce",r.nc),t.src=r.p+"static/js/"+e+"."+{0:"2df2feb345d639bbe415",1:"5957001eea30fb7dfb71",2:"16245f5bcb88b5b640bf",3:"cb0e919d300a9a3004be",4:"40ccdf99fbcc9c94ba7d",5:"35c21a9a684a2d8d4534",6:"c65829cf4f070117f271",7:"bf62870a5cd096bddedc",8:"756b2b323ac553b002d5",9:"1c9fa255f310bb8b4e6a",10:"7ee33d51aede03d926f0",11:"ce77bd250e489483340e",12:"5bb1519d95fb708106bb",13:"43f421c3eb64a990eab2",14:"e918345baacdc3d391bf",15:"e89ab9ff03d59f4e5f9f",16:"abdd37a831290369cab3",17:"76969a55011b8f5ca096",18:"c64d73a608befb9174d1",19:"19c2c1ab5f332872664e",20:"4d03512be3a553567e4a",21:"b6e306bfdfb59d23d500",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(){t.onerror=t.onload=null,clearTimeout(b);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return t.onerror=t.onload=o,f.appendChild(t),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}}([]); !function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,b){for(var f,d,o,i=0,u=[];i<c.length;i++)d=c[i],n[d]&&u.push(n[d][0]),n[d]=0;for(f in t)Object.prototype.hasOwnProperty.call(t,f)&&(e[f]=t[f]);for(a&&a(c,t,b);u.length;)u.shift()();if(b)for(i=0;i<b.length;i++)o=r(r.s=b[i]);return o};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],b=document.createElement("script");b.type="text/javascript",b.charset="utf-8",b.async=!0,b.timeout=12e4,r.nc&&b.setAttribute("nonce",r.nc),b.src=r.p+"static/js/"+e+"."+{0:"2df2feb345d639bbe415",1:"5957001eea30fb7dfb71",2:"16245f5bcb88b5b640bf",3:"cb0e919d300a9a3004be",4:"40ccdf99fbcc9c94ba7d",5:"35c21a9a684a2d8d4534",6:"d9acbd7c15e1d0ec1648",7:"bf62870a5cd096bddedc",8:"756b2b323ac553b002d5",9:"1c9fa255f310bb8b4e6a",10:"7ee33d51aede03d926f0",11:"ce77bd250e489483340e",12:"5bb1519d95fb708106bb",13:"43f421c3eb64a990eab2",14:"e918345baacdc3d391bf",15:"e89ab9ff03d59f4e5f9f",16:"abdd37a831290369cab3",17:"76969a55011b8f5ca096",18:"c64d73a608befb9174d1",19:"19c2c1ab5f332872664e",20:"4d03512be3a553567e4a",21:"b6e306bfdfb59d23d500",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 f=setTimeout(d,12e4);function d(){b.onerror=b.onload=null,clearTimeout(f);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return b.onerror=b.onload=d,t.appendChild(b),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 \ No newline at end of file
dist/index.html
View file @ 931d4b2f
<!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>*{ <!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; -webkit-overflow-scrolling:touch;
}</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.e82a40672481631e56887f46aee6f3f6.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.dbc45ca13b2447294b3d.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.b304a5a2c263dafee763.js></script></body></html> }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.8ff4ce3c485aa2feba7d539d293c1ca1.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.31fea134ef210c8355d0.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.b304a5a2c263dafee763.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/manifest.dbc45ca13b2447294b3d.js → dist/static/js/manifest.31fea134ef210c8355d0.js
View file @ 931d4b2f
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,f){for(var o,d,b,i=0,u=[];i<a.length;i++)d=a[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(c&&c(a,r,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=t(t.s=f[i]);return b};var a={},n={35:0};function t(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,t),n.l=!0,n.exports}t.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,t){c=n[e]=[a,t]});c[2]=a;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:"7ec98bfdf29d8f373f46",1:"ab065393c81998bdaf12",2:"98e78476b2bf208770ca",3:"de9003ad0cd58d4933e6",4:"9e8aa6a3c22b79f2c73a",5:"6946057667b6c752b23c",6:"4f1ad01fda14bf94da56",7:"83fc9932263c5b565ced",8:"a1cac73c2d4eed071f80",9:"245ee811d4a3ba944f78",10:"f8fb30dbb5264e6f2d22",11:"746a87de7ea3f73b88d5",12:"50545fc8db8a460df1a4",13:"4f7e7350f0ebcb13a353",14:"ef760d2a9b835c95953e",15:"f9fabe9d7c33c807d49f",16:"835b556b4767d5af24de",17:"728d6d330a5d76b527ff",18:"c7b9b0a2d589677b8843",19:"90a793f0450207e24962",20:"0fc0a436a7b6051797e3",21:"4c372b88a9b857ea266d",22:"d0a6cb8b6a3d435048d8",23:"433fe98378cc42391942",24:"1198e7fee7b6e7141dc3",25:"e5861d8c07fc8bedff04",26:"fffd056570411fbe813b",27:"9df8c5274aa09925c217",28:"42630fb198c3dc5aeeec",29:"0632a94166032e753f0b",30:"1a675b9e47ee56e51498",31:"d78f5c7b828744a3cd40",32:"e4146760976652405136"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=d,r.appendChild(f),a},t.m=e,t.c=a,t.d=function(e,c,a){t.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},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}}([]); !function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,r,f){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 r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(c&&c(n,r,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=t(t.s=f[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 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:"7ec98bfdf29d8f373f46",1:"ab065393c81998bdaf12",2:"98e78476b2bf208770ca",3:"de9003ad0cd58d4933e6",4:"9e8aa6a3c22b79f2c73a",5:"6946057667b6c752b23c",6:"1c0b2c694218e58b3b67",7:"83fc9932263c5b565ced",8:"a1cac73c2d4eed071f80",9:"245ee811d4a3ba944f78",10:"f8fb30dbb5264e6f2d22",11:"746a87de7ea3f73b88d5",12:"50545fc8db8a460df1a4",13:"4f7e7350f0ebcb13a353",14:"ef760d2a9b835c95953e",15:"f9fabe9d7c33c807d49f",16:"835b556b4767d5af24de",17:"728d6d330a5d76b527ff",18:"c7b9b0a2d589677b8843",19:"90a793f0450207e24962",20:"0fc0a436a7b6051797e3",21:"4c372b88a9b857ea266d",22:"d0a6cb8b6a3d435048d8",23:"433fe98378cc42391942",24:"1198e7fee7b6e7141dc3",25:"e5861d8c07fc8bedff04",26:"fffd056570411fbe813b",27:"9df8c5274aa09925c217",28:"42630fb198c3dc5aeeec",29:"0632a94166032e753f0b",30:"1a675b9e47ee56e51498",31:"d78f5c7b828744a3cd40",32:"e4146760976652405136"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return f.onerror=f.onload=d,r.appendChild(f),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 \ No newline at end of file
src/components/map/secMap.vue
View file @ 931d4b2f
...@@ -70,14 +70,14 @@ ...@@ -70,14 +70,14 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="lessonList2&&lessonList2.length&&couponInfo.coupon_list&&!userCourse.periods_list" class="card-block"> <div v-if="lessonList2&&lessonList2.length&&!userCourse.periods_list" class="card-block">
<img :src="lessonList2[0].cover+'?imageslim'"> <img :src="lessonList2[0].cover+'?imageslim'">
<div class="shadowbox" @click="goToBuyPage" v-if="!lessonList2[0].open&&couponInfo.coupon_list.length" > <div class="shadowbox" @click="goToBuyPage" v-if="!lessonList2[0].open&&oneGoodinfo.goods_desc" >
<div class="shadow"></div> <div class="shadow"></div>
<div class="content"> <div class="content">
<p>更多课程 福利</p> <p>更多课程 福利</p>
<div> <div>
三节课&nbsp;&nbsp;+&nbsp;&nbsp;{{couponInfo.coupon_list[0].money/100}}元课程抵用卷&nbsp;&nbsp; 三节课&nbsp;&nbsp;+&nbsp;&nbsp;{{oneGoodinfo.goods_desc.tips}}&nbsp;&nbsp;
<span>1元解锁</span> <span>1元解锁</span>
</div> </div>
</div> </div>
...@@ -145,7 +145,8 @@ import { ...@@ -145,7 +145,8 @@ import {
getCourseInfoApi, getCourseInfoApi,
getAutomationApi, getAutomationApi,
getAutomationCouponApi, getAutomationCouponApi,
payApi payApi,
getGoodsDetailApi
} from "../../service/api"; } from "../../service/api";
import star_act from "../../assets/newLesson/star_act.png"; import star_act from "../../assets/newLesson/star_act.png";
import star_def from "../../assets/newLesson/star_def.png"; import star_def from "../../assets/newLesson/star_def.png";
...@@ -251,6 +252,8 @@ export default { ...@@ -251,6 +252,8 @@ export default {
h:0, h:0,
m:0, m:0,
s:0, s:0,
deadline:'',
oneGoodinfo:{}
}; };
}, },
created() { created() {
...@@ -314,7 +317,6 @@ export default { ...@@ -314,7 +317,6 @@ export default {
this.actions.push(el); this.actions.push(el);
}); });
} }
// 高亮 // 高亮
this.actions.forEach(el=>{ this.actions.forEach(el=>{
el.className="" el.className=""
...@@ -325,7 +327,11 @@ export default { ...@@ -325,7 +327,11 @@ export default {
console.log(this.userCourse) console.log(this.userCourse)
// debugger // debugger
this.getLessonList(); this.getLessonList();
this.getAutomationCoupon(); // 优惠券商品
if(!this.userCourse.periods_list){
this.getAutomationCoupon();
}
}, },
tobuy(){ tobuy(){
this.$router.push({name:'buyDetail', query: { this.$router.push({name:'buyDetail', query: {
...@@ -493,6 +499,11 @@ export default { ...@@ -493,6 +499,11 @@ export default {
},500) },500)
// debugger // debugger
}); });
getGoodsDetailApi(this.userCourse.can_buy_goods_id).then(res=>{
this.oneGoodinfo = res
this.oneGoodinfo.goods_desc = JSON.parse(res.goods_desc)
// debugger
})
} }
if (this.userCourse.automation_id) { if (this.userCourse.automation_id) {
this.userCourse.automation_id.forEach((el, index) => { this.userCourse.automation_id.forEach((el, index) => {
...@@ -533,7 +544,7 @@ export default { ...@@ -533,7 +544,7 @@ export default {
} }
}, },
leftTimer(){ leftTimer(){
if(this.couponInfo.coupon_list){ if(this.couponInfo.coupon_list.length){
this.deadline = this.couponInfo.coupon_list[0].deadline_at this.deadline = this.couponInfo.coupon_list[0].deadline_at
} }
let leftTime = (new Date(this.deadline.replace(/\-/g, '/'))) - (new Date()); //计算剩余的毫秒数 let leftTime = (new Date(this.deadline.replace(/\-/g, '/'))) - (new Date()); //计算剩余的毫秒数
......
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