Skip to content

M
mr-julyedu
Commit 5bad60df by xuzhenghua
Options

push

parents 0bbcacfd 8430b14d
Showing with 69 additions and 49 deletions
build/asset-manifest.json
......@@ -34,8 +34,8 @@
"Examination.js": "/mrstatic/js/Examination.4b038bb6.chunk.js",
"Examination.js.map": "/mrstatic/js/Examination.4b038bb6.chunk.js.map",
"Invite.css": "/mrstatic/css/Invite.f0f99418.chunk.css",
"Invite.js": "/mrstatic/js/Invite.9dcd636b.chunk.js",
"Invite.js.map": "/mrstatic/js/Invite.9dcd636b.chunk.js.map",
"Invite.js": "/mrstatic/js/Invite.5e1cceea.chunk.js",
"Invite.js.map": "/mrstatic/js/Invite.5e1cceea.chunk.js.map",
"MyEdit.js": "/mrstatic/js/MyEdit.61346b9a.chunk.js",
"MyEdit.js.map": "/mrstatic/js/MyEdit.61346b9a.chunk.js.map",
"Order.css": "/mrstatic/css/Order.8c058a7a.chunk.css",
......@@ -83,8 +83,8 @@
"detail.js": "/mrstatic/js/detail.e17f23bd.chunk.js",
"detail.js.map": "/mrstatic/js/detail.e17f23bd.chunk.js.map",
"main.css": "/mrstatic/css/main.c30781b3.chunk.css",
"main.js": "/mrstatic/js/main.903a2656.chunk.js",
"main.js.map": "/mrstatic/js/main.903a2656.chunk.js.map",
"main.js": "/mrstatic/js/main.3a14b603.chunk.js",
"main.js.map": "/mrstatic/js/main.3a14b603.chunk.js.map",
"myorders.css": "/mrstatic/css/myorders.179a42fc.chunk.css",
"myorders.js": "/mrstatic/js/myorders.8455376c.chunk.js",
"myorders.js.map": "/mrstatic/js/myorders.8455376c.chunk.js.map",
......@@ -103,8 +103,8 @@
"python-class.css": "/mrstatic/css/python-class.1fe9d108.chunk.css",
"python-class.js": "/mrstatic/js/python-class.49d98ed1.chunk.js",
"python-class.js.map": "/mrstatic/js/python-class.49d98ed1.chunk.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.d4f41ec8.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.d4f41ec8.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.9c2da2f5.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.9c2da2f5.js.map",
"search.css": "/mrstatic/css/search.5716d9b3.chunk.css",
"search.js": "/mrstatic/js/search.2f51f25b.chunk.js",
"search.js.map": "/mrstatic/js/search.2f51f25b.chunk.js.map",
......@@ -138,8 +138,8 @@
"mrstatic/js/47.a2633431.chunk.js": "/mrstatic/js/47.a2633431.chunk.js",
"mrstatic/js/47.a2633431.chunk.js.map": "/mrstatic/js/47.a2633431.chunk.js.map",
"mrstatic/css/48.47bdf249.chunk.css": "/mrstatic/css/48.47bdf249.chunk.css",
"mrstatic/js/48.12c113a9.chunk.js": "/mrstatic/js/48.12c113a9.chunk.js",
"mrstatic/js/48.12c113a9.chunk.js.map": "/mrstatic/js/48.12c113a9.chunk.js.map",
"mrstatic/js/48.0d37708c.chunk.js": "/mrstatic/js/48.0d37708c.chunk.js",
"mrstatic/js/48.0d37708c.chunk.js.map": "/mrstatic/js/48.0d37708c.chunk.js.map",
"mrstatic/css/49.bff100af.chunk.css": "/mrstatic/css/49.bff100af.chunk.css",
"mrstatic/js/49.730d6da1.chunk.js": "/mrstatic/js/49.730d6da1.chunk.js",
"mrstatic/js/49.730d6da1.chunk.js.map": "/mrstatic/js/49.730d6da1.chunk.js.map",
......@@ -244,6 +244,6 @@
"mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.f2f4294d.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.0e9c51ccf13937a184ed7bac76326fb5.js": "/precache-manifest.0e9c51ccf13937a184ed7bac76326fb5.js",
"precache-manifest.cb4f58bf7b1334b01a4cb462ec7905be.js": "/precache-manifest.cb4f58bf7b1334b01a4cb462ec7905be.js",
"service-worker.js": "/service-worker.js"
}
\ No newline at end of file
build/mrstatic/js/48.0d37708c.chunk.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/48.12c113a9.chunk.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/main.903a2656.chunk.js → build/mrstatic/js/main.3a14b603.chunk.js
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/main.3a14b603.chunk.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/main.903a2656.chunk.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
build/precache-manifest.0e9c51ccf13937a184ed7bac76326fb5.js → build/precache-manifest.cb4f58bf7b1334b01a4cb462ec7905be.js
......@@ -24,16 +24,16 @@ self.__precacheManifest = [
"url": "/mrstatic/js/3.6a7e4fd9.chunk.js"
},
{
"revision": "c79abf5cb7ae8a82009cf68fe44d1078",
"url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
"revision": "6902434f8f18a23319d57d0ac8aaea8c",
"url": "/mrstatic/media/redb_sp_bj@2x.6902434f.png"
},
{
"revision": "fca49361335241976be2",
"url": "/mrstatic/js/4.91ffcfe7.chunk.js"
},
{
"revision": "6902434f8f18a23319d57d0ac8aaea8c",
"url": "/mrstatic/media/redb_sp_bj@2x.6902434f.png"
"revision": "c79abf5cb7ae8a82009cf68fe44d1078",
"url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
},
{
"revision": "4bcfa21679332790a510",
......@@ -92,8 +92,8 @@ self.__precacheManifest = [
"url": "/mrstatic/media/iconfont.64fd0b16.eot"
},
{
"revision": "6f79469ea853b84b6754",
"url": "/mrstatic/js/Invite.9dcd636b.chunk.js"
"revision": "5dcc7eecaedf324d48db",
"url": "/mrstatic/js/Invite.5e1cceea.chunk.js"
},
{
"revision": "c492b002ec118c1110d8",
......@@ -220,8 +220,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/50.542964cd.chunk.js"
},
{
"revision": "775ac5b7d85a29447c92",
"url": "/mrstatic/js/main.903a2656.chunk.js"
"revision": "72d59eb74b062346cb77",
"url": "/mrstatic/js/main.3a14b603.chunk.js"
},
{
"revision": "0bbfe3330d20cbe177b2",
......@@ -232,8 +232,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/myorders.8455376c.chunk.js"
},
{
"revision": "c3704fcb2e447034eb58",
"url": "/mrstatic/js/48.12c113a9.chunk.js"
"revision": "27f24171b83d056744bf",
"url": "/mrstatic/js/48.0d37708c.chunk.js"
},
{
"revision": "f7cba5435d685885efa8",
......@@ -272,8 +272,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/python-class.49d98ed1.chunk.js"
},
{
"revision": "f0cc2da35bc5723eae9f",
"url": "/mrstatic/js/runtime~main.d4f41ec8.js"
"revision": "e08874144922f4315554",
"url": "/mrstatic/js/runtime~main.9c2da2f5.js"
},
{
"revision": "1471e2648bcdcb11113c",
......@@ -360,7 +360,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/47.2fd45d08.chunk.css"
},
{
"revision": "c3704fcb2e447034eb58",
"revision": "27f24171b83d056744bf",
"url": "/mrstatic/css/48.47bdf249.chunk.css"
},
{
......@@ -380,7 +380,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/50.820320a6.chunk.css"
},
{
"revision": "775ac5b7d85a29447c92",
"revision": "72d59eb74b062346cb77",
"url": "/mrstatic/css/main.c30781b3.chunk.css"
},
{
......@@ -488,7 +488,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/Order.8c058a7a.chunk.css"
},
{
"revision": "6f79469ea853b84b6754",
"revision": "5dcc7eecaedf324d48db",
"url": "/mrstatic/css/Invite.f0f99418.chunk.css"
},
{
......@@ -528,7 +528,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/1.037b510f.chunk.css"
},
{
"revision": "dfd76cc86f9071308d4c9e4b9778a145",
"revision": "04deaf7f8368185e1f0afcd8d6403560",
"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.0e9c51ccf13937a184ed7bac76326fb5.js"
"/precache-manifest.cb4f58bf7b1334b01a4cb462ec7905be.js"
);
workbox.clientsClaim();
......
src/App.js
import React, { Component } from 'react'
import React, {Component} from 'react'
import Routes from './router'
import cookie from 'js-cookie'
import { connect } from "react-redux"
import { setCurrentUser, startFetchUser } from "@/store/userAction"
import { initialState } from "@/store/userReducer"
import { withRouter, Link } from 'react-router-dom'
import { compose } from 'redux'
import { getParam, http, browser } from "@/utils"
import { Toast } from "antd-mobile"
import { addDays } from 'date-fns'
import {connect} from "react-redux"
import {setCurrentUser, startFetchUser} from "@/store/userAction"
import {initialState} from "@/store/userReducer"
import {withRouter, Link} from 'react-router-dom'
import {compose} from 'redux'
import {getParam, http, browser} from "@/utils"
import {Toast} from "antd-mobile"
import {addDays} from 'date-fns'
import stringify from 'json-stringify-safe'
import Hammer from 'hammerjs'
......@@ -116,7 +116,7 @@ class App extends Component {
isShowActivityEntry: data.treasure_stage,
isShowChannel: data.is_show_site_window_by_channel
}, () => {
this.bindGlobalEntry()
data.treasure_stage && this.bindGlobalEntry()
})
window.sessionStorage.setItem('isShowSiteWindowByChannel', data.is_show_site_window_by_channel)
......@@ -301,6 +301,9 @@ class App extends Component {
}
bindGlobalEntry = () => {
if (!this.globalEntry) {
return
}
const mc = new Hammer(this.globalEntry)
const {history} = this.props
const _this = this
......
src/components/ml/index.js
......@@ -20,6 +20,7 @@ class ML extends Component {
super(props)
this.state = {
isPay: '',
buyTry: '',
userInfoList: [],
isAppUpdate: false,
backwardVersion: false, // 默认是新版本
......@@ -205,7 +206,8 @@ class ML extends Component {
} else {
this.setState({
backwardVersion: false,
isPay: data.course_info.is_pay
isPay: data.course_info.is_pay,
buyTry: data.course_info.buy_try
})
}
}
......@@ -213,7 +215,7 @@ class ML extends Component {
}
render() {
const {isPay, isAppUpdate, backwardVersion, isWxlogin} = this.state
const {isPay, buyTry, isAppUpdate, backwardVersion, isWxlogin} = this.state
// 旧版本 无论购买未购买 都跳转到 未购买的详情页； 如果是已购买就提示更新APP
return (
<div>
......@@ -225,11 +227,12 @@ class ML extends Component {
history={this.props.history}
isAppUpdate={isAppUpdate}
isPay={isPay}
buyTry={buyTry}
/>
)
}
{
(isPay === 1 && !getParam('version')) && <PythonStudy isAppUpdate={isAppUpdate} />
(isPay === 1 && !getParam('version')) && <PythonStudy isAppUpdate={isAppUpdate} buyTry={buyTry}/>
}
{
......
src/components/ml/pythomDes/index.js
......@@ -186,7 +186,9 @@ class PythonDes extends Component {
}
getStatus = () => {
http.get(`${API['home']}/web/it_detail?course_id=${getParam('id')}`).then(res => {
const {buyTry} = this.props
http.get(`${API['home']}/web/it_detail?course_id=${getParam('id')}&buy_try=${buyTry}`).then(res => {
const {code, data, msg} = res.data
if (code == 200) {
this.setState({
......
src/components/ml/pythonStudy/index.js
......@@ -25,7 +25,9 @@ class PythonStudy extends Component {
}
fetchCourseDetail = () => {
http.get(`${API['home']}/web/it_detail?course_id=${getParam('id')}&is_pay=1`).then(res => {
const {buyTry} = this.props
http.get(`${API['home']}/web/it_detail?course_id=${getParam('id')}&is_pay=1&buy_try=${buyTry}`).then(res => {
const {data, code, msg} = res.data
if (code === 200) {
this.setState({
......
src/components/vip/index.js
......@@ -27,24 +27,32 @@ class NewVip extends Component {
tobuyID: '',
list1: [
{
img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/39376e2038.png',
src: '/getDetail?id=280'
},
{
img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/e61f810c30.png',
src: '/getDetail?id=293'
},
{
img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/1b56e21e68.png',
src: '/getDetail?id=196'
},
{
img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/c9a6779b75.png',
src: '/getDetail?id=181'
img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/07dafc3480.png',
src: '/getDetail?id=216'
},
{
img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/be4b7de643.jpg',
src: '/getDetail?id=146'
img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/d9ca2ad5e8.png',
src: '/getDetail?id=262'
},
{
img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/2ec904c98b.png',
src: '/getDetail?id=158'
img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/a7e5ab0af6.png',
src: '/getDetail?id=232'
},
{
img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/6996ee5c57.png',
src: '/getDetail?id=180'
img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/c9a6779b75.png',
src: '/getDetail?id=181'
},
{
img: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/19VIP/newvip/h5/more2.png',
......
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