Skip to content

M
mr-julyedu
Commit f7f8a2a8 by wangshuo
Options

打包

parents 09ad847f 7470c756
Showing with 118 additions and 80 deletions
build/asset-manifest.json
......@@ -38,8 +38,8 @@
"Orderinfo.js": "/mrstatic/js/Orderinfo.48056050.chunk.js",
"Orderinfo.js.map": "/mrstatic/js/Orderinfo.48056050.chunk.js.map",
"PayOrder.css": "/mrstatic/css/PayOrder.4a91788c.chunk.css",
"PayOrder.js": "/mrstatic/js/PayOrder.1000aee4.chunk.js",
"PayOrder.js.map": "/mrstatic/js/PayOrder.1000aee4.chunk.js.map",
"PayOrder.js": "/mrstatic/js/PayOrder.7270de40.chunk.js",
"PayOrder.js.map": "/mrstatic/js/PayOrder.7270de40.chunk.js.map",
"Preferential.css": "/mrstatic/css/Preferential.8ccc590e.chunk.css",
"Preferential.js": "/mrstatic/js/Preferential.6e0091c3.chunk.js",
"Preferential.js.map": "/mrstatic/js/Preferential.6e0091c3.chunk.js.map",
......@@ -55,9 +55,9 @@
"aist-share.css": "/mrstatic/css/aist-share.7510d5bb.chunk.css",
"aist-share.js": "/mrstatic/js/aist-share.b5c8cddb.chunk.js",
"aist-share.js.map": "/mrstatic/js/aist-share.b5c8cddb.chunk.js.map",
"blessing-preheat.css": "/mrstatic/css/blessing-preheat.9ddebed8.chunk.css",
"blessing-preheat.js": "/mrstatic/js/blessing-preheat.c1968bd4.chunk.js",
"blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.c1968bd4.chunk.js.map",
"blessing-preheat.css": "/mrstatic/css/blessing-preheat.a5410be9.chunk.css",
"blessing-preheat.js": "/mrstatic/js/blessing-preheat.843e4f67.chunk.js",
"blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.843e4f67.chunk.js.map",
"blessing-rank.css": "/mrstatic/css/blessing-rank.f3d178ff.chunk.css",
"blessing-rank.js": "/mrstatic/js/blessing-rank.05a004d7.chunk.js",
"blessing-rank.js.map": "/mrstatic/js/blessing-rank.05a004d7.chunk.js.map",
......@@ -77,16 +77,16 @@
"main.js": "/mrstatic/js/main.f960bb75.chunk.js",
"main.js.map": "/mrstatic/js/main.f960bb75.chunk.js.map",
"myorders.css": "/mrstatic/css/myorders.5cf0b543.chunk.css",
"myorders.js": "/mrstatic/js/myorders.80fde39e.chunk.js",
"myorders.js.map": "/mrstatic/js/myorders.80fde39e.chunk.js.map",
"myorders.js": "/mrstatic/js/myorders.563d8cc1.chunk.js",
"myorders.js.map": "/mrstatic/js/myorders.563d8cc1.chunk.js.map",
"prize-winner-list.css": "/mrstatic/css/prize-winner-list.013af682.chunk.css",
"prize-winner-list.js": "/mrstatic/js/prize-winner-list.f4cc9237.chunk.js",
"prize-winner-list.js.map": "/mrstatic/js/prize-winner-list.f4cc9237.chunk.js.map",
"purchased.css": "/mrstatic/css/purchased.28c23daa.chunk.css",
"purchased.js": "/mrstatic/js/purchased.4e7a96e5.chunk.js",
"purchased.js.map": "/mrstatic/js/purchased.4e7a96e5.chunk.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.11831a69.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.11831a69.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.1669603f.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.1669603f.js.map",
"search.css": "/mrstatic/css/search.85280180.chunk.css",
"search.js": "/mrstatic/js/search.03a4c888.chunk.js",
"search.js.map": "/mrstatic/js/search.03a4c888.chunk.js.map",
......@@ -147,7 +147,7 @@
"mrstatic/css/ShareCourse.c571c49e.chunk.css.map": "/mrstatic/css/ShareCourse.c571c49e.chunk.css.map",
"mrstatic/css/ShopCart.f39ca42e.chunk.css.map": "/mrstatic/css/ShopCart.f39ca42e.chunk.css.map",
"mrstatic/css/aist-share.7510d5bb.chunk.css.map": "/mrstatic/css/aist-share.7510d5bb.chunk.css.map",
"mrstatic/css/blessing-preheat.9ddebed8.chunk.css.map": "/mrstatic/css/blessing-preheat.9ddebed8.chunk.css.map",
"mrstatic/css/blessing-preheat.a5410be9.chunk.css.map": "/mrstatic/css/blessing-preheat.a5410be9.chunk.css.map",
"mrstatic/css/blessing-rank.f3d178ff.chunk.css.map": "/mrstatic/css/blessing-rank.f3d178ff.chunk.css.map",
"mrstatic/css/coupons.940f5632.chunk.css.map": "/mrstatic/css/coupons.940f5632.chunk.css.map",
"mrstatic/css/deposit-order.0cb67b20.chunk.css.map": "/mrstatic/css/deposit-order.0cb67b20.chunk.css.map",
......@@ -166,6 +166,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.f18ba32fe96f5822df7ed428f6d0a183.js": "/precache-manifest.f18ba32fe96f5822df7ed428f6d0a183.js",
"precache-manifest.b494158f338a45536e61df7828722434.js": "/precache-manifest.b494158f338a45536e61df7828722434.js",
"service-worker.js": "/service-worker.js"
}
\ No newline at end of file
build/mrstatic/js/PayOrder.1000aee4.chunk.js → build/mrstatic/js/PayOrder.7270de40.chunk.js
(window.webpackJsonp=window.webpackJsonp||[]).push([[14],{1213:function(e,a,t){"use strict";t.r(a),t.d(a,"default",function(){return P});t(155);var n=t(75),i=t.n(n),c=(t(90),t(25)),o=t.n(c),r=(t(154),t(35)),s=t.n(r),l=(t(39),t(12)),d=t.n(l),p=t(4),u=t(7),m=t(5),y=t(8),f=t(9),g=t(73),h=(t(639),t(640)),b=t.n(h),v=(t(118),t(46)),w=t.n(v),E=t(0),S=t.n(E),x=t(3),_=t(26),j=t(15),k=(t(916),w.a.Item.Brief,b.a.RadioItem),I=[];I=x.b.isWeixin?[{value:1,label:"\u5fae\u4fe1\u652f\u4ed8",icon:"iconweixinzhifu"}]:[{value:1,label:"\u5fae\u4fe1\u652f\u4ed8",icon:"iconweixinzhifu"},{value:0,label:"\u652f\u4ed8\u5b9d",icon:"iconalipay"}];var P=function(e){function a(e){var t;return Object(p.a)(this,a),(t=Object(m.a)(this,Object(y.a)(a).call(this,e))).redirectAfterPay=function(){var e=Object(x.c)("status"),a=Object(x.c)("type"),n=Object(x.c)("oid"),i=t.props.history;if(e||a)if(0===parseInt(e,10))if(2===parseInt(a,10))i.push("/togroup?id=".concat(n));else if(4===parseInt(a,10)){c&&window.localStorage.setItem("payCourse",c);var c=window.localStorage.getItem("payCourse");c&&i.push("/detail?id=".concat(c),{oid:n})}else i.push("/purchased");else d.a.info("\u652f\u4ed8\u5f02\u5e38",2)},t.onChange=function(e){t.setState({payType:e,checkPeriod:!1}),2===e&&t.setState({huabei:!0})},t.checkStaging=function(e){t.setState({huabei:!1,stageNumber:e.value,singleMoney:e.everyTotal,periodNumber:e.stage,checkPeriod:!0})},t.print=function(){for(var e=arguments.length,a=new Array(e),t=0;t<e;t++)a[t]=arguments[t];console.log(a)},t.pay=function(){var e=t.state,a=e.payType,n=e.orderId;0===a?t.alipayPay(n):1===a&&t.weixinPay(n)},t.weixinPay=function(e){Object(x.f)()?window.location.href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri="+encodeURIComponent(window.location.href+"&aa=bb").toLowerCase()+"&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect":x.d.get("".concat(API["base-api"],"/pay/wxpay/wap_charge/oid/").concat(e)).then(function(e){0===e.data.errno?window.location.href=e.data.data.url+"&redirect_url="+encodeURIComponent(window.location.href+"&weixinpay=1").toLowerCase():d.a.info(e.data.msg,2)})},t.isweixinPay=function(){var e=Object(g.a)(Object(g.a)(t)),a=Object(x.c)("code");if(a){if(void 0===Object(x.c)("oid"))return;x.d.get("".concat(API["base-api"],"/pay/wxpay/pub_charge/oid/").concat(Object(x.c)("oid"),"/code/").concat(a)).then(function(a){if(0===a.data.errno){var t=function(){WeixinJSBridge.invoke("getBrandWCPayRequest",{appId:n.appId,timeStamp:n.timeStamp,nonceStr:n.nonceStr,package:n.package,signType:n.signType,paySign:n.paySign},function(a){"get_brand_wcpay_request:ok"==a.err_msg?(d.a.info("\u652f\u4ed8\u6210\u529f",2),e.intervalPayStatus=setInterval(function(){x.d.get("".concat(API["base-api"],"/m/orderState/oid/").concat(Object(x.c)("oid"))).then(function(a){401===a.data.errno&&(clearInterval(e.intervalPayStatus),e.intervalPayStatus=null,x.d.get("".concat(API["base-api"],"/m/app_order/detail/").concat(Object(x.c)("oid"))).then(function(a){2===Number(a.data.data.course_type)?e.props.history.replace("/togroup?id=".concat(Object(x.c)("oid"))):e.props.history.replace("/purchased")}))})},1e3)):alert("\u652f\u4ed8\u5931\u8d25")})},n=a.data.data;"undefined"==typeof WeixinJSBridge?document.addEventListener?document.addEventListener("WeixinJSBridgeReady",t,!1):document.attachEvent&&(document.attachEvent("WeixinJSBridgeReady",t),document.attachEvent("onWeixinJSBridgeReady",t)):t()}else d.a.info(a.data.msg,2)})}},t.payCallback=function(){var e=Object(g.a)(Object(g.a)(t));e.intervalPayStatus=setInterval(function(){x.d.get("".concat(API["base-api"],"/m/orderState/oid/").concat(Object(x.c)("oid"))).then(function(a){401===a.data.errno&&(clearInterval(e.intervalPayStatus),e.intervalPayStatus=null,x.d.get("".concat(API["base-api"],"/m/app_order/detail/").concat(Object(x.c)("oid"))).then(function(a){2===Number(a.data.data.course_type)?e.props.history.replace("/togroup?id=".concat(Object(x.c)("oid"))):e.props.history.replace("/purchased")}))})},1e3)},t.onBridgeReady1=function(e){var a=Object(g.a)(Object(g.a)(t));e=e||a.BridgeData,WeixinJSBridge.invoke("getBrandWCPayRequest",{appId:"wx23dac6775ac82877",timeStamp:e.timeStamp,nonceStr:e.nonceStr,package:e.package,signType:e.signType,paySign:e.paySign},function(e){"get_brand_wcpay_request:ok"==e.err_msg?(d.a.info("\u652f\u4ed8\u6210\u529f",2),a.payCallback()):alert("\u652f\u4ed8\u5931\u8d25")})},t.alipayPay=function(e){x.d.get("".concat(API["base-api"],"/pay/alipay/wap_charge_new/oid/").concat(e)).then(function(e){0===e.data.errno?(t.payCallback(),window.location=e.data.data.url):d.a.info(e.data.msg,2)})},t.huabeiPay=function(e){var a=t.state,n=(a.singleMoney,a.periodNumber);x.d.get("/pay/alipay/wap_charge/oid/".concat(e,"/plat/{plat} /hb_num/").concat(n)).then(function(e){0===e.data.errno?window.location=e.data.data.url:d.a.info(e.data.msg,2)})},t.state={pay_amount:0,payType:1,stageNumber:0,checkPeriod:!1,singleMoney:0,periodNumber:0,orderId:Object(x.c)("oid"),huabei:!1,fenqiList:[{value:"zhifubao",qishu:"3",lilv:"2.30%",everyMoney:300,feiyong:2.3},{value:"weixin",qishu:"6",lilv:"4.50%",everyMoney:150,feiyong:4.5},{value:"huabei",qishu:"9",lilv:"7.50%",everyMoney:100,feiyong:7.5}],categoryList:[]},t}return Object(f.a)(a,e),Object(u.a)(a,[{key:"componentDidMount",value:function(){var e=this;this.redirectAfterPay();var a={};a=this.props.location.state&&this.props.location.state.group?{order_id:this.state.orderId,type:2}:{order_id:this.state.orderId},x.d.post("".concat(API["base-api"],"/m/order/detail"),a).then(function(a){if(200===a.data.errno){var t=a.data.data,n=t.course,i=t.pay_amount,c=[];[1,2,3].map(function(e){var a={};a.value=e,1===e?(a.stage=3,a.moneyRate="2.30%",a.rate=.023,a.periodic=(i/3).toFixed(2)):2===e?(a.stage=6,a.moneyRate="4.50%",a.rate=.045,a.periodic=(i/6).toFixed(2)):(a.stage=12,a.moneyRate="7.50%",a.rate=.075,a.periodic=(i/9).toFixed(2)),a.serviceFee=(i*a.rate/a.stage).toFixed(2),a.everyTotal=(parseFloat(a.periodic)+parseFloat(a.serviceFee)).toFixed(2),c.push(a)}),e.setState({pay_amount:i,categoryList:n,fenqiList:c})}else d.a.info(a.data.msg,2)}),(1===Object(x.c)("is_class")||Object(x.c)("weixinpay"))&&this.payCallback(),Object(x.f)()&&(this.setState({payType:1}),this.isweixinPay())}},{key:"render",value:function(){var e=this,a=this.state,t=a.orderId,n=a.pay_amount,c=a.payType,r=a.checkPeriod,l=a.singleMoney,d=a.periodNumber,p=a.huabei,u=a.fenqiList,m=a.categoryList,y=a.stageNumber;return S.a.createElement("div",{className:"pay-order"},S.a.createElement(_.e,{title:"\u786e\u8ba4\u652f\u4ed8",arrow:!0}),S.a.createElement(s.a,{size:"sm"}),S.a.createElement("div",{className:"order-number"},S.a.createElement(i.a,null,S.a.createElement(o.a,{justify:"between",align:"center",style:{height:"44px"}},S.a.createElement("span",null,"\u8ba2\u5355\u53f7"),S.a.createElement("span",{className:"number"},t)))),S.a.createElement(s.a,{size:"md"}),m.map(function(a,t){var n=S.a.createElement("div",{className:"order-info"},S.a.createElement("p",{className:"order-title text-overflow-one"},S.a.createElement(j.b,{to:"/detail?id=".concat(a.course_id)},a.course_title)),S.a.createElement("p",{className:"order-content text-overflow-2"},a.simpledescription),S.a.createElement("p",{className:"order-des"},S.a.createElement("span",{className:"order-newprice"},"\xa5",a.price1),S.a.createElement("span",{className:"order-price"},"\xa5",a.price0)));return S.a.createElement(_.j,{handleClick:e.print,key:t,img:a.image_name,id:a.course_id,info:n})}),S.a.createElement(s.a,{size:"md"}),S.a.createElement("div",{className:"order-number"},S.a.createElement(i.a,null,S.a.createElement(o.a,{justify:"between",align:"center",style:{height:"44px"}},S.a.createElement("span",null,"\u652f\u4ed8\u91d1\u989d"),S.a.createElement("span",{className:"money"},"\uffe5".concat(n))))),S.a.createElement(s.a,{size:"md"}),S.a.createElement(w.a,{renderHeader:function(){return"\u652f\u4ed8\u65b9\u5f0f"},className:"pay-type-list"},I.map(function(a){return S.a.createElement(k,{thumb:S.a.createElement("i",{className:"iconfont ".concat(a.icon," ").concat(c===a.value?"checked":"")}),key:a.value,checked:c===a.value,onChange:function(){return e.onChange(a.value)}},2===a.value?S.a.createElement(o.a,{direction:"column",align:"start",style:{width:"100%",marginTop:"6px"}},S.a.createElement(o.a,{direction:"row",justify:"between",style:{width:"100%",paddingRight:"30px"}},S.a.createElement("span",{style:{color:"#555555",fontSize:"14px"}},a.label),r?S.a.createElement("span",{style:{color:"#333333",fontSize:"12px"}},"".concat(l,"\u5143 \xd7 ").concat(d,"\u671f")):null),S.a.createElement(o.a,{justify:"start"},S.a.createElement("span",{style:{color:"#999999",fontSize:"12px"}},"\u652f\u4ed8\u4e0a\u9650\u53d7\u9650\u4e8e\u60a8\u7684\u82b1\u5457\u989d\u5ea6"))):a.label)})),S.a.createElement("div",{className:"pay-tip"},"\u8bf7\u572815\u5206\u949f\u5185\u5b8c\u6210\u652f\u4ed8\uff0c\u5426\u5219\u5c4a\u65f6\u7cfb\u7edf\u5c06\u5173\u95ed\u8be5\u8ba2\u5355\u3002"),S.a.createElement("div",{className:"pay-button",onClick:this.pay},"\u786e\u8ba4\u652f\u4ed8"),p?S.a.createElement("div",{className:"check-staging"},S.a.createElement("div",{className:"container"},S.a.createElement("p",{className:"check-title"},"\u8bf7\u9009\u62e9\u5206\u671f"),u.map(function(a){return S.a.createElement(k,{key:a.value,checked:y===a.value,onChange:function(){return e.checkStaging(a)}},"".concat(a.everyTotal,"\u5143 \xd7 ").concat(a.stage,"\u671f"),S.a.createElement(w.a.Item.Brief,null,"\u624b\u7eed\u8d39".concat(a.serviceFee,"\u5143/\u671f\uff0c\u8d39\u7387").concat(a.moneyRate)))}))):null)}}]),a}(E.Component)},916:function(e,a,t){}}]);
//# sourceMappingURL=PayOrder.1000aee4.chunk.js.map
\ No newline at end of file
//# sourceMappingURL=PayOrder.7270de40.chunk.js.map
\ No newline at end of file
build/mrstatic/js/blessing-preheat.843e4f67.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/blessing-preheat.c1968bd4.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.f18ba32fe96f5822df7ed428f6d0a183.js → build/precache-manifest.b494158f338a45536e61df7828722434.js
......@@ -100,8 +100,8 @@ self.__precacheManifest = [
"url": "/mrstatic/media/iconfont.7aa984ce.eot"
},
{
"revision": "d949b861a007d9b4f8e0",
"url": "/mrstatic/js/PayOrder.1000aee4.chunk.js"
"revision": "74a5a7e8a5a855e50ca8",
"url": "/mrstatic/js/PayOrder.7270de40.chunk.js"
},
{
"revision": "e0655d4da66dce391e6b5227b400e037",
......@@ -148,8 +148,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/38.78ce841b.chunk.js"
},
{
"revision": "edd1c7076cf4f27b1fcf",
"url": "/mrstatic/js/blessing-preheat.c1968bd4.chunk.js"
"revision": "8f647e1a4add72e00d8f",
"url": "/mrstatic/js/blessing-preheat.843e4f67.chunk.js"
},
{
"revision": "d7c7f971421032a4777b",
......@@ -204,12 +204,12 @@ self.__precacheManifest = [
"url": "/mrstatic/js/search.03a4c888.chunk.js"
},
{
"revision": "734e064bf3bcf5b8fea3",
"url": "/mrstatic/js/myorders.80fde39e.chunk.js"
"revision": "cc376205496deca3b7e3",
"url": "/mrstatic/js/myorders.563d8cc1.chunk.js"
},
{
"revision": "c637037f450a5c26f135",
"url": "/mrstatic/js/runtime~main.11831a69.js"
"revision": "cd006b0b2705f4ce1f6e",
"url": "/mrstatic/js/runtime~main.1669603f.js"
},
{
"revision": "98b1647d1ba63eeab462",
......@@ -260,7 +260,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/main.500c88fe.chunk.css"
},
{
"revision": "734e064bf3bcf5b8fea3",
"revision": "cc376205496deca3b7e3",
"url": "/mrstatic/css/myorders.5cf0b543.chunk.css"
},
{
......@@ -288,8 +288,8 @@ self.__precacheManifest = [
"url": "/mrstatic/css/38.6b450e29.chunk.css"
},
{
"revision": "edd1c7076cf4f27b1fcf",
"url": "/mrstatic/css/blessing-preheat.9ddebed8.chunk.css"
"revision": "8f647e1a4add72e00d8f",
"url": "/mrstatic/css/blessing-preheat.a5410be9.chunk.css"
},
{
"revision": "390d9f4af7e2e4c59fb9",
......@@ -328,7 +328,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/Preferential.8ccc590e.chunk.css"
},
{
"revision": "d949b861a007d9b4f8e0",
"revision": "74a5a7e8a5a855e50ca8",
"url": "/mrstatic/css/PayOrder.4a91788c.chunk.css"
},
{
......@@ -372,7 +372,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/2.fd1b61f1.chunk.css"
},
{
"revision": "f5808f1c572de5ca480f833fcbb682ce",
"revision": "aba0eb187206d59bf1156430888e8db8",
"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.f18ba32fe96f5822df7ed428f6d0a183.js"
"/precache-manifest.b494158f338a45536e61df7828722434.js"
);
workbox.clientsClaim();
......
src/components/blessingPreheat/collectBlessing/index.js
......@@ -61,13 +61,12 @@ class CollectBlessing extends Component {
if(!uid) {
SendMessageToApp("toLogin");
}else {
let data = {
SendMessageToApp("QQshare", {
title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！',
desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线',
link: 'https://m.julyedu.com/blessingPreheat',
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png',
};
SendMessageToApp("QQshare", data);
});
}
}else {
if(!uid) {
......@@ -87,13 +86,12 @@ class CollectBlessing extends Component {
if(!uid) {
SendMessageToApp("toLogin");
}else {
let data = {
SendMessageToApp("WXshare", {
title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！',
desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线',
link: 'https://m.julyedu.com/blessingPreheat',
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png',
};
SendMessageToApp("WXshare", data);
});
}
}else {
if(!uid) {
......@@ -113,13 +111,12 @@ class CollectBlessing extends Component {
if(!uid) {
SendMessageToApp("toLogin");
}else {
let data = {
SendMessageToApp("WBshare", {
title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！',
desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线',
link: 'https://m.julyedu.com/blessingPreheat',
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png',
};
SendMessageToApp("WXshare", data);
});
}
}else {
if(!uid) {
......@@ -177,7 +174,8 @@ class CollectBlessing extends Component {
render() {
const {
isSign,
userInfo: { isLogin = false, blessingVal = 0, buyBlessing = 0, inviteBlessing = 0 },
userInfo: {blessingVal = 0, buyBlessing = 0, inviteBlessing = 0 },
isLogin,
handleToShowNotice,
handleToShowList,
handleToShowInvite,
......
src/components/blessingPreheat/courseItem/index.js
......@@ -3,11 +3,11 @@ import './index.scss';
class CourseItem extends Component {
render() {
const { image } = this.props;
const { image,toCourse,id} = this.props;
return (
<div className="course-container">
<div className="course__cover">
<img src={image} alt="cover"/>
<img src={image} alt="cover" onClick={() => toCourse(id)}/>
</div>
{this.props.children}
</div>
......
src/components/blessingPreheat/courseItem/index.scss
......@@ -15,5 +15,6 @@
img {
display: block;
width: 100%;
height: 100%;
}
}
\ No newline at end of file
src/components/blessingPreheat/courseList/index.js
......@@ -298,7 +298,7 @@ class CourseList extends Component {
<div data-layout="row">
{
group.course.map(item => (
<CourseItem image={item.image_name} key={item.course_id}>
<CourseItem image={item.image_name} key={item.course_id} id={item.course_id} toCourse={this.toCourse}>
<div className="coupon-course__footer">
<a onClick={() => this.toQQque()} className="course-button">立抢超低团购价</a>
</div>
......@@ -323,7 +323,7 @@ class CourseList extends Component {
<div data-layout="row">
{
training.course.map(item => (
<CourseItem image={item.image_name} key={item.course_id}>
<CourseItem image={item.image_name} key={item.course_id} id={item.course_id} toCourse={this.toCourse}>
<div className="coupon-course__footer">
{
item.course_status === 1 &&
......@@ -391,7 +391,7 @@ class CourseList extends Component {
<div data-layout="row">
{
basic.course.map(item => (
<CourseItem image={item.image_name} key={item.course_id}>
<CourseItem image={item.image_name} key={item.course_id} id={item.course_id} toCourse={this.toCourse}>
{
item.type === 0 &&
<div className="coupon-course__footer">
......@@ -472,7 +472,7 @@ class CourseList extends Component {
<div data-layout="row">
{
advanced.course.map(item => (
<CourseItem image={item.image_name} key={item.course_id}>
<CourseItem image={item.image_name} key={item.course_id} id={item.course_id} toCourse={this.toCourse}>
{
item.type === 0 &&
<div className="coupon-course__footer">
......@@ -552,7 +552,7 @@ class CourseList extends Component {
<div data-layout="row">
{
higher.course.map(item => (
<CourseItem image={item.image_name} key={item.course_id}>
<CourseItem image={item.image_name} key={item.course_id} id={item.course_id} toCourse={this.toCourse}>
{
item.type === 0 &&
<div className="coupon-course__footer">
......@@ -632,7 +632,7 @@ class CourseList extends Component {
<div data-layout="row">
{
expand.course.map(item => (
<CourseItem image={item.image_name} key={item.course_id}>
<CourseItem image={item.image_name} key={item.course_id} id={item.course_id} toCourse={this.toCourse}>
{
item.type === 0 &&
<div className="coupon-course__footer">
......
src/components/blessingPreheat/courseList/index.scss
......@@ -23,7 +23,7 @@
padding: 10px 0;
.course-button {
margin: 5px auto 0;
//margin: 5px auto 0;
}
}
......@@ -42,7 +42,8 @@
text-align: center;
line-height: 1;
background-image: url('https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/coupon-bg-0.png');
background-repeat: no-repeat;
background-size: cover;
}
.coupon-course__button--receive {
......
src/components/blessingPreheat/index.js
import React, { Component } from 'react'
import React, {Component} from 'react'
import QRCode from 'qrcode'
import { http, SendMessageToApp,wxShare,is_weixin,getParam} from '@/utils';
import { Link } from 'react-router-dom'
import { throttle, findIndex, debounce } from 'lodash'
import {http, SendMessageToApp, wxShare, is_weixin, getParam} from '@/utils';
import {Link} from 'react-router-dom'
import {throttle, findIndex, debounce} from 'lodash'
import RulePopup from './rulePopup/index'
import CoursePopup from './coursePopup/index'
import RecordPopup from './recordPopup/index'
......@@ -15,9 +15,9 @@ import ListHeader from './listHeader/index'
import LevelTest from './levelTest/index'
import RankList from './rankList/index'
import './index.scss'
import { Popup } from '@/common'
import { CopyToClipboard } from 'react-copy-to-clipboard'
import { Toast } from "antd-mobile"
import {Popup} from '@/common'
import {CopyToClipboard} from 'react-copy-to-clipboard'
import {Toast} from "antd-mobile"
import Live from './live'
import Banner from './banner'
import cookie from "js-cookie";
......@@ -27,7 +27,6 @@ import {compose} from "redux";
import {connect} from "react-redux";
class BlessingPreheat extends Component {
constructor(props) {
......@@ -35,6 +34,7 @@ class BlessingPreheat extends Component {
this.navTop = 183
this.prevY = 0
this.state = {
isLogin: false,
userInfoList: [],
isRule: false,
isCourse: false,
......@@ -76,6 +76,7 @@ class BlessingPreheat extends Component {
},
],
index: 0,
userHasError: props.user.hasError
}
}
......@@ -83,7 +84,7 @@ class BlessingPreheat extends Component {
this.fetchUserBlessing();
this.setInitialNavActiveStatus()
window.addEventListener('scroll', throttle(this.calcNavActive, 100));
if(is_weixin()) {
if (is_weixin()) {
wxShare({
title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！',
desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线',
......@@ -96,6 +97,22 @@ class BlessingPreheat extends Component {
window['loginInfo'] = result => {
this.loginInfo(result)
}
window['getNewData'] = result => {
this.fetchUserBlessing();
}
}
componentDidUpdate(prevProps, prevState){
let {user} = this.props
if (this.props.user.hasError !== this.state.userHasError) {
const uid = user && user.data && user.data.uid;
this.setState({
isLogin: !uid ? false : true,
userHasError: user.hasError
})
}
}
// 获取app登录数据
......@@ -188,15 +205,10 @@ class BlessingPreheat extends Component {
}
fetchUserBlessing() {
// 判断登录未登录 根据this.state.userInfo.isLogin
if(getParam('version')) {
// app 平台
}else{
// H5
}
const { userInfo } = this.state;
const {user, history} = this.props;
const uid = user && user.data && user.data.uid;
// 判断登录未登录 根据this.state.isLogin
Toast.info('fetchUserBlessing', 2)
const {userInfo} = this.state;
http.get(`${API.home}/sys/user/blessing`).then(res => {
const {code, data} = res.data
if (code === 200) {
......@@ -204,10 +216,9 @@ class BlessingPreheat extends Component {
isSign: !!data.today_signed,
isFormal: data.is_activity,
userInfo: Object.assign({}, userInfo, {
isLogin: !!uid,
blessingVal: data.user_blessing_value,
buyBlessing: (data.types_total_blessing_value &&data.types_total_blessing_value.buy_course)? data.types_total_blessing_value.buy_course : 0,
inviteBlessing: (data.types_total_blessing_value &&data.types_total_blessing_value.invite)? data.types_total_blessing_value.invite : 0,
buyBlessing: (data.types_total_blessing_value && data.types_total_blessing_value.buy_course) ? data.types_total_blessing_value.buy_course : 0,
inviteBlessing: (data.types_total_blessing_value && data.types_total_blessing_value.invite) ? data.types_total_blessing_value.invite : 0,
})
})
if (data.is_login === 1) {
......@@ -241,9 +252,8 @@ class BlessingPreheat extends Component {
}
handleToShow = (key, isLogin = false) => {
const {userInfo} = this.state
// 需要用户登录 并且用户未登录
if (isLogin && !userInfo.isLogin) {
if (isLogin && !this.state.isLogin) {
this.toLogin()
} else {
let obj = {}
......@@ -256,9 +266,9 @@ class BlessingPreheat extends Component {
// 邀请好友注册
handleToShowInvite = () => {
const { userInfo } = this.state;
if(userInfo.isLogin) {
if(!getParam('version')) {
const {isLogin} = this.state;
if (isLogin) {
if (!getParam('version')) {
QRCode.toDataURL(`${API.m}/invite`, {
width: 120,
height: 120,
......@@ -349,7 +359,7 @@ class BlessingPreheat extends Component {
}
let el = document.querySelector(`#${navs[_index].id}`)
let nav = document.querySelector('#main-nav')
if(el) {
if (el) {
let top = el.offsetTop
......@@ -380,6 +390,7 @@ class BlessingPreheat extends Component {
const {
navs,
userInfo,
isLogin,
isRule,
isCourse,
inviteUrl,
......@@ -408,6 +419,7 @@ class BlessingPreheat extends Component {
<CollectBlessing
isSign={isSign}
userInfo={userInfo}
isLogin={isLogin}
history={this.props.history}
toSection={(e) => this.toSection(this.fetchMoudleId('best-courses'), e)}
handleToShowList={() => this.handleToShow('isCourse')}
......@@ -438,7 +450,7 @@ class BlessingPreheat extends Component {
<ListHeader id={'best-courses'} text="精品课程特惠专区" styles={{margin: '30px 0 15px'}}/>
<CourseList
isFormal={isFormal}
isLogin={userInfo.isLogin}
isLogin={isLogin}
history={this.props.history}
toLogin={this.toLogin}
/>
......@@ -449,7 +461,8 @@ class BlessingPreheat extends Component {
}
{
isCourse &&
<CoursePopup toLogin={this.toLogin} history={history} isLogin={userInfo.isLogin} handleToHide={() => this.handleToHide('isCourse')}/>
<CoursePopup toLogin={this.toLogin} history={history} isLogin={isLogin}
handleToHide={() => this.handleToHide('isCourse')}/>
}
{
showRecordList &&
......@@ -503,12 +516,12 @@ class BlessingPreheat extends Component {
</Popup>
<ListHeader id={'ai-test'} text="全国AI工程师水平测试" styles={{margin: '30px 0 15px'}} />
<ListHeader id={'ai-test'} text="全国AI工程师水平测试" styles={{margin: '30px 0 15px'}}/>
<div className="test__record" onClick={() => this.handleToShow('showRecordList', true)}>
测试记录>
</div>
<LevelTest history={history} isLogin={userInfo.isLogin} toLogin={this.toLogin}></LevelTest>
<LevelTest history={history} isLogin={isLogin} toLogin={this.toLogin}></LevelTest>
<RankList></RankList>
......
src/components/blessingPreheat/rankList/index.js
......@@ -23,6 +23,19 @@ export default class RankList extends Component {
});
}
formart = (time) => {
let date = time * 1000,
hours = 0,
minutes = 0,
seconds = 0;
hours = `${parseInt(date / (60 * 60 * 1000))}`.padStart(2, 0);
minutes = `${parseInt((date - hours * 3600000) / 60000)}`.padStart(2, 0);
seconds = `${parseInt(
(date - hours * 3600000 - minutes * 60000) / 1000
)}`.padStart(2, 0);
return `${minutes}'${seconds}"`;
}
render() {
let {rankList} = this.state;
return (
......@@ -55,7 +68,7 @@ export default class RankList extends Component {
<img className="user__avatar" src={item.avatar} />
<span className="user__name">{item.user_name}</span>
</div>
<div className='table__body table_head__time'>{item.cost_time}</div>
<div className='table__body table_head__time'>{this.formart(item.cost_time)}</div>
<div className='table__body table_head__score'>{item.score}</div>
<div className='table__body table_head__prize'>{item.prize}</div>
</div>
......
src/components/myOrders/index.js
......@@ -193,7 +193,7 @@ function PayInfo(props) {
</p>
<p>
<span className='payable'>已优惠：</span>
<span className='price'>¥{props.item.deposit_cut}</span>
<span className='price'>¥{props.item.discount}</span>
</p>
</div>
......
src/components/order/payOrder/PayOrder.js
......@@ -112,6 +112,15 @@ export default class PayOrder extends Component {
// 微信内部-支付
if (is_weixin()) {
window.location.href = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri=" + encodeURIComponent(window.location.href + "&aa=bb").toLowerCase() + "&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
// if(window.location.href.indexOf('aa=bb') === -1){
// localStorage.setItem('a', '第一次');
// window.location.href = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri=" + encodeURIComponent(window.location.href + "&aa=bb").toLowerCase() + "&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
// }
// if(window.location.href.indexOf('aa=bb') > 0) {
// localStorage.setItem('a', '多次');
// let newHref = window.location.href.slice(0, window.location.href.indexOf('aa=bb')-1);
// window.location.href = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri=" + encodeURIComponent(newHref + "&aa=bb").toLowerCase() + "&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
// }
} else {
// 微信外部-支付
http.get(`${API['base-api']}/pay/wxpay/wap_charge/oid/${orderId}`).then((res) => {
......
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