Commit a4ee6a13 by FE

Merge branch 'master' of gitlab.julyedu.com:baiguangyao/mr-julyedu

parents 897988f3 441f6a64
......@@ -42,17 +42,17 @@
"detail.css": "/static/css/detail.6b1d509c.chunk.css",
"detail.js": "/static/js/detail.244e6893.chunk.js",
"detail.js.map": "/static/js/detail.244e6893.chunk.js.map",
"main.css": "/static/css/main.e3b6cb89.chunk.css",
"main.js": "/static/js/main.254f9877.chunk.js",
"main.js.map": "/static/js/main.254f9877.chunk.js.map",
"main.css": "/static/css/main.b67e9860.chunk.css",
"main.js": "/static/js/main.dfa73800.chunk.js",
"main.js.map": "/static/js/main.dfa73800.chunk.js.map",
"myorders.css": "/static/css/myorders.67814bde.chunk.css",
"myorders.js": "/static/js/myorders.1eba4115.chunk.js",
"myorders.js.map": "/static/js/myorders.1eba4115.chunk.js.map",
"purchased.css": "/static/css/purchased.19e06a3f.chunk.css",
"purchased.js": "/static/js/purchased.106dca9c.chunk.js",
"purchased.js.map": "/static/js/purchased.106dca9c.chunk.js.map",
"runtime~main.js": "/static/js/runtime~main.af17f50b.js",
"runtime~main.js.map": "/static/js/runtime~main.af17f50b.js.map",
"runtime~main.js": "/static/js/runtime~main.08a5911b.js",
"runtime~main.js.map": "/static/js/runtime~main.08a5911b.js.map",
"search.css": "/static/css/search.5716d9b3.chunk.css",
"search.js": "/static/js/search.b0ad2834.chunk.js",
"search.js.map": "/static/js/search.b0ad2834.chunk.js.map",
......@@ -63,8 +63,8 @@
"study.js": "/static/js/study.d9b5aa22.chunk.js",
"study.js.map": "/static/js/study.d9b5aa22.chunk.js.map",
"togroup.css": "/static/css/togroup.f08bc5f3.chunk.css",
"togroup.js": "/static/js/togroup.85e215c0.chunk.js",
"togroup.js.map": "/static/js/togroup.85e215c0.chunk.js.map",
"togroup.js": "/static/js/togroup.0e08d3a5.chunk.js",
"togroup.js.map": "/static/js/togroup.0e08d3a5.chunk.js.map",
"video.css": "/static/css/video.56215f62.chunk.css",
"video.js": "/static/js/video.087b46c9.chunk.js",
"video.js.map": "/static/js/video.087b46c9.chunk.js.map",
......@@ -91,7 +91,7 @@
"static/js/31.20f868b0.chunk.js": "/static/js/31.20f868b0.chunk.js",
"static/js/31.20f868b0.chunk.js.map": "/static/js/31.20f868b0.chunk.js.map",
"index.html": "/index.html",
"precache-manifest.7ad1b921ff44a4726c6948f907b57fab.js": "/precache-manifest.7ad1b921ff44a4726c6948f907b57fab.js",
"precache-manifest.abdf81addf7cfcfa6ccc51a9cd6bf0c4.js": "/precache-manifest.abdf81addf7cfcfa6ccc51a9cd6bf0c4.js",
"service-worker.js": "/service-worker.js",
"static/css/24.4abd5c22.chunk.css.map": "/static/css/24.4abd5c22.chunk.css.map",
"static/css/26.c76b300d.chunk.css.map": "/static/css/26.c76b300d.chunk.css.map",
......@@ -112,7 +112,7 @@
"static/css/aist-share.a97e13d0.chunk.css.map": "/static/css/aist-share.a97e13d0.chunk.css.map",
"static/css/coupons.f2c7a13b.chunk.css.map": "/static/css/coupons.f2c7a13b.chunk.css.map",
"static/css/detail.6b1d509c.chunk.css.map": "/static/css/detail.6b1d509c.chunk.css.map",
"static/css/main.e3b6cb89.chunk.css.map": "/static/css/main.e3b6cb89.chunk.css.map",
"static/css/main.b67e9860.chunk.css.map": "/static/css/main.b67e9860.chunk.css.map",
"static/css/myorders.67814bde.chunk.css.map": "/static/css/myorders.67814bde.chunk.css.map",
"static/css/purchased.19e06a3f.chunk.css.map": "/static/css/purchased.19e06a3f.chunk.css.map",
"static/css/search.5716d9b3.chunk.css.map": "/static/css/search.5716d9b3.chunk.css.map",
......
......@@ -112,12 +112,12 @@ self.__precacheManifest = [
"url": "/static/js/detail.244e6893.chunk.js"
},
{
"revision": "3e764b18b46f2d8d08de",
"url": "/static/css/main.e3b6cb89.chunk.css"
"revision": "581c6cc250fc6168c816",
"url": "/static/css/main.b67e9860.chunk.css"
},
{
"revision": "3e764b18b46f2d8d08de",
"url": "/static/js/main.254f9877.chunk.js"
"revision": "581c6cc250fc6168c816",
"url": "/static/js/main.dfa73800.chunk.js"
},
{
"revision": "5bdca47935e6121117e4",
......@@ -136,8 +136,8 @@ self.__precacheManifest = [
"url": "/static/js/BargainMiddlePage.2b56f15a.chunk.js"
},
{
"revision": "ed91c92fd5c9dd175a37",
"url": "/static/js/runtime~main.af17f50b.js"
"revision": "70bfcf491c911d9c32f4",
"url": "/static/js/runtime~main.08a5911b.js"
},
{
"revision": "21c06dc0e5ef203e0371",
......@@ -164,12 +164,12 @@ self.__precacheManifest = [
"url": "/static/js/study.d9b5aa22.chunk.js"
},
{
"revision": "d5433e6195b0c07a4969",
"revision": "47115b8f7448e9769610",
"url": "/static/css/togroup.f08bc5f3.chunk.css"
},
{
"revision": "d5433e6195b0c07a4969",
"url": "/static/js/togroup.85e215c0.chunk.js"
"revision": "47115b8f7448e9769610",
"url": "/static/js/togroup.0e08d3a5.chunk.js"
},
{
"revision": "7b1f2837e2e8e9707c5c",
......@@ -260,7 +260,7 @@ self.__precacheManifest = [
"url": "/static/css/24.4abd5c22.chunk.css"
},
{
"revision": "22be235d1d874e956302e161b384763f",
"revision": "bf21e0fcc6eb8df1b75b1033c2269be6",
"url": "/index.html"
}
];
\ No newline at end of file
......@@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
importScripts(
"/precache-manifest.7ad1b921ff44a4726c6948f907b57fab.js"
"/precache-manifest.abdf81addf7cfcfa6ccc51a9cd6bf0c4.js"
);
workbox.clientsClaim();
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
!function(e){function r(r){for(var n,a,d=r[0],i=r[1],f=r[2],u=0,l=[];u<d.length;u++)a=d[u],o[a]&&l.push(o[a][0]),o[a]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(s&&s(r);l.length;)l.shift()();return c.push.apply(c,f||[]),t()}function t(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,a=1;a<t.length;a++){var i=t[a];0!==o[i]&&(n=!1)}n&&(c.splice(r--,1),e=d(d.s=t[0]))}return e}var n={},a={18:0},o={18:0},c=[];function d(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,d),t.l=!0,t.exports}d.e=function(e){var r=[];a[e]?r.push(a[e]):0!==a[e]&&{0:1,1:1,2:1,3:1,4:1,6:1,8:1,9:1,10:1,11:1,12:1,13:1,14:1,16:1,17:1,19:1,20:1,21:1,22:1,23:1,26:1,28:1,29:1,30:1,31:1}[e]&&r.push(a[e]=new Promise(function(r,t){for(var n="static/css/"+({0:"BargainMiddlePage",1:"Classify",2:"CourseList",3:"DrawDocument",4:"Examination",5:"MyEdit",6:"Order",7:"Orderinfo",8:"PayOrder",9:"Preferential",10:"SearchResult",11:"ShopCart",12:"aist-share",13:"coupons",14:"detail",16:"myorders",17:"purchased",19:"search",20:"shareposter",21:"study",22:"togroup",23:"video"}[e]||e)+"."+{0:"417c8635",1:"fb4bedde",2:"3bf9cf6e",3:"aeb3f822",4:"7bb0622b",5:"31d6cfe0",6:"c0945477",7:"31d6cfe0",8:"7eb7d317",9:"a285bc5d",10:"530e102d",11:"92ab48a3",12:"a97e13d0",13:"f2c7a13b",14:"6b1d509c",16:"67814bde",17:"19e06a3f",19:"5716d9b3",20:"76774ba4",21:"e132441c",22:"f08bc5f3",23:"56215f62",25:"31d6cfe0",26:"c76b300d",27:"31d6cfe0",28:"42a89c77",29:"bf839917",30:"35e22f8c",31:"57d8b033"}[e]+".chunk.css",o=d.p+n,c=document.getElementsByTagName("link"),i=0;i<c.length;i++){var f=(s=c[i]).getAttribute("data-href")||s.getAttribute("href");if("stylesheet"===s.rel&&(f===n||f===o))return r()}var u=document.getElementsByTagName("style");for(i=0;i<u.length;i++){var s;if((f=(s=u[i]).getAttribute("data-href"))===n||f===o)return r()}var l=document.createElement("link");l.rel="stylesheet",l.type="text/css",l.onload=r,l.onerror=function(r){var n=r&&r.target&&r.target.src||o,c=new Error("Loading CSS chunk "+e+" failed.\n("+n+")");c.request=n,delete a[e],l.parentNode.removeChild(l),t(c)},l.href=o,document.getElementsByTagName("head")[0].appendChild(l)}).then(function(){a[e]=0}));var t=o[e];if(0!==t)if(t)r.push(t[2]);else{var n=new Promise(function(r,n){t=o[e]=[r,n]});r.push(t[2]=n);var c,i=document.createElement("script");i.charset="utf-8",i.timeout=120,d.nc&&i.setAttribute("nonce",d.nc),i.src=function(e){return d.p+"static/js/"+({0:"BargainMiddlePage",1:"Classify",2:"CourseList",3:"DrawDocument",4:"Examination",5:"MyEdit",6:"Order",7:"Orderinfo",8:"PayOrder",9:"Preferential",10:"SearchResult",11:"ShopCart",12:"aist-share",13:"coupons",14:"detail",16:"myorders",17:"purchased",19:"search",20:"shareposter",21:"study",22:"togroup",23:"video"}[e]||e)+"."+{0:"2b56f15a",1:"18f1f73c",2:"a076dfff",3:"7af1171c",4:"124327b7",5:"23ff2aa9",6:"954eb44a",7:"4adde6f8",8:"426b6955",9:"dd37db70",10:"f8ca1c2c",11:"a7824661",12:"187f8c1d",13:"938bd70d",14:"244e6893",16:"1eba4115",17:"106dca9c",19:"b0ad2834",20:"91aadac7",21:"d9b5aa22",22:"85e215c0",23:"087b46c9",25:"29681c9e",26:"1eb4af6d",27:"4dd08449",28:"aba8b528",29:"461d17e0",30:"f2ca88f1",31:"20f868b0"}[e]+".chunk.js"}(e),c=function(r){i.onerror=i.onload=null,clearTimeout(f);var t=o[e];if(0!==t){if(t){var n=r&&("load"===r.type?"missing":r.type),a=r&&r.target&&r.target.src,c=new Error("Loading chunk "+e+" failed.\n("+n+": "+a+")");c.type=n,c.request=a,t[1](c)}o[e]=void 0}};var f=setTimeout(function(){c({type:"timeout",target:i})},12e4);i.onerror=i.onload=c,document.head.appendChild(i)}return Promise.all(r)},d.m=e,d.c=n,d.d=function(e,r,t){d.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},d.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},d.t=function(e,r){if(1&r&&(e=d(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(d.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)d.d(t,n,function(r){return e[r]}.bind(null,n));return t},d.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(r,"a",r),r},d.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},d.p="/",d.oe=function(e){throw console.error(e),e};var i=window.webpackJsonp=window.webpackJsonp||[],f=i.push.bind(i);i.push=r,i=i.slice();for(var u=0;u<i.length;u++)r(i[u]);var s=f;t()}([]);
//# sourceMappingURL=runtime~main.af17f50b.js.map
\ No newline at end of file
!function(e){function r(r){for(var n,a,d=r[0],i=r[1],f=r[2],u=0,l=[];u<d.length;u++)a=d[u],o[a]&&l.push(o[a][0]),o[a]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(s&&s(r);l.length;)l.shift()();return c.push.apply(c,f||[]),t()}function t(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,a=1;a<t.length;a++){var i=t[a];0!==o[i]&&(n=!1)}n&&(c.splice(r--,1),e=d(d.s=t[0]))}return e}var n={},a={18:0},o={18:0},c=[];function d(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,d),t.l=!0,t.exports}d.e=function(e){var r=[];a[e]?r.push(a[e]):0!==a[e]&&{0:1,1:1,2:1,3:1,4:1,6:1,8:1,9:1,10:1,11:1,12:1,13:1,14:1,16:1,17:1,19:1,20:1,21:1,22:1,23:1,26:1,28:1,29:1,30:1,31:1}[e]&&r.push(a[e]=new Promise(function(r,t){for(var n="static/css/"+({0:"BargainMiddlePage",1:"Classify",2:"CourseList",3:"DrawDocument",4:"Examination",5:"MyEdit",6:"Order",7:"Orderinfo",8:"PayOrder",9:"Preferential",10:"SearchResult",11:"ShopCart",12:"aist-share",13:"coupons",14:"detail",16:"myorders",17:"purchased",19:"search",20:"shareposter",21:"study",22:"togroup",23:"video"}[e]||e)+"."+{0:"417c8635",1:"fb4bedde",2:"3bf9cf6e",3:"aeb3f822",4:"7bb0622b",5:"31d6cfe0",6:"c0945477",7:"31d6cfe0",8:"7eb7d317",9:"a285bc5d",10:"530e102d",11:"92ab48a3",12:"a97e13d0",13:"f2c7a13b",14:"6b1d509c",16:"67814bde",17:"19e06a3f",19:"5716d9b3",20:"76774ba4",21:"e132441c",22:"f08bc5f3",23:"56215f62",25:"31d6cfe0",26:"c76b300d",27:"31d6cfe0",28:"42a89c77",29:"bf839917",30:"35e22f8c",31:"57d8b033"}[e]+".chunk.css",o=d.p+n,c=document.getElementsByTagName("link"),i=0;i<c.length;i++){var f=(s=c[i]).getAttribute("data-href")||s.getAttribute("href");if("stylesheet"===s.rel&&(f===n||f===o))return r()}var u=document.getElementsByTagName("style");for(i=0;i<u.length;i++){var s;if((f=(s=u[i]).getAttribute("data-href"))===n||f===o)return r()}var l=document.createElement("link");l.rel="stylesheet",l.type="text/css",l.onload=r,l.onerror=function(r){var n=r&&r.target&&r.target.src||o,c=new Error("Loading CSS chunk "+e+" failed.\n("+n+")");c.request=n,delete a[e],l.parentNode.removeChild(l),t(c)},l.href=o,document.getElementsByTagName("head")[0].appendChild(l)}).then(function(){a[e]=0}));var t=o[e];if(0!==t)if(t)r.push(t[2]);else{var n=new Promise(function(r,n){t=o[e]=[r,n]});r.push(t[2]=n);var c,i=document.createElement("script");i.charset="utf-8",i.timeout=120,d.nc&&i.setAttribute("nonce",d.nc),i.src=function(e){return d.p+"static/js/"+({0:"BargainMiddlePage",1:"Classify",2:"CourseList",3:"DrawDocument",4:"Examination",5:"MyEdit",6:"Order",7:"Orderinfo",8:"PayOrder",9:"Preferential",10:"SearchResult",11:"ShopCart",12:"aist-share",13:"coupons",14:"detail",16:"myorders",17:"purchased",19:"search",20:"shareposter",21:"study",22:"togroup",23:"video"}[e]||e)+"."+{0:"2b56f15a",1:"18f1f73c",2:"a076dfff",3:"7af1171c",4:"124327b7",5:"23ff2aa9",6:"954eb44a",7:"4adde6f8",8:"426b6955",9:"dd37db70",10:"f8ca1c2c",11:"a7824661",12:"187f8c1d",13:"938bd70d",14:"244e6893",16:"1eba4115",17:"106dca9c",19:"b0ad2834",20:"91aadac7",21:"d9b5aa22",22:"0e08d3a5",23:"087b46c9",25:"29681c9e",26:"1eb4af6d",27:"4dd08449",28:"aba8b528",29:"461d17e0",30:"f2ca88f1",31:"20f868b0"}[e]+".chunk.js"}(e),c=function(r){i.onerror=i.onload=null,clearTimeout(f);var t=o[e];if(0!==t){if(t){var n=r&&("load"===r.type?"missing":r.type),a=r&&r.target&&r.target.src,c=new Error("Loading chunk "+e+" failed.\n("+n+": "+a+")");c.type=n,c.request=a,t[1](c)}o[e]=void 0}};var f=setTimeout(function(){c({type:"timeout",target:i})},12e4);i.onerror=i.onload=c,document.head.appendChild(i)}return Promise.all(r)},d.m=e,d.c=n,d.d=function(e,r,t){d.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},d.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},d.t=function(e,r){if(1&r&&(e=d(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(d.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)d.d(t,n,function(r){return e[r]}.bind(null,n));return t},d.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(r,"a",r),r},d.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},d.p="/",d.oe=function(e){throw console.error(e),e};var i=window.webpackJsonp=window.webpackJsonp||[],f=i.push.bind(i);i.push=r,i=i.slice();for(var u=0;u<i.length;u++)r(i[u]);var s=f;t()}([]);
//# sourceMappingURL=runtime~main.08a5911b.js.map
\ No newline at end of file
......@@ -363,12 +363,14 @@ function ScrollBox(props) {
<div className="item-content">
<h2 className="item-title">{item.live_title}</h2>
<p className="item-teacher">讲师:{item.live_teacher_name}</p>
{/*公开课需预约、付费课不需要预约*/}
{
item.is_prepare && item.live_status === 0 &&
( item.is_prepare || item.is_free === 0) && item.live_status === 0 &&
<p className="item-time">时间:{item.live_start_time}</p>
}
{
!item.is_prepare && item.live_status === 0 &&
!item.is_prepare && item.live_status === 0 && item.is_free === 1 &&
<button className='item-btn'>预约</button>
}
{
......
......@@ -504,7 +504,7 @@
text-align: center;
height: 47px;
button {
button,a {
width: 60px;
height: 27px;
background-color: $bg_active;
......@@ -517,6 +517,11 @@
margin-left: -30px;
bottom: 10px;
}
a{
width: 90px;
line-height: 27px;
margin-left: -45px;
}
span {
width: 220px;
......
......@@ -2,6 +2,8 @@ import React, {Component} from 'react'
import './index.scss'
import {http, browser, validateTel} from '@/utils'
import {Toast} from 'antd-mobile'
import { Link } from "react-router-dom"
class LiveRoom extends Component {
constructor(props) {
......@@ -214,10 +216,14 @@ class LiveRoom extends Component {
</div>
<div className='course-subscribe'>
{
!roomMess.is_prepare && roomMess.course_id !== 0 &&
!roomMess.is_prepare && roomMess.is_free === 1 &&
<button onClick={this.toSubscribeFun}>预约</button>
}
{
roomMess.is_free === 0 &&
<Link to={`/detail?id=${roomMess.course_id}`}>查看课程</Link>
}
{
roomMess.is_prepare &&
<span>直播尚未开始,敬请期待...</span>
}
......
......@@ -207,6 +207,7 @@ class ToGroup extends Component {
function GorupContent(props) {
let tip, btn, dec, groupTip, shareTip, groupSuccessMbc;
const { pdd_price, data, groupon_member, is_success, person_num, userInfo, share, number, countdown } = props.data;
let ary=[],num = number;
while(num != 0) {
ary.push(num);
......@@ -252,11 +253,11 @@ function GorupContent(props) {
})
if(flag) {
tip = <p className='tip'>{`拼团省¥${pdd_price}元`}</p>
tip = <p className='tip'>{`拼团省¥${data.price1-pdd_price}元`}</p>
btn = <span className='group-btn' onClick={props.invitedFriends}>邀请好友参团 {countdown} 后结束</span>
dec = <p className='dec'>分享到3个群后,成团率高达98%</p>
} else {
tip = <p className='tip'>{`拼团省¥${pdd_price}元`}</p>
tip = <p className='tip'>{`拼团省¥${data.price1-pdd_price}元`}</p>
btn = <Link to={`/order?id=${data.course_id}`} className='group-btn'>一键参团</Link>
}
}
......
......@@ -76,7 +76,7 @@ class My extends PureComponent {
</Link>
{
!isVIP &&
<Link className="my-isvip" to={'/detail?id=139'}></Link>
<a href="javascript:;" className="my-isvip" onClick={() => this.toCourseDetail(139)}></a>
}
</List>
}
......
......@@ -22,5 +22,7 @@
margin-bottom: 21px;
}
.next_step {
margin-top: 32px;
}
}
\ No newline at end of file
......@@ -89,7 +89,7 @@ class ForgotPassword extends Component {
}
<OnSubmissionError callback={this.onSubmissionError}/>
<Captcha getInstance={this.getCaptchaInstance} onVerify={this.onVerify}/>
<Button active={isValid}>下一步</Button>
<Button className={'next_step'} active={isValid}>下一步</Button>
</Form>
</div>
</div>
......
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