Commit 8cd597d9 by xuzhenghua

双旦

parent 5b8a844c
self.__precacheManifest = [
{
"revision": "ef0f64163f60fbb99300",
"url": "/mrstatic/js/0.d77d77d7.chunk.js"
},
{
"revision": "d5f514e18fe8d241ec2c",
"url": "/mrstatic/js/1.1d80bb51.chunk.js"
},
{
"revision": "caf68c6bc6445f28a7f7",
"url": "/mrstatic/css/2.1133c967.chunk.css"
},
{
"revision": "caf68c6bc6445f28a7f7",
"url": "/mrstatic/js/2.c76491e4.chunk.js"
},
{
"revision": "031ddb106f1ab9f378fa",
"url": "/mrstatic/css/3.ac8fad1f.chunk.css"
},
{
"revision": "031ddb106f1ab9f378fa",
"url": "/mrstatic/js/3.cd3c0508.chunk.js"
},
{
"revision": "3d063a8e480d4d336392",
"url": "/mrstatic/css/Activity.b39c3782.chunk.css"
},
{
"revision": "3d063a8e480d4d336392",
"url": "/mrstatic/js/Activity.4f4c2c8b.chunk.js"
},
{
"revision": "e8bdaad6fdc2c95ebbf7",
"url": "/mrstatic/css/BargainMiddlePage.2a913483.chunk.css"
},
{
"revision": "e8bdaad6fdc2c95ebbf7",
"url": "/mrstatic/js/BargainMiddlePage.1b0cbd58.chunk.js"
},
{
"revision": "ac033e7bc84939e25878",
"url": "/mrstatic/css/Classify.127d35ae.chunk.css"
},
{
"revision": "ac033e7bc84939e25878",
"url": "/mrstatic/js/Classify.7a5c3114.chunk.js"
},
{
"revision": "8828f719cb518436890e",
"url": "/mrstatic/css/Country.400393b7.chunk.css"
},
{
"revision": "8828f719cb518436890e",
"url": "/mrstatic/js/Country.53054397.chunk.js"
},
{
"revision": "a322bfd5897aaf5ccbf3",
"url": "/mrstatic/css/CourseList.fed92c83.chunk.css"
},
{
"revision": "a322bfd5897aaf5ccbf3",
"url": "/mrstatic/js/CourseList.07ec868a.chunk.js"
},
{
"revision": "f7d9ffc0ad30682c1dbc",
"url": "/mrstatic/css/DrawDocument.1bd3da48.chunk.css"
},
{
"revision": "f7d9ffc0ad30682c1dbc",
"url": "/mrstatic/js/DrawDocument.6c4df6aa.chunk.js"
},
{
"revision": "6f50bf8e075c4f86163c",
"url": "/mrstatic/css/Examination.17af9370.chunk.css"
},
{
"revision": "6f50bf8e075c4f86163c",
"url": "/mrstatic/js/Examination.e4675c25.chunk.js"
},
{
"revision": "1a32b4fa17098153d9ed",
"url": "/mrstatic/css/Invite.b39c3782.chunk.css"
},
{
"revision": "1a32b4fa17098153d9ed",
"url": "/mrstatic/js/Invite.df910dd3.chunk.js"
},
{
"revision": "1401fc6f023497888f82",
"url": "/mrstatic/js/MyEdit.5c3f02b4.chunk.js"
},
{
"revision": "135da842462abfc4a33e",
"url": "/mrstatic/css/Order.83a999aa.chunk.css"
},
{
"revision": "135da842462abfc4a33e",
"url": "/mrstatic/js/Order.d48eea3c.chunk.js"
},
{
"revision": "ed5737203074b6273821",
"url": "/mrstatic/js/Orderinfo.16f2a4c2.chunk.js"
},
{
"revision": "eef01dd3b9540bcfc59a",
"url": "/mrstatic/css/PayOrder.68a25070.chunk.css"
},
{
"revision": "eef01dd3b9540bcfc59a",
"url": "/mrstatic/js/PayOrder.8187998e.chunk.js"
},
{
"revision": "fb4be297bf69b212f973",
"url": "/mrstatic/css/Preferential.ccebc534.chunk.css"
},
{
"revision": "fb4be297bf69b212f973",
"url": "/mrstatic/js/Preferential.e85f1864.chunk.js"
},
{
"revision": "b5895022bb0dffaebb77",
"url": "/mrstatic/css/SearchResult.6d7d1b77.chunk.css"
},
{
"revision": "b5895022bb0dffaebb77",
"url": "/mrstatic/js/SearchResult.fffb46b1.chunk.js"
},
{
"revision": "f5b32ddca1c7e6f00feb",
"url": "/mrstatic/css/ShareCourse.6e885738.chunk.css"
},
{
"revision": "f5b32ddca1c7e6f00feb",
"url": "/mrstatic/js/ShareCourse.63a835db.chunk.js"
},
{
"revision": "087cf1a5a3277ab5f623",
"url": "/mrstatic/css/ShopCart.887eb690.chunk.css"
},
{
"revision": "087cf1a5a3277ab5f623",
"url": "/mrstatic/js/ShopCart.f3047aad.chunk.js"
},
{
"revision": "c7231ce7d8b9562a50c7",
"url": "/mrstatic/css/aist-share.affb05d7.chunk.css"
},
{
"revision": "c7231ce7d8b9562a50c7",
"url": "/mrstatic/js/aist-share.0ad652d5.chunk.js"
},
{
"revision": "10c92f0552680a90ea81",
"url": "/mrstatic/css/blessing-getPrize.32a9cccc.chunk.css"
},
{
"revision": "10c92f0552680a90ea81",
"url": "/mrstatic/js/blessing-getPrize.d2a85415.chunk.js"
},
{
"revision": "0099f80cec74f2f5621e",
"url": "/mrstatic/css/blessing-preheat.5dc65c0d.chunk.css"
},
{
"revision": "0099f80cec74f2f5621e",
"url": "/mrstatic/js/blessing-preheat.435d97cd.chunk.js"
},
{
"revision": "7104b6e51001f5f77445",
"url": "/mrstatic/css/blessing-rank.39fb77c8.chunk.css"
},
{
"revision": "7104b6e51001f5f77445",
"url": "/mrstatic/js/blessing-rank.867eb5a0.chunk.js"
},
{
"revision": "87fa60999e6aa41627b5",
"url": "/mrstatic/css/coupons.0ce3fd3d.chunk.css"
},
{
"revision": "87fa60999e6aa41627b5",
"url": "/mrstatic/js/coupons.7fbfea17.chunk.js"
},
{
"revision": "a60057f79274dbd52e23",
"url": "/mrstatic/css/deposit-order.2e5f43c4.chunk.css"
},
{
"revision": "a60057f79274dbd52e23",
"url": "/mrstatic/js/deposit-order.0135e56c.chunk.js"
},
{
"revision": "e2fd3c476efddda79102",
"url": "/mrstatic/css/deposit-pay-order.e8363b32.chunk.css"
},
{
"revision": "e2fd3c476efddda79102",
"url": "/mrstatic/js/deposit-pay-order.659a509b.chunk.js"
},
{
"revision": "950a1cd14446b74702d9",
"url": "/mrstatic/css/detail.55b938da.chunk.css"
},
{
"revision": "950a1cd14446b74702d9",
"url": "/mrstatic/js/detail.49dc727c.chunk.js"
},
{
"revision": "01074c6a860532275a6e",
"url": "/mrstatic/css/main.5e7d7bb2.chunk.css"
},
{
"revision": "01074c6a860532275a6e",
"url": "/mrstatic/js/main.19903c38.chunk.js"
},
{
"revision": "ccd54b380fd52e65d84f",
"url": "/mrstatic/css/myorders.841d0cfb.chunk.css"
},
{
"revision": "ccd54b380fd52e65d84f",
"url": "/mrstatic/js/myorders.619100e6.chunk.js"
},
{
"revision": "f7f23ab2abf02e79102f",
"url": "/mrstatic/css/prize-winner-list.dc21d885.chunk.css"
},
{
"revision": "f7f23ab2abf02e79102f",
"url": "/mrstatic/js/prize-winner-list.09039b2b.chunk.js"
},
{
"revision": "b90571ade4d783255a2b",
"url": "/mrstatic/css/purchased.7558403e.chunk.css"
},
{
"revision": "b90571ade4d783255a2b",
"url": "/mrstatic/js/purchased.3ea67700.chunk.js"
},
{
"revision": "9251c71cae2b39093a56",
"url": "/mrstatic/css/python-class.11408886.chunk.css"
},
{
"revision": "9251c71cae2b39093a56",
"url": "/mrstatic/js/python-class.b6afbbaa.chunk.js"
},
{
"revision": "b445c6e26bf9ef404f53",
"url": "/mrstatic/js/runtime~main.ef7702b0.js"
},
{
"revision": "39b606ec549cfee8a0d2",
"url": "/mrstatic/css/search.efa1dd44.chunk.css"
},
{
"revision": "39b606ec549cfee8a0d2",
"url": "/mrstatic/js/search.0e502e29.chunk.js"
},
{
"revision": "1c3131e89ecf384ca1c0",
"url": "/mrstatic/css/shareposter.cde549fc.chunk.css"
},
{
"revision": "1c3131e89ecf384ca1c0",
"url": "/mrstatic/js/shareposter.88143f5a.chunk.js"
},
{
"revision": "70cdf307c50ec63162f1",
"url": "/mrstatic/css/study.62b8863b.chunk.css"
},
{
"revision": "70cdf307c50ec63162f1",
"url": "/mrstatic/js/study.2c968a8e.chunk.js"
},
{
"revision": "9b799d4131982b9c89c6",
"url": "/mrstatic/css/togroup.ffd8be6c.chunk.css"
},
{
"revision": "9b799d4131982b9c89c6",
"url": "/mrstatic/js/togroup.74eb9bc4.chunk.js"
},
{
"revision": "bee476e77ab3d9614002",
"url": "/mrstatic/css/video.b3755c1b.chunk.css"
},
{
"revision": "bee476e77ab3d9614002",
"url": "/mrstatic/js/video.35b134eb.chunk.js"
},
{
"revision": "fc2998bfb936266c1a82",
"url": "/mrstatic/css/39.2c1f7d7c.chunk.css"
},
{
"revision": "fc2998bfb936266c1a82",
"url": "/mrstatic/js/39.0c755b39.chunk.js"
},
{
"revision": "ca174918cb4c39b06e45",
"url": "/mrstatic/css/40.976b2058.chunk.css"
},
{
"revision": "ca174918cb4c39b06e45",
"url": "/mrstatic/js/40.bc77485a.chunk.js"
},
{
"revision": "ff3b0d363210ed871188",
"url": "/mrstatic/css/41.51412fcd.chunk.css"
},
{
"revision": "ff3b0d363210ed871188",
"url": "/mrstatic/js/41.336fde4a.chunk.js"
},
{
"revision": "bf2f1a1fe64fc59720fd",
"url": "/mrstatic/js/42.737f4d32.chunk.js"
},
{
"revision": "5e600bd95d4066c5f17e",
"url": "/mrstatic/css/43.e292ab6b.chunk.css"
},
{
"revision": "5e600bd95d4066c5f17e",
"url": "/mrstatic/js/43.cecef918.chunk.js"
},
{
"revision": "793b314badd59885f2d5",
"url": "/mrstatic/css/44.37fb0c23.chunk.css"
},
{
"revision": "793b314badd59885f2d5",
"url": "/mrstatic/js/44.67979cf5.chunk.js"
},
{
"revision": "673200a7bf7999bd697a",
"url": "/mrstatic/css/45.56b04545.chunk.css"
},
{
"revision": "673200a7bf7999bd697a",
"url": "/mrstatic/js/45.4d1126c9.chunk.js"
},
{
"revision": "7128b3033a43b924cb94",
"url": "/mrstatic/css/46.ce17075b.chunk.css"
},
{
"revision": "7128b3033a43b924cb94",
"url": "/mrstatic/js/46.cec05770.chunk.js"
},
{
"revision": "7b1fd48ea61212b54260",
"url": "/mrstatic/css/47.bacf914e.chunk.css"
},
{
"revision": "7b1fd48ea61212b54260",
"url": "/mrstatic/js/47.f546a7de.chunk.js"
},
{
"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": "e0655d4da66dce391e6b5227b400e037",
"url": "/mrstatic/media/iconfont.e0655d4d.woff"
},
{
"revision": "81a489ac63f2f2df5ab412e0782bd54c",
"url": "/mrstatic/media/kanjia_cg_icon.81a489ac.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"
},
{
"revision": "8edaf2ff2566ed17e2dd22cf4f8ad7ae",
"url": "/mrstatic/media/redb_chai_bj@2x.8edaf2ff.png"
},
{
"revision": "c79abf5cb7ae8a82009cf68fe44d1078",
"url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
},
{
"revision": "6902434f8f18a23319d57d0ac8aaea8c",
"url": "/mrstatic/media/redb_sp_bj@2x.6902434f.png"
},
{
"revision": "79139f6aad350256e151f9f73c226348",
"url": "/mrstatic/media/hb_bj.79139f6a.png"
},
{
"revision": "3497ba5b7882387d85905e1bb3d2b4b7",
"url": "/index.html"
}
];
\ No newline at end of file
import React, { Component } from 'react';
import { Link } from 'react-router-dom';
import {CopyToClipboard} from 'react-copy-to-clipboard';
import AceEditor from 'react-ace';
import { Toast } from "antd-mobile"
......@@ -16,10 +17,10 @@ class PythonClass extends Component {
isWechat: browser.isWeixin,
isShare: true,
type: '1', // 1:课后习题,2:课堂习题
entryMode: 1, // 0:扫码页,1:落地页,2:直接进入
entryMode: 0, // 0:扫码页,1:落地页,2:直接进入
isExecute: false,
isCopy: false,
command: 'http://m.julyedu.com/python?from=python',
command: '',
data: {}
}
}
......@@ -27,6 +28,13 @@ class PythonClass extends Component {
componentDidMount() {
this.handleFetchInfo();
this.initPageStatus();
this.initCommand();
}
initCommand = () => {
this.setState({
command: `${API.m}/pythonShare?id=${getParam('id')}&type=${getParam('type')}&ques=${getParam('ques')}&from=python`
})
}
initPageStatus = () => {
......@@ -57,8 +65,12 @@ class PythonClass extends Component {
handleFetchInfo = () => {
const id = getParam('id') || 10;
http.get(`${API.home}/web/python/share/help/${id}`).then(res => {
console.log(res);
// http.get(`${API.home}/web/python/share/help/${id}`).then(res => {
http.get(`${API.home}/m/it/share/show`, {
params: {
id
}
}).then(res => {
const { code, data } = res.data;
if(code === 200) {
this.setState({
......@@ -74,7 +86,7 @@ class PythonClass extends Component {
this.setState({
entryMode: 1
});
history.push(`/python?id=${getParam('id')}&type=${getParam('type')}&ques=${getParam('ques')}&from=python`);
history.push(`/pythonShare?id=${getParam('id')}&type=${getParam('type')}&ques=${getParam('ques')}&from=python`);
}
}
......@@ -91,6 +103,12 @@ class PythonClass extends Component {
});
}
handleToHide = () => {
this.setState({
entryMode: 2
});
}
render() {
const { isWechat, isShare, isExecute, type, entryMode, command, isCopy, data } = this.state;
return (
......@@ -112,6 +130,7 @@ class PythonClass extends Component {
handleToExecute={this.handleToExecute}
handleToSend={this.handleToSend}
copyToSuccess={this.copyToSuccess}
handleToHide={this.handleToHide}
/>
</>
);
......@@ -143,10 +162,11 @@ function PythonContent(props) {
entryMode,
isCopy,
command,
data: { head_img, nickname, code_lines, code, result, ques_name, course_name, video_name },
data: { head_img, nickname, code_lines, code, result, ques_name, course_name, course_id, video_name },
handleToSend,
copyToSuccess,
handleToExecute
handleToExecute,
handleToHide
} = props;
let labelName = '';
if(type === '1') {
......@@ -180,7 +200,7 @@ function PythonContent(props) {
{
(entryMode === 1 && isWechat) &&
<div className="python-popup">
<div className="python-popup" onClick={handleToHide}>
<div className="python-header">
<p className="python-wechat__title">请点击右上角分享</p>
<i className="iconfont iconyindao"></i>
......@@ -230,23 +250,20 @@ function PythonContent(props) {
}
</div>
<h4 className="python-code__title">
{entryMode !== 0 && isShare? `这是Ta的第${code_lines}行代码` : '运行结果'}
{entryMode !== 0 && isShare && !isWechat? `这是Ta的第${code_lines}行代码` : '运行结果'}
</h4>
<div className="python-code__content">
<SelfAceEditor code={entryMode !== 0 && isShare? code : result} />
<SelfAceEditor code={entryMode !== 0 && isShare && !isWechat? code : result} />
</div>
<h4 className="python-code__title">{entryMode === 0? '代码' : '运行结果'}</h4>
<h4 className="python-code__title">{entryMode !== 0 && isShare && !isWechat? '运行结果' : '代码'}</h4>
<div className="python-code__content">
{
entryMode === 0 &&
<SelfAceEditor code={code} />
}
{
entryMode !== 0 &&
<SelfAceEditor code={isExecute? result : ''} />
entryMode !== 0 && isShare && !isWechat
? <SelfAceEditor code={isExecute? result : ''} />
: <SelfAceEditor code={code} />
}
{
(entryMode !== 0 && isShare && !isExecute) &&
(entryMode !== 0 && isShare && !isWechat && !isExecute) &&
<button className="python-button python-button__execute" onClick={handleToExecute}>运行看看</button>
}
</div>
......@@ -254,7 +271,9 @@ function PythonContent(props) {
{
(entryMode === 0 && isWechat) &&
<button className="python-button python-button__study" onClick={handleToSend}>发给好友</button>
<button className="python-button python-button__study" onClick={handleToSend}>
{isShare? '分享给好友' : '发给好友求助'}
</button>
}
{
......@@ -263,18 +282,20 @@ function PythonContent(props) {
text={command}
onCopy={copyToSuccess}
>
<button className="python-button python-button__study">发给好友</button>
<button className="python-button python-button__study">
{isShare? '分享给好友' : '发给好友求助'}
</button>
</CopyToClipboard>
}
{
(entryMode === 0 && !isWechat && isCopy) &&
<button className="python-button python-button__study">已复制链接,快去粘贴发给好友吧~</button>
<p className="python-button__tip">已复制链接,快去粘贴发给好友吧~</p>
}
{
entryMode !== 0 &&
<button className="python-button python-button__study">我也要学Python</button>
<Link className="python-button python-button__study" to={`/python?id=${course_id}`}>我也要学Python</Link>
}
</div>
);
......
......@@ -135,10 +135,20 @@
font-weight: 500;
color: #2D56F0;
line-height: 44px;
text-align: center;
background-color: #FFF95B;
box-shadow: 0px 5px 0px rgba(255,210,0,1);
}
.python-button__tip {
margin: 35px 0 0;
font-size: 15px;
font-weight: 500;
color: #fff;
line-height: 44px;
text-align: center;
}
.python-button__execute {
position: absolute;
top: 0;
......
......@@ -1237,16 +1237,16 @@
"@types/unist" "*"
"@types/vfile-message" "*"
"@videojs/http-streaming@1.10.3":
version "1.10.3"
resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-1.10.3.tgz#0c028443b9a3c96da85e5995748ed94280884584"
integrity sha512-fxXtwVrQBdhOFh6GymPAPCb4utCI01Zs5fdyZgtR6FSsaz/zGmnzfNS5GvNjBi/hZviMsbNPFaOTTFMMNLNA3A==
"@videojs/http-streaming@1.10.6":
version "1.10.6"
resolved "https://registry.npm.taobao.org/@videojs/http-streaming/download/@videojs/http-streaming-1.10.6.tgz#a9119b1828b354c5cc17b42ea051cc7bcce2dca0"
integrity sha1-qRGbGCizVMXMF7QuoFHMe8zi3KA=
dependencies:
aes-decrypter "3.0.0"
global "^4.3.0"
m3u8-parser "4.3.0"
m3u8-parser "4.4.0"
mpd-parser "0.8.1"
mux.js "5.1.3"
mux.js "5.2.1"
url-toolkit "^2.1.3"
video.js "^6.8.0 || ^7.0.0"
......@@ -6953,6 +6953,13 @@ m3u8-parser@4.3.0:
dependencies:
global "^4.3.2"
m3u8-parser@4.4.0:
version "4.4.0"
resolved "https://registry.npm.taobao.org/m3u8-parser/download/m3u8-parser-4.4.0.tgz#adf606c0af6d97f6750095a42006c2ae03dde177"
integrity sha1-rfYGwK9tl/Z1AJWkIAbCrgPd4Xc=
dependencies:
global "^4.3.2"
make-dir@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
......@@ -7354,10 +7361,10 @@ mux.js@5.1.1:
resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.1.1.tgz#0e95f048b4ac51d413c9ddc2d78e4cefad8d06de"
integrity sha512-Mf/UYmh5b8jvUP+jmrTbETnyFZprMdbT0RxKm/lJ/4d2Q3xdc5GaHaRPI1zVV5D3+6uxArVPm78QEb1RsrmaQw==
mux.js@5.1.3:
version "5.1.3"
resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.1.3.tgz#1a59b8979a6780be5bcb63983c7e883c90cd615b"
integrity sha512-FhDcysLvAkO9H8ftBJ2sK1O4Rmz0AWnMS+2uqP7WjrnaAyE/ox11GEiZkRzrWIdp8at9R9qBHDqdURY3/h/xTg==
mux.js@5.2.1:
version "5.2.1"
resolved "https://registry.npm.taobao.org/mux.js/download/mux.js-5.2.1.tgz#6698761fc88da5acecea0758ac25f11d3a08bee8"
integrity sha1-Zph2H8iNpazs6gdYrCXxHToIvug=
nan@^2.12.1:
version "2.13.2"
......@@ -11528,17 +11535,16 @@ vfile@^4.0.0:
videojs-vtt.js "0.14.1"
xhr "2.4.0"
video.js@^7.6.0:
version "7.6.0"
resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.6.0.tgz#556c151004e27d340be3a732a14bf7c1aaf7e8b4"
integrity sha512-A0HSKzAmcYkd1xyExqUlM6n8bkghcX54iCvW08bPvvl3UHt8d8zijuylfIWu8vo1Z8fYyk9HPOFs1i3Cldr/cw==
video.js@^7.6.5:
version "7.6.6"
resolved "https://registry.npm.taobao.org/video.js/download/video.js-7.6.6.tgz#e7c9163d53f9b0e05ccb5ac0f79d02fa49b4d3ac"
integrity sha1-58kWPVP5sOBcy1rA950C+km006w=
dependencies:
"@babel/runtime" "^7.4.5"
"@videojs/http-streaming" "1.10.3"
"@videojs/http-streaming" "1.10.6"
global "4.3.2"
keycode "^2.2.0"
safe-json-parse "4.0.0"
tsml "1.0.1"
videojs-font "3.2.0"
videojs-vtt.js "^0.14.1"
xhr "2.4.0"
......
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