Skip to content

M
mr-julyedu
Commit 63a49acf by FE
Options

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

parents 6fb92842 476f97f7
Showing with 90 additions and 13 deletions
build/index.html 0 → 100644
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/manifest.json"/><title>七月在线 - 国内领先的人工智能教育平台</title><link href="/mrstatic/css/42.2c1f7d7c.chunk.css" rel="stylesheet"><link href="/mrstatic/css/main.7e1c28a3.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="/api.js"></script><script>!function(i){function e(e){for(var r,t,n=e[0],a=e[1],o=e[2],c=0,d=[];c<n.length;c++)t=n[c],l[t]&&d.push(l[t][0]),l[t]=0;for(r in a)Object.prototype.hasOwnProperty.call(a,r)&&(i[r]=a[r]);for(p&&p(e);d.length;)d.shift()();return s.push.apply(s,o||[]),f()}function f(){for(var e,r=0;r<s.length;r++){for(var t=s[r],n=!0,a=1;a<t.length;a++){var o=t[a];0!==l[o]&&(n=!1)}n&&(s.splice(r--,1),e=b(b.s=t[0]))}return e}var t={},u={35:0},l={35:0},s=[];function b(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return i[e].call(r.exports,r,r.exports,b),r.l=!0,r.exports}b.e=function(s){var e=[];u[s]?e.push(u[s]):0!==u[s]&&{1:1,2:1,3:1,4:1,5:1,6:1,7:1,8:1,9:1,10:1,11:1,13:1,15:1,16:1,17:1,18:1,19:1,20:1,21:1,22:1,23:1,24:1,25:1,26:1,27:1,29:1,30:1,31:1,32:1,33:1,34:1,36:1,37:1,38:1,39:1,40:1,41:1,44:1,45:1,47:1,48:1,49:1,50:1,51:1}[s]&&e.push(u[s]=new Promise(function(e,n){for(var r="mrstatic/css/"+({4:"Activity",5:"BargainMiddlePage",6:"Classify",7:"Country",8:"CourseList",9:"DrawDocument",10:"Examination",11:"Invite",12:"MyEdit",13:"Order",14:"Orderinfo",15:"PayOrder",16:"Preferential",17:"SearchResult",18:"ShareCourse",19:"ShopCart",20:"aist-share",21:"blessing-getPrize",22:"blessing-preheat",23:"blessing-rank",24:"coupons",25:"deposit-order",26:"deposit-pay-order",27:"detail",29:"myorders",30:"newyear-2019-landing",31:"newyear-yearIndex",32:"prize-winner-list",33:"purchased",34:"python-class",36:"search",37:"shareposter",38:"study",39:"system-notices",40:"togroup",41:"video"}[s]||s)+"."+{0:"31d6cfe0",1:"4db54483",2:"1133c967",3:"9c10cbdc",4:"5ad58b77",5:"2a913483",6:"127d35ae",7:"400393b7",8:"fed92c83",9:"1bd3da48",10:"17af9370",11:"5ad58b77",12:"31d6cfe0",13:"83a999aa",14:"31d6cfe0",15:"68a25070",16:"ccebc534",17:"6d7d1b77",18:"6e885738",19:"887eb690",20:"affb05d7",21:"32a9cccc",22:"0800b4f0",23:"39fb77c8",24:"0ce3fd3d",25:"2e5f43c4",26:"e8363b32",27:"633b10a8",29:"841d0cfb",30:"5499d2d9",31:"a0a74bc1",32:"ce85cb83",33:"7558403e",34:"821064f5",36:"efa1dd44",37:"cde549fc",38:"62b8863b",39:"4fbf61d8",40:"ffd8be6c",41:"b3755c1b",43:"31d6cfe0",44:"976b2058",45:"51412fcd",46:"31d6cfe0",47:"e292ab6b",48:"37fb0c23",49:"56b04545",50:"ce17075b",51:"262f17a1"}[s]+".chunk.css",a=b.p+r,t=document.getElementsByTagName("link"),o=0;o<t.length;o++){var c=(i=t[o]).getAttribute("data-href")||i.getAttribute("href");if("stylesheet"===i.rel&&(c===r||c===a))return e()}var d=document.getElementsByTagName("style");for(o=0;o<d.length;o++){var i;if((c=(i=d[o]).getAttribute("data-href"))===r||c===a)return e()}var f=document.createElement("link");f.rel="stylesheet",f.type="text/css",f.onload=e,f.onerror=function(e){var r=e&&e.target&&e.target.src||a,t=new Error("Loading CSS chunk "+s+" failed.\n("+r+")");t.request=r,delete u[s],f.parentNode.removeChild(f),n(t)},f.href=a,document.getElementsByTagName("head")[0].appendChild(f)}).then(function(){u[s]=0}));var t=l[s];if(0!==t)if(t)e.push(t[2]);else{var r=new Promise(function(e,r){t=l[s]=[e,r]});e.push(t[2]=r);var n,o=document.createElement("script");o.charset="utf-8",o.timeout=120,b.nc&&o.setAttribute("nonce",b.nc),o.src=b.p+"mrstatic/js/"+({4:"Activity",5:"BargainMiddlePage",6:"Classify",7:"Country",8:"CourseList",9:"DrawDocument",10:"Examination",11:"Invite",12:"MyEdit",13:"Order",14:"Orderinfo",15:"PayOrder",16:"Preferential",17:"SearchResult",18:"ShareCourse",19:"ShopCart",20:"aist-share",21:"blessing-getPrize",22:"blessing-preheat",23:"blessing-rank",24:"coupons",25:"deposit-order",26:"deposit-pay-order",27:"detail",29:"myorders",30:"newyear-2019-landing",31:"newyear-yearIndex",32:"prize-winner-list",33:"purchased",34:"python-class",36:"search",37:"shareposter",38:"study",39:"system-notices",40:"togroup",41:"video"}[s]||s)+"."+{0:"a1f55c4b",1:"27a3e6ef",2:"0fac390d",3:"92b68111",4:"e2fb033f",5:"cf95b372",6:"8163d312",7:"141c61f5",8:"f5ca4969",9:"0076a47c",10:"5cac77c0",11:"28851ee3",12:"dae94c7e",13:"6def7194",14:"78f26106",15:"e6c3479b",16:"0a7db7f8",17:"1d558834",18:"c519a5df",19:"58cf523e",20:"fe6680a0",21:"3af378d7",22:"f19da7b8",23:"60ea5af3",24:"2b77f2be",25:"b854048e",26:"e64172c9",27:"e26f1759",29:"d820f269",30:"83018304",31:"ed61fff9",32:"b2af75ba",33:"89577d91",34:"3ddf1d15",36:"bbed24b1",37:"9564bc99",38:"91a35873",39:"d28438a2",40:"4e69a206",41:"defefd9a",43:"f063ef63",44:"346f8d8b",45:"83264ccd",46:"7e77ddf7",47:"39c28519",48:"eb589f62",49:"40cd7435",50:"81199908",51:"3c10cacd"}[s]+".chunk.js",n=function(e){o.onerror=o.onload=null,clearTimeout(c);var r=l[s];if(0!==r){if(r){var t=e&&("load"===e.type?"missing":e.type),n=e&&e.target&&e.target.src,a=new Error("Loading chunk "+s+" failed.\n("+t+": "+n+")");a.type=t,a.request=n,r[1](a)}l[s]=void 0}};var c=setTimeout(function(){n({type:"timeout",target:o})},12e4);o.onerror=o.onload=n,document.head.appendChild(o)}return Promise.all(e)},b.m=i,b.c=t,b.d=function(e,r,t){b.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},b.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},b.t=function(r,e){if(1&e&&(r=b(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(b.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)b.d(t,n,function(e){return r[e]}.bind(null,n));return t},b.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(r,"a",r),r},b.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},b.p="/",b.oe=function(e){throw console.error(e),e};var r=window.webpackJsonp=window.webpackJsonp||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var a=0;a<r.length;a++)e(r[a]);var p=n;f()}([])</script><script src="/mrstatic/js/42.e48db56b.chunk.js"></script><script src="/mrstatic/js/main.ac7a8873.chunk.js"></script></body></html>
\ No newline at end of file
build/manifest.json 0 → 100755
{
"short_name": "React App",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}
build/service-worker.js 0 → 100644
/**
* Welcome to your Workbox-powered service worker!
*
* You'll need to register this file in your web app and you should
* disable HTTP caching for this file too.
* See https://goo.gl/nhQhGp
*
* The rest of the code is auto-generated. Please don't update this file
* directly; instead, make changes to your Workbox build configuration
* and re-run your build process.
* See https://goo.gl/2aRDsh
*/
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
importScripts(
"/precache-manifest.cb1f3625a3c7328990e6a7274fbe8f85.js"
);
workbox.clientsClaim();
/**
* The workboxSW.precacheAndRoute() method efficiently caches and responds to
* requests for URLs in the manifest.
* See https://goo.gl/S9QRab
*/
self.__precacheManifest = [].concat(self.__precacheManifest || []);
workbox.precaching.suppressWarnings();
workbox.precaching.precacheAndRoute(self.__precacheManifest, {});
workbox.routing.registerNavigationRoute("/index.html", {
blacklist: [/^\/_/,/\/[^/]+\.[^/]+$/],
});
src/components/activity/1111/index.scss
...@@ -6,13 +6,13 @@ ...@@ -6,13 +6,13 @@
.banner__con { .banner__con {
width: 100%; width: 100%;
height: 170px; height: 170px;
background: url('images/formal-banner.png') center center no-repeat; background: url('/images/formal-banner.png') center center no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
.content__con { .content__con {
width: 100%; width: 100%;
height: 454px; height: 454px;
background: url('images/dalibao_bj.png') center center no-repeat; background: url('/images/dalibao_bj.png') center center no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
position: relative; position: relative;
......
src/components/activity/newyear-2019/preheat/index.js
...@@ -102,6 +102,28 @@ export default class index extends Component { ...@@ -102,6 +102,28 @@ export default class index extends Component {
// 获取未拆宝箱数量 // 获取未拆宝箱数量
getRemovable = (removable, currentOpenId) => { getRemovable = (removable, currentOpenId) => {
this.setState({
removable,
currentOpenId,
})
}
// 跳转到我的宝箱列表页
toBoxList = () => {
const isLogin = !this.props.user.hasError
const {currentOpenId} = this.state;
let search = '';
if(currentOpenId) {
search = `?id=${currentOpenId}`;
}
if (isLogin) {
this.props.history.push(`/year/yearTreasure${search}`)
} else {
if (!getParam('version')) {
this.props.history.push('/passport/login')
} else {
SendMessageToApp("toLogin")
}
}
} }
......
src/components/bargainMiddlePage/index.js
...@@ -644,7 +644,7 @@ function CourseDes(props) { ...@@ -644,7 +644,7 @@ function CourseDes(props) {
<span className={'discount-price'}>￥{course.course_price}</span> <span className={'discount-price'}>￥{course.course_price}</span>
{/* is_originator 是否发起人 0-否 1-是 */} {/* is_originator 是否发起人 0-否 1-是 */}
{ {
(is_originator == 1 && bargain_status !=3) && (is_originator == 1 && bargain_status != 3) &&
<button className={'purchase-btn'} onClick={toCart}> <button className={'purchase-btn'} onClick={toCart}>
¥{course.pay_price}去支付 ¥{course.pay_price}去支付
</button> </button>
......
src/components/python/index.js
...@@ -38,7 +38,10 @@ class Python extends Component { ...@@ -38,7 +38,10 @@ class Python extends Component {
this.setState({ this.setState({
userInfoList: result userInfoList: result
}, () => { }, () => {
alert(JSON.stringify(this.state.userInfoList))
alert(this.state.userInfoList.length)
if (this.state.userInfoList.length) { if (this.state.userInfoList.length) {
alert(3)
this.props.startFetchUser() this.props.startFetchUser()
this.appLogin() this.appLogin()
} }
...@@ -61,10 +64,13 @@ class Python extends Component { ...@@ -61,10 +64,13 @@ class Python extends Component {
this.setState({ this.setState({
isAppUpdate: true isAppUpdate: true
}) })
} }
this.props.setCurrentUser(this.transformUser(this.state.userInfoList)) this.props.setCurrentUser(this.transformUser(this.state.userInfoList));
this.fetchCourseInfo();
} }
transformUser = res => { transformUser = res => {
let payload let payload
...@@ -87,7 +93,6 @@ class Python extends Component { ...@@ -87,7 +93,6 @@ class Python extends Component {
fetchCourseInfo = () => { fetchCourseInfo = () => {
const id = getParam('id') const id = getParam('id')
alert(0)
http.get(`${API.home}/m/course/detail/${id}`).then((res) => { http.get(`${API.home}/m/course/detail/${id}`).then((res) => {
const {data, code} = res.data const {data, code} = res.data
if (code === 200) { if (code === 200) {
...@@ -105,9 +110,9 @@ class Python extends Component { ...@@ -105,9 +110,9 @@ class Python extends Component {
isPay: 0, isPay: 0,
}) })
}else{ // 安卓/IOS 的高版本 }else{ // 安卓/IOS 的高版本
alert('的高版本') alert('的高版本');
alert(data.course_info.is_pay)
if(data.course_info.is_pay === 1) { // 在APP内未登录-去登陆-登录后还显示此页；如果是已购买的用户 就需要跳转到 APP已购买的原生页面 if(data.course_info.is_pay === 1) { // 在APP内未登录-去登陆-登录后还显示此页；如果是已购买的用户 就需要跳转到 APP已购买的原生页面
alert(1)
SendMessageToApp('toSyllabusChapter', id); // 跳转到APP的已购买详情页 id 是课程ID SendMessageToApp('toSyllabusChapter', id); // 跳转到APP的已购买详情页 id 是课程ID
return; return;
} }
...@@ -117,6 +122,7 @@ class Python extends Component { ...@@ -117,6 +122,7 @@ class Python extends Component {
}) })
} }
} else { } else {
this.setState({ this.setState({
backwardVersion: false, backwardVersion: false,
isPay: data.course_info.is_pay isPay: data.course_info.is_pay
...@@ -131,6 +137,7 @@ class Python extends Component { ...@@ -131,6 +137,7 @@ class Python extends Component {
// 旧版本 无论购买未购买 都跳转到 未购买的详情页； 如果是已购买就提示更新APP // 旧版本 无论购买未购买 都跳转到 未购买的详情页； 如果是已购买就提示更新APP
return ( return (
<div> <div>
<p>{isPay}</p>
{ {
isPay === 0 && ( isPay === 0 && (
<PythonDes <PythonDes
......
src/components/pythonShare/index.js
...@@ -293,4 +293,4 @@ function PythonContent(props) { ...@@ -293,4 +293,4 @@ function PythonContent(props) {
); );
} }
export default PythonClass; export default PythonClass;
\ No newline at end of file
src/components/pythonShare/index.scss
...@@ -178,4 +178,4 @@ ...@@ -178,4 +178,4 @@
.ace_mobile-menu { .ace_mobile-menu {
display: none; display: none;
} }
\ No newline at end of file
src/router/router-config.js
...@@ -227,7 +227,6 @@ export default [ ...@@ -227,7 +227,6 @@ export default [
path: '/invite', path: '/invite',
component: Invite, component: Invite,
}, },
//双旦活动 //双旦活动
{ {
path: '/activity/newyear-2019/landing', path: '/activity/newyear-2019/landing',
...@@ -239,7 +238,7 @@ export default [ ...@@ -239,7 +238,7 @@ export default [
path: '/year/yearIndex', path: '/year/yearIndex',
component: loadable(() => import(/* webpackChunkName: 'newyear-yearIndex' */ '@components/activity/newyear-2019/preheat/index')) component: loadable(() => import(/* webpackChunkName: 'newyear-yearIndex' */ '@components/activity/newyear-2019/preheat/index'))
}, },
// 我的宝箱 // 我的宝箱
{ {
path: '/year/yearTreasure', path: '/year/yearTreasure',
......
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