Skip to content

M
mr-julyedu
Commit 32bdb014 by zhanghaozhe
Options

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

 Conflicts:
	build/asset-manifest.json
	build/index.html
	build/mrstatic/css/2.5ed15c7e.chunk.css
	build/mrstatic/css/36.aebbab68.chunk.css
	build/mrstatic/css/37.4c706a4e.chunk.css
	build/mrstatic/css/38.2471f477.chunk.css
	build/mrstatic/css/39.0bb224f2.chunk.css
	build/mrstatic/css/40.ecbb6f9a.chunk.css
	build/mrstatic/css/41.030986a1.chunk.css
	build/mrstatic/css/42.eb90513f.chunk.css
	build/mrstatic/css/Activity.16611a91.chunk.css
	build/mrstatic/css/BargainMiddlePage.fc53c3d0.chunk.css
	build/mrstatic/css/Classify.f2f19957.chunk.css
	build/mrstatic/css/Country.16a64650.chunk.css
	build/mrstatic/css/CourseList.85889ffd.chunk.css
	build/mrstatic/css/DrawDocument.2e7d81ca.chunk.css
	build/mrstatic/css/Examination.f2cc3163.chunk.css
	build/mrstatic/css/Invite.16611a91.chunk.css
	build/mrstatic/css/Order.35f475a1.chunk.css
	build/mrstatic/css/PayOrder.e5315535.chunk.css
	build/mrstatic/css/Preferential.cda7a495.chunk.css
	build/mrstatic/css/SearchResult.bb7c3056.chunk.css
	build/mrstatic/css/ShareCourse.278ad3b1.chunk.css
	build/mrstatic/css/ShopCart.3a4dbb7a.chunk.css
	build/mrstatic/css/aist-share.ca49c1cb.chunk.css
	build/mrstatic/css/blessing-preheat.9f20de2c.chunk.css
	build/mrstatic/css/blessing-rank.e60367d5.chunk.css
	build/mrstatic/css/coupons.ff6280ad.chunk.css
	build/mrstatic/css/deposit-order.6f3a01ca.chunk.css
	build/mrstatic/css/deposit-pay-order.039d87dd.chunk.css
	build/mrstatic/css/detail.def61ddb.chunk.css
	build/mrstatic/css/main.b1f8779d.chunk.css
	build/mrstatic/css/myorders.a5a13d80.chunk.css
	build/mrstatic/css/prize-winner-list.e1adc61c.chunk.css
	build/mrstatic/css/purchased.dd7556e0.chunk.css
	build/mrstatic/css/search.fab97849.chunk.css
	build/mrstatic/css/shareposter.f09a5959.chunk.css
	build/mrstatic/css/study.b002c899.chunk.css
	build/mrstatic/css/togroup.49988cae.chunk.css
	build/mrstatic/css/video.1f56370b.chunk.css
	build/mrstatic/js/2.146795d7.chunk.js
	build/mrstatic/js/2.146795d7.chunk.js.map
	build/mrstatic/js/37.d76b2fb9.chunk.js.map
	build/mrstatic/js/40.ee92f8a2.chunk.js
	build/mrstatic/js/40.ee92f8a2.chunk.js.map
	build/mrstatic/js/41.7e30a165.chunk.js
	build/mrstatic/js/42.f3b8ff3b.chunk.js
	build/mrstatic/js/42.f3b8ff3b.chunk.js.map
	build/mrstatic/js/Activity.53c64571.chunk.js
	build/mrstatic/js/BargainMiddlePage.76c11a6d.chunk.js
	build/mrstatic/js/Classify.35396fa1.chunk.js
	build/mrstatic/js/Country.77c2cd9e.chunk.js
	build/mrstatic/js/CourseList.140d07a0.chunk.js
	build/mrstatic/js/DrawDocument.78f1cea8.chunk.js
	build/mrstatic/js/Examination.4acae891.chunk.js
	build/mrstatic/js/Examination.4acae891.chunk.js.map
	build/mrstatic/js/Invite.d0f87368.chunk.js
	build/mrstatic/js/MyEdit.a239f40c.chunk.js
	build/mrstatic/js/Order.6e071c1b.chunk.js
	build/mrstatic/js/Orderinfo.b9479eef.chunk.js
	build/mrstatic/js/PayOrder.905b652f.chunk.js
	build/mrstatic/js/Preferential.80e74534.chunk.js
	build/mrstatic/js/SearchResult.4c7513b7.chunk.js
	build/mrstatic/js/SearchResult.4c7513b7.chunk.js.map
	build/mrstatic/js/ShareCourse.e3cfc73d.chunk.js
	build/mrstatic/js/ShopCart.75035a72.chunk.js
	build/mrstatic/js/ShopCart.75035a72.chunk.js.map
	build/mrstatic/js/aist-share.9d8a8873.chunk.js
	build/mrstatic/js/aist-share.9d8a8873.chunk.js.map
	build/mrstatic/js/blessing-rank.e4b8d13e.chunk.js
	build/mrstatic/js/blessing-rank.e4b8d13e.chunk.js.map
	build/mrstatic/js/coupons.a6c0401b.chunk.js
	build/mrstatic/js/coupons.a6c0401b.chunk.js.map
	build/mrstatic/js/deposit-order.10df6cd8.chunk.js
	build/mrstatic/js/deposit-pay-order.65a82b79.chunk.js
	build/mrstatic/js/detail.a2e83107.chunk.js
	build/mrstatic/js/main.3eee7c69.chunk.js
	build/mrstatic/js/myorders.f45fc7d4.chunk.js
	build/mrstatic/js/prize-winner-list.693ecacc.chunk.js
	build/mrstatic/js/prize-winner-list.693ecacc.chunk.js.map
	build/mrstatic/js/purchased.36c6db89.chunk.js
	build/mrstatic/js/runtime~main.d8bf7acf.js.map
	build/mrstatic/js/search.724ecacc.chunk.js
	build/mrstatic/js/search.724ecacc.chunk.js.map
	build/mrstatic/js/shareposter.ef1e92d5.chunk.js
	build/mrstatic/js/study.8902f11d.chunk.js
	build/mrstatic/js/study.8902f11d.chunk.js.map
	build/mrstatic/js/togroup.e0c16884.chunk.js
	build/mrstatic/js/video.f6c72f8b.chunk.js
	build/service-worker.js
parents d105bf24 42cf4a15
Showing with 73 additions and 74 deletions
build/manifest.json deleted 100644 → 0
{
"short_name": "React App",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}
build/mrstatic/js/0.859d9215.chunk.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/1.03fe4b8f.chunk.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/37.d76b2fb9.chunk.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/38.361b0e04.chunk.js deleted 100644 → 0
(window.webpackJsonp=window.webpackJsonp||[]).push([[38],{1153:function(t,e,n){var o=n(1154),i=n(726),r="Expected a function";t.exports=function(t,e,n){var a=!0,u=!0;if("function"!=typeof t)throw new TypeError(r);return i(n)&&(a="leading"in n?!!n.leading:a,u="trailing"in n?!!n.trailing:u),o(t,e,{leading:a,maxWait:e,trailing:u})}},1154:function(t,e,n){var o=n(726),i=n(1155),r=n(1157),a="Expected a function",u=Math.max,l=Math.min;t.exports=function(t,e,n){var c,s,f,p,h,d,v=0,m=!1,g=!1,y=!0;if("function"!=typeof t)throw new TypeError(a);function b(e){var n=c,o=s;return c=s=void 0,v=e,p=t.apply(o,n)}function C(t){var n=t-d;return void 0===d||n>=e||n<0||g&&t-v>=f}function x(){var t=i();if(C(t))return w(t);h=setTimeout(x,function(t){var n=e-(t-d);return g?l(n,f-(t-v)):n}(t))}function w(t){return h=void 0,y&&c?b(t):(c=s=void 0,p)}function R(){var t=i(),n=C(t);if(c=arguments,s=this,d=t,n){if(void 0===h)return function(t){return v=t,h=setTimeout(x,e),m?b(t):p}(d);if(g)return clearTimeout(h),h=setTimeout(x,e),b(d)}return void 0===h&&(h=setTimeout(x,e)),p}return e=r(e)||0,o(n)&&(m=!!n.leading,f=(g="maxWait"in n)?u(r(n.maxWait)||0,e):f,y="trailing"in n?!!n.trailing:y),R.cancel=function(){void 0!==h&&clearTimeout(h),v=0,c=d=s=h=void 0},R.flush=function(){return void 0===h?p:w(i())},R}},1155:function(t,e,n){var o=n(797);t.exports=function(){return o.Date.now()}},1156:function(t,e,n){(function(e){var n="object"==typeof e&&e&&e.Object===Object&&e;t.exports=n}).call(this,n(45))},1157:function(t,e,n){var o=n(726),i=n(1158),r=NaN,a=/^\s+|\s+$/g,u=/^[-+]0x[0-9a-f]+$/i,l=/^0b[01]+$/i,c=/^0o[0-7]+$/i,s=parseInt;t.exports=function(t){if("number"==typeof t)return t;if(i(t))return r;if(o(t)){var e="function"==typeof t.valueOf?t.valueOf():t;t=o(e)?e+"":e}if("string"!=typeof t)return 0===t?t:+t;t=t.replace(a,"");var n=l.test(t);return n||c.test(t)?s(t.slice(2),n?2:8):u.test(t)?r:+t}},1158:function(t,e,n){var o=n(1159),i=n(1162),r="[object Symbol]";t.exports=function(t){return"symbol"==typeof t||i(t)&&o(t)==r}},1159:function(t,e,n){var o=n(798),i=n(1160),r=n(1161),a="[object Null]",u="[object Undefined]",l=o?o.toStringTag:void 0;t.exports=function(t){return null==t?void 0===t?u:a:l&&l in Object(t)?i(t):r(t)}},1160:function(t,e,n){var o=n(798),i=Object.prototype,r=i.hasOwnProperty,a=i.toString,u=o?o.toStringTag:void 0;t.exports=function(t){var e=r.call(t,u),n=t[u];try{t[u]=void 0;var o=!0}catch(l){}var i=a.call(t);return o&&(e?t[u]=n:delete t[u]),i}},1161:function(t,e){var n=Object.prototype.toString;t.exports=function(t){return n.call(t)}},1162:function(t,e){t.exports=function(t){return null!=t&&"object"==typeof t}},587:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(t){return Object.keys(t).reduce(function(e,n){return"aria-"!==n.substr(0,5)&&"data-"!==n.substr(0,5)&&"role"!==n||(e[n]=t[n]),e},{})},t.exports=e.default},592:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var o,i=n(6),r=(o=i)&&o.__esModule?o:{default:o};e.getComponentLocale=function(t,e,n,o){var i={};if(e&&e.antLocale&&e.antLocale[n])i=e.antLocale[n];else{var a=o();i=a.default||a}var u=(0,r.default)({},i);t.locale&&(u=(0,r.default)({},u,t.locale),t.locale.lang&&(u.lang=(0,r.default)({},i.lang,t.locale.lang)));return u},e.getLocaleCode=function(t){var e=t.antLocale&&t.antLocale.locale;if(t.antLocale&&t.antLocale.exist&&!e)return"zh-cn";return e}},610:function(t,e,n){"use strict";n(49),n(611)},611:function(t,e,n){},612:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var o=g(n(6)),i=g(n(34)),r=g(n(10)),a=g(n(13)),u=g(n(11)),l=g(n(14)),c=g(n(17)),s=m(n(0)),f=m(n(2)),p=g(n(156)),h=g(n(587)),d=n(592),v=n(613);function m(t){if(t&&t.__esModule)return t;var e={};if(null!=t)for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e.default=t,e}function g(t){return t&&t.__esModule?t:{default:t}}var y=function(t){function e(t){(0,r.default)(this,e);var n=(0,u.default)(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t));n.onSubmit=function(t){t.preventDefault(),n.props.onSubmit&&n.props.onSubmit(n.state.value||""),n.inputRef&&n.inputRef.blur()},n.onChange=function(t){n.state.focus||n.setState({focus:!0});var e=t.target.value;"value"in n.props||n.setState({value:e}),n.props.onChange&&n.props.onChange(e)},n.onFocus=function(){n.setState({focus:!0}),n.firstFocus=!0,n.props.onFocus&&n.props.onFocus()},n.onBlur=function(){var t;n.onBlurTimeout=(t=function(){n.blurFromOnClear||document.activeElement!==n.inputRef&&n.setState({focus:!1}),n.blurFromOnClear=!1},window.requestAnimationFrame?window.requestAnimationFrame(t):window.setTimeout(t,1)),n.props.onBlur&&(setTimeout(function(){document.body&&(document.body.scrollTop=document.body.scrollTop)},100),n.props.onBlur())},n.onClear=function(){n.doClear()},n.doClear=function(){var t=!(arguments.length>0&&void 0!==arguments[0])||arguments[0];n.blurFromOnClear=t,"value"in n.props||n.setState({value:""}),n.props.onClear&&n.props.onClear(""),n.props.onChange&&n.props.onChange(""),t&&n.focus()},n.onCancel=function(){n.props.onCancel?n.props.onCancel(n.state.value||""):n.doClear(!1)},n.focus=function(){n.inputRef&&n.inputRef.focus()};var o=void 0;return o="value"in t?t.value||"":"defaultValue"in t?t.defaultValue:"",n.state={value:o,focus:!1},n}return(0,l.default)(e,t),(0,a.default)(e,[{key:"componentDidMount",value:function(){if(this.rightBtnRef){var t=window.getComputedStyle(this.rightBtnRef);this.rightBtnInitMarginleft=t.marginLeft}this.componentDidUpdate()}},{key:"componentDidUpdate",value:function(){if(this.syntheticPhRef)if(this.inputContainerRef&&this.inputContainerRef.className.indexOf(this.props.prefixCls+"-start")>-1){if(this.syntheticPhContainerRef){var t=this.syntheticPhContainerRef.getBoundingClientRect().width;this.syntheticPhRef.style.width=Math.ceil(t)+"px"}!this.props.showCancelButton&&this.rightBtnRef&&(this.rightBtnRef.style.marginRight="0")}else this.syntheticPhRef.style.width="100%",!this.props.showCancelButton&&this.rightBtnRef&&(this.rightBtnRef.style.marginRight="-"+(this.rightBtnRef.offsetWidth+(null!=this.rightBtnInitMarginleft?parseInt(this.rightBtnInitMarginleft,10):0))+"px")}},{key:"componentWillReceiveProps",value:function(t){"value"in t&&t.value!==this.state.value&&this.setState({value:t.value})}},{key:"componentWillUnmount",value:function(){var t;this.onBlurTimeout&&(t=this.onBlurTimeout,window.cancelAnimationFrame?window.cancelAnimationFrame(t):window.clearTimeout(t),this.onBlurTimeout=null)}},{key:"render",value:function(){var t,e=this,r=this.props,a=r.prefixCls,u=r.showCancelButton,l=r.disabled,f=r.placeholder,v=r.className,m=r.style,g=r.maxLength,y=(0,d.getComponentLocale)(this.props,this.context,"SearchBar",function(){return n(614)}).cancelText,b=this.state,C=b.value,x=b.focus,w=(0,c.default)(a,v,(0,i.default)({},a+"-start",!!(x||C&&C.length>0))),R=(0,c.default)(a+"-clear",(0,i.default)({},a+"-clear-show",!!(x&&C&&C.length>0))),B=(0,c.default)(a+"-cancel",(t={},(0,i.default)(t,a+"-cancel-show",!!(u||x||C&&C.length>0)),(0,i.default)(t,a+"-cancel-anim",this.firstFocus),t));return s.createElement("form",{onSubmit:this.onSubmit,className:w,style:m,ref:function(t){return e.inputContainerRef=t},action:"#"},s.createElement("div",{className:a+"-input"},s.createElement("div",{className:a+"-synthetic-ph",ref:function(t){return e.syntheticPhRef=t}},s.createElement("span",{className:a+"-synthetic-ph-container",ref:function(t){return e.syntheticPhContainerRef=t}},s.createElement("i",{className:a+"-synthetic-ph-icon"}),s.createElement("span",{className:a+"-synthetic-ph-placeholder",style:{visibility:f&&!C?"visible":"hidden"}},f))),s.createElement("input",(0,o.default)({type:"search",className:a+"-value",value:C,disabled:l,placeholder:f,onChange:this.onChange,onFocus:this.onFocus,onBlur:this.onBlur,ref:function(t){return e.inputRef=t},maxLength:g},(0,h.default)(this.props))),s.createElement(p.default,{activeClassName:a+"-clear-active"},s.createElement("a",{onClick:this.onClear,className:R}))),s.createElement("div",{className:B,onClick:this.onCancel,ref:function(t){return e.rightBtnRef=t}},this.props.cancelText||y))}}]),e}(s.Component);e.default=y,y.defaultProps=v.defaultProps,y.contextTypes={antLocale:f.object},t.exports=e.default},613:function(t,e,n){"use strict";function o(){}Object.defineProperty(e,"__esModule",{value:!0});e.defaultProps={prefixCls:"am-search",placeholder:"",onSubmit:o,onChange:o,onFocus:o,onBlur:o,onClear:o,showCancelButton:!1,disabled:!1}},614:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default={cancelText:"\u53d6\u6d88"},t.exports=e.default},726:function(t,e){t.exports=function(t){var e=typeof t;return null!=t&&("object"==e||"function"==e)}},797:function(t,e,n){var o=n(1156),i="object"==typeof self&&self&&self.Object===Object&&self,r=o||i||Function("return this")();t.exports=r},798:function(t,e,n){var o=n(797).Symbol;t.exports=o}}]);
//# sourceMappingURL=38.361b0e04.chunk.js.map
\ No newline at end of file
build/mrstatic/media/iconfont.b9b072e1.svg deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/activity/invite.js
......@@ -21,7 +21,6 @@ class Invite extends Component {
let uid = jsCookie.get('uid');
let shareuid = getParam('shareuid');
if(uid === shareuid) {
} else {
if(getParam('new')) {
this.props.history.push(`/activity?shareuid=${shareuid}&code=${inviteCode}`);
......@@ -81,10 +80,10 @@ class Invite extends Component {
if(is_weixin()) {
// TODO 这里需要运营确定文案
wxShare({
title: "哈哈哈哈哈哈哈",
desc: "你的老相好在七月在线学习呢你来不来",
title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！',
desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线',
link: encodeURI(location.origin + `/invite?shareuid=${jsCookie.get('uid')}&new=1&code=${inviteCode}`),
imgUrl: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/20a86c1353.jpg'
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png',
});
this.setState({
showTip: true,
......@@ -139,7 +138,6 @@ class Invite extends Component {
</div>
</div>
</div>
<div className="but__con">
<div className="button__content" onClick={this.inviteFriends}>
......
src/components/blessingPreheat/index.js
import React, { Component } from 'react'
import QRCode from 'qrcode'
import { http, SendMessageToApp } from '@/utils'
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'
......@@ -20,7 +20,8 @@ import { CopyToClipboard } from 'react-copy-to-clipboard'
import { Toast } from "antd-mobile"
import Live from './live'
import Banner from './banner'
import { getParam } from '../../utils'
import jsCookie from "js-cookie";
class BlessingPreheat extends Component {
......@@ -74,10 +75,17 @@ class BlessingPreheat extends Component {
}
componentDidMount() {
this.fetchUserBlessing()
this.fetchUserBlessing();
this.setInitialNavActiveStatus()
window.addEventListener('scroll', throttle(this.calcNavActive, 100))
window.addEventListener('scroll', throttle(this.calcNavActive, 100));
if(is_weixin()) {
wxShare({
title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！',
desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线',
link: window.location.href,
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png',
})
}
}
getActiveIndex = (arr, n) => {
......@@ -127,13 +135,14 @@ class BlessingPreheat extends Component {
}
fetchUserBlessing() {
// 判断登录未登录 根据this.state.userInfo.isLogin
if (getParam('version')) {
// 判断登录未登录 根据this.state.userInfo.isLogin
if(getParam('version')) {
// app 平台
} else {
}else{
// H5
}
const {userInfo} = this.state
const { userInfo } = this.state;
http.get(`${API.home}/sys/user/blessing`).then(res => {
const {code, data} = res.data
if (code === 200) {
......@@ -191,9 +200,9 @@ class BlessingPreheat extends Component {
// 邀请好友注册
handleToShowInvite = () => {
const {userInfo} = this.state
if (userInfo.isLogin) {
if (!getParam('version')) {
const { userInfo } = this.state;
if(userInfo.isLogin) {
if(!getParam('version')) {
QRCode.toDataURL('http://m.julyedu.com/invite', {
width: 120,
height: 120,
......@@ -210,15 +219,15 @@ class BlessingPreheat extends Component {
})
} else {
let data = {
title: '11.11-11.13 AI充电节，预热来袭！重磅好课1折秒，超10万元奖品来就送-七月在线', // 标题
desc: '11.11-11.13 AI充电节，预热来袭！重磅好课1折秒，超10万元奖品来就送-七月在线', // 描述
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_717/m/717/shareimg.png', // 图片地址
link: 'https://m.julyedu.com/blessingPreheat' // url
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("toShare", data)
}
} else {
this.toLogin()
this.toLogin();
}
}
......@@ -230,8 +239,7 @@ class BlessingPreheat extends Component {
width: 120,
height: 120,
margin: 1
})
.then(url => {
}).then(url => {
this.setState({
isServer: true,
serverUrl: url,
......@@ -255,6 +263,15 @@ class BlessingPreheat extends Component {
}
}
toLogin = () => {
const { history } = this.props;
if(!getParam('version')) {
history.push('/passport');
}else{
SendMessageToApp("toLogin");
}
}
onCopy = () => {
Toast.info('复制成功', 2, null, false)
}
......@@ -285,7 +302,8 @@ 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
if (y <= this.navTop) {
......@@ -326,16 +344,17 @@ class BlessingPreheat extends Component {
showRecordList,
shareMark,
index
} = this.state
const {history} = this.props
} = this.state;
const {history} = this.props;
return (
<div id={'blessing-preheat'}>
<Banner
isFormal={isFormal}
navs={navs}
toSection={this.toSection}
index={index}
/>
isFormal={isFormal}
navs={navs}
toSection={this.toSection}
index={index}
/>
{/* 积福气 */}
<ListHeader id={'lucky-value'} text="积福气，享受更多福利" styles={{margin: '60px 0 15px'}}/>
<Link className="luck-draw__button" to="/blessingRank">福气排行榜></Link>
......@@ -378,8 +397,7 @@ 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={userInfo.isLogin} handleToHide={() => this.handleToHide('isCourse')}/>
}
{
showRecordList &&
......@@ -407,7 +425,6 @@ class BlessingPreheat extends Component {
<img src={serverUrl} alt="barcode" className="qr-code"/>
</Popup>
<Popup visible={this.state.joinLotteryVisible}
title={'你已成功参与本时段抽奖'}
className={'join-lottery'}
......@@ -434,7 +451,8 @@ 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>
......
src/components/blessingPreheat/toAppDemo.js
......@@ -101,10 +101,10 @@ class ToAppDemo extends Component {
QQshare = () => {
// 内容需要和产品确认
let data = {
title: '11.11-11.13 AI充电节，预热来袭！重磅好课1折秒，超10万元奖品来就送-七月在线', // 标题
desc: '11.11-11.13 AI充电节，预热来袭！重磅好课1折秒，超10万元奖品来就送-七月在线', // 描述
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_717/m/717/shareimg.png', // 图片地址
link: 'https://m.julyedu.com/blessingPreheat' // url
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)
}
......@@ -112,10 +112,10 @@ class ToAppDemo extends Component {
WXshare = () => {
// 内容需要和产品确认
let data = {
title: '11.11-11.13 AI充电节，预热来袭！重磅好课1折秒，超10万元奖品来就送-七月在线', // 标题
desc: '11.11-11.13 AI充电节，预热来袭！重磅好课1折秒，超10万元奖品来就送-七月在线', // 描述
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_717/m/717/shareimg.png', // 图片地址
link: 'https://m.julyedu.com/blessingPreheat' // url
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)
}
......@@ -123,10 +123,10 @@ class ToAppDemo extends Component {
// 邀请好友注册
toShare = () => {
let data = {
title: '11.11-11.13 AI充电节，预热来袭！重磅好课1折秒，超10万元奖品来就送-七月在线', // 标题
desc: '11.11-11.13 AI充电节，预热来袭！重磅好课1折秒，超10万元奖品来就送-七月在线', // 描述
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_717/m/717/shareimg.png', // 图片地址
link: 'https://m.julyedu.com/blessingPreheat' // url
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("toShare", data)
}
......
src/components/expand/share.js
import React, {Component} from 'react'
import './share.scss'
import {http, getParam, browser, wxShare} from '@/utils'
import {http, getParam, browser, wxShare,is_weixin} from '@/utils'
import {Toast} from 'antd-mobile'
import {connect} from "react-redux";
import {Link} from "react-router-dom";
......@@ -21,13 +21,14 @@ class ExpandShare extends Component {
componentDidMount() {
this.getListorData()
this.getCourseList()
wxShare({
title: 'AI充电节，预热来袭！80元红包送你，手要快！',
desc: '重磅好课1折秒，超10万元奖品来就送',
link: window.location.href,
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_717/m/717/shareimg.png',
})
if(is_weixin()) {
wxShare({
title: 'AI充电节，预热来袭！80元红包送给你，手要快！',
desc: '积福气享1折秒课，超10万元奖品来就送--七月在线',
link: window.location.href,
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/dj-share-img.png',
})
}
}
// 获取膨胀券相关
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment