Skip to content

M
mr-julyedu
Commit 306c895f by xuzhenghua
Options

登录

parents eed5843c acf4003d
Showing with 99 additions and 93 deletions
build/asset-manifest.json
...@@ -103,8 +103,8 @@ ...@@ -103,8 +103,8 @@
"python-class.css": "/mrstatic/css/python-class.1fe9d108.chunk.css", "python-class.css": "/mrstatic/css/python-class.1fe9d108.chunk.css",
"python-class.js": "/mrstatic/js/python-class.24cd3eb9.chunk.js", "python-class.js": "/mrstatic/js/python-class.24cd3eb9.chunk.js",
"python-class.js.map": "/mrstatic/js/python-class.24cd3eb9.chunk.js.map", "python-class.js.map": "/mrstatic/js/python-class.24cd3eb9.chunk.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.5700ac54.js", "runtime~main.js": "/mrstatic/js/runtime~main.50eebd91.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.5700ac54.js.map", "runtime~main.js.map": "/mrstatic/js/runtime~main.50eebd91.js.map",
"search.css": "/mrstatic/css/search.5716d9b3.chunk.css", "search.css": "/mrstatic/css/search.5716d9b3.chunk.css",
"search.js": "/mrstatic/js/search.20bbab86.chunk.js", "search.js": "/mrstatic/js/search.20bbab86.chunk.js",
"search.js.map": "/mrstatic/js/search.20bbab86.chunk.js.map", "search.js.map": "/mrstatic/js/search.20bbab86.chunk.js.map",
...@@ -138,8 +138,8 @@ ...@@ -138,8 +138,8 @@
"mrstatic/js/47.4ef49615.chunk.js": "/mrstatic/js/47.4ef49615.chunk.js", "mrstatic/js/47.4ef49615.chunk.js": "/mrstatic/js/47.4ef49615.chunk.js",
"mrstatic/js/47.4ef49615.chunk.js.map": "/mrstatic/js/47.4ef49615.chunk.js.map", "mrstatic/js/47.4ef49615.chunk.js.map": "/mrstatic/js/47.4ef49615.chunk.js.map",
"mrstatic/css/48.47bdf249.chunk.css": "/mrstatic/css/48.47bdf249.chunk.css", "mrstatic/css/48.47bdf249.chunk.css": "/mrstatic/css/48.47bdf249.chunk.css",
"mrstatic/js/48.39932ed3.chunk.js": "/mrstatic/js/48.39932ed3.chunk.js", "mrstatic/js/48.57fca03b.chunk.js": "/mrstatic/js/48.57fca03b.chunk.js",
"mrstatic/js/48.39932ed3.chunk.js.map": "/mrstatic/js/48.39932ed3.chunk.js.map", "mrstatic/js/48.57fca03b.chunk.js.map": "/mrstatic/js/48.57fca03b.chunk.js.map",
"mrstatic/css/49.bff100af.chunk.css": "/mrstatic/css/49.bff100af.chunk.css", "mrstatic/css/49.bff100af.chunk.css": "/mrstatic/css/49.bff100af.chunk.css",
"mrstatic/js/49.0dfc3020.chunk.js": "/mrstatic/js/49.0dfc3020.chunk.js", "mrstatic/js/49.0dfc3020.chunk.js": "/mrstatic/js/49.0dfc3020.chunk.js",
"mrstatic/js/49.0dfc3020.chunk.js.map": "/mrstatic/js/49.0dfc3020.chunk.js.map", "mrstatic/js/49.0dfc3020.chunk.js.map": "/mrstatic/js/49.0dfc3020.chunk.js.map",
...@@ -244,6 +244,6 @@ ...@@ -244,6 +244,6 @@
"mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.f2f4294d.woff", "mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.f2f4294d.woff",
"mrstatic/media/kanjia_cg_icon.png": "/mrstatic/media/kanjia_cg_icon.81a489ac.png", "mrstatic/media/kanjia_cg_icon.png": "/mrstatic/media/kanjia_cg_icon.81a489ac.png",
"mrstatic/media/video.scss": "/mrstatic/media/progress-share-bg.80011994.png", "mrstatic/media/video.scss": "/mrstatic/media/progress-share-bg.80011994.png",
"precache-manifest.d4afddf4d603abfc82fd7611779c5757.js": "/precache-manifest.d4afddf4d603abfc82fd7611779c5757.js", "precache-manifest.02fff305b875b68509f2f33b95c45a3c.js": "/precache-manifest.02fff305b875b68509f2f33b95c45a3c.js",
"service-worker.js": "/service-worker.js" "service-worker.js": "/service-worker.js"
} }
\ No newline at end of file
build/mrstatic/js/48.39932ed3.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/48.57fca03b.chunk.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/precache-manifest.d4afddf4d603abfc82fd7611779c5757.js → build/precache-manifest.02fff305b875b68509f2f33b95c45a3c.js
...@@ -232,8 +232,8 @@ self.__precacheManifest = [ ...@@ -232,8 +232,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/myorders.3d2381f9.chunk.js" "url": "/mrstatic/js/myorders.3d2381f9.chunk.js"
}, },
{ {
"revision": "638aaa2ceca474edbcc7", "revision": "d59875493242f4210f9b",
"url": "/mrstatic/js/48.39932ed3.chunk.js" "url": "/mrstatic/js/48.57fca03b.chunk.js"
}, },
{ {
"revision": "952434d03d9bbafc37dd", "revision": "952434d03d9bbafc37dd",
...@@ -272,8 +272,8 @@ self.__precacheManifest = [ ...@@ -272,8 +272,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/python-class.24cd3eb9.chunk.js" "url": "/mrstatic/js/python-class.24cd3eb9.chunk.js"
}, },
{ {
"revision": "a7e4591ac426f67af7ad", "revision": "c3d6102fef69c28f26ec",
"url": "/mrstatic/js/runtime~main.5700ac54.js" "url": "/mrstatic/js/runtime~main.50eebd91.js"
}, },
{ {
"revision": "602e7c833e2ac47b90f8", "revision": "602e7c833e2ac47b90f8",
...@@ -360,7 +360,7 @@ self.__precacheManifest = [ ...@@ -360,7 +360,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/47.2fd45d08.chunk.css" "url": "/mrstatic/css/47.2fd45d08.chunk.css"
}, },
{ {
"revision": "638aaa2ceca474edbcc7", "revision": "d59875493242f4210f9b",
"url": "/mrstatic/css/48.47bdf249.chunk.css" "url": "/mrstatic/css/48.47bdf249.chunk.css"
}, },
{ {
...@@ -528,7 +528,7 @@ self.__precacheManifest = [ ...@@ -528,7 +528,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/1.037b510f.chunk.css" "url": "/mrstatic/css/1.037b510f.chunk.css"
}, },
{ {
"revision": "290d8d67792624054bd6c0ccd7919b49", "revision": "79754170d352dc0fb3679eeaec8725e9",
"url": "/index.html" "url": "/index.html"
} }
]; ];
\ No newline at end of file
build/service-worker.js
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js"); importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
importScripts( importScripts(
"/precache-manifest.d4afddf4d603abfc82fd7611779c5757.js" "/precache-manifest.02fff305b875b68509f2f33b95c45a3c.js"
); );
workbox.clientsClaim(); workbox.clientsClaim();
......
src/components/ml/index.js
...@@ -6,6 +6,7 @@ import {connect} from "react-redux" ...@@ -6,6 +6,7 @@ import {connect} from "react-redux"
import {addDays} from "date-fns" import {addDays} from "date-fns"
import cookie from "js-cookie" import cookie from "js-cookie"
import {setCurrentUser, startFetchUser} from "@/store/userAction" import {setCurrentUser, startFetchUser} from "@/store/userAction"
import {Toast} from "antd-mobile"
@connect(state => ({ @connect(state => ({
...@@ -32,6 +33,88 @@ class ML extends Component { ...@@ -32,6 +33,88 @@ class ML extends Component {
window['loginInfo'] = result => { window['loginInfo'] = result => {
_this.loginInfo(result) _this.loginInfo(result)
} }
if (browser.isWeixin) {
this.isweixinPay()
}
if (getParam('weixinpay')) {
this.payCallback()
}
}
// 微信内部支付回调
isweixinPay = () => {
let _this = this;
let weixin_code = getParam('code');
if (weixin_code) {
if (getParam('oid') === undefined) {
return
} else {
http.get(`${API['base-api']}/pay/wxpay/pub_charge/oid/${getParam('oid')}/code/${weixin_code}`).then((res) => {
if (res.data.errno === 0) {
let data = res.data.data;
function onBridgeReady() {
WeixinJSBridge.invoke(
'getBrandWCPayRequest', {
appId: data.appId, //公众号名称，由商户传入
timeStamp: data.timeStamp, //时间戳，自1970年以来的秒数
nonceStr: data.nonceStr, //随机串
package: data.package,
signType: data.signType, //微信签名方式：
paySign: data.paySign //微信签名
},
function (res) {
if (res.err_msg == "get_brand_wcpsys/order_status/ay_request:ok") {
Toast.info('支付成功', 2);
_this.intervalPayStatus = setInterval(function () {
http.get(`${API['base-api']}/m/orderState/oid/${getParam('oid')}`).then(res => {
if (res.data.errno === 401) {
clearInterval(_this.intervalPayStatus);
_this.intervalPayStatus = null;
location.reload()
}
})
}, 1000)
} else {
Toast.info('支付失败', 2);
}
}
)
}
if (typeof WeixinJSBridge == "undefined") {
if (document.addEventListener) {
document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false)
} else if (document.attachEvent) {
document.attachEvent('WeixinJSBridgeReady', onBridgeReady);
document.attachEvent('onWeixinJSBridgeReady', onBridgeReady)
}
} else {
onBridgeReady();
}
} else {
Toast.info(res.data.msg, 2)
}
})
}
}
}
// 支付完成之后获取状态
payCallback = () => {
const _this = this;
// 支付回调
// 定时器轮训获取订单状态
_this.intervalPayStatus = setInterval(function () {
http.get(`${API['base-api']}/m/orderState/oid/${getParam('oid')}`).then(res => {
if (res.data.errno === 401) {
clearInterval(_this.intervalPayStatus);
_this.intervalPayStatus = null;
location.reload()
}
})
}, 1000)
} }
// 获取app登录数据 // 获取app登录数据
...@@ -133,9 +216,9 @@ class ML extends Component { ...@@ -133,9 +216,9 @@ class ML extends Component {
<div> <div>
{ {
isPay === 0 && ( isPay === 0 && (
<PythonDes <PythonDes
backwardVersion={backwardVersion} backwardVersion={backwardVersion}
history={this.props.history} history={this.props.history}
isAppUpdate={isAppUpdate} isAppUpdate={isAppUpdate}
isPay={isPay} isPay={isPay}
/> />
......
src/components/ml/pythonStudy/index.js
...@@ -23,13 +23,6 @@ class PythonStudy extends Component { ...@@ -23,13 +23,6 @@ class PythonStudy extends Component {
componentDidMount() { componentDidMount() {
this.fetchCourseDetail() this.fetchCourseDetail()
if (browser.isWeixin) {
this.isweixinPay()
}
if (getParam('weixinpay')) {
this.payCallback()
}
} }
fetchCourseDetail = () => { fetchCourseDetail = () => {
...@@ -119,79 +112,7 @@ class PythonStudy extends Component { ...@@ -119,79 +112,7 @@ class PythonStudy extends Component {
}) })
} }
} }
// 微信支付
isweixinPay = () => {
let _this = this;
let weixin_code = getParam('code');
if (weixin_code) {
if (getParam('oid') === undefined) {
return
} else {
http.get(`${API['base-api']}/pay/wxpay/pub_charge/oid/${getParam('oid')}/code/${weixin_code}`).then((res) => {
if (res.data.errno === 0) {
let data = res.data.data;
function onBridgeReady() {
WeixinJSBridge.invoke(
'getBrandWCPayRequest', {
appId: data.appId, //公众号名称，由商户传入
timeStamp: data.timeStamp, //时间戳，自1970年以来的秒数
nonceStr: data.nonceStr, //随机串
package: data.package,
signType: data.signType, //微信签名方式：
paySign: data.paySign //微信签名
},
function (res) {
if (res.err_msg == "get_brand_wcpsys/order_status/ay_request:ok") {
Toast.info('支付成功', 2);
_this.intervalPayStatus = setInterval(function () {
http.get(`${API['base-api']}/m/orderState/oid/${getParam('oid')}`).then(res => {
if (res.data.errno === 401) {
clearInterval(_this.intervalPayStatus);
_this.intervalPayStatus = null;
location.reload()
}
})
}, 1000)
} else {
Toast.info('支付失败', 2);
}
}
)
}
if (typeof WeixinJSBridge == "undefined") {
if (document.addEventListener) {
document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false)
} else if (document.attachEvent) {
document.attachEvent('WeixinJSBridgeReady', onBridgeReady);
document.attachEvent('onWeixinJSBridgeReady', onBridgeReady)
}
} else {
onBridgeReady();
}
} else {
Toast.info(res.data.msg, 2)
}
})
}
}
}
// 支付完成之后获取状态
payCallback = () => {
const _this = this;
// 支付回调
// 定时器轮训获取订单状态
_this.intervalPayStatus = setInterval(function () {
http.get(`${API['base-api']}/m/orderState/oid/${getParam('oid')}`).then(res => {
if (res.data.errno === 401) {
clearInterval(_this.intervalPayStatus);
_this.intervalPayStatus = null;
location.reload()
}
})
}, 1000)
}
render() { render() {
const {user} = this.props const {user} = this.props
......
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