Skip to content

M
mr-julyedu
Commit b8e6de9f by wangshuo
Options

合并代码PythonForAPP

parents 583ad6fa 373e5493
Showing with 356 additions and 195 deletions
build/mrstatic/css/main.680deaad.chunk.css
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/css/main.7e1c28a3.chunk.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/css/main.7e1c28a3.chunk.css.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/1.27a3e6ef.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/42.e48db56b.chunk.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/42.e48db56b.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/51.3c10cacd.chunk.js 0 → 100644
(window.webpackJsonp=window.webpackJsonp||[]).push([[51],{1250:function(e,t,a){},1286:function(e,t,a){"use strict";a.r(t);a(41);var n=a(12),c=a.n(n),o=a(5),s=a(7),i=a(6),l=a(8),r=a(9),d=a(0),u=a.n(d),m=a(16),h=a(722),p=a(1244),y=a.n(p),E=a(28),b=a(3),_=(a(1250),a(1251),a(1252),function(e){function t(e){var a;return Object(o.a)(this,t),(a=Object(i.a)(this,Object(l.a)(t).call(this,e))).initCommand=function(){a.setState({command:"".concat(API.m,"/pythonShare?id=").concat(Object(b.c)("id"),"&type=").concat(Object(b.c)("type"),"&ques=").concat(Object(b.c)("ques"),"&origin=python")})},a.initPageStatus=function(){"barcode"===Object(b.c)("origin")&&a.setState({entryMode:0}),"python"===Object(b.c)("origin")&&a.setState({entryMode:1}),"1"===Object(b.c)("type")&&a.setState({isShare:!0}),"2"===Object(b.c)("type")&&a.setState({isShare:!1}),a.setState({type:Object(b.c)("ques")||"1"})},a.handleFetchInfo=function(){var e=Object(b.c)("id")||10;b.d.get("".concat(API.home,"/m/it/share/show"),{params:{id:e}}).then(function(e){var t=e.data,n=t.code,c=t.data;200===n&&a.setState({data:c})})},a.handleToSend=function(e){var t=a.props.history,n=a.state,c=n.isShare;n.entryMode;b.b.isWeixin&&(t.push("/pythonShare?id=".concat(Object(b.c)("id"),"&type=").concat(Object(b.c)("type"),"&ques=").concat(Object(b.c)("ques"),"&origin=python")),a.setState({isGuide:!0}),Object(b.i)({title:c?"\u6211\u5df2\u5728\u3010".concat(e.course_name,"\u3011\u4e0a\u8fd0\u884c\u4e86\u884c\u4ee3\u7801\u4e86").concat(e.code_lines):"\u6211\u5728".concat(e.course_name,"\u7684").concat(labelName,"\u9047\u5230\u4e86\u56f0\u96be"),desc:a.formatTitle(e),link:encodeURI(location.href),imgUrl:e.course_img}))},a.formatTitle=function(e){var t=a.state.type;return"1"===t?"\u7ec3\u4e60-".concat(e.ques_name):"2"===t?"\u8bfe\u5802-".concat(e.video_name):void 0},a.copyToSuccess=function(){c.a.info("\u5df2\u590d\u5236\u94fe\u63a5\uff0c\u5feb\u53bb\u7c98\u8d34\u53d1\u7ed9\u597d\u53cb\u5427\uff5e"),a.setState({isCopy:!0})},a.handleToExecute=function(){a.setState({isExecute:!0})},a.handleToHide=function(){a.setState({isGuide:!1})},a.state={isWechat:b.b.isWeixin,isShare:!0,type:"1",entryMode:0,isGuide:!1,isExecute:!1,isCopy:!1,command:"",data:{}},a}return Object(r.a)(t,e),Object(s.a)(t,[{key:"componentDidMount",value:function(){this.handleFetchInfo(),this.initPageStatus(),this.initCommand()}},{key:"render",value:function(){var e=this,t=this.state,a=t.isWechat,n=t.isShare,c=t.isExecute,o=t.entryMode,s=t.command,i=t.isCopy,l=t.isGuide,r=t.data;return u.a.createElement(u.a.Fragment,null,u.a.createElement(E.e,{title:"Python\u57fa\u7840\u8bed\u6cd5",arrow:!0,home:!0}),u.a.createElement(f,{isWechat:a,isShare:n,isExecute:c,entryMode:o,isGuide:l,isCopy:i,command:s,data:r,labelName:this.formatTitle(r),handleToExecute:this.handleToExecute,handleToSend:function(){return e.handleToSend(r)},copyToSuccess:this.copyToSuccess,handleToHide:this.handleToHide}))}}]),t}(d.Component));function S(e){return u.a.createElement(y.a,{mode:"python",theme:"dracula",readOnly:!0,showPrintMargin:!1,value:e.code,style:{width:"100%",height:"100%"}})}function f(e){var t=e.isWechat,a=e.isShare,n=e.isExecute,c=e.entryMode,o=e.isCopy,s=e.command,i=e.labelName,l=e.isGuide,r=e.data,d=r.head_img,p=r.nickname,y=r.code_lines,E=r.code,b=r.result,_=r.course_name,f=r.course_id,N=e.handleToSend,T=e.copyToSuccess,v=e.handleToExecute,O=e.handleToHide;return u.a.createElement("div",{className:"python-container"},l&&u.a.createElement("div",{className:"python-popup",onClick:O},u.a.createElement("div",{className:"python-header"},u.a.createElement("p",{className:"python-wechat__title"},"\u8bf7\u70b9\u51fb\u53f3\u4e0a\u89d2\u5206\u4eab"),u.a.createElement("i",{className:"iconfont iconyindao"}))),u.a.createElement("div",{className:"python-content"},u.a.createElement("div",{className:"python-user"},u.a.createElement("i",{className:"python-user__portrait",style:{backgroundImage:"url(".concat(d,")")}}),u.a.createElement("h2",{className:"python-user__id"},p),0===c&&a&&u.a.createElement("p",{className:"python-user__desc"},"\u5b8c\u6210\u4e86",u.a.createElement("span",null,"\u3010",i,"\u3011")),1===c&&a&&u.a.createElement("p",{className:"python-user__desc"},"\u5728",u.a.createElement("span",null,"\u3010",_,"\u3011"),"\u5b8c\u6210\u4e86",u.a.createElement("br",null),i),0===c&&!a&&u.a.createElement("p",{className:"python-user__desc"},"\u5728",u.a.createElement("span",null,"\u3010",i,"\u3011"),"\u9047\u5230\u4e86\u56f0\u96be"),1===c&&!a&&u.a.createElement("p",{className:"python-user__desc"},"\u5728",u.a.createElement("span",null,"\u3010",_,"\u3011"),"\u7684",u.a.createElement("br",null),u.a.createElement("span",null,i),"\u9047\u5230\u4e86\u56f0\u96be")),u.a.createElement("h4",{className:"python-code__title"},1===c&&a?"\u8fd9\u662fTa\u7684\u7b2c".concat(y,"\u884c\u4ee3\u7801"):"\u8fd0\u884c\u7ed3\u679c"),u.a.createElement("div",{className:"python-code__content"},u.a.createElement(S,{code:1===c&&a?E:b})),u.a.createElement("h4",{className:"python-code__title"},1===c&&a?"\u8fd0\u884c\u7ed3\u679c":"\u4ee3\u7801"),u.a.createElement("div",{className:"python-code__content"},1===c&&a?u.a.createElement(S,{code:n?b:""}):u.a.createElement(S,{code:E}),1===c&&a&&!n&&u.a.createElement("button",{className:"python-button python-button__execute",onClick:v},"\u8fd0\u884c\u770b\u770b"))),0===c&&t&&u.a.createElement("button",{className:"python-button python-button__study",onClick:N},a?"\u5206\u4eab\u7ed9\u597d\u53cb":"\u53d1\u7ed9\u597d\u53cb\u6c42\u52a9"),0===c&&!t&&!o&&u.a.createElement(h.CopyToClipboard,{text:s,onCopy:T},u.a.createElement("button",{className:"python-button python-button__study"},a?"\u5206\u4eab\u7ed9\u597d\u53cb":"\u53d1\u7ed9\u597d\u53cb\u6c42\u52a9")),0===c&&!t&&o&&u.a.createElement("p",{className:"python-button__tip"},"\u5df2\u590d\u5236\u94fe\u63a5\uff0c\u5feb\u53bb\u7c98\u8d34\u53d1\u7ed9\u597d\u53cb\u5427\uff5e"),1===c&&u.a.createElement(m.b,{className:"python-button python-button__study",to:"/python?id=".concat(f)},"\u6211\u4e5f\u8981\u5b66Python"))}t.default=_}}]);
//# sourceMappingURL=51.3c10cacd.chunk.js.map
\ No newline at end of file
build/mrstatic/js/DrawDocument.0076a47c.chunk.js 0 → 100644
(window.webpackJsonp=window.webpackJsonp||[]).push([[9],{1262:function(e,a,t){"use strict";t.r(a),t.d(a,"default",function(){return b});t(90);var n=t(27),c=t.n(n),l=(t(155),t(35)),s=t.n(l),i=(t(156),t(74)),r=t.n(i),m=t(5),o=t(7),d=t(6),p=t(8),E=t(9),u=t(0),N=t.n(u),v=(t(920),t(101)),b=function(e){function a(e){return Object(m.a)(this,a),Object(d.a)(this,Object(p.a)(a).call(this,e))}return Object(E.a)(a,e),Object(o.a)(a,[{key:"render",value:function(){return N.a.createElement("div",{className:"drawDocument"},N.a.createElement("div",null,N.a.createElement(r.a,{className:"navbar"},N.a.createElement("i",{className:"iconfont iconiconfront-68 back",onClick:this.props.history.goBack}),N.a.createElement("div",{className:"common-ft-15"},"\u89c4\u5219\u8bf4\u660e"))),N.a.createElement("div",{className:"content"},N.a.createElement(r.a,null,N.a.createElement("div",{className:"directions-div"},"\u5206\u9500\u89c4\u5219"),N.a.createElement(s.a,{size:"md"}),N.a.createElement("p",{className:"directions-p"},"\u70b9\u51fb\u300e\u5206\u4eab\u8d5a\u94b1\u300f\u751f\u6210\u60a8\u7684\u4e13\u5c5e\u6d77\u62a5\uff0c\u628a\u4e13\u5c5e\u6d77\u62a5\u5206\u4eab\u5230\u5fae\u4fe1\u3001\u5fae\u535a\u3001QQ\u3001\u77e5\u4e4e\u3001\u8d34\u5427\u7b49\uff0c\u4ed6\u4eba\u901a\u8fc7\u60a8\u7684\u6d77\u62a5\u8d2d\u4e70\u540e\u60a8\u53ef\u83b7\u5f97\u76f8\u5e94\u7684\u4f63\u91d1\u5956\u52b1\u3002"),N.a.createElement(s.a,{size:"lg"}),N.a.createElement(s.a,{size:"lg"}),N.a.createElement("div",{className:"directions-div"},"\u63d0\u73b0\u89c4\u5219"),N.a.createElement(s.a,{size:"md"}),N.a.createElement("p",{className:"directions-p"},"1. \u5df2\u5f00\u59cb\u7684\u76f4\u64ad\u8bfe\u7a0b\uff0c\u7528\u6237\u8d2d\u4e70\u540e\u4f63\u91d1\u4f1a\u5b9e\u65f6\u8f6c\u5165\u60a8\u7684\u8d26\u53f7\u4f59\u989d\uff1b"),N.a.createElement("p",{className:"directions-p"},"2. \u5c1a\u672a\u5f00\u8bfe\u7684\u76f4\u64ad\u8bfe\u7a0b\uff0c\u7528\u6237\u8d2d\u4e70\u540e\u5f52\u5c5e\u60a8\u7684\u4f63\u91d1\u6237\u6682\u65f6\u5b58\u653e\u5728\u300e\u5f85\u786e\u8ba4\u91d1\u989d\u300f\u4e2d\uff0c\u76f4\u5230\u8be5\u8bfe\u7a0b\u6b63\u5f0f\u5f00\u8bfe\u3002\u5982\u679c\u7528\u6237\u6ca1\u6709\u9000\u6b3e\uff0c\u5bf9\u5e94\u7684\u8ba2\u5355\u91d1\u989d\u4f1a\u81ea\u52a8\u8f6c\u5165\u60a8\u7684\u8d26\u53f7\u4f59\u989d\uff0c\u5426\u5219\u8be5\u4f63\u91d1\u4f1a\u81ea\u52a8\u6536\u56de\uff1b"),N.a.createElement("p",{className:"directions-p"},"3. \u4f59\u989d\u4e2d\u7684\u91d1\u989d\u53ef\u968f\u65f6\u63d0\u73b0\u3002"))),N.a.createElement("div",{className:"bottom"},N.a.createElement(r.a,null,N.a.createElement(c.a,{justify:"between",align:"center",style:{height:"44px"}},N.a.createElement("p",{className:"tip"},"\u6536\u652f\u660e\u7ec6\u53ca\u5f85\u786e\u8ba4\u91d1\u989d\u8bf7\u524d\u5f80App\u67e5\u770b"),N.a.createElement(v.a,{className:"app",text:"\u5728APP\u6253\u5f00"})))))}}]),a}(u.Component)},920:function(e,a,t){}}]);
//# sourceMappingURL=DrawDocument.0076a47c.chunk.js.map
\ No newline at end of file
build/mrstatic/js/DrawDocument.0076a47c.chunk.js.map 0 → 100644
{"version":3,"sources":["components/scholarship/DrawDocument/DrawDocument.js"],"names":["DrawDocument","props","Object","_Users_fe_frontCode_mr_julyedu_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_classCallCheck__WEBPACK_IMPORTED_MODULE_6__","this","_Users_fe_frontCode_mr_julyedu_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_possibleConstructorReturn__WEBPACK_IMPORTED_MODULE_8__","_Users_fe_frontCode_mr_julyedu_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_getPrototypeOf__WEBPACK_IMPORTED_MODULE_9__","call","react__WEBPACK_IMPORTED_MODULE_11___default","a","createElement","className","antd_mobile_lib_wing_blank__WEBPACK_IMPORTED_MODULE_5___default","onClick","history","goBack","antd_mobile_lib_white_space__WEBPACK_IMPORTED_MODULE_3___default","size","antd_mobile_lib_flex__WEBPACK_IMPORTED_MODULE_1___default","justify","align","style","height","_common_CallApp__WEBPACK_IMPORTED_MODULE_13__","text","Component"],"mappings":"4RAKqBA,cACjB,SAAAA,EAAYC,GAAQ,OAAAC,OAAAC,EAAA,EAAAD,CAAAE,KAAAJ,GAAAE,OAAAG,EAAA,EAAAH,CAAAE,KAAAF,OAAAI,EAAA,EAAAJ,CAAAF,GAAAO,KAAAH,KACVH,0EAGN,OACIO,EAAAC,EAAAC,cAAA,OAAKC,UAAW,gBACZH,EAAAC,EAAAC,cAAA,WACIF,EAAAC,EAAAC,cAAAE,EAAAH,EAAA,CAAWE,UAAW,UAClBH,EAAAC,EAAAC,cAAA,KAAGC,UAAW,iCAAkCE,QAAST,KAAKH,MAAMa,QAAQC,SAC5EP,EAAAC,EAAAC,cAAA,OAAKC,UAAW,gBAAhB,8BAIRH,EAAAC,EAAAC,cAAA,OAAKC,UAAW,WACZH,EAAAC,EAAAC,cAAAE,EAAAH,EAAA,KACID,EAAAC,EAAAC,cAAA,OAAKC,UAAW,kBAAhB,4BACAH,EAAAC,EAAAC,cAAAM,EAAAP,EAAA,CAAYQ,KAAK,OACjBT,EAAAC,EAAAC,cAAA,KAAGC,UAAW,gBAAd,0XACAH,EAAAC,EAAAC,cAAAM,EAAAP,EAAA,CAAYQ,KAAK,OACjBT,EAAAC,EAAAC,cAAAM,EAAAP,EAAA,CAAYQ,KAAK,OACjBT,EAAAC,EAAAC,cAAA,OAAKC,UAAW,kBAAhB,4BACAH,EAAAC,EAAAC,cAAAM,EAAAP,EAAA,CAAYQ,KAAK,OACjBT,EAAAC,EAAAC,cAAA,KAAGC,UAAW,gBAAd,+KACAH,EAAAC,EAAAC,cAAA,KAAGC,UAAW,gBAAd,qgBACAH,EAAAC,EAAAC,cAAA,KAAGC,UAAW,gBAAd,iFAIRH,EAAAC,EAAAC,cAAA,OAAKC,UAAW,UACZH,EAAAC,EAAAC,cAAAE,EAAAH,EAAA,KACID,EAAAC,EAAAC,cAAAQ,EAAAT,EAAA,CAAMU,QAAQ,UAAUC,MAAM,SAASC,MAAO,CAACC,OAAQ,SACnDd,EAAAC,EAAAC,cAAA,KAAGC,UAAW,OAAd,iGAEAH,EAAAC,EAAAC,cAACa,EAAA,EAAD,CAASZ,UAAU,MAAMa,KAAK,qCAlChBC","file":"mrstatic/js/DrawDocument.0076a47c.chunk.js","sourcesContent":["import React, { Component } from 'react';\nimport { Flex, WhiteSpace, WingBlank } from 'antd-mobile';\nimport './DrawDocument.scss';\nimport OpenApp from '@/common/CallApp';\n\nexport default class DrawDocument extends Component {\n constructor(props) {\n super(props);\n }\n render() {\n return (\n <div className={'drawDocument'}>\n <div>\n <WingBlank className={'navbar'}>\n <i className={'iconfont iconiconfront-68 back'} onClick={this.props.history.goBack}></i>\n <div className={\"common-ft-15\"}>规则说明</div>\n </WingBlank>\n </div>\n\n <div className={'content'}>\n <WingBlank>\n <div className={'directions-div'}>分销规则</div>\n <WhiteSpace size='md'></WhiteSpace>\n <p className={'directions-p'}>点击『分享赚钱』生成您的专属海报，把专属海报分享到微信、微博、QQ、知乎、贴吧等，他人通过您的海报购买后您可获得相应的佣金奖励。</p>\n <WhiteSpace size='lg'></WhiteSpace>\n <WhiteSpace size='lg'></WhiteSpace>\n <div className={'directions-div'}>提现规则</div>\n <WhiteSpace size='md'></WhiteSpace>\n <p className={'directions-p'}>1. 已开始的直播课程，用户购买后佣金会实时转入您的账号余额；</p>\n <p className={'directions-p'}>2. 尚未开课的直播课程，用户购买后归属您的佣金户暂时存放在『待确认金额』中，直到该课程正式开课。如果用户没有退款，对应的订单金额会自动转入您的账号余额，否则该佣金会自动收回；</p>\n <p className={'directions-p'}>3. 余额中的金额可随时提现。</p>\n </WingBlank>\n </div>\n\n <div className={'bottom'}>\n <WingBlank>\n <Flex justify='between' align='center' style={{height: '44px'}}>\n <p className={'tip'}>收支明细及待确认金额请前往App查看</p>\n {/* <div className={'app'}>在APP打开</div> */}\n <OpenApp className='app' text='在APP打开'/>\n </Flex>\n </WingBlank>\n </div>\n </div>\n )\n }\n}\n"],"sourceRoot":""}
\ No newline at end of file
build/mrstatic/js/MyEdit.dae94c7e.chunk.js 0 → 100644
(window.webpackJsonp=window.webpackJsonp||[]).push([[12],{1267:function(e,t,a){"use strict";a.r(t);a(41);var n=a(12),s=a.n(n),i=a(5),c=a(7),l=a(6),o=a(8),u=a(9),r=a(0),m=a.n(r),d=(a(261),a(22)),h=a(3),p=a(28),v=a(26),f=a(25),b=a(63),E=function(e){function t(e){var a;return Object(i.a)(this,t),(a=Object(l.a)(this,Object(o.a)(t).call(this,e))).toEditName=function(e){a.setState({isShow:!0,value:e})},a.cancle=function(){a.setState({isShow:!1})},a.handleChange=function(e){a.setState({value:e.target.value})},a.outLogin=function(){a.props.logout(),s.a.info("\u5df2\u9000\u51fa",2,null,!1),a.props.history.push("/my")},a.submit=function(){if(a.state.value.length>12)s.a.info("\u4e0d\u8d85\u8fc712\u4e2a\u5b57\u7b26",2);else if(0===a.state.value.length)s.a.info("\u8bf7\u8f93\u5165\u6635\u79f0",2);else{var e={user_name:a.state.value};h.d.post("".concat(API.home,"/m/user_info/update"),e).then(function(e){200===e.data.code?(a.setState({isShow:!1}),a.props.updateUser({data:{username:a.state.value}}),s.a.info("\u4fee\u6539\u6210\u529f",2)):4008===e.data.code?a.setState({isShow:!1}):s.a.info(e.data.msg,2)})}},a.state={isShow:!1,value:""},a}return Object(u.a)(t,e),Object(c.a)(t,[{key:"render",value:function(){var e=this.props.user,t=e&&e.data&&e.data.username,a=e&&e.data&&e.data.avatar;return m.a.createElement("div",{className:"edit-name"},m.a.createElement(p.e,{title:"\u8d26\u53f7",arrow:!0,cart:!1}),m.a.createElement("div",{className:"my-mess"},m.a.createElement("img",{src:a,alt:""}),m.a.createElement("span",{className:"name"},t),m.a.createElement("span",{onClick:this.toEditName.bind(this,t),className:"edit"},"\u7f16\u8f91")),m.a.createElement("div",{className:"out-login",onClick:this.outLogin},"\u9000\u51fa\u767b\u5f55"),this.state.isShow&&m.a.createElement("div",{className:"edit-mbc"},m.a.createElement("div",{className:"edit-content"},m.a.createElement("div",{className:"edit-title"},"\u4fee\u6539\u6635\u79f0"),m.a.createElement("input",{type:"text",placeholder:"\u8bf7\u8f93\u5165\u6635\u79f0\uff08\u4e0d\u8d85\u8fc712\u4e2a\u5b57\u7b26\uff09",value:this.state.value,onChange:this.handleChange.bind(this)}),m.a.createElement("div",{className:"edit-btn"},m.a.createElement("button",{className:"cancle",onClick:this.cancle},"\u53d6\u6d88"),m.a.createElement("button",{className:"submit",onClick:this.submit},"\u786e\u8ba4")))))}}]),t}(r.PureComponent);t.default=Object(f.d)(Object(d.b)(function(e){return{user:e.user}},{logout:v.e,updateUser:v.i}),b.a)(E)}}]);
//# sourceMappingURL=MyEdit.dae94c7e.chunk.js.map
\ No newline at end of file
build/mrstatic/js/MyEdit.dae94c7e.chunk.js.map 0 → 100644
{"version":3,"sources":["components/my/edit.js"],"names":["MyEdut","props","_this","Object","_Users_fe_frontCode_mr_julyedu_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_classCallCheck__WEBPACK_IMPORTED_MODULE_2__","this","_Users_fe_frontCode_mr_julyedu_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_possibleConstructorReturn__WEBPACK_IMPORTED_MODULE_4__","_Users_fe_frontCode_mr_julyedu_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_getPrototypeOf__WEBPACK_IMPORTED_MODULE_5__","call","toEditName","name","setState","isShow","value","cancle","handleChange","e","target","outLogin","logout","antd_mobile_lib_toast__WEBPACK_IMPORTED_MODULE_1___default","a","info","history","push","submit","state","length","data","user_name","http","post","concat","API","home","then","res","code","updateUser","username","msg","user","avatar","react__WEBPACK_IMPORTED_MODULE_7___default","createElement","className","_common__WEBPACK_IMPORTED_MODULE_11__","title","arrow","cart","src","alt","onClick","bind","type","placeholder","onChange","PureComponent","compose","connect","WithFullSize"],"mappings":"yOAUMA,cACF,SAAAA,EAAYC,GAAO,IAAAC,EAAA,OAAAC,OAAAC,EAAA,EAAAD,CAAAE,KAAAL,IACfE,EAAAC,OAAAG,EAAA,EAAAH,CAAAE,KAAAF,OAAAI,EAAA,EAAAJ,CAAAH,GAAAQ,KAAAH,KAAMJ,KAQVQ,WAAa,SAACC,GACVR,EAAKS,SAAS,CACVC,QAAQ,EACRC,MAAOH,KAZIR,EAgBnBY,OAAS,WACLZ,EAAKS,SAAS,CACVC,QAAQ,KAlBGV,EAuBnBa,aAAe,SAACC,GACZd,EAAKS,SAAS,CACVE,MAAOG,EAAEC,OAAOJ,SAzBLX,EA6BnBgB,SAAW,WACPhB,EAAKD,MAAMkB,SACXC,EAAAC,EAAMC,KAAK,qBAAO,EAAG,MAAM,GAC3BpB,EAAKD,MAAMsB,QAAQC,KAAK,QAhCTtB,EAoCnBuB,OAAS,WACL,GAAIvB,EAAKwB,MAAMb,MAAMc,OAAS,GAC1BP,EAAAC,EAAMC,KAAK,yCAAY,QACpB,GAAgC,IAA5BpB,EAAKwB,MAAMb,MAAMc,OACxBP,EAAAC,EAAMC,KAAK,iCAAS,OACjB,CACH,IAAIM,EAAO,CACPC,UAAW3B,EAAKwB,MAAMb,OAE1BiB,IAAKC,KAAL,GAAAC,OAAaC,IAAIC,KAAjB,uBAA4CN,GAAMO,KAAK,SAACC,GAC9B,MAAlBA,EAAIR,KAAKS,MACTnC,EAAKS,SAAS,CACVC,QAAQ,IAEZV,EAAKD,MAAMqC,WAAW,CAACV,KAAM,CAACW,SAAUrC,EAAKwB,MAAMb,SACnDO,EAAAC,EAAMC,KAAK,2BAAQ,IACM,OAAlBc,EAAIR,KAAKS,KAChBnC,EAAKS,SAAS,CACVC,QAAQ,IAGZQ,EAAAC,EAAMC,KAAKc,EAAIR,KAAKY,IAAK,OAvDrCtC,EAAKwB,MAAQ,CACTd,QAAQ,EACRC,MAAO,IAJIX,wEAgEV,IACEuC,EAAQpC,KAAKJ,MAAbwC,KACDF,EAAWE,GAAQA,EAAKb,MAAQa,EAAKb,KAAKW,SAC1CG,EAASD,GAAQA,EAAKb,MAAQa,EAAKb,KAAKc,OAC9C,OACIC,EAAAtB,EAAAuB,cAAA,OAAKC,UAAU,aACXF,EAAAtB,EAAAuB,cAACE,EAAA,EAAD,CAAWC,MAAM,eAAKC,OAAO,EAAMC,MAAM,IAEzCN,EAAAtB,EAAAuB,cAAA,OAAKC,UAAU,WACXF,EAAAtB,EAAAuB,cAAA,OAAKM,IAAKR,EAAQS,IAAI,KACtBR,EAAAtB,EAAAuB,cAAA,QAAMC,UAAU,QAAQN,GACxBI,EAAAtB,EAAAuB,cAAA,QAAMQ,QAAS/C,KAAKI,WAAW4C,KAAKhD,KAAMkC,GAAWM,UAAU,QAA/D,iBAEJF,EAAAtB,EAAAuB,cAAA,OAAKC,UAAU,YAAYO,QAAS/C,KAAKa,UAAzC,4BAKIb,KAAKqB,MAAMd,QACX+B,EAAAtB,EAAAuB,cAAA,OAAKC,UAAU,YACXF,EAAAtB,EAAAuB,cAAA,OAAKC,UAAU,gBACXF,EAAAtB,EAAAuB,cAAA,OAAKC,UAAU,cAAf,4BACAF,EAAAtB,EAAAuB,cAAA,SAAOU,KAAK,OAAOC,YAAY,mFACxB1C,MAAOR,KAAKqB,MAAMb,MAClB2C,SAAUnD,KAAKU,aAAasC,KAAKhD,QAExCsC,EAAAtB,EAAAuB,cAAA,OAAKC,UAAU,YACXF,EAAAtB,EAAAuB,cAAA,UAAQC,UAAU,SAASO,QAAS/C,KAAKS,QAAzC,gBACA6B,EAAAtB,EAAAuB,cAAA,UAAQC,UAAU,SAASO,QAAS/C,KAAKoB,QAAzC,2BA7FXgC,iBAwGNC,sBACXC,YACI,SAAAjC,GAAK,MAAK,CAACe,KAAMf,EAAMe,OACvB,CAACtB,WAAQmB,iBAEbsB,IALWF,CAMb1D","file":"mrstatic/js/MyEdit.dae94c7e.chunk.js","sourcesContent":["import React, {PureComponent} from 'react'\nimport './index.scss'\nimport {connect} from \"react-redux\"\nimport {Toast} from 'antd-mobile'\nimport {http} from \"@/utils\"\nimport {HeaderBar} from \"@/common\"\nimport {logout, updateUser} from '@/store/userAction'\nimport {compose} from \"redux\";\nimport {WithFullSize} from '@/HOCs'\n\nclass MyEdut extends PureComponent {\n constructor(props) {\n super(props)\n this.state = {\n isShow: false,\n value: ''\n }\n }\n\n // 点击编辑\n toEditName = (name) => {\n this.setState({\n isShow: true,\n value: name\n })\n }\n // 取消\n cancle = () => {\n this.setState({\n isShow: false\n })\n }\n\n // 获取input的值\n handleChange = (e) => {\n this.setState({\n value: e.target.value\n })\n }\n // 退出登录\n outLogin = () => {\n this.props.logout()\n Toast.info('已退出', 2, null, false)\n this.props.history.push('/my')\n }\n\n // 确定修改\n submit = () => {\n if (this.state.value.length > 12) {\n Toast.info('不超过12个字符', 2)\n } else if (this.state.value.length === 0) {\n Toast.info('请输入昵称', 2)\n } else {\n let data = {\n user_name: this.state.value\n }\n http.post(`${API.home}/m/user_info/update`, data).then((res) => {\n if (res.data.code === 200) {\n this.setState({\n isShow: false\n })\n this.props.updateUser({data: {username: this.state.value}})\n Toast.info('修改成功', 2)\n } else if (res.data.code === 4008) {\n this.setState({\n isShow: false\n })\n } else {\n Toast.info(res.data.msg, 2)\n }\n\n })\n }\n }\n\n render() {\n const {user} = this.props\n const username = user && user.data && user.data.username\n const avatar = user && user.data && user.data.avatar\n return (\n <div className=\"edit-name\">\n <HeaderBar title='账号' arrow={true} cart={false}></HeaderBar>\n\n <div className='my-mess'>\n <img src={avatar} alt=\"\"/>\n <span className=\"name\">{username}</span>\n <span onClick={this.toEditName.bind(this, username)} className=\"edit\">编辑</span>\n </div>\n <div className=\"out-login\" onClick={this.outLogin}>\n 退出登录\n </div>\n\n {\n this.state.isShow &&\n <div className=\"edit-mbc\">\n <div className=\"edit-content\">\n <div className=\"edit-title\">修改昵称</div>\n <input type=\"text\" placeholder='请输入昵称（不超过12个字符）'\n value={this.state.value}\n onChange={this.handleChange.bind(this)}\n />\n <div className=\"edit-btn\">\n <button className='cancle' onClick={this.cancle}>取消</button>\n <button className='submit' onClick={this.submit}>确认</button>\n </div>\n </div>\n </div>\n }\n </div>\n )\n }\n\n}\n\nexport default compose(\n connect(\n state => ({user: state.user}),\n {logout, updateUser}\n ),\n WithFullSize\n)(MyEdut)\n"],"sourceRoot":""}
\ No newline at end of file
build/mrstatic/js/PayOrder.e6c3479b.chunk.js 0 → 100644
(window.webpackJsonp=window.webpackJsonp||[]).push([[15],{1261:function(e,a,t){"use strict";t.r(a),t.d(a,"default",function(){return P});t(156);var n=t(74),i=t.n(n),c=(t(90),t(27)),o=t.n(c),r=(t(155),t(35)),s=t.n(r),l=(t(41),t(12)),d=t.n(l),p=t(5),u=t(7),m=t(6),y=t(8),f=t(89),g=t(9),h=(t(637),t(638)),b=t.n(h),v=(t(118),t(47)),w=t.n(v),E=t(0),S=t.n(E),x=t(3),_=t(28),k=t(16),j=(t(919),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(f.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(f.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(f.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(g.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(k.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(j,{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(j,{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)},919:function(e,a,t){}}]);
//# sourceMappingURL=PayOrder.e6c3479b.chunk.js.map
\ No newline at end of file
build/mrstatic/js/deposit-order.b854048e.chunk.js 0 → 100644
(window.webpackJsonp=window.webpackJsonp||[]).push([[25],{1208:function(e,t,a){},1281:function(e,t,a){"use strict";a.r(t);a(41);var r=a(12),n=a.n(r),c=a(5),o=a(7),i=a(6),s=a(8),l=a(9),m=(a(90),a(27)),d=a.n(m),p=(a(118),a(47)),u=a.n(p),f=a(0),E=a.n(f),h=a(28),b=a(16),v=a(3),N=(a(1208),u.a.Item);function x(e){var t=e.list;return E.a.createElement("div",null,t.map(function(t,a){t.is_coupon;var r=t.course_id,n=t.image_name,c=t.sale_price,o=t.simpledescription,i=t.course_title,s=t.coupon_num,l=t.coupon_desc,m=E.a.createElement("span",{className:"order-newprice"},"\xa5",c);e.locationState&&e.locationState.group&&(m=E.a.createElement("span",{className:"order-newprice"},"\xa5",e.groupPrice));var p=E.a.createElement("div",{className:"order-info"},E.a.createElement("p",{className:"order-title",style:{overflow:"hidden",textOverflow:"ellipsis",whiteSpace:"nowrap"},onClick:function(){return e.toDetail(r)}},i),E.a.createElement("p",{className:"order-content",style:{WebkitBoxOrient:"vertical",WebkitLineClamp:"2",wordBreak:"break-all",overflow:"hidden",textOverflow:"ellipsis",display:"-webkit-box"}},o),E.a.createElement("p",{className:"order-des"},m,E.a.createElement("span",{className:"price-des"},"\uff08\u9884\u4ed8\u5b9a\u91d1\uff09")));return E.a.createElement(h.g,Object.assign({},t,{src:n,id:r,key:a,info:p,isaist:e.isaist,toDetail:e.toDetail}),e.locationState&&(e.locationState.type||e.locationState.simple)?E.a.createElement("div",{className:"order-prefer"},E.a.createElement(u.a,{key:a},E.a.createElement(N,{arrow:"horizontal",onClick:function(){}},E.a.createElement(b.b,{to:{pathname:"/coupons",search:"?id=".concat(r),state:{from:"/order"}}},E.a.createElement(d.a,{justify:"between"},E.a.createElement("span",{style:{color:"#333",fontSize:"15px"}},"\u4f18\u60e0\u5238"),E.a.createElement("span",{style:{fontSize:"14px",color:"#999999"}},l||(0===s?"\u65e0":"".concat(s,"\u5f20\u53ef\u7528")))))))):null)}))}var g=function(e){function t(e){var a;return Object(c.a)(this,t),(a=Object(i.a)(this,Object(s.a)(t).call(this,e))).submitOrder=function(){v.d.post("".concat(API["base-api"],"/m/deposit/create"),{plat_form:5,source:Object(v.c)("source"),course_id:a.state.course_id,is_deduction:a.state.useBalance?1:0}).then(function(e){var t=e.data;200==t.errno?t.data.pay_jump?a.props.history.replace("/expand/callback?order_id=".concat(t.data.order_id)):a.props.history.replace({pathname:"/deposit-pay-order",search:"?oid=".concat(t.data.order_id)}):n.a.info(t.msg)})},a.showInfo=function(){a.setState(function(e){return{info:!e.info}})},a.toCourseDetail=function(e){a.props.history.push("/detail?id=".concat(e))},a.useBalance=function(){var e=a.state,t=e.user_account,r=e.depositPrice;if(0!==parseFloat(t)){var n=parseFloat(t)-parseFloat(r);n=n>0?r:t,a.setState(function(e){return{useBalance:!e.useBalance,offset:n}})}},a.updateUserAccount=function(){},a.state={groupPrice:"",total:0,discount:0,useBalance:!1,orderList:[],info:!1,offset:0,depositPrice:0,course_id:Object(v.c)("oid"),user_account:"",finalStartTime:""},a}return Object(l.a)(t,e),Object(o.a)(t,[{key:"componentDidMount",value:function(){var e=this;v.d.post("".concat(API["base-api"],"/m/deposit/preorder"),{course_id:this.state.course_id}).then(function(t){var a=t.data;200==a.errno?e.setState({orderList:[a.data.course],depositPrice:a.data.course.sale_price,user_account:a.data.user_account,finalStartTime:a.data.final_start_time}):n.a.info(a.msg)})}},{key:"render",value:function(){var e=this.state,t=e.orderList,a=e.discount,r=e.groupPrice,n=e.depositPrice,c=e.user_account,o=e.useBalance,i=e.info,s=e.offset,l=e.finalStartTime;return E.a.createElement("div",{className:"order-wrapper"},E.a.createElement(d.a,null,E.a.createElement(d.a.Item,null,E.a.createElement(h.e,{title:"\u8bfe\u7a0b\u62a5\u540d",arrow:!0}),E.a.createElement("div",{className:"order-list"},E.a.createElement(x,{list:t,courseId:Object(v.c)("id"),locationState:this.props.location.state,groupPrice:r,toDetail:this.toCourseDetail})),E.a.createElement("div",{className:"order-balance"},E.a.createElement(u.a,null,E.a.createElement(N,{className:"order-prefer-text"},E.a.createElement(d.a,{justify:"between"},E.a.createElement(d.a,{align:"center"},E.a.createElement("span",null,"\u4f59\u989d\u62b5\u6263"),E.a.createElement("span",{className:"order-balanceprice"}," (\u4f59\u989d: ",E.a.createElement("i",{className:"order-money"},"".concat(c,"\u5143")),")"),E.a.createElement("i",{className:"iconfont iconiconfront-22 question-mark",onClick:this.showInfo})),E.a.createElement(d.a,null,o?E.a.createElement(E.a.Fragment,null,E.a.createElement("span",{style:{color:"#FF2121",fontSize:"15px",marginRight:"6px"}},"-\xa5".concat(s)),E.a.createElement("i",{className:"iconfont icondanseshixintubiao-5 balance-used",onClick:this.useBalance})):E.a.createElement("i",{className:"circle-icon",onClick:this.useBalance})))))),E.a.createElement("ul",{className:"deposit-limit-time"},E.a.createElement("li",null,"\xb7 ",l,"\u5f00\u59cb\u652f\u4ed8\u5c3e\u6b3e"),E.a.createElement("li",null,"\xb7 \u4ee3\u91d1\u5238\u53ea\u80fd\u5728\u652f\u4ed8\u5c3e\u6b3e\u65f6\u4f7f\u7528")),E.a.createElement("div",{className:"order-bar"},E.a.createElement("div",{className:"order-course"},E.a.createElement("span",{className:"order-course-text"},"".concat(t.length,"\u95e8\u8bfe\u7a0b"))),E.a.createElement("div",{className:"order-bar-text"},E.a.createElement("div",{className:"order-amount"},E.a.createElement("span",{className:"order-amount-title"},"\u5408\u8ba1:"),E.a.createElement("span",{className:"order-amount-price"},"\uffe5".concat(n))),E.a.createElement("div",{className:"order-preprice"},E.a.createElement("span",{className:"order-preprice-title"},"\u5df2\u4f18\u60e0:"),E.a.createElement("span",{className:"order-preprice-price"},"\xa5".concat(a)))),E.a.createElement("button",{type:"button",className:"order-button has-info"},E.a.createElement("span",{className:"order-button-text",onClick:this.submitOrder},"\u786e\u5b9a\u8ba2\u5355"))))),i?E.a.createElement("div",{style:{position:"fixed",top:0,left:0,width:"100%",height:"100%",backgroundColor:"rgba(0, 0, 0, 0.8)",zIndex:"99"}},E.a.createElement("div",{style:{padding:"20px",backgroundColor:"#FFF",width:"300px",height:"170px",margin:"0 auto",position:"absolute",left:"50%",top:"50%",transform:"translate(-50%, -50%)"}},E.a.createElement(d.a,{direction:"column",justify:"between",align:"center",style:{height:"100%"}},E.a.createElement("p",{style:{fontSize:"16px",color:"#333333"}},"\u4f59\u989d\u62b5\u6263\u8bf4\u660e"),E.a.createElement("p",{style:{lineHeight:"20px",fontSize:"13px",color:"#666666"}},"\u5206\u9500\u8bfe\u7a0b\u6216\u8005\u53c2\u4e0e\u4e03\u6708\u5728\u7ebf\u7684\u76f8\u5173\u6d3b\u52a8\uff0c\u53ef\u83b7\u5f97\u8d44\u91d1\u5956\u52b1\u3002\u8d26\u6237\u8d44\u91d1\u53ef\u76f4\u63a5\u63d0\u73b0\uff0c\u4e5f\u53ef\u62b5\u6263\u8bfe\u7a0b\u8d39\u7528\u3002"),E.a.createElement("div",{onClick:this.showInfo,style:{width:"260px",height:"30px",lineHeight:"30px",textAlign:"center",borderRadius:"3px",border:"1px solid #0099FF",color:"#0099FF",fontSize:"15px"}},"\u77e5\u9053\u4e86")))):null)}}]),t}(f.Component);t.default=g}}]);
//# sourceMappingURL=deposit-order.b854048e.chunk.js.map
\ No newline at end of file
build/mrstatic/js/detail.e26f1759.chunk.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/detail.e26f1759.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/detail.e7545d44.chunk.js
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/main.ac7a8873.chunk.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/main.ac7a8873.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/newyear-yearIndex.ed61fff9.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/study.4e9e68aa.chunk.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/togroup.4e69a206.chunk.js 0 → 100644
(window.webpackJsonp=window.webpackJsonp||[]).push([[40],{1260:function(e,a,t){"use strict";t.r(a);t(156);var n,c=t(74),s=t.n(c),r=(t(90),t(27)),i=t.n(r),o=(t(155),t(35)),l=t.n(o),d=(t(256),t(92)),m=t.n(d),u=(t(41),t(12)),p=t.n(u),E=t(5),f=t(7),_=t(6),h=t(8),v=t(9),N=t(0),g=t.n(N),b=(t(918),t(28)),w=t(3),y=t(22),C=t(16),k=Object(y.b)(function(e){return{user:e.user}})(n=function(e){function a(e){var t;return Object(E.a)(this,a),(t=Object(_.a)(this,Object(h.a)(a).call(this,e))).invitedFriends=function(){var e=t.state,a=e.pdd_price,n=e.number,c=e.data;if(w.b.isWeixin){var s=t.state.share;t.setState({share:!s}),Object(w.i)({title:"\u3010\u4ec5\u5269".concat(n,"\u4e2a\u540d\u989d\u3011\u6211").concat(a,"\u5143\u62fc\u4e86\u300a").concat(c.course_title,"\u300b"),desc:c.course_title,link:location.href+"&is_originator=1",imgUrl:c.image_name})}else p.a.info("\u8bf7\u5728\u5fae\u4fe1\u4e2d\u4f7f\u7528\u5206\u4eab\u529f\u80fd\uff01",2)},t.toCourseDetail=function(e){return t.props.history.push("/detail?id=".concat(e),{href:"/classify"}),!1},t.handleToGroup=function(){var e=t.state,a=e.isBuy,n=void 0!==a&&a,c=e.data,s=void 0===c?{}:c,r=t.props,i=r.user,o=r.history,l=r.location;if(i.hasError)if(w.b.isWeixin){var d=window.location.href;if(d.includes("code=")&&d.includes("state=STATE")){var m=d.lastIndexOf("code=");d=d.substr(0,m-1)}window.location.assign("https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri=".concat(encodeURIComponent(d),"&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect"))}else o.push("/passport",{from:l});else n?t.setState({modal:!0}):o.push("/order?id=".concat(s.course_id),{group:1,pdd_order_id:t.state.pddOrderId})},t.state={data:{},share:!1,pdd_price:0,groupon_member:[],person_num:0,is_success:!1,number:0,isBuy:!1,modal:!1,pddOrderId:""},t}return Object(v.a)(a,e),Object(f.a)(a,[{key:"componentDidMount",value:function(){var e=this;w.d.get("".concat(API["base-api"],"/pdd/info/").concat(Object(w.c)("id"))).then(function(a){if(0===a.data.errno){if(e.setState({data:a.data.data.course_info,pdd_price:a.data.data.pdd_price,groupon_member:a.data.data.groupon_member,is_success:a.data.data.is_success,person_num:a.data.data.person_num,course_list:a.data.data.course_list,number:a.data.data.number,pddOrderId:a.data.data.pdd_order_id,countdown:"",isBuy:a.data.data.is_buy}),0===a.data.data.is_success){var t=1e3*a.data.data.end_time,n=0,c=0,s=0;setInterval(function(){t-=1e3,n="".concat(parseInt(t/36e5)).padStart(2,0),c="".concat(parseInt((t-36e5*n)/6e4)).padStart(2,0),s="".concat(parseInt((t-36e5*n-6e4*c)/1e3)).padStart(2,0),e.setState({countdown:"".concat(n,":").concat(c,":").concat(s)})},1e3)}}else p.a.info(a.data.msg,2)})}},{key:"render",value:function(){var e=this,a=this.state,t=a.data,n=t.course_id,c=t.course_title,s=t.simpledescription,r=t.price0,i=t.price1,o=(a.pdd_price,a.is_success),d=(a.person_num,a.groupon_member,a.course_list),u=g.a.createElement("div",{className:"info"},g.a.createElement("p",{className:"title",onClick:function(){return e.toCourseDetail(n)}},c),g.a.createElement("p",{className:"contact text-overflow-2"},s),g.a.createElement("div",{className:"des"},g.a.createElement("p",{className:"course-price"},g.a.createElement("span",{className:"new"},"\xa5",i),g.a.createElement("span",{className:"old"},"\xa5",r))));return g.a.createElement("div",{className:"to-group-box"},g.a.createElement(b.e,{title:"\u62fc\u56e2",cart:!1,toHref:"/"}),g.a.createElement(m.a,{transparent:!0,visible:this.state.modal,title:"\u63d0\u793a",footer:[{text:"\u786e\u5b9a",onPress:function(){e.setState({modal:!1}),e.props.history.push("/")}}]},g.a.createElement("p",null,"\u60a8\u5df2\u7ecf\u8d2d\u4e70\u8fc7\u8be5\u8bfe\u7a0b\uff5e")),!o&&g.a.createElement(b.j,{img:this.state.data.image_name,id:this.state.data.course_id,info:u,toDetail:this.toCourseDetail}),g.a.createElement(j,{data:this.state,invitedFriends:this.invitedFriends,handleToGroup:this.handleToGroup,userInfo:this.props.user}),g.a.createElement(l.a,null),g.a.createElement("div",{className:"group-course"},g.a.createElement("div",{className:"top-title"},g.a.createElement("span",null,"\u672c\u5468\u7279\u60e0"),g.a.createElement(C.b,{to:"/preferential",className:"more"},"\u66f4\u591a",g.a.createElement("i",{className:"iconfont iconiconfront-70"}))),d&&d.length>0&&d[0].course&&d[0].course.length>0&&d[0].course.slice(0,4).map(function(a){var t=g.a.createElement("div",{className:"info"},g.a.createElement("p",{className:"title",onClick:function(){return e.toCourseDetail(a.course_id)}},a.course_title),g.a.createElement("p",{className:"contact text-overflow-2"},a.simpledescription),g.a.createElement("div",{className:"des"},g.a.createElement("p",{className:"course-price"},g.a.createElement("span",{className:"new"},"\xa5",a.price1),g.a.createElement("span",{className:"old"},"\xa5",a.price0))));return g.a.createElement(b.j,{img:a.image_name,key:a.uid,id:a.course_id,info:t,toDetail:e.toCourseDetail})})))}}]),a}(N.Component))||n;function j(e){for(var a,t,n,c,r=e.data,o=r.pdd_price,l=r.data,d=r.groupon_member,m=r.is_success,u=r.person_num,p=r.share,E=r.number,f=r.countdown,_=e.userInfo,h=[],v=E;0!=v;)h.push(v),v--;if(c=g.a.createElement("div",{className:"group-user-list"},g.a.createElement(i.a,{justify:"center",className:"imgList"},d.map(function(e){return g.a.createElement("div",{className:"imgContainer",key:Math.random()},g.a.createElement("img",{className:"imgname",src:e.avatar,alt:""}),1===e.user_type?g.a.createElement("div",{className:"leaderFlag"},g.a.createElement("span",null,"\u56e2\u957f")):null)}),h.map(function(e){return g.a.createElement("div",{className:"imgContainer",key:Math.random()},g.a.createElement("div",{className:"imgname"},g.a.createElement("i",{className:"iconfont iconwode-xianxing no-body"})))}))),d&&d.length>0){var N=!1;!_.hasError&&d.map(function(e){e.uid!=_.data.uid||(N=!0)}),N?(a=g.a.createElement("p",{className:"tip"},"\u62fc\u56e2\u7701\uffe5".concat(l.price1-o,"\u5143")),t=g.a.createElement("span",{className:"group-btn",onClick:e.invitedFriends},"\u9080\u8bf7\u597d\u53cb\u53c2\u56e2 ",f," \u540e\u7ed3\u675f"),n=g.a.createElement("p",{className:"dec"},"\u5206\u4eab\u52303\u4e2a\u7fa4\u540e\uff0c\u6210\u56e2\u7387\u9ad8\u8fbe98%")):1==Object(w.c)("is_originator")?(a=g.a.createElement("p",{className:"tip"},"\u62fc\u56e2\u7701\uffe5".concat(l.price1-o,"\u5143")),t=g.a.createElement("a",{href:"javascript:;",className:"group-btn",onClick:e.handleToGroup},"\u4e00\u952e\u53c2\u56e2")):(a=g.a.createElement("p",{className:"tip"},"\u62fc\u56e2\u7701\uffe5".concat(l.price1-o,"\u5143")),t=g.a.createElement("span",{className:"group-btn",onClick:e.invitedFriends},"\u9080\u8bf7\u597d\u53cb\u53c2\u56e2 ",f," \u540e\u7ed3\u675f"),n=g.a.createElement("p",{className:"dec"},"\u5206\u4eab\u52303\u4e2a\u7fa4\u540e\uff0c\u6210\u56e2\u7387\u9ad8\u8fbe98%"))}return 1===m&&(a=g.a.createElement("p",{className:"success"},"\u62fc\u56e2\u6210\u529f"),t=g.a.createElement(C.b,{to:"/detail?id=".concat(l.course_id),className:"tostudy"},"\u53bb\u5b66\u4e60")),g.a.createElement("div",{className:"gorup-content"},p?g.a.createElement("div",{className:"groupSuccessMbc",onClick:e.invitedFriends},g.a.createElement("div",{className:"tipContent"},"\u8fd8\u5dee".concat(E,"\u4eba\uff0c\u5206\u4eab\u52303\u4e2a\u7fa4\uff0c\u6210\u56e2\u7387\u9ad8\u8fbe98%")),g.a.createElement("div",{className:"tipArrow"},g.a.createElement("i",{className:"iconfont iconyindao"}))):null,a,g.a.createElement(s.a,null,c),g.a.createElement(s.a,null,t),n,!m&&g.a.createElement("div",{className:"group-dec"},g.a.createElement("span",null,g.a.createElement("i",{className:"iconfont iconiconfront-1"}),"\xb7\u597d\u53cb\u53c2\u56e2 \xb7\u4eba\u6ee1\u6210\u4ea4 \xb7\u4eba\u4e0d\u6ee1\u9000\u6b3e"),g.a.createElement("span",{className:"allNum"},"\u7d2f\u8ba1".concat(u,"\u4eba\u6210\u56e2"))))}a.default=k},918:function(e,a,t){}}]);
//# sourceMappingURL=togroup.4e69a206.chunk.js.map
\ No newline at end of file
build/service-worker.js
...@@ -14,7 +14,11 @@ ...@@ -14,7 +14,11 @@
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(
<<<<<<< HEAD
"/precache-manifest.84aad5c661eb545fdcb06fb87b15cb86.js" "/precache-manifest.84aad5c661eb545fdcb06fb87b15cb86.js"
=======
"/precache-manifest.fe2f732468c013283146abe36c36a09c.js"
>>>>>>> pythonForApp
); );
workbox.clientsClaim(); workbox.clientsClaim();
......
src/App.js
...@@ -3,6 +3,7 @@ import Routes from './router' ...@@ -3,6 +3,7 @@ import Routes from './router'
import cookie from 'js-cookie' import cookie from 'js-cookie'
import { connect } from "react-redux" import { connect } from "react-redux"
import { setCurrentUser, startFetchUser } from "@/store/userAction" import { setCurrentUser, startFetchUser } from "@/store/userAction"
import {initialState} from "@/store/userReducer"
import { withRouter, Link } from 'react-router-dom' import { withRouter, Link } from 'react-router-dom'
import { compose } from 'redux' import { compose } from 'redux'
import { getParam, http, browser } from "@/utils" import { getParam, http, browser } from "@/utils"
...@@ -153,13 +154,10 @@ class App extends Component { ...@@ -153,13 +154,10 @@ class App extends Component {
getUser = () => { getUser = () => {
//获取用户信息 //获取用户信息
this.props.startFetchUser() this.props.startFetchUser()
http.get(`${API.home}/m/user_info`).then(res => {
this.props.setCurrentUser(this.transformUser(res))
})
//微信 //微信
let code = getParam('code') let code = getParam('code')
let oid = getParam('oid') let oid = getParam('oid')
if (code && !oid) { if (code && !oid) {
//针对2019双旦活动特殊处理，活动结束后删掉 //针对2019双旦活动特殊处理，活动结束后删掉
...@@ -168,7 +166,7 @@ class App extends Component { ...@@ -168,7 +166,7 @@ class App extends Component {
return return
} }
http.get(`${API['home']}/m/wx_loginInfo/code/${code}?redirect=${encodeURIComponent(window.location.href)}`) http.get(`${API["passport-api"]}/m/wx_loginInfo/code/${code}?redirect=${encodeURIComponent(window.location.href)}`)
.then(res => { .then(res => {
let data = res.data let data = res.data
if (data.errno == 200) { if (data.errno == 200) {
...@@ -185,11 +183,17 @@ class App extends Component { ...@@ -185,11 +183,17 @@ class App extends Component {
} }
} else { } else {
Toast.info(data.msg) Toast.info(data.msg)
this.props.setCurrentUser(initialState)
} }
}) })
} else {
http.get(`${API.home}/m/user_info`).then(res => {
this.props.setCurrentUser(this.transformUser(res))
})
} }
} }
componentDidUpdate() { componentDidUpdate() {
...@@ -273,12 +277,7 @@ class App extends Component { ...@@ -273,12 +277,7 @@ class App extends Component {
} }
render() { render() {
return <> return <Routes/>
<Routes/>
<Link className={'year19-index'} to="/year/yearindex">
<img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/gift-package.png" alt=""/>
</Link>
</>
} }
} }
......
src/assets/css/index.scss
...@@ -512,18 +512,3 @@ input[type="radio"]:checked:before { ...@@ -512,18 +512,3 @@ input[type="radio"]:checked:before {
color: #333; color: #333;
font-size: 15px; font-size: 15px;
} }
.year19-index {
display: block;
width: 58px;
height: 70px;
position: fixed;
top: 50%;
right: 0;
margin-top: -35px;
z-index: 9;
img {
width: 100%;
height: 100%;
}
}
\ No newline at end of file
src/components/activity/newyear-2019/landing/index.js
...@@ -9,6 +9,7 @@ import './landing.scss' ...@@ -9,6 +9,7 @@ import './landing.scss'
import { browser, getParam, http, wxShare, SendMessageToApp } from "@/utils" import { browser, getParam, http, wxShare, SendMessageToApp } from "@/utils"
import QRCode from "qrcode" import QRCode from "qrcode"
import YearCourse from '../preheat/YearCourse' import YearCourse from '../preheat/YearCourse'
import { FadeLoader } from "react-spinners"
class Landing extends Component { class Landing extends Component {
...@@ -32,16 +33,18 @@ class Landing extends Component { ...@@ -32,16 +33,18 @@ class Landing extends Component {
activityEnd: false, activityEnd: false,
notices: [], notices: [],
rule: '', rule: '',
isCaptain: getParam('origin') == 1 isCaptain: getParam('origin') == 1,
isLoading: this.props.user.isFetching
} }
componentDidMount() { componentDidMount() {
this.getStage();
this.fetchPageData() this.fetchPageData()
window.showFollowAlert = this.remind.bind(this, 'create') window.showFollowAlert = this.remind.bind(this, 'create')
document.title = '七月在线年终大回馈，幸运宝箱随你开，100%有奖！' document.title = '七月在线年终大回馈，幸运宝箱随你开，100%有奖！'
const landing = document.querySelector('#landing') const landing = document.querySelector('#landing')
const boxContainer = document.querySelector('.box-container') const boxContainer = document.querySelector('.box-container')
if(boxContainer.offsetHeight < window.innerHeight){ if (boxContainer.offsetHeight < window.innerHeight) {
landing.style.minHeight = `${window.innerHeight}px` landing.style.minHeight = `${window.innerHeight}px`
boxContainer.style.minHeight = `${window.innerHeight}px` boxContainer.style.minHeight = `${window.innerHeight}px`
} }
...@@ -51,12 +54,51 @@ class Landing extends Component { ...@@ -51,12 +54,51 @@ class Landing extends Component {
if (prevProps.user.hasError !== this.props.user.hasError && !this.props.user.hasError) { if (prevProps.user.hasError !== this.props.user.hasError && !this.props.user.hasError) {
this.fetchPageData() this.fetchPageData()
} }
if(prevProps.user.isFetching !== this.props.user.isFetching && !this.props.user.isFetching){
this.setState({
isLoading: this.props.user.isFetching
})
}
} }
componentWillUnmount() { componentWillUnmount() {
this.shareTipPopup && this.shareTipPopup.remove() this.shareTipPopup && this.shareTipPopup.remove()
} }
// 获取活动以及宝箱的阶段
getStage = () => {
http.get(`${API.home}/activity/stage`).then(res => {
const {code, data, msg} = res.data
if (code === 200) {
if(Number(data.activity_stage) === 0) {
this.props.history.push('/');
return;
}
} else {
Toast.info(msg, 2)
}
})
}
createMeta = (title,dec,imgname) => {
let meta = document.createElement('meta');
meta.setAttribute('name', 'description')
meta.setAttribute('itemprop', 'description')
meta.setAttribute('content', dec)
let meta2 = document.createElement('meta')
meta2.setAttribute('itemprop', 'name')
meta2.setAttribute('content', title)
let meta3 = document.createElement('meta')
meta3.setAttribute('itemprop', 'image')
meta3.setAttribute('content', imgname)
let head = document.getElementsByTagName('head')[0]
head.appendChild(meta)
head.appendChild(meta2)
head.appendChild(meta3)
}
fetchPageData = ({origin = this.state.origin, treasure_code = this.state.treasure_code} = {}) => { fetchPageData = ({origin = this.state.origin, treasure_code = this.state.treasure_code} = {}) => {
const {location} = this.props const {location} = this.props
...@@ -84,6 +126,8 @@ class Landing extends Component { ...@@ -84,6 +126,8 @@ class Landing extends Component {
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/wx-share-icon.png' imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/wx-share-icon.png'
}) })
// history.replace(`${match.url}?treasure_code=${getParam('treasure_code')}&origin=2`) // history.replace(`${match.url}?treasure_code=${getParam('treasure_code')}&origin=2`)
} else {
this.createMeta(this.shareTitle, this.shareDesc, 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/wx-share-icon.png')
} }
let searchParams = new URLSearchParams(window.location.search) let searchParams = new URLSearchParams(window.location.search)
...@@ -392,7 +436,6 @@ class Landing extends Component { ...@@ -392,7 +436,6 @@ class Landing extends Component {
} }
} }
render() { render() {
const { const {
teamData: { teamData: {
...@@ -406,7 +449,8 @@ class Landing extends Component { ...@@ -406,7 +449,8 @@ class Landing extends Component {
standby_plan standby_plan
}, },
activityEnd, activityEnd,
isCaptain isCaptain,
isLoading
} = this.state } = this.state
/* /*
* status * status
...@@ -544,7 +588,8 @@ class Landing extends Component { ...@@ -544,7 +588,8 @@ class Landing extends Component {
</> </>
} }
{ {
!(standby_plan && browser.isWeixin) && status === 2 && !activityEnd && < button type='button' className={'invite-btn'} onClick={this.joinTeam}> !(standby_plan && browser.isWeixin) && status === 2 && !activityEnd &&
< button type='button' className={'invite-btn'} onClick={this.joinTeam}>
同意加入队伍 同意加入队伍
</button> </button>
} }
...@@ -572,6 +617,14 @@ class Landing extends Component { ...@@ -572,6 +617,14 @@ class Landing extends Component {
}}/> }}/>
</> </>
} }
{
isLoading && <div className="loading" style={{width: window.innerWidth + 'px', height: window.innerHeight + 'px'}}>
<FadeLoader
color={'#fff'}
loading={isLoading}
/>
</div>
}
</div> </div>
) )
} }
......
src/components/activity/newyear-2019/landing/landing.scss
...@@ -233,6 +233,20 @@ ...@@ -233,6 +233,20 @@
.am-whitespace.am-whitespace-xl { .am-whitespace.am-whitespace-xl {
height: 35px; height: 35px;
} }
.loading{
transform: scale(1);
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba(0,0,0,.8);
z-index: 1000;
display: flex;
align-items: center;
justify-content: center;
}
} }
.popup-container { .popup-container {
......
src/components/activity/newyear-2019/myTreasure/index.js
...@@ -51,6 +51,8 @@ class MyTreasure extends Component { ...@@ -51,6 +51,8 @@ class MyTreasure extends Component {
const {userInfo} = nextProp const {userInfo} = nextProp
if (!userInfo.uid) { if (!userInfo.uid) {
history.push('/passport') history.push('/passport')
}else {
this.fetchMyTreasure();
} }
} }
...@@ -307,6 +309,10 @@ class MyTreasure extends Component { ...@@ -307,6 +309,10 @@ class MyTreasure extends Component {
http.get(`${API.home}/activity/stage`).then(res => { http.get(`${API.home}/activity/stage`).then(res => {
const {code, data} = res.data const {code, data} = res.data
if (code === 200) { if (code === 200) {
if(Number(data.activity_stage) === 0) {
this.props.history.push('/');
return;
}
// treasure_stage，宝箱阶段，0-不在活动时间，1-活动时间内 // treasure_stage，宝箱阶段，0-不在活动时间，1-活动时间内
if (data.treasure_stage === 0) { if (data.treasure_stage === 0) {
this.startCountDown() this.startCountDown()
......
src/components/activity/newyear-2019/myTreasure/team.js
...@@ -2,6 +2,7 @@ import React, { Component } from 'react'; ...@@ -2,6 +2,7 @@ import React, { Component } from 'react';
import classnames from 'classnames'; import classnames from 'classnames';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import './team.scss'; import './team.scss';
import { getParam } from "@/utils"
class TreasureTeam extends Component { class TreasureTeam extends Component {
constructor(props) { constructor(props) {
...@@ -69,7 +70,7 @@ class TreasureTeam extends Component { ...@@ -69,7 +70,7 @@ class TreasureTeam extends Component {
} }
render() { render() {
const { const {
team: { team: {
is_captain, is_captain,
status, status,
...@@ -81,7 +82,7 @@ class TreasureTeam extends Component { ...@@ -81,7 +82,7 @@ class TreasureTeam extends Component {
}, },
currentMember currentMember
} = this.state; } = this.state;
const { const {
toSplitTreasure, toSplitTreasure,
userInfo, userInfo,
children children
...@@ -92,7 +93,7 @@ class TreasureTeam extends Component { ...@@ -92,7 +93,7 @@ class TreasureTeam extends Component {
!is_captain && !is_captain &&
<i className="team-friend">友</i> <i className="team-friend">友</i>
} }
{/* 组队状态 */} {/* 组队状态 */}
{ {
status === 1 status === 1
...@@ -106,7 +107,7 @@ class TreasureTeam extends Component { ...@@ -106,7 +107,7 @@ class TreasureTeam extends Component {
? <h2 className="team-title">{team_num}号队伍</h2> ? <h2 className="team-title">{team_num}号队伍</h2>
: <h2 className="team-title">好友队伍</h2> : <h2 className="team-title">好友队伍</h2>
} }
{/* 队员情况 */} {/* 队员情况 */}
{ {
...@@ -117,7 +118,7 @@ class TreasureTeam extends Component { ...@@ -117,7 +118,7 @@ class TreasureTeam extends Component {
<div className="team-member"> <div className="team-member">
{ {
member.map((item, index) => ( member.map((item, index) => (
<div <div
className={this.computedClass(item.uid)} className={this.computedClass(item.uid)}
onClick={() => this.toCheckPrize(item.uid)} onClick={() => this.toCheckPrize(item.uid)}
key={index} key={index}
...@@ -134,12 +135,16 @@ class TreasureTeam extends Component { ...@@ -134,12 +135,16 @@ class TreasureTeam extends Component {
<div className="team-footer" data-layout={is_open? 'column': 'row'}> <div className="team-footer" data-layout={is_open? 'column': 'row'}>
{/* 队伍未满 */} {/* 队伍未满 */}
{ {
status === 1 && status === 1 &&
<> <>
{ {
is_captain getParam('version')
? <a className="team-button" href={`https://h5.julyedu.com/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=1`}>继续邀请队友</a> ? is_captain
: <a className="team-button" href={`https://h5.julyedu.com/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=2`}>帮好友完成组队</a> ? <a className="team-button" href={`https://h5.julyedu.com/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=1&version=${getParam('version')}`}>继续邀请队友</a>
: <a className="team-button" href={`https://h5.julyedu.com/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=2&version=${getParam('version')}`}>帮好友完成组队</a>
: is_captain
? <a className="team-button" href={`https://h5.julyedu.com/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=1`}>继续邀请队友</a>
: <a className="team-button" href={`https://h5.julyedu.com/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=2`}>帮好友完成组队</a>
} }
</> </>
} }
......
src/components/activity/newyear-2019/preheat/LiveRoom/index.js
...@@ -66,7 +66,7 @@ class LiveRoom extends Component { ...@@ -66,7 +66,7 @@ class LiveRoom extends Component {
} }
}); });
} }
} }
// 已预约 给提示 // 已预约 给提示
tip = () => { tip = () => {
...@@ -88,7 +88,7 @@ class LiveRoom extends Component { ...@@ -88,7 +88,7 @@ class LiveRoom extends Component {
this.toLogin(); this.toLogin();
}else{ }else{
const vCourseId = url.split('/')[0]; const vCourseId = url.split('/')[0];
history.push(`/play/video?id=${vCourseId}`) window.location.href = `/play/video?id=${vCourseId}`
} }
} }
// 关闭弹框 // 关闭弹框
...@@ -140,7 +140,7 @@ class LiveRoom extends Component { ...@@ -140,7 +140,7 @@ class LiveRoom extends Component {
</CommonPopup> </CommonPopup>
) )
} }
<CommonContainer title='大咖直播' id="year-live"> <CommonContainer title='大咖直播' id="year-live">
<ul className='live__list'> <ul className='live__list'>
{ {
...@@ -177,7 +177,7 @@ class LiveRoom extends Component { ...@@ -177,7 +177,7 @@ class LiveRoom extends Component {
item.on_live == 0 && item.is_end == 0 && item.is_subscribe == 1 && ( item.on_live == 0 && item.is_end == 0 && item.is_subscribe == 1 && (
<span onClick={this.tip} className="order__btn subscribed">已预约</span> <span onClick={this.tip} className="order__btn subscribed">已预约</span>
) )
} }
{ {
item.on_live == 1 && item.is_end == 0 && ( item.on_live == 1 && item.is_end == 0 && (
<span onClick={()=>this.toLivingRoom(item.room_url)} className="order__btn living">正在直播</span> <span onClick={()=>this.toLivingRoom(item.room_url)} className="order__btn living">正在直播</span>
......
src/components/activity/newyear-2019/preheat/YearCourse/index.js
...@@ -463,7 +463,7 @@ class YearCourse extends Component { ...@@ -463,7 +463,7 @@ class YearCourse extends Component {
let data = { let data = {
title: `【仅剩${params.number}个名额】我${params.price}元拼了《${params.course_title}》`, title: `【仅剩${params.number}个名额】我${params.price}元拼了《${params.course_title}》`,
desc: params.course_title, desc: params.course_title,
link: `${API.m}/togroup?id=${oid}`, link: `${API.m}/togroup?id=${oid}&is_originator=1`,
imgUrl: params.image_name, imgUrl: params.image_name,
} }
SendMessageToApp("toShare", data) SendMessageToApp("toShare", data)
...@@ -605,27 +605,46 @@ class YearCourse extends Component { ...@@ -605,27 +605,46 @@ class YearCourse extends Component {
removable, removable,
sum, sum,
} = this.state } = this.state
const { stage } = this.props const { stage,treasureStage } = this.props
return ( return (
<div className={'year-index-course'}> <div className={'year-index-course'}>
{/*浮框*/} {/*浮框*/}
<div className='nav-right'> {
<span onClick={this.toBoxList} className='nav-right__link'> Number(treasureStage) === 1 &&
<div className='nav-right'>
<span onClick={this.toBoxList} className='nav-right__link'>
未开宝箱 未开宝箱
{ {
removable > 0 && removable > 0 &&
<i className="nav-right__number">{removable}</i> <i className="nav-right__number">{removable}</i>
} }
</span> </span>
<a onClick={() => this.toYearWish()} className='nav-right__link'> <a onClick={() => this.toYearWish()} className='nav-right__link'>
心愿单 心愿单
{ {
sum > 0 && sum > 0 &&
<i className="nav-right__number">{sum}</i> <i className="nav-right__number">{sum}</i>
} }
</a> </a>
</div> </div>
}
{
Number(treasureStage) === 0 &&
<div className='nav-right-wish nav-right'>
<a onClick={() => this.toYearWish()} className='nav-right__link'>
心愿单
{
sum > 0 &&
<i className="nav-right__number">{sum}</i>
}
</a>
</div>
}
{/* 重磅好课 */} {/* 重磅好课 */}
<CommonContainer title='重磅好课' id='year-course'> <CommonContainer title='重磅好课' id='year-course'>
...@@ -673,56 +692,60 @@ class YearCourse extends Component { ...@@ -673,56 +692,60 @@ class YearCourse extends Component {
</CommonContainer> </CommonContainer>
{/* 人气好课免费学 */} {/* 人气好课免费学 */}
<CommonContainer title='人气好课免费学' id='year-free'> {
{ Number(stage) !== 3 &&
(freecourse.course && freecourse.course.length > 0) && <CommonContainer title='人气好课免费学' id='year-free'>
<> <a className='boss__add' href="/active/givecourse?activename=shuangdan">更有42本技术书籍免费送</a>
<div className='freecourse course-box'> {
(freecourse.course && freecourse.course.length > 0) &&
<>
<div className='freecourse course-box'>
{
freecourse.course.map(item => (
<CourseItem
image={item.image_name}
key={item.course_id}
id={item.course_id}
toCourse={this.toCourse}
>
<div className="coupon-course__footer">
{
item.is_buy == 1 &&
<a
onClick={() => this.toCourse(item.course_id)}
className="btn to-study"
>开始学习</a>
}
{
item.is_buy == 0 &&
<a
onClick={() => this.freeStudy()}
className="btn free-study"
>点击免费学</a>
}
<p className="free-course-num">
已送出<span>{item.act_num}</span>个课程
</p>
</div>
</CourseItem>
))
}
</div>
{ {
freecourse.course.map(item => ( (freecourse.courseList && freecourse.courseList.length > 4) &&
<CourseItem <button
image={item.image_name} className="more-button"
key={item.course_id} onClick={() => this.handleToMore('freecourse')}
id={item.course_id} >{freecourse.isMore ? '查看更多' : '收起'}</button>
toCourse={this.toCourse}
>
<div className="coupon-course__footer">
{
item.is_buy == 1 &&
<a
onClick={() => this.toCourse(item.course_id)}
className="btn to-study"
>开始学习</a>
}
{
item.is_buy == 0 &&
<a
onClick={() => this.freeStudy()}
className="btn free-study"
>点击免费学</a>
}
<p className="free-course-num">
已送出<span>{item.act_num}</span>个课程
</p>
</div>
</CourseItem>
))
} }
</div> </>
{ }
(freecourse.courseList && freecourse.courseList.length > 4) && </CommonContainer>
<button }
className="more-button"
onClick={() => this.handleToMore('freecourse')}
>{freecourse.isMore ? '查看更多' : '收起'}</button>
}
</>
}
</CommonContainer>
{/* stage，活动阶段 0-不在活动时间 1-预热 2-正式 3-返场 */} {/* stage，活动阶段 0-不在活动时间 1-预热 2-正式 3-返场 */}
{ {
Number(stage) === 2 && Number(stage) !== 1 &&
<> <>
{/* 精品好课1分开抢 */} {/* 精品好课1分开抢 */}
<CommonContainer title='精品好课1分开抢' id='year-group'> <CommonContainer title='精品好课1分开抢' id='year-group'>
...@@ -997,7 +1020,7 @@ class YearCourse extends Component { ...@@ -997,7 +1020,7 @@ class YearCourse extends Component {
</> </>
} }
{ {
Number(stage) !== 2 && Number(stage) === 1 &&
<> <>
{/* 精品好课1分开抢 */} {/* 精品好课1分开抢 */}
<CommonContainer title='精品好课1分开抢' id='year-group'> <CommonContainer title='精品好课1分开抢' id='year-group'>
......
src/components/activity/newyear-2019/preheat/YearCourse/index.scss
.year-index-course { .year-index-course {
.boss__add {
font-size: 12px;
color: #fff;
text-align: center;
height: 16px;
line-height: 16px;
text-decoration: underline;
display: block;
margin: 12px auto 0;
}
.course-box { .course-box {
display: flex; display: flex;
...@@ -196,6 +206,7 @@ ...@@ -196,6 +206,7 @@
display: flex; display: flex;
.to-group { .to-group {
font-size: 12px;
&:nth-child(1) { &:nth-child(1) {
margin-right: 2px; margin-right: 2px;
...@@ -285,7 +296,7 @@ ...@@ -285,7 +296,7 @@
.groupcourse[data-stage="2"] .course-container { .groupcourse[data-stage="2"] .course-container {
height: 215px; height: 215px;
} }
.progree-and-sale { .progree-and-sale {
display: flex; display: flex;
...@@ -405,5 +416,12 @@ ...@@ -405,5 +416,12 @@
line-height: 14px; line-height: 14px;
} }
} }
.nav-right-wish {
background-image: url("https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/fanc-bx.png");
.nav-right__link{
top: 60px;
left: 10px;
}
}
} }
\ No newline at end of file
src/components/activity/newyear-2019/preheat/index.js
...@@ -132,11 +132,25 @@ export default class index extends Component { ...@@ -132,11 +132,25 @@ export default class index extends Component {
http.get(`${API.home}/activity/stage`).then(res => { http.get(`${API.home}/activity/stage`).then(res => {
const {code, data, msg} = res.data const {code, data, msg} = res.data
if (code === 200) { if (code === 200) {
if(Number(data.activity_stage) === 0) {
this.props.history.push('/');
return;
}
// treasure_stage，宝箱阶段，0-不在活动时间，1-活动时间内 // treasure_stage，宝箱阶段，0-不在活动时间，1-活动时间内
this.setState({ this.setState({
activity_stage: data.activity_stage, activity_stage: data.activity_stage,
treasure_stage: data.treasure_stage treasure_stage: data.treasure_stage
}) })
if(data.activity_stage == 3){
this.setState({
banner: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/m_banner_fc.png',
})
} else {
this.setState({
banner: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/m_banner_bj%402x.png',
})
}
} else { } else {
Toast.info(msg, 2) Toast.info(msg, 2)
} }
...@@ -145,8 +159,8 @@ export default class index extends Component { ...@@ -145,8 +159,8 @@ export default class index extends Component {
render() { render() {
const { const {
banner, banner,
activity_stage, activity_stage,
treasure_stage, treasure_stage,
} = this.state } = this.state
return ( return (
...@@ -155,7 +169,7 @@ export default class index extends Component { ...@@ -155,7 +169,7 @@ export default class index extends Component {
<div id="banner" className="banner-treasure__header" <div id="banner" className="banner-treasure__header"
style={{backgroundImage: `url(${banner})`}}></div> style={{backgroundImage: `url(${banner})`}}></div>
<div className="banner-treasure__nav"> <div className="banner-treasure__nav">
<TreasureNav id="banner" treasure_stage={treasure_stage}/> <TreasureNav id="banner" treasure_stage={treasure_stage} activeStage={activity_stage}/>
</div> </div>
<div className="banner-treasure__decorate"></div> <div className="banner-treasure__decorate"></div>
</div> </div>
...@@ -165,12 +179,12 @@ export default class index extends Component { ...@@ -165,12 +179,12 @@ export default class index extends Component {
{/* 组队开宝箱 */} {/* 组队开宝箱 */}
{ {
treasure_stage === 1 && treasure_stage === 1 &&
<TreasureBox isAppUpdate={this.state.isAppUpdate} getRemovable={this.getRemovable}/> <TreasureBox isAppUpdate={this.state.isAppUpdate} getRemovable={this.getRemovable}/>
} }
{/* 课程 */} {/* 课程 */}
<YearCourse stage={activity_stage} isAppUpdate={this.state.isAppUpdate} /> <YearCourse stage={activity_stage} treasureStage={treasure_stage} isAppUpdate={this.state.isAppUpdate} />
{/*好友加入队伍提醒；获得宝箱提醒；开售提醒弹窗，需要自取，注意修改文案*/} {/*好友加入队伍提醒；获得宝箱提醒；开售提醒弹窗，需要自取，注意修改文案*/}
{ {
...@@ -203,6 +217,9 @@ export default class index extends Component { ...@@ -203,6 +217,9 @@ export default class index extends Component {
</div> </div>
</CommonPopup> </CommonPopup>
} }
<div className={'btm-rule'}>* 本活动解释权归北京七月在线科技有限公司所有 *</div>
</div> </div>
) )
} }
......
src/components/activity/newyear-2019/preheat/index.scss
...@@ -59,6 +59,12 @@ ...@@ -59,6 +59,12 @@
} }
} }
.btm-rule {
color: #fff;
font-size: 12px;
width: 100%;
text-align: center;
}
} }
.year-index + .year19-index { .year-index + .year19-index {
......
src/components/activity/newyear-2019/preheat/nav.js
...@@ -48,21 +48,22 @@ class TreasureNav extends Component { ...@@ -48,21 +48,22 @@ class TreasureNav extends Component {
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
this.initNav(nextProps.treasure_stage); this.initNav(nextProps.treasure_stage,nextProps.activeStage);
} }
initNav = (treasure_stage) => { initNav = (treasure_stage,activeStage) => {
let {navs} = this.state; let {navs} = this.state;
// treasure_stage，宝箱阶段，0-不在活动时间，1-活动时间内 // treasure_stage，宝箱阶段，0-不在活动时间，1-活动时间内
let data = this.state.navs
if(treasure_stage === 0) { if(treasure_stage === 0) {
this.setState({ data = navs.filter(item => item.id !== 'year-treasure')
formatNavs: navs.filter(item => item.id !== 'year-treasure') }
}); if(activeStage === 3) {
}else { data = data.filter(item => item.id !== 'year-free')
this.setState({
formatNavs: navs
})
} }
this.setState({
formatNavs: data
})
} }
calcNavActive = () => { calcNavActive = () => {
...@@ -108,9 +109,9 @@ class TreasureNav extends Component { ...@@ -108,9 +109,9 @@ class TreasureNav extends Component {
<div className={classnames("treasure-nav", {'fixed': isFixed})} data-skip="nav"> <div className={classnames("treasure-nav", {'fixed': isFixed})} data-skip="nav">
{ {
formatNavs.map((item, index) => ( formatNavs.map((item, index) => (
<a <a
href={`#${item.id}`} href={`#${item.id}`}
className={classnames("treasure-nav__item", {'active': index === curIndex})} className={classnames("treasure-nav__item", {'active': index === curIndex})}
key={item.id} key={item.id}
onClick={() => this.selectToNav(index)} onClick={() => this.selectToNav(index)}
>{item.name}</a> >{item.name}</a>
......
src/components/activity/newyear-2019/treasure-box/team.js
...@@ -115,6 +115,7 @@ class TeamInfo extends Component { ...@@ -115,6 +115,7 @@ class TeamInfo extends Component {
if (code === 200) { if (code === 200) {
const { treasure_code } = data; const { treasure_code } = data;
if (!getParam('version')) { if (!getParam('version')) {
// this.props.history.push('/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
window.location.assign('https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code); window.location.assign('https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
} else { } else {
window.location.assign('https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code + '&version='+ getParam('version')); window.location.assign('https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code + '&version='+ getParam('version'));
......
src/components/activity/newyear-2019/year-wish/index.js
...@@ -46,6 +46,11 @@ class YarnWish extends Component { ...@@ -46,6 +46,11 @@ class YarnWish extends Component {
http.get(`${API.home}/activity/stage`).then(res => { http.get(`${API.home}/activity/stage`).then(res => {
const {code, data} = res.data const {code, data} = res.data
if (code === 200) { if (code === 200) {
if(Number(data.activity_stage) === 0) {
this.props.history.push('/');
return;
}
this.setState({ this.setState({
activityStage: data.activity_stage // 0-不在活动时间 1-预热 2-正式 3-返场 activityStage: data.activity_stage // 0-不在活动时间 1-预热 2-正式 3-返场
}) })
...@@ -149,25 +154,25 @@ class YarnWish extends Component { ...@@ -149,25 +154,25 @@ class YarnWish extends Component {
list.length > 0 list.length > 0
? <> ? <>
{ {
activityStage === 2 && activityStage !== 1 &&
<> <>
<CommonContainer> <CommonContainer>
<div className='groupcourse course-box'> <div className='groupcourse course-box'>
{ {
list.map(item => ( list.map(item => (
<CourseItem <CourseItem
image={item.image_name} image={item.image_name}
key={item.course_id} key={item.course_id}
id={item.course_id} id={item.course_id}
time={item.type === 2 || item.type === 7? item.end_time : ''} time={item.type === 2 || item.type === 7? item.end_time : ''}
toCourse={this.toCourse} toCourse={this.toCourse}
> >
{/* {/*
* 拼团，正常：未开团1 已开2；一分：未开团5 已开7 * 拼团，正常：未开团1 已开2；一分：未开团5 已开7
* type 1 立即参团 2 已参团 3 我要砍价 4 已参加砍价 可以继续砍价 5 马上抢 6 开始学习 7 已参加一分钱拼团 8 砍价待支付 * type 1 立即参团 2 已参团 3 我要砍价 4 已参加砍价 可以继续砍价 5 马上抢 6 开始学习 7 已参加一分钱拼团 8 砍价待支付
*/} */}
<div className="coupon-course__footer"> <div className="coupon-course__footer">
{ {
...@@ -306,7 +311,7 @@ class YarnWish extends Component { ...@@ -306,7 +311,7 @@ class YarnWish extends Component {
} }
{ {
item.type === 6 && item.type === 6 &&
<a <a
onClick={() => this.toCourse(item.course_id)} onClick={() => this.toCourse(item.course_id)}
className="btn to-group" className="btn to-group"
data-status="study" data-status="study"
...@@ -322,15 +327,15 @@ class YarnWish extends Component { ...@@ -322,15 +327,15 @@ class YarnWish extends Component {
</> </>
} }
{ {
activityStage !== 2 && activityStage === 1 &&
<> <>
<CommonContainer> <CommonContainer>
<div className='groupcourse course-box'> <div className='groupcourse course-box'>
{ {
list.map(item => ( list.map(item => (
<CourseItem <CourseItem
image={item.image_name} image={item.image_name}
key={item.course_id} key={item.course_id}
id={item.course_id} id={item.course_id}
toCourse={this.toCourse} toCourse={this.toCourse}
> >
...@@ -343,7 +348,7 @@ class YarnWish extends Component { ...@@ -343,7 +348,7 @@ class YarnWish extends Component {
item.is_buy == 1 && item.is_buy == 1 &&
<> <>
<p className={'course-title text-overflow-1'}>{item.course_title}</p> <p className={'course-title text-overflow-1'}>{item.course_title}</p>
<a <a
onClick={() => this.toCourse(item.course_id)} onClick={() => this.toCourse(item.course_id)}
className="btn to-study" className="btn to-study"
>开始学习</a> >开始学习</a>
...@@ -382,7 +387,7 @@ class YarnWish extends Component { ...@@ -382,7 +387,7 @@ class YarnWish extends Component {
<span className="old-price">{item.type == 2 ? '' : '现价：'}<s>¥{item.price1}</s></span> <span className="old-price">{item.type == 2 ? '' : '现价：'}<s>¥{item.price1}</s></span>
</div> </div>
<div className="status"> <div className="status">
<a <a
onClick={() => this.toCourse(item.course_id)} onClick={() => this.toCourse(item.course_id)}
className="status-btn to-buy" className="status-btn to-buy"
>直接购买</a> >直接购买</a>
...@@ -425,7 +430,7 @@ class YarnWish extends Component { ...@@ -425,7 +430,7 @@ class YarnWish extends Component {
<div className="notData"> <div className="notData">
<img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/PC/icon-empty.png" alt=""/> <img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/PC/icon-empty.png" alt=""/>
{ {
activityStage == 1 activityStage == 1
? <p>你的心愿单目前空空如也，<br/>快去挑选更多优惠课程吧～</p> ? <p>你的心愿单目前空空如也，<br/>快去挑选更多优惠课程吧～</p>
: <p>你的心愿单没有课程哦，<br/>感兴趣的课程可在双旦主会场直接购买！</p> : <p>你的心愿单没有课程哦，<br/>感兴趣的课程可在双旦主会场直接购买！</p>
} }
......
src/components/activity/newyear-2019/year-wish/index.scss
...@@ -207,6 +207,7 @@ html, body, #root { ...@@ -207,6 +207,7 @@ html, body, #root {
display: flex; display: flex;
.to-group { .to-group {
font-size: 12px;
&:nth-child(1) { &:nth-child(1) {
margin-right: 2px; margin-right: 2px;
......
src/components/detail/group/togroup.js
...@@ -91,7 +91,16 @@ class ToGroup extends Component { ...@@ -91,7 +91,16 @@ class ToGroup extends Component {
const {isBuy = false, data = {}} = this.state; const {isBuy = false, data = {}} = this.state;
const {user, history, location} = this.props; const {user, history, location} = this.props;
if (user.hasError) { if (user.hasError) {
history.push('/passport', {from: location}) if (browser.isWeixin) {
let redirectURI = window.location.href
if (redirectURI.includes('code=') && redirectURI.includes('state=STATE')) {
let index = redirectURI.lastIndexOf('code=');
redirectURI = redirectURI.substr(0, index - 1);
}
window.location.assign(`https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri=${encodeURIComponent(redirectURI)}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`)
} else {
history.push('/passport', {from: location})
}
return return
} }
...@@ -248,30 +257,26 @@ function GorupContent(props) { ...@@ -248,30 +257,26 @@ function GorupContent(props) {
</div>); </div>);
if (groupon_member && groupon_member.length > 0) { if (groupon_member && groupon_member.length > 0) {
let flag = true; let flag = false;
!userInfo.hasError && groupon_member.map(item => { !userInfo.hasError && groupon_member.map(item => {
if (item.uid == userInfo.data.uid) { if (item.uid == userInfo.data.uid) {
flag = true flag = true
return; return;
} else {
flag = false;
return;
} }
}) })
if (flag) { if (flag) {
tip = <p className='tip'>{`拼团省￥${data.price1 - pdd_price}元`}</p> tip = <p className='tip'>{`拼团省￥${data.price1 - pdd_price}元`}</p>
btn = <span className='group-btn' onClick={props.invitedFriends}>邀请好友参团 {countdown} 后结束</span> btn = <span className='group-btn' onClick={props.invitedFriends}>邀请好友参团 {countdown} 后结束</span>
dec = <p className='dec'>分享到3个群后，成团率高达98%</p> dec = <p className='dec'>分享到3个群后，成团率高达98%</p>
} else { } else {
if(getParam('getParam') == 1){ if(getParam('is_originator') == 1){
tip = <p className='tip'>{`拼团省￥${data.price1 - pdd_price}元`}</p> tip = <p className='tip'>{`拼团省￥${data.price1 - pdd_price}元`}</p>
btn = <a href="javascript:;" className='group-btn' onClick={props.handleToGroup}>一键参团</a> btn = <a href="javascript:;" className='group-btn' onClick={props.handleToGroup}>一键参团</a>
} else { } else {
tip = <p className='tip'>{`拼团省￥${data.price1 - pdd_price}元`}</p> tip = <p className='tip'>{`拼团省￥${data.price1 - pdd_price}元`}</p>
btn = <span className='group-btn' onClick={props.invitedFriends}>邀请好友参团 {countdown} 后结束</span> btn = <span className='group-btn' onClick={props.invitedFriends}>邀请好友参团 {countdown} 后结束</span>
dec = <p className='dec'>分享到3个群后，成团率高达98%</p> dec = <p className='dec'>分享到3个群后，成团率高达98%</p>
} }
} }
} }
......
src/components/detail/index.js
...@@ -348,19 +348,21 @@ class Detail extends Component { ...@@ -348,19 +348,21 @@ class Detail extends Component {
document.title = `${course_info.course_title} - 七月在线`; document.title = `${course_info.course_title} - 七月在线`;
if (course_info.group_status === 3 || course_info.group_status === 4) { if (course_info.group_status === 3 || course_info.group_status === 4) {
let endTime = course_info.pdd_group_info.groupon_member.end_time; let endTime = course_info.pdd_group_info.groupon_member.end_time;
let date = endTime * 1000, if(endTime && endTime > 0) {
hours = 0, let date = endTime * 1000,
minutes = 0, hours = 0,
seconds = 0; minutes = 0,
setInterval(() => { seconds = 0;
date -= 1000 setInterval(() => {
hours = `${parseInt(date / (60 * 60 * 1000))}`.padStart(2, 0); date -= 1000
minutes = `${parseInt((date - hours * 3600000) / 60000)}`.padStart(2, 0); hours = `${parseInt(date / (60 * 60 * 1000))}`.padStart(2, 0);
seconds = `${parseInt((date - hours * 3600000 - minutes * 60000) / 1000)}`.padStart(2, 0); minutes = `${parseInt((date - hours * 3600000) / 60000)}`.padStart(2, 0);
this.setState({ seconds = `${parseInt((date - hours * 3600000 - minutes * 60000) / 1000)}`.padStart(2, 0);
countdown: `${hours}:${minutes}:${seconds}` this.setState({
}); countdown: `${hours}:${minutes}:${seconds}`
}, 1000) });
}, 1000)
}
} }
wxShare({ wxShare({
title: course_info.course_title, title: course_info.course_title,
......
src/components/python/index.js
import React, {Component} from 'react' import React, {Component} from 'react'
import {http, getParam, browser} from '@/utils' import {http, getParam, browser, SendMessageToApp} from '@/utils'
import PythonDes from './pythomDes' import PythonDes from './pythomDes'
import PythonStudy from './pythonStudy' import PythonStudy from './pythonStudy'
import {connect} from "react-redux" import {connect} from "react-redux"
...@@ -62,7 +62,6 @@ class Python extends Component { ...@@ -62,7 +62,6 @@ class Python extends Component {
isAppUpdate: true isAppUpdate: true
}) })
} }
alert(`uid = ${cookie.get("uid")}`);
this.props.setCurrentUser(this.transformUser(this.state.userInfoList)) this.props.setCurrentUser(this.transformUser(this.state.userInfoList))
} }
...@@ -94,26 +93,21 @@ class Python extends Component { ...@@ -94,26 +93,21 @@ class Python extends Component {
let version = getParam('version') let version = getParam('version')
if(version) { if(version) {
version = version.replace(/\./g, '').slice(0, 3) version = version.replace(/\./g, '').slice(0, 3)
alert(version);
if(browser.isAndroidApp && version < 453) { // 安卓的低版本 if(browser.isAndroidApp && version < 453) { // 安卓的低版本
alert('低版本');
this.setState({ this.setState({
backwardVersion: true, backwardVersion: true,
isPay: 0, isPay: 0,
}) })
}else{ }else if(browser.isIOSApp && version < 380) { // ISO的低版本
alert('高版本');
this.setState({
backwardVersion: false,
isPay: data.course_info.is_pay
})
}
if(browser.isIOSApp && version < 380) { // ISO的低版本
this.setState({ this.setState({
backwardVersion: true, backwardVersion: true,
isPay: 0, isPay: 0,
}) })
}else{ }else{ // 安卓/IOS 的高版本
if(data.course_info.is_pay === 1) { // 在APP内未登录-去登陆-登录后还显示此页；如果是已购买的用户 就需要跳转到 APP已购买的原生页面
SendMessageToApp('toSyllabusChapter', id); // 跳转到APP的已购买详情页 id 是课程ID
return;
}
this.setState({ this.setState({
backwardVersion: false, backwardVersion: false,
isPay: data.course_info.is_pay isPay: data.course_info.is_pay
...@@ -135,8 +129,14 @@ class Python extends Component { ...@@ -135,8 +129,14 @@ class Python extends Component {
return ( return (
<div> <div>
{ {
// isPay === 0 && <PythonDes history={this.props.history} isAppUpdate={isAppUpdate} backwardVersion={backwardVersion} isPay={isPay}></PythonDes> isPay === 0 && (
isPay === 0 && <div>为什么需要这么做</div> <PythonDes
backwardVersion={backwardVersion}
history={this.props.history}
isAppUpdate={isAppUpdate}
isPay={isPay}
/>
)
} }
{ {
(isPay === 1 && !getParam('version')) && <PythonStudy isAppUpdate={isAppUpdate}/> (isPay === 1 && !getParam('version')) && <PythonStudy isAppUpdate={isAppUpdate}/>
......
src/components/python/pythomDes/index.js
...@@ -121,7 +121,7 @@ class PythonDes extends Component { ...@@ -121,7 +121,7 @@ class PythonDes extends Component {
} }
toLearn = () => { toLearn = () => {
const {backwardVersion, isPay} = this.props; const {backwardVersion} = this.props;
http.post(`${API['home']}/m/it/user/trialCourse`, {course_id: getParam('id')}).then((res) => { http.post(`${API['home']}/m/it/user/trialCourse`, {course_id: getParam('id')}).then((res) => {
const {code, msg} = res.data const {code, msg} = res.data
if (code == 200) { if (code == 200) {
...@@ -133,7 +133,7 @@ class PythonDes extends Component { ...@@ -133,7 +133,7 @@ class PythonDes extends Component {
if(backwardVersion) { if(backwardVersion) {
Toast.info('当前版本不支持该课程模式，请升级到最新版本或前往PC端体验', 2) Toast.info('当前版本不支持该课程模式，请升级到最新版本或前往PC端体验', 2)
} else { } else {
SendMessageToApp("toLearn") SendMessageToApp("toLearn", getParam('id'))
} }
} }
} else { } else {
...@@ -149,7 +149,7 @@ class PythonDes extends Component { ...@@ -149,7 +149,7 @@ class PythonDes extends Component {
} }
toDetail = () => { toDetail = () => {
const {backwardVersion, isPay} = this.props; const {backwardVersion} = this.props;
const id = getParam('id') const id = getParam('id')
if (!getParam('version')) { // H5 if (!getParam('version')) { // H5
http.get(`${API['base-api']}/m/cart/addtopreorder/[${id}]`).then((res) => { http.get(`${API['base-api']}/m/cart/addtopreorder/[${id}]`).then((res) => {
...@@ -260,7 +260,6 @@ class PythonDes extends Component { ...@@ -260,7 +260,6 @@ class PythonDes extends Component {
} = this.state } = this.state
return ( return (
<div className={'python__des'}> <div className={'python__des'}>
<div>测试显示不显示</div>
<div className={'des__start'}></div> <div className={'des__start'}></div>
<div className={'python__define'}> <div className={'python__define'}>
<img className={'left__decorate'} <img className={'left__decorate'}
......
src/components/pythonShare/index.js
...@@ -89,17 +89,9 @@ class PythonClass extends Component { ...@@ -89,17 +89,9 @@ class PythonClass extends Component {
this.setState({ this.setState({
isGuide: true isGuide: true
}); });
let title = '';
let labelName = this.formatTitle(params);
if(entryMode !== 0 && !isShare) {
title = `我在${params.course_name}的${labelName}遇到了困难`;
}
if(entryMode !== 0 && isShare) {
title = `我已在【${params.course_name}】上运行了行代码了${params.code_lines}`
}
wxShare({ wxShare({
title, title: isShare? `我已在【${params.course_name}】上运行了行代码了${params.code_lines}` : `我在${params.course_name}的${labelName}遇到了困难`,
desc: labelName, desc: this.formatTitle(params),
link: encodeURI(location.href), link: encodeURI(location.href),
imgUrl: params.course_img, imgUrl: params.course_img,
}); });
...@@ -155,7 +147,7 @@ class PythonClass extends Component { ...@@ -155,7 +147,7 @@ class PythonClass extends Component {
data={data} data={data}
labelName={this.formatTitle(data)} labelName={this.formatTitle(data)}
handleToExecute={this.handleToExecute} handleToExecute={this.handleToExecute}
handleToSend={this.handleToSend} handleToSend={() => this.handleToSend(data)}
copyToSuccess={this.copyToSuccess} copyToSuccess={this.copyToSuccess}
handleToHide={this.handleToHide} handleToHide={this.handleToHide}
/> />
......
src/router/router-config.js
...@@ -227,6 +227,10 @@ export default [ ...@@ -227,6 +227,10 @@ export default [
path: '/invite', path: '/invite',
component: Invite, component: Invite,
}, },
<<<<<<< HEAD
=======
>>>>>>> pythonForApp
//双旦活动 //双旦活动
{ {
path: '/activity/newyear-2019/landing', path: '/activity/newyear-2019/landing',
......
src/store/userReducer.js
...@@ -3,7 +3,7 @@ import { merge } from 'lodash' ...@@ -3,7 +3,7 @@ import { merge } from 'lodash'
const notLoggedIn = 4030 const notLoggedIn = 4030
const initialState = { export const initialState = {
hasError: true, hasError: true,
code: notLoggedIn, code: notLoggedIn,
msg: '', msg: '',
...@@ -30,4 +30,4 @@ export default function (state = initialState, action) { ...@@ -30,4 +30,4 @@ export default function (state = initialState, action) {
default: default:
return state return state
} }
} }
\ No newline at end of file
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