Commit b9ceb094 authored by chenyishuai@singsingenglish.com's avatar chenyishuai@singsingenglish.com

823

parents b55204bf b64589b0
......@@ -11,4 +11,8 @@
position: fixed;
background: #f4f4f4;
}
<<<<<<< HEAD
/* html{font-size: 1px;} */</style><link href=static/css/app.f983055a19b69eb54137ee36031e8a72.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=static/js/manifest.f1fac8c2f5ee55a388b7.js></script><script type=text/javascript src=static/js/vendor.19fbc79f608887e9859d.js></script><script type=text/javascript src=static/js/app.14adbeff83e7d8a299ee.js></script></body></html>
=======
/* html{font-size: 1px;} */</style><link href=static/css/app.f983055a19b69eb54137ee36031e8a72.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=static/js/manifest.e733bc1c767e4749c44b.js></script><script type=text/javascript src=static/js/vendor.19fbc79f608887e9859d.js></script><script type=text/javascript src=static/js/app.14adbeff83e7d8a299ee.js></script></body></html>
>>>>>>> dev
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,f,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],d[t]&&u.push(d[t][0]),d[t]=0;for(r in f)Object.prototype.hasOwnProperty.call(f,r)&&(e[r]=f[r]);for(a&&a(c,f,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var c={},d={60:0};function b(a){if(c[a])return c[a].exports;var d=c[a]={i:a,l:!1,exports:{}};return e[a].call(d.exports,d,d.exports,b),d.l=!0,d.exports}b.e=function(e){var a=d[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,b){a=d[e]=[c,b]});a[2]=c;var f=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"2a422df3e9559ad6c791",1:"c906fa944c7ac0eca985",2:"aa6329edd741532bf257",3:"502214c3a86420a21333",4:"25aee3a3e468698eb344",5:"a64dd349e179ad669aa4",6:"bb0a47712a1c0a787b6f",7:"6a6d0d758484f18e6be0",8:"d70d7691d5bea1635193",9:"b8f71f2ea2e1cf08ff54",10:"bcc40aa92506aa01ce7b",11:"169d8f8b3d7bede6d59b",12:"8fa5d0677b2f14804c28",13:"b02930589a633523d0a9",14:"1a7c8152259a1b7a69ae",15:"eec555b5baabb8d880ec",16:"37ae0fc404d386098016",17:"47c8a9ad84bde8fad52d",18:"937fb2936f4011e0ecdb",19:"726b2eb0846f8a8cae74",20:"6c74ce4ba953f194a3e2",21:"959dc648ef4c09104245",22:"da5322a3e43121e0b3b8",23:"69b66523d072ca7b9bf3",24:"b683b9bc101eabc63a71",25:"445901ed5422885e73b0",26:"e68cef44e7ce9a86475f",27:"7eec9d64b6a64f95631d",28:"423191880a905836fb6a",29:"1b130dccc4c8d8ec0a79",30:"ea57c470adb3a481ab0e",31:"b623b8c797951c52ba57",32:"9a6364487916f90948ea",33:"74cb36aa562c7dd0a90a",34:"082eef0aa545c5f131e5",35:"5a1958b322765d2e8a57",36:"ba141d3f1f1750dcc615",37:"514df673fefe17b85e8b",38:"17cada64d3fcb721208e",39:"5805d0872cdc1217f1c8",40:"fe94e66a8a38e6487c7b",41:"e6e5d46fd60e18aecd64",42:"4ab652e7d2baa89138de",43:"bc713d1560f2846ba298",44:"38bc3417497eb1d86594",45:"283a1316c102de43d28c",46:"a9a040fd7ed39baf1fa3",47:"e8d26a3f687410e3ac75",48:"73c860653c1cc8ac6948",49:"bd719cb0fdbe32b02fb5",50:"a38b9b4987f7e5809c36",51:"9b9a80a5b97873aa5801",52:"2739e773573e0794ed6e",53:"8deb2ecdb63d8c1ec7ff",54:"871dc3b3972a4028aa6e",55:"7bbc6a8c4065c465d21c",56:"fb79bee79d699c45a0b4",57:"8125146976f37440ecad"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=d[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return n.onerror=n.onload=t,f.appendChild(n),c},b.m=e,b.c=c,b.d=function(e,a,c){b.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},b.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(a,"a",a),a},b.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},b.p="",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
This diff is collapsed.
......@@ -74,7 +74,7 @@
暂无课程
</div>
</div>
<div class="card-block" v-for="(data,index) in lessonList">
<div class="card-block" v-for="(data,index) in lessonList" >
<img :src="data[0].cover+'?imageslim'"/>
<div :class="'card-li cid'+item.id" v-for="(item,x) in data" @click="showDia(item,x+1)">
<div class="text-block">
......@@ -523,14 +523,13 @@
if(i.status === 1 || i.status === 2 ){
this.unitList.push(i)
// 在推的主题2
if(i.status === 2){
if(i.status === 2 ){
this.parent_category_id = i.category_id
}
}
if(res.length==1){
if(res.length>0 && i.status !== 1 && i.status !== 2){
this.parent_category_id = i.category_id
this.unitList.push(i)
// debugger
}
});
// 跳回上次看课主题
......
......@@ -142,6 +142,7 @@ import audioGreat from "../../assets/great.mp3";
import audioPerfect from "../../assets/perfect.mp3";
import leftIcon from "../../assets/shop/left.png";
import { Toast } from "vant";
// import videojs from "videojs";
export default {
name: "play",
components: {
......@@ -217,6 +218,7 @@ export default {
},
false
);
console.log(videojs)
},
methods: {
activity() {},
......
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