Skip to content

M
mr-julyedu
Commit 031fd158 by FE
Options

build

parents fa26c498 52738d02
Showing with 98 additions and 52 deletions
build/asset-manifest.json
......@@ -7,7 +7,7 @@
"mrstatic/css/2.1133c967.chunk.css": "/mrstatic/css/2.1133c967.chunk.css",
"mrstatic/js/2.27491ad8.chunk.js": "/mrstatic/js/2.27491ad8.chunk.js",
"mrstatic/js/2.27491ad8.chunk.js.map": "/mrstatic/js/2.27491ad8.chunk.js.map",
"mrstatic/css/3.ac8fad1f.chunk.css": "/mrstatic/css/3.ac8fad1f.chunk.css",
"mrstatic/css/3.9c10cbdc.chunk.css": "/mrstatic/css/3.9c10cbdc.chunk.css",
"mrstatic/js/3.af6d17fa.chunk.js": "/mrstatic/js/3.af6d17fa.chunk.js",
"mrstatic/js/3.af6d17fa.chunk.js.map": "/mrstatic/js/3.af6d17fa.chunk.js.map",
"Activity.css": "/mrstatic/css/Activity.08739942.chunk.css",
......@@ -98,11 +98,11 @@
"purchased.css": "/mrstatic/css/purchased.7558403e.chunk.css",
"purchased.js": "/mrstatic/js/purchased.84142f1d.chunk.js",
"purchased.js.map": "/mrstatic/js/purchased.84142f1d.chunk.js.map",
"python-class.css": "/mrstatic/css/python-class.13b5b2f3.chunk.css",
"python-class.js": "/mrstatic/js/python-class.32912065.chunk.js",
"python-class.js.map": "/mrstatic/js/python-class.32912065.chunk.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.60dbd628.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.60dbd628.js.map",
"python-class.css": "/mrstatic/css/python-class.821064f5.chunk.css",
"python-class.js": "/mrstatic/js/python-class.ff994438.chunk.js",
"python-class.js.map": "/mrstatic/js/python-class.ff994438.chunk.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.0f447f2c.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.0f447f2c.js.map",
"search.css": "/mrstatic/css/search.efa1dd44.chunk.css",
"search.js": "/mrstatic/js/search.e967606f.chunk.js",
"search.js.map": "/mrstatic/js/search.e967606f.chunk.js.map",
......@@ -152,7 +152,7 @@
"index.html": "/index.html",
"mrstatic/css/1.4db54483.chunk.css.map": "/mrstatic/css/1.4db54483.chunk.css.map",
"mrstatic/css/2.1133c967.chunk.css.map": "/mrstatic/css/2.1133c967.chunk.css.map",
"mrstatic/css/3.ac8fad1f.chunk.css.map": "/mrstatic/css/3.ac8fad1f.chunk.css.map",
"mrstatic/css/3.9c10cbdc.chunk.css.map": "/mrstatic/css/3.9c10cbdc.chunk.css.map",
"mrstatic/css/42.2c1f7d7c.chunk.css.map": "/mrstatic/css/42.2c1f7d7c.chunk.css.map",
"mrstatic/css/44.976b2058.chunk.css.map": "/mrstatic/css/44.976b2058.chunk.css.map",
"mrstatic/css/45.51412fcd.chunk.css.map": "/mrstatic/css/45.51412fcd.chunk.css.map",
......@@ -189,7 +189,7 @@
"mrstatic/css/newyear-yearIndex.a0a74bc1.chunk.css.map": "/mrstatic/css/newyear-yearIndex.a0a74bc1.chunk.css.map",
"mrstatic/css/prize-winner-list.ce85cb83.chunk.css.map": "/mrstatic/css/prize-winner-list.ce85cb83.chunk.css.map",
"mrstatic/css/purchased.7558403e.chunk.css.map": "/mrstatic/css/purchased.7558403e.chunk.css.map",
"mrstatic/css/python-class.13b5b2f3.chunk.css.map": "/mrstatic/css/python-class.13b5b2f3.chunk.css.map",
"mrstatic/css/python-class.821064f5.chunk.css.map": "/mrstatic/css/python-class.821064f5.chunk.css.map",
"mrstatic/css/search.efa1dd44.chunk.css.map": "/mrstatic/css/search.efa1dd44.chunk.css.map",
"mrstatic/css/shareposter.cde549fc.chunk.css.map": "/mrstatic/css/shareposter.cde549fc.chunk.css.map",
"mrstatic/css/study.62b8863b.chunk.css.map": "/mrstatic/css/study.62b8863b.chunk.css.map",
......@@ -200,6 +200,6 @@
"mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.e0655d4d.woff",
"mrstatic/media/kanjia_cg_icon.png": "/mrstatic/media/kanjia_cg_icon.81a489ac.png",
"mrstatic/media/video.scss": "/mrstatic/media/progress-share-bg.80011994.png",
"precache-manifest.8005004d870f966ebb51dce82c44890c.js": "/precache-manifest.8005004d870f966ebb51dce82c44890c.js",
"precache-manifest.7ab8a06e1459ca8151425b8f04197322.js": "/precache-manifest.7ab8a06e1459ca8151425b8f04197322.js",
"service-worker.js": "/service-worker.js"
}
\ No newline at end of file
build/precache-manifest.8005004d870f966ebb51dce82c44890c.js → build/precache-manifest.7ab8a06e1459ca8151425b8f04197322.js
......@@ -20,11 +20,11 @@ self.__precacheManifest = [
"url": "/mrstatic/js/2.27491ad8.chunk.js"
},
{
"revision": "baedadad026d81f58acb",
"url": "/mrstatic/css/3.ac8fad1f.chunk.css"
"revision": "b8d9c19c6a656cc25c0b",
"url": "/mrstatic/css/3.9c10cbdc.chunk.css"
},
{
"revision": "baedadad026d81f58acb",
"revision": "b8d9c19c6a656cc25c0b",
"url": "/mrstatic/js/3.af6d17fa.chunk.js"
},
{
......@@ -260,16 +260,16 @@ self.__precacheManifest = [
"url": "/mrstatic/js/purchased.84142f1d.chunk.js"
},
{
"revision": "2b20557acb85f7b2d052",
"url": "/mrstatic/css/python-class.13b5b2f3.chunk.css"
"revision": "71ca54de27152c12a49b",
"url": "/mrstatic/css/python-class.821064f5.chunk.css"
},
{
"revision": "2b20557acb85f7b2d052",
"url": "/mrstatic/js/python-class.32912065.chunk.js"
"revision": "71ca54de27152c12a49b",
"url": "/mrstatic/js/python-class.ff994438.chunk.js"
},
{
"revision": "8ea940a42e68d0a7ac74",
"url": "/mrstatic/js/runtime~main.60dbd628.js"
"revision": "9eb685da529d793a9f5f",
"url": "/mrstatic/js/runtime~main.0f447f2c.js"
},
{
"revision": "ef93561a000d86220cd0",
......@@ -392,34 +392,34 @@ self.__precacheManifest = [
"url": "/mrstatic/js/51.b545b340.chunk.js"
},
{
"revision": "e0655d4da66dce391e6b5227b400e037",
"url": "/mrstatic/media/iconfont.e0655d4d.woff"
"revision": "7aa984cefad739ea18edb76c541aa1fd",
"url": "/mrstatic/media/iconfont.7aa984ce.eot"
},
{
"revision": "b9b072e1116fd1830cc8f425dc163a6b",
"url": "/mrstatic/media/iconfont.b9b072e1.svg"
"revision": "e0655d4da66dce391e6b5227b400e037",
"url": "/mrstatic/media/iconfont.e0655d4d.woff"
},
{
"revision": "258b4b114d3d9be3018cd113b2470a13",
"url": "/mrstatic/media/iconfont.258b4b11.ttf"
},
{
"revision": "7aa984cefad739ea18edb76c541aa1fd",
"url": "/mrstatic/media/iconfont.7aa984ce.eot"
"revision": "b9b072e1116fd1830cc8f425dc163a6b",
"url": "/mrstatic/media/iconfont.b9b072e1.svg"
},
{
"revision": "81a489ac63f2f2df5ab412e0782bd54c",
"url": "/mrstatic/media/kanjia_cg_icon.81a489ac.png"
},
{
"revision": "d76ebce726bdf3459fa14e96d84c5b9a",
"url": "/mrstatic/media/formal-banner.d76ebce7.png"
},
{
"revision": "9ab091267ae7c83bd30d0f5ad018a8c9",
"url": "/mrstatic/media/dalibao_bj.9ab09126.png"
},
{
"revision": "d76ebce726bdf3459fa14e96d84c5b9a",
"url": "/mrstatic/media/formal-banner.d76ebce7.png"
},
{
"revision": "80011994e30adf599e5f47fcc81bc06d",
"url": "/mrstatic/media/progress-share-bg.80011994.png"
},
......@@ -428,10 +428,6 @@ self.__precacheManifest = [
"url": "/mrstatic/media/redb_chai_bj@2x.8edaf2ff.png"
},
{
"revision": "79139f6aad350256e151f9f73c226348",
"url": "/mrstatic/media/hb_bj.79139f6a.png"
},
{
"revision": "c79abf5cb7ae8a82009cf68fe44d1078",
"url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
},
......@@ -440,7 +436,11 @@ self.__precacheManifest = [
"url": "/mrstatic/media/redb_sp_bj@2x.6902434f.png"
},
{
"revision": "93f1d2d1793b470c73f023b659e40041",
"revision": "79139f6aad350256e151f9f73c226348",
"url": "/mrstatic/media/hb_bj.79139f6a.png"
},
{
"revision": "7f99fac291966dace5a322a8d1ce36e0",
"url": "/index.html"
}
];
\ No newline at end of file
build/service-worker.js
......@@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
importScripts(
"/precache-manifest.8005004d870f966ebb51dce82c44890c.js"
"/precache-manifest.7ab8a06e1459ca8151425b8f04197322.js"
);
workbox.clientsClaim();
......
src/components/python/index.js
import React, {Component} from 'react'
import {http, getParam, browser} from '@/utils'
import {http, getParam, browser, SendMessageToApp} from '@/utils'
import PythonDes from './pythomDes'
import PythonStudy from './pythonStudy'
import {connect} from "react-redux"
......@@ -61,10 +61,12 @@ class Python extends Component {
this.setState({
isAppUpdate: true
})
this.fetchCourseInfo();
}
this.props.setCurrentUser(this.transformUser(this.state.userInfoList))
this.props.setCurrentUser(this.transformUser(this.state.userInfoList));
}
transformUser = res => {
let payload
......@@ -98,18 +100,16 @@ class Python extends Component {
backwardVersion: true,
isPay: 0,
})
}else{
this.setState({
backwardVersion: false,
isPay: data.course_info.is_pay
})
}
if(browser.isIOSApp && version < 380) { // ISO的低版本
}else if(browser.isIOSApp && version < 380) { // ISO的低版本
this.setState({
backwardVersion: true,
isPay: 0,
})
}else{
}else{ // 安卓/IOS 的高版本
if(data.course_info.is_pay === 1) { // 在APP内未登录-去登陆-登录后还显示此页；如果是已购买的用户 就需要跳转到 APP已购买的原生页面
SendMessageToApp('toSyllabusChapter', id); // 跳转到APP的已购买详情页 id 是课程ID
return;
}
this.setState({
backwardVersion: false,
isPay: data.course_info.is_pay
......@@ -131,7 +131,14 @@ class Python extends Component {
return (
<div>
{
isPay === 0 && <PythonDes history={this.props.history} isAppUpdate={isAppUpdate} backwardVersion={backwardVersion} isPay={isPay}></PythonDes>
isPay === 0 && (
<PythonDes
backwardVersion={backwardVersion}
history={this.props.history}
isAppUpdate={isAppUpdate}
isPay={isPay}
/>
)
}
{
(isPay === 1 && !getParam('version')) && <PythonStudy isAppUpdate={isAppUpdate}/>
......
src/components/python/pythomDes/Test/index.js
......@@ -35,7 +35,7 @@ export default class Test extends Component {
<div className={'table_body'}>
{
this.props.practice.map((item, index)=>{
return <div key={index}>
return <div className="stage-item" key={index}>
<div className='stage'>{`第${this.Change(item.stage)}阶段 ${item.name}`}</div>
{
item.questions.map((question, index)=>{
......
src/components/python/pythomDes/Test/index.scss
......@@ -49,6 +49,10 @@
.table_body {
background: #34AFFF;
.stage-item {
border-bottom: 1px solid #0099FF;
}
.stage {
height: 38px;
font-size: 14px;
......@@ -59,6 +63,7 @@
justify-content: center;
align-items: center;
}
.line {
display: flex;
justify-content: space-between;
......@@ -94,7 +99,6 @@
.table_bottom {
height: 36px;
background: #3DB1FF;
border-top: 1px solid #0099FF;
div {
display: flex;
justify-content: center;
......
src/components/python/pythomDes/index.js
......@@ -121,7 +121,7 @@ class PythonDes extends Component {
}
toLearn = () => {
const {backwardVersion, isPay} = this.props;
const {backwardVersion} = this.props;
http.post(`${API['home']}/m/it/user/trialCourse`, {course_id: getParam('id')}).then((res) => {
const {code, msg} = res.data
if (code == 200) {
......@@ -133,7 +133,7 @@ class PythonDes extends Component {
if(backwardVersion) {
Toast.info('当前版本不支持该课程模式，请升级到最新版本或前往PC端体验', 2)
} else {
SendMessageToApp("toLearn")
SendMessageToApp("toLearn", getParam('id'))
}
}
} else {
......@@ -149,7 +149,7 @@ class PythonDes extends Component {
}
toDetail = () => {
const {backwardVersion, isPay} = this.props;
const {backwardVersion} = this.props;
const id = getParam('id')
if (!getParam('version')) { // H5
http.get(`${API['base-api']}/m/cart/addtopreorder/[${id}]`).then((res) => {
......@@ -304,10 +304,18 @@ class PythonDes extends Component {
<Description list={desList} />
<NoWorry list={worryList}></NoWorry>
<Study syllabus={syllabus} allSyllabusShow={allSyllabusShow} show={this.showAll}
hide={this.hideSome}></Study>
<Test practice={practice} allPracticeShow={allPracticeShow} show={this.showAll}
hide={this.hideSome}></Test>
{/* 课后实操 */}
<Test
practice={practice}
allPracticeShow={allPracticeShow}
show={this.showAll}
hide={this.hideSome}
/>
<Team/>
{/* 试学体验 */}
......
src/components/python/pythonStudy/index.scss
......@@ -59,9 +59,34 @@ html:not([data-scale]) .am-accordion.python-study__stage .am-accordion-item .am-
display: flex;
align-items: center;
justify-content: space-between;
position: relative;
height: 55px;
padding: 0 12px;
background-color: #1A9BFC;
&::after {
content: '';
position: absolute;
left: -60px;
top: 0;
width: 146px;
height: 100%;
background-repeat: no-repeat;
background-size: 100% auto;
background-image: url('https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/pythonCourse/pc/python-title-bg-1.png');
}
&::before {
content: '';
position: absolute;
right: -60px;
bottom: -20px;
width: 106px;
height: 100%;
background-repeat: no-repeat;
background-size: 100% auto;
background-image: url('https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/pythonCourse/pc/python-title-bg-0.png');
}
}
.python-study__course-name {
......
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