Skip to content

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

5.10

parent d4a73a3f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 164 additions and 118 deletions
dev/index.html
View file @ e2eaa6e4
......@@ -6,4 +6,4 @@
overflow: hidden;
position: fixed;
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 src=static/vconsole/vconsole.min.js></script><script>// 初始化</script><script type=text/javascript src=static/js/manifest.2560050c7eebe8dd5897.js></script><script type=text/javascript src=static/js/vendor.971a89734ef51957abe6.js></script><script type=text/javascript src=static/js/app.bc77edd41358c702873f.js></script></body></html>
\ No newline at end of file
}</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>// 初始化</script><script type=text/javascript src=static/js/manifest.917ea8d31963d140aa25.js></script><script type=text/javascript src=static/js/vendor.971a89734ef51957abe6.js></script><script type=text/javascript src=static/js/app.bc77edd41358c702873f.js></script></body></html>
\ No newline at end of file
dev/static/js/0.aca104e21d74f40086d1.js → dev/static/js/0.d261cbe54004bf7bd480.js
View file @ e2eaa6e4
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/1.46732ccf0492b4a318b9.js 0 → 100644
View file @ e2eaa6e4
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/1.7ab75714c31827e0249b.js deleted 100644 → 0
View file @ d4a73a3f
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/15.674b4c27730d9f2cf273.js deleted 100644 → 0
View file @ d4a73a3f
This diff is collapsed.
dev/static/js/15.90a96aab21403d7c5ccc.js 0 → 100644
View file @ e2eaa6e4
This diff is collapsed.
dev/static/js/6.94716e8a79bb25659db8.js → dev/static/js/6.d36abfa6a6f9e2b196c2.js
View file @ e2eaa6e4
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/7.229ee4e4001a85416ba1.js deleted 100644 → 0
View file @ d4a73a3f
This diff is collapsed.
dev/static/js/7.9a5aa78aff6a06104027.js 0 → 100644
View file @ e2eaa6e4
This diff is collapsed.
dev/static/js/8.a7bf708127094294a4c1.js 0 → 100644
View file @ e2eaa6e4
This diff is collapsed.
dev/static/js/8.dabe607ade14d3a6a2f6.js deleted 100644 → 0
View file @ d4a73a3f
This diff is collapsed.
dev/static/js/manifest.2560050c7eebe8dd5897.js → dev/static/js/manifest.917ea8d31963d140aa25.js
View file @ e2eaa6e4
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,d){for(var o,f,b,i=0,u=[];i<c.length;i++)f=c[i],n[f]&&u.push(n[f][0]),n[f]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(a&&a(c,t,d);u.length;)u.shift()();if(d)for(i=0;i<d.length;i++)b=r(r.s=d[i]);return b};var c={},n={34: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],d=document.createElement("script");d.type="text/javascript",d.charset="utf-8",d.async=!0,d.timeout=12e4,r.nc&&d.setAttribute("nonce",r.nc),d.src=r.p+"static/js/"+e+"."+{0:"aca104e21d74f40086d1",1:"7ab75714c31827e0249b",2:"337acc427fdbf9c65040",3:"395ad735c1dddbaf83ed",4:"684780c477a1a0a998d7",5:"5eabe154dfef266b3a87",6:"94716e8a79bb25659db8",7:"229ee4e4001a85416ba1",8:"dabe607ade14d3a6a2f6",9:"8fd30b5b294fc19f4266",10:"a2e42c3a49c2aa14526b",11:"539cef049364093bd6e1",12:"8e264d614be2ace1d68b",13:"3b76f5664037559abc01",14:"35ba17dc8ff245af5bea",15:"674b4c27730d9f2cf273",16:"f7b863f1592818dcb219",17:"a1edd7b1e9fb8cd6ede4",18:"a17ffd34e3418030f0ad",19:"6788ece3a8027eb36940",20:"7e3e404954d3a7bfdb08",21:"39d99ac940199668a959",22:"3ad9c9136ccfcd599d82",23:"abd000c2d42590325658",24:"7d513d80b42dc2d2f825",25:"f612962de659e104ba02",26:"f688ad0a42f7f2456842",27:"ca2bbdddc1013b1db64f",28:"649d19a394c945241555",29:"d1a603ec7004ae7a1c13",30:"53eaac9001d51b255a57",31:"cddf51a01bd712b1cc09"}[e]+".js";var o=setTimeout(f,12e4);function f(){d.onerror=d.onload=null,clearTimeout(o);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return d.onerror=d.onload=f,t.appendChild(d),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,d){for(var o,f,b,i=0,u=[];i<c.length;i++)f=c[i],n[f]&&u.push(n[f][0]),n[f]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(a&&a(c,t,d);u.length;)u.shift()();if(d)for(i=0;i<d.length;i++)b=r(r.s=d[i]);return b};var c={},n={34: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],d=document.createElement("script");d.type="text/javascript",d.charset="utf-8",d.async=!0,d.timeout=12e4,r.nc&&d.setAttribute("nonce",r.nc),d.src=r.p+"static/js/"+e+"."+{0:"d261cbe54004bf7bd480",1:"46732ccf0492b4a318b9",2:"337acc427fdbf9c65040",3:"395ad735c1dddbaf83ed",4:"684780c477a1a0a998d7",5:"5eabe154dfef266b3a87",6:"d36abfa6a6f9e2b196c2",7:"9a5aa78aff6a06104027",8:"a7bf708127094294a4c1",9:"8fd30b5b294fc19f4266",10:"a2e42c3a49c2aa14526b",11:"539cef049364093bd6e1",12:"8e264d614be2ace1d68b",13:"3b76f5664037559abc01",14:"210d868c4c063d2f39ee",15:"90a96aab21403d7c5ccc",16:"f7b863f1592818dcb219",17:"a1edd7b1e9fb8cd6ede4",18:"a17ffd34e3418030f0ad",19:"6788ece3a8027eb36940",20:"7e3e404954d3a7bfdb08",21:"39d99ac940199668a959",22:"3ad9c9136ccfcd599d82",23:"abd000c2d42590325658",24:"7d513d80b42dc2d2f825",25:"f612962de659e104ba02",26:"f688ad0a42f7f2456842",27:"ca2bbdddc1013b1db64f",28:"649d19a394c945241555",29:"d1a603ec7004ae7a1c13",30:"53eaac9001d51b255a57",31:"cddf51a01bd712b1cc09"}[e]+".js";var o=setTimeout(f,12e4);function f(){d.onerror=d.onload=null,clearTimeout(o);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return d.onerror=d.onload=f,t.appendChild(d),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 @ e2eaa6e4
<!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.6962c9fd5f2dd71806828d1c2ae19bdb.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.71c18504a7cf2526386a.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.46262833f7fc058ac130.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.9b053b029595f88604b5.js></script></body></html>
\ No newline at end of file
}</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.bef3336055e49fabb4bf1906c9d4e732.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.6ed796b00c145de0f440.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.46262833f7fc058ac130.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.9b30541f868e88ffe6bc.js></script></body></html>
\ No newline at end of file
dist/static/js/1.55621bd1c7409875d557.js 0 → 100644
View file @ e2eaa6e4
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/1.82fb4957651d64616fe6.js deleted 100644 → 0
View file @ d4a73a3f
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/14.1ed2989079a6deea8b14.js deleted 100644 → 0
View file @ d4a73a3f
This diff is collapsed.
dist/static/js/14.263101540b8c7c6ce0be.js 0 → 100644
View file @ e2eaa6e4
This diff is collapsed.
dist/static/js/17.d95269c4fed65fa73a1d.js deleted 100644 → 0
View file @ d4a73a3f
This diff is collapsed.
dist/static/js/18.27810984a2ab79690cc9.js 0 → 100644
View file @ e2eaa6e4
This diff is collapsed.
dist/static/js/manifest.71c18504a7cf2526386a.js → dist/static/js/manifest.6ed796b00c145de0f440.js
View file @ e2eaa6e4
!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={34: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:"3bc746b88fb3b9718b46",1:"82fb4957651d64616fe6",2:"d912e90da56ffe83e816",3:"2a2c2fd7e681a2d82028",4:"732353acd050116b32af",5:"9de715b675e55ec36a45",6:"fc81e2969f4f9a1c4c4e",7:"31f6c19c175513491eff",8:"ab8dc564b3651189405f",9:"6c0f6a0dabf60a307c3d",10:"ac78c9d65ffd5c0f1a4c",11:"4638c140153ee40c01f4",12:"a01d02655b0b1dca002f",13:"ac1a8883104e709ce1ec",14:"1ed2989079a6deea8b14",15:"1eb6cc7d23dfe5f3e91f",16:"eacc590d6a7abb7c650b",17:"d95269c4fed65fa73a1d",18:"bddb3d09bf79d426b041",19:"3e06c7e9646ebe26de4a",20:"af95c97c8a8c2c1421b3",21:"3f31027b2bc9b31c23ef",22:"a3728b7411c5e89aef21",23:"9f60147a0140625d3e93",24:"f8c8d8245371c429836a",25:"7ec0eebf2bc062261cf7",26:"7666b30658fa47c11856",27:"3f17efe9421b9d53694c",28:"71f6faa1429340461c22",29:"bfe10f6244a3cba92976",30:"d5efff3d8c9ca8c658dd",31:"49822bd434035bdd8d51"}[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
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,f){for(var o,d,i,b=0,u=[];b<a.length;b++)d=a[b],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(b=0;b<f.length;b++)i=t(t.s=f[b]);return i};var a={},n={34: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:"3e40f178aa6e5a17437d",1:"55621bd1c7409875d557",2:"d912e90da56ffe83e816",3:"2a2c2fd7e681a2d82028",4:"732353acd050116b32af",5:"e9dac2e438ae237a6b16",6:"596c23f5186580473e84",7:"31f6c19c175513491eff",8:"d6df1e556688fc194b8e",9:"6c0f6a0dabf60a307c3d",10:"ac78c9d65ffd5c0f1a4c",11:"4638c140153ee40c01f4",12:"a01d02655b0b1dca002f",13:"ac1a8883104e709ce1ec",14:"263101540b8c7c6ce0be",15:"1eb6cc7d23dfe5f3e91f",16:"eacc590d6a7abb7c650b",17:"f8f84cfa4b191f48271d",18:"27810984a2ab79690cc9",19:"3e06c7e9646ebe26de4a",20:"af95c97c8a8c2c1421b3",21:"3f31027b2bc9b31c23ef",22:"a3728b7411c5e89aef21",23:"9f60147a0140625d3e93",24:"f8c8d8245371c429836a",25:"7ec0eebf2bc062261cf7",26:"7666b30658fa47c11856",27:"3f17efe9421b9d53694c",28:"71f6faa1429340461c22",29:"bfe10f6244a3cba92976",30:"d5efff3d8c9ca8c658dd",31:"49822bd434035bdd8d51"}[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}}([]);
\ No newline at end of file
src/assets/newLesson/shareConBG.png
View replaced file @ d4a73a3f View file @ e2eaa6e4
src/assets/newLesson/shareConBG.png

14 KB | W: | H:

src/assets/newLesson/shareConBG.png

85.2 KB | W: | H:

src/assets/newLesson/shareConBG.png
src/assets/newLesson/shareConBG.png
src/assets/newLesson/shareConBG.png
src/assets/newLesson/shareConBG.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/newLesson/share_button.png
View replaced file @ d4a73a3f View file @ e2eaa6e4
src/assets/newLesson/share_button.png

1.83 KB | W: | H:

src/assets/newLesson/share_button.png

104 KB | W: | H:

src/assets/newLesson/share_button.png
src/assets/newLesson/share_button.png
src/assets/newLesson/share_button.png
src/assets/newLesson/share_button.png
  • 2-up
  • Swipe
  • Onion skin
src/components/buy/index.vue
View file @ e2eaa6e4
......@@ -341,7 +341,6 @@
if(this.$route.query.invite_code){
this.invite_code = this.$route.query.invite_code;
}
this.user_id=JSON.parse(localStorage.getItem('userDesc')).user_id;
if(window.location.href.indexOf('shopId')>-1){
this.shopId = this.$route.query.shopId;
......
src/components/collection/audio.vue
View file @ e2eaa6e4
......@@ -13,7 +13,7 @@
{{showObj.audio[showObj.audioIndex].sub_title}}
</div>
</div>
<div :class="{'image-block':true,swin:true,pause:!playFlag}" @click="imgPop=true">
<div :class="{'image-block':true,swin:true,noanimation:!playFlag}" @click="imgPop=true">
<img :src="showObj.audio[showObj.audioIndex].url">
</div>
<div>
......@@ -391,8 +391,11 @@
transform: rotate(360deg);
}
}
.swin{-webkit-animation: spin 6s linear 1s 5 alternate;animation: spin 6s linear infinite;}
.pause{animation-play-state: paused;}
.swin{-webkit-animation: spin 8s linear 1s 5 alternate;animation: spin 8s linear infinite;}
.pause{animation-play-state: paused;-webkit-animation-play-state:paused;}
.noanimation {
-webkit-animation:none !important;animation:none !important;
}
.collect-block{
padding: 10*@toVw;
border-radius: 4*@toVw;
......@@ -426,7 +429,7 @@
margin-top: 20*@toVw;
box-shadow: 0 0 30*@toVw 5*@toVw #ddd;
overflow: hidden;
border-radius: 94*@toVw;
border-radius: 999*@toVw;
box-shadow:0px 0px 4px 0px rgba(96,173,240,1);
border:4px solid rgba(255,255,255,1);
img{
......@@ -655,7 +658,7 @@
overflow: hidden;
display: block;
margin: auto;
border-radius: 75*@toVw;
border-radius: 999*@toVw;
box-shadow:0px 0px 4px 0px rgba(96,173,240,1);
border:4px solid rgba(255,255,255,1);
img{
......@@ -864,7 +867,7 @@
overflow: hidden;
display: block;
margin: auto;
border-radius: 75*@toVw;
border-radius: 999*@toVw;
box-shadow:0px 0px 4px 0px rgba(96,173,240,1);
border:4px solid rgba(255,255,255,1);
img{
......
src/components/map/index.vue
View file @ e2eaa6e4
......@@ -128,16 +128,14 @@
<img :src="mok4" alt="">
<p>您的课程尚未开始</p>
<div>课程开始时间：{{secActions.start_at}}</div>
</div>ad
</div>
<!-- <div v-if="!adVisible" @click="adVisible=true" class="adSmall shake">
</div>
<van-popup v-model="adVisible">
<div class="adBig">
<i class="map close" @click="adVisible=false"></i>
</div>
</van-popup > -->
</van-popup> -->
<van-popup v-model="popupVisible">
<div v-if="thisLesson" class="popup-block">
<i class="map close" @click="popupVisible=false"></i>
......
src/components/map/secMap.vue
View file @ e2eaa6e4
......@@ -65,7 +65,7 @@
<p class="tip">{{couponInfo.goods_desc.tips}}</p>
<div class="price">券后价<span class="now">￥{{(couponInfo.current_price-couponInfo.coupon_list[0].money)/100}}</span>&nbsp;&nbsp;<span class="old">￥{{couponInfo.current_price/100}}</span> </div>
</div>
<div class="btn">去报名</div>
<div class="btn">立即抢</div>
</div>
</div>
</div>
......@@ -86,7 +86,7 @@
<div class="title">{{item.name | substr10}}</div>
<div class="tips" >
<span v-if="item.open">快去听课吧~</span>
<span v-if="!item.open">解锁后即可听课~</span>
<span v-if="!item.open">学完上节课得2颗星后即可解锁~</span>
</div>
</div>
<div class="star-block" v-if="item.star_num!=null">
......
src/components/newLesson/audio.vue
View file @ e2eaa6e4
......@@ -31,7 +31,7 @@
{{showObj.audio[index].tips}}
</div>
</div>
<div :class="{'image-block':true,swin:true,pause:!playFlag}" @click="imgPop=true">
<div :class="{'image-block':true,swin:true,noanimation:!playFlag}" @click="imgPop=true">
<img :src="showObj.audio[index].image">
</div>
<div>
......@@ -247,6 +247,7 @@
let json ={
url:this.showObj.audio[this.index].url
};
// debugger
getUserCollectApi(json).then(res=>{
this.hasCollect = res.list.length<1? false : res.list[0].id
})
......@@ -634,16 +635,19 @@
transform: rotate(360deg);
}
}
.swin{-webkit-animation: spin 6s linear 1s 5 alternate;animation: spin 6s linear infinite;}
.pause{animation-play-state: paused;}
.swin{-webkit-animation: spin 8s linear 1s 5 alternate;animation: spin 8s linear infinite;}
.pause{animation-play-state: paused;-webkit-animation-play-state:paused;}
.noanimation {
-webkit-animation:none !important;animation:none !important;
}
.content{
background: white;
width: 315*@toVw;
position: absolute;
top: 80*@toVw;
top: 70*@toVw;
left: 20*@toVw;
right: 20*@toVw;
bottom: 20*@toVw;
bottom: 0;
overflow: auto;
margin: auto;
display: block;
......@@ -656,7 +660,7 @@
margin-top: 5*@toVw;
box-shadow: 0 0 30*@toVw 5*@toVw #ddd;
overflow: hidden;
border-radius: 94*@toVw;
border-radius: 999*@toVw;
box-shadow:0px 0px 4px 0px rgba(96,173,240,1);
border:4px solid rgba(255,255,255,1);
img{
......@@ -709,6 +713,8 @@
-webkit-transform: translateZ(0);
transform: translateZ(0);
-webkit-appearance: none;
border: none;
outline: none;
background: -webkit-linear-gradient(#69c0ff, #69c0ff) no-repeat,#D8D8D8;
background-size: 75% 100%;/*设置左右宽度比例*/
width: 100%;
......@@ -718,13 +724,17 @@
-webkit-appearance: none;
}
input[type=range]::-webkit-slider-runnable-track {
-webkit-appearance: none;
height: 4*@toVw;
border-radius: 2*@toVw ;
}
input[type=range]:focus {
-webkit-appearance: none;
outline: none;
}
input[type=range]::-webkit-slider-thumb {
border: none;
outline: none;
-webkit-appearance: none;
border-radius: 50%; /*外观设置为圆形*/
height: 16*@toVw;
......@@ -773,7 +783,7 @@
}
.btn-block{
position: relative;
margin-top: 15*@toVw;
// margin-top: 15*@toVw;
text-align: center;
.age-block{
height: 28*@toVw;
......@@ -836,17 +846,17 @@
display: none;
}
.parent-finish{
position: absolute;
bottom: 10 * @toVw;
// position: absolute;
// bottom: 0 * @toVw;
width: 100%;
left: 0;
top: 430*@toVw;
.finish-block{
position: absolute;
// position: absolute;
width: 100%;
left: 0;
padding: 0;
margin: 0;
margin:20*@toVw 0 0;
text-align: center;
bottom: 0;
img{
......@@ -915,7 +925,7 @@
overflow: hidden;
display: block;
margin: auto;
border-radius: 75*@toVw;
border-radius: 99*@toVw;
box-shadow:0px 0px 4px 0px rgba(96,173,240,1);
border:4px solid rgba(255,255,255,1);
img{
......
src/components/newLesson/share.vue
View file @ e2eaa6e4
......@@ -13,13 +13,14 @@
<div class="head-block">
<img :src="userDetail.avatar"/>
</div>
<div class="content-title" :style="{backgroundImage:`url('${shareTitle}')`}">
{{userDetail.nickname}}
<div class="content-title" >
{{userDetail.nickname}}家宝宝
<p>累计学习</p>
</div>
<div class="main-text">
<div class="title">累计学习</div>
<div v-if="watchDetail" class="day">
{{watchDetail.total_day}} <span>Days</span>
{{watchDetail.total_day}}<br> <span>Days</span>
</div>
</div>
<div class="main-desc">
......@@ -31,7 +32,7 @@
</div>
</div>
<div class="main-content-desc">
<img :src="share_code_bg">
<!-- <img :src="share_code_bg"> -->
<div id="qrcode" class="qrcode"></div>
</div>
</div>
......@@ -39,7 +40,8 @@
<img :src="shareBtn" @click="showShare()"/>
</div>
</div>
<img :src="share_close" class="share_close" @click="$emit('closeShare')"/>
<div class="share_close" @click="$emit('closeShare')">X</div>
<!-- <img :src="share_close" class="share_close" @click="$emit('closeShare')"/> -->
<div class="tips" v-if="shareVisible" @click="shareVisible=false">
<img :src="share_tips">
</div>
......@@ -284,6 +286,9 @@ import {Toast} from 'vant'
height1,
width1
} = document.getElementById('capture').getClientRects()[0];
// height1 = 481
console.log(document.getElementById('capture').getClientRects()[0])
// debugger
setTimeout(()=>{
html2canvas(document.getElementById('capture'),{
async: true,
......@@ -300,7 +305,6 @@ import {Toast} from 'vant'
this.dataURL = dataURL;
Toast.clear()
}).catch(res=>{alert(res);console.log()});},500)
})
})
},
......@@ -341,7 +345,7 @@ import {Toast} from 'vant'
@import "../../util/public";
.share-page{
position: fixed;
background: #EEEEEE;
background: white;
top: 0;
left: 0;
bottom: 0;
......@@ -353,8 +357,8 @@ import {Toast} from 'vant'
top: 20*@toVw;
left: 20*@toVw;
right: 20*@toVw;
background: white;
bottom: 20*@toVw;
// background: white;
bottom: 0;
overflow: auto;
.bg-title{
position: absolute;
......@@ -371,28 +375,29 @@ import {Toast} from 'vant'
left: 0;
right: 0;
bottom: 0;
background: white;
// background: white;
z-index: -1;
border-radius: 0 0 8*@toVw 8*@toVw;
}
#cvs-img{
position: absolute;
width: 291*@toVw;
top: 21*@toVw;
left: 23*@toVw;
width: 100%;
// top: -3*@toVw;
left: 0;
z-index: 1;
}
.content{
width: 291*@toVw;
height: (422-53)*@toVw;
width: 100%;
height: (480-53)*@toVw;
padding-top: 53*@toVw;
margin-top: 20*@toVw;
// margin-top: 20*@toVw;
background-size: 100% 100%;
position: relative;
.content-black{
position: absolute;
z-index: -1;
width: 100%;
height: 100%;
top: 0;
right: 0;
left: 0;
......@@ -402,7 +407,7 @@ import {Toast} from 'vant'
.main-content{
width: 261*@toVw;
height: 263*@toVw;
background: white;
// background: white;
border-radius: 8*@toVw;
position: relative;
.main-text{
......@@ -410,34 +415,37 @@ import {Toast} from 'vant'
width: 215*@toVw;
text-align: center;
margin: auto;
border-bottom: 1*@toVw solid #EEEEEE;
margin-bottom: 0;
// border-bottom: 1*@toVw solid #EEEEEE;
.title{
font-size:16*@toVw;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(51,51,51,1);
color:#55343A;
}
.day{
font-size:48px;
margin: 5*@toVw 0;
font-family:PingFang-SC-Bold;
margin: 52*@toVw 0 0;
font-family:PingFangSC-Semibold;
font-weight:bold;
color:rgba(105,192,255,1);
line-height: 30*@toVw;
color:white;
span{
font-size:20px;
font-family:PingFang-SC-Bold;
font-weight:bold;
color:rgba(105,192,255,1);
font-family:PingFangSC-Semibold;
font-weight:300;
color:white;
}
}
}
.main-desc{
margin-top: 10*@toVw;
margin-top: 20*@toVw;
text-align: center;
font-size:12px;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(0,0,0,1);
color: #B75B3A;
span{
font-size:16px;
font-family:PingFang-SC-Medium;
......@@ -448,27 +456,28 @@ import {Toast} from 'vant'
}
.head-block{
position: absolute;
height: 85*@toVw;
width: 85*@toVw;
height: 54*@toVw;
width: 54*@toVw;
text-align: center;
border-radius: 200*@toVw;
left: 50%;
margin-left: -40*@toVw;
background: white;
top: -38*@toVw;
margin-left: -27*@toVw;
// background: white;
top: -8*@toVw;
img{
border-radius: 200*@toVw;
width: 64*@toVw;
width: 54*@toVw;
margin-top: 7*@toVw;
height: 64*@toVw;
height: 54*@toVw;
}
}
.content-title{
width: 226*@toVw;
height: 54*@toVw;
line-height: 50*@toVw;
color: white;
background: white;
line-height: 26*@toVw;
margin-top: 40*@toVw;
color: #55343A;
// background: white;
font-size: 14*@toVw;
text-align: center;
background-size: 99.99% 99.99%;
......@@ -479,16 +488,16 @@ import {Toast} from 'vant'
}
}
.share-btn{
margin-top: 22*@toVw;
margin-top: 2*@toVw;
text-align: center;
img{
width: 240*@toVw;
width: 270*@toVw;
}
}
.main-content-desc{
width: 261*@toVw;
height: 82*@toVw;
background: white;
// background: white;
border-radius: 8*@toVw;
margin-top: 10*@toVw;
position: relative;
......@@ -497,7 +506,7 @@ import {Toast} from 'vant'
}
.qrcode{
position: absolute;
top: 5*@toVw;
top: 40*@toVw;
right: 5*@toVw;
}
}
......@@ -505,8 +514,11 @@ import {Toast} from 'vant'
.share_close{
position: fixed;
width: 20*@toVw;
top: 19*@toVw;
right: 13*@toVw;
top: 26*@toVw;
right: 14*@toVw;
z-index: 999;
color: white;
font-size: 12px;
}
.tips{
background: rgba(0,0,0,0.8);
......
src/components/newLesson/shareGoods.vue
View file @ e2eaa6e4
......@@ -29,7 +29,7 @@
{{goodsDetail.goods_desc.course_title}}
</div>
</div>
<div class="good-content" v-if="goodsDetail&&goodsDetail.goods_type==1">
<div class="good-content" v-if="goodsDetail">
<div class="content" v-html="goodsDetail.desc.detail">
</div>
<div class="btn-block" ref="btn_block">
......@@ -41,7 +41,7 @@
</div>
</div>
</div>
<div class="good-content" v-if="goodsDetail&&goodsDetail.goods_type==2">
<!-- <div class="good-content" v-if="goodsDetail&&goodsDetail.goods_type==2">
<div class="content" v-html="goodsDetail.desc.detail">
</div>
<div class="btn-block" ref="btn_block">
......@@ -57,7 +57,7 @@
</div>
</div>
</div>
</div>
</div> -->
</div>
<login-page v-if="goodsDetail" :bind-mobile="bindMobile" :groupDetail="goodsDetail" @goToBuyPage="goToBuyPage"></login-page>
</div>
......@@ -180,9 +180,9 @@
mounted(){
this.initPage();
setInterval(()=>{this.lastTimeOut()},1000);
this.$refs.share_page.addEventListener('scroll',()=>{
// this.$refs.share_page.addEventListener('scroll',()=>{
//变量t是滚动条滚动时，距离顶部的距离
let t = this.$refs.share_page.scrollTop;
// let t = this.$refs.share_page.scrollTop;
// if( this.$refs.btn_block){
// this.$refs.btn_block.style.opacity = 1
// if(t>500){
......@@ -191,7 +191,7 @@
// this.$refs.btn_block.style.opacity = 0
// }
// }
})
// })
}
}
</script>
......
src/components/newLesson/video.vue
View file @ e2eaa6e4
<template>
<div class="video-page">
<div class="content">
<div class="header">
<img :src="imgURL.luolacoming" class="text" v-if="nowShow === 3">
<img :src="imgURL.luolalaila" class="text" v-if="nowShow === 2">
</div>
<div class="video-block hp-video" v-if="showObj.video[videoIndex]" v-show="!share_show && !popupVisible && !star">
<video :src="showObj.video[videoIndex].url" @ended="videoEnd" @play="videoPlay()" controls :poster="showObj.video[videoIndex].url+'?vframe/jpg/offset/3'"></video>
</div>
<div class="btn-block">
<div v-if="contentData.content.age" class="age-block" @click="ageShow = !ageShow">
<div v-if="contentData.age === 1">0-3岁<i class="playImage _154722344142123489"></i></div>
......@@ -33,6 +26,13 @@
<div @click="changeAudio(true)">音频教学</div>
</div>
</div>
<div class="header">
<img :src="imgURL.luolacoming" class="text" v-if="nowShow === 3">
<img :src="imgURL.luolalaila" class="text" v-if="nowShow === 2">
</div>
<div class="video-block hp-video" v-if="showObj.video[videoIndex]" v-show="!share_show && !popupVisible && !star">
<video :src="showObj.video[videoIndex].url" @ended="videoEnd" @play="videoPlay()" controls :poster="showObj.video[videoIndex].url+'?vframe/jpg/offset/3'"></video>
</div>
<div class="parent-finish">
<div class="finish-block" v-if="nowShow === 3">
<img :src="finishStuat" @click="finishStudy">
......@@ -220,10 +220,10 @@
background: white;
width: 315*@toVw;
position: absolute;
top: 80*@toVw;
top: 70*@toVw;
left: 20*@toVw;
right: 20*@toVw;
bottom: 20*@toVw;
bottom: 0;
overflow: auto;
margin: auto;
display: block;
......
src/components/order.vue
View file @ e2eaa6e4
......@@ -9,7 +9,7 @@
<p>还没有订单哦~</p>
<div @click="goIndex">去逛逛吧</div>
</div>
<div v-for="data in orderList" class="list">
<div v-for="(data,index) in orderList" @click="goDetail(index)" class="list">
<div class="head">
<div class="bg-img" v-if="data.goods_desc" :style="{backgroundImage: `url(${data.goods_desc.img[0].url})`}">
</div>
......@@ -45,7 +45,8 @@
showShare:false,
shareTipsUrl:shareTipsUrl,
shareUrl:shareUrl,
mok4:mok4
mok4:mok4,
shopId:''
}
},
filters:{
......@@ -57,6 +58,24 @@
this.initPage()
},
methods:{
goDetail(index){
if(this.orderList[index].buy_type==1){
this.$router.push({
name: 'buySuccess',
query:{
out_trade_no:this.orderList[index].out_trade_no
}
});
}else{
this.$router.push({
name: 'success',
query:{
out_trade_no:this.orderList[index].out_trade_no
}
});
}
},
goIndex(){
this.$router.push({
name: "index"
......@@ -131,6 +150,7 @@
<style scoped lang="less">
@import "../util/public";
.child-view{background: white;}
.unStart{
text-align: center;
img{width:300*@toVw; }
......
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