Skip to content

M
mr-julyedu
Commit 24f9d353 by wangshuo
Options

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

parents 42cb7df2 b116c899
Showing with 88 additions and 55 deletions
build/asset-manifest.json
......@@ -55,9 +55,9 @@
"aist-share.css": "/mrstatic/css/aist-share.40873df0.chunk.css",
"aist-share.js": "/mrstatic/js/aist-share.3a04b022.chunk.js",
"aist-share.js.map": "/mrstatic/js/aist-share.3a04b022.chunk.js.map",
"blessing-preheat.css": "/mrstatic/css/blessing-preheat.3ea8b615.chunk.css",
"blessing-preheat.js": "/mrstatic/js/blessing-preheat.5810afef.chunk.js",
"blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.5810afef.chunk.js.map",
"blessing-preheat.css": "/mrstatic/css/blessing-preheat.564d8d7c.chunk.css",
"blessing-preheat.js": "/mrstatic/js/blessing-preheat.e897c984.chunk.js",
"blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.e897c984.chunk.js.map",
"blessing-rank.css": "/mrstatic/css/blessing-rank.edf00bf8.chunk.css",
"blessing-rank.js": "/mrstatic/js/blessing-rank.9beb2e6a.chunk.js",
"blessing-rank.js.map": "/mrstatic/js/blessing-rank.9beb2e6a.chunk.js.map",
......@@ -85,8 +85,8 @@
"purchased.css": "/mrstatic/css/purchased.bb758677.chunk.css",
"purchased.js": "/mrstatic/js/purchased.a38723f4.chunk.js",
"purchased.js.map": "/mrstatic/js/purchased.a38723f4.chunk.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.a873bb0a.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.a873bb0a.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.b8db1102.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.b8db1102.js.map",
"search.css": "/mrstatic/css/search.5716d9b3.chunk.css",
"search.js": "/mrstatic/js/search.589ab26a.chunk.js",
"search.js.map": "/mrstatic/js/search.589ab26a.chunk.js.map",
......@@ -147,7 +147,7 @@
"mrstatic/css/ShareCourse.8046fb41.chunk.css.map": "/mrstatic/css/ShareCourse.8046fb41.chunk.css.map",
"mrstatic/css/ShopCart.92ab48a3.chunk.css.map": "/mrstatic/css/ShopCart.92ab48a3.chunk.css.map",
"mrstatic/css/aist-share.40873df0.chunk.css.map": "/mrstatic/css/aist-share.40873df0.chunk.css.map",
"mrstatic/css/blessing-preheat.3ea8b615.chunk.css.map": "/mrstatic/css/blessing-preheat.3ea8b615.chunk.css.map",
"mrstatic/css/blessing-preheat.564d8d7c.chunk.css.map": "/mrstatic/css/blessing-preheat.564d8d7c.chunk.css.map",
"mrstatic/css/blessing-rank.edf00bf8.chunk.css.map": "/mrstatic/css/blessing-rank.edf00bf8.chunk.css.map",
"mrstatic/css/coupons.466858c7.chunk.css.map": "/mrstatic/css/coupons.466858c7.chunk.css.map",
"mrstatic/css/deposit-order.5ea077aa.chunk.css.map": "/mrstatic/css/deposit-order.5ea077aa.chunk.css.map",
......@@ -166,6 +166,6 @@
"mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.e0655d4d.woff",
"mrstatic/media/kanjia_cg_icon.png": "/mrstatic/media/kanjia_cg_icon.81a489ac.png",
"mrstatic/media/video.scss": "/mrstatic/media/progress-share-bg.80011994.png",
"precache-manifest.031dbafe662ef918b7f541caad3f9432.js": "/precache-manifest.031dbafe662ef918b7f541caad3f9432.js",
"precache-manifest.e1b050fa0efbb6f4526894ae0d52c4d7.js": "/precache-manifest.e1b050fa0efbb6f4526894ae0d52c4d7.js",
"service-worker.js": "/service-worker.js"
}
\ No newline at end of file
build/mrstatic/js/blessing-preheat.5810afef.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/blessing-preheat.e897c984.chunk.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/precache-manifest.031dbafe662ef918b7f541caad3f9432.js → build/precache-manifest.e1b050fa0efbb6f4526894ae0d52c4d7.js
......@@ -84,8 +84,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/MyEdit.fea133fd.chunk.js"
},
{
"revision": "258b4b114d3d9be3018cd113b2470a13",
"url": "/mrstatic/media/iconfont.258b4b11.ttf"
"revision": "7aa984cefad739ea18edb76c541aa1fd",
"url": "/mrstatic/media/iconfont.7aa984ce.eot"
},
{
"revision": "a28bdbb65926824a31b2",
......@@ -96,8 +96,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/Orderinfo.57e0641d.chunk.js"
},
{
"revision": "7aa984cefad739ea18edb76c541aa1fd",
"url": "/mrstatic/media/iconfont.7aa984ce.eot"
"revision": "258b4b114d3d9be3018cd113b2470a13",
"url": "/mrstatic/media/iconfont.258b4b11.ttf"
},
{
"revision": "17e2d9973e72bb3206ae",
......@@ -148,8 +148,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/38.6484232f.chunk.js"
},
{
"revision": "d5662128ca71bdcb1d02",
"url": "/mrstatic/js/blessing-preheat.5810afef.chunk.js"
"revision": "e0282a9c0c1a1d37c5e2",
"url": "/mrstatic/js/blessing-preheat.e897c984.chunk.js"
},
{
"revision": "ce643559cbe26713d628",
......@@ -208,8 +208,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/myorders.5b24e8bb.chunk.js"
},
{
"revision": "1c5c2bd44ba689414f5a",
"url": "/mrstatic/js/runtime~main.a873bb0a.js"
"revision": "9858e3402f6b3b845034",
"url": "/mrstatic/js/runtime~main.b8db1102.js"
},
{
"revision": "480dec355e65b21ce336",
......@@ -288,8 +288,8 @@ self.__precacheManifest = [
"url": "/mrstatic/css/38.bff100af.chunk.css"
},
{
"revision": "d5662128ca71bdcb1d02",
"url": "/mrstatic/css/blessing-preheat.3ea8b615.chunk.css"
"revision": "e0282a9c0c1a1d37c5e2",
"url": "/mrstatic/css/blessing-preheat.564d8d7c.chunk.css"
},
{
"revision": "97c315fa0d51e7539ad9",
......@@ -372,7 +372,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/2.bf839917.chunk.css"
},
{
"revision": "48ea9147d195d49ff86e12045a552317",
"revision": "f68864c50428193e3cc56a6ed011070f",
"url": "/index.html"
}
];
\ No newline at end of file
build/service-worker.js
......@@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
importScripts(
"/precache-manifest.031dbafe662ef918b7f541caad3f9432.js"
"/precache-manifest.e1b050fa0efbb6f4526894ae0d52c4d7.js"
);
workbox.clientsClaim();
......
package-lock.json
......@@ -1650,15 +1650,15 @@
}
},
"@videojs/http-streaming": {
"version": "1.10.3",
"resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-1.10.3.tgz",
"integrity": "sha512-fxXtwVrQBdhOFh6GymPAPCb4utCI01Zs5fdyZgtR6FSsaz/zGmnzfNS5GvNjBi/hZviMsbNPFaOTTFMMNLNA3A==",
"version": "1.10.6",
"resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-1.10.6.tgz",
"integrity": "sha512-uPBuunHnxWeFRYxRX0j6h1IIWv3+QKvSkZGmW9TvqxWBqeNGSrQymR6tm1nVjQ2HhMVxVphQTUhUTTPDVWqmQg==",
"requires": {
"aes-decrypter": "3.0.0",
"global": "^4.3.0",
"m3u8-parser": "4.3.0",
"m3u8-parser": "4.4.0",
"mpd-parser": "0.8.1",
"mux.js": "5.1.3",
"mux.js": "5.2.1",
"url-toolkit": "^2.1.3",
"video.js": "^6.8.0 || ^7.0.0"
}
......@@ -9333,9 +9333,9 @@
}
},
"m3u8-parser": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.3.0.tgz",
"integrity": "sha512-bVbjuBMoVIgFL1vpXVIxjeaoB5TPDJRb0m5qiTdM738SGqv/LAmsnVVPlKjM4fulm/rr1XZsKM+owHm+zvqxYA==",
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.4.0.tgz",
"integrity": "sha512-iH2AygTFILtato+XAgnoPYzLHM4R3DjATj7Ozbk7EHdB2XoLF2oyOUguM7Kc4UVHbQHHL/QPaw98r7PbWzG0gg==",
"requires": {
"global": "^4.3.2"
}
......@@ -9845,9 +9845,9 @@
"integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
},
"mux.js": {
"version": "5.1.3",
"resolved": "https://registry.npmjs.org/mux.js/-/mux.js-5.1.3.tgz",
"integrity": "sha512-FhDcysLvAkO9H8ftBJ2sK1O4Rmz0AWnMS+2uqP7WjrnaAyE/ox11GEiZkRzrWIdp8at9R9qBHDqdURY3/h/xTg=="
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/mux.js/-/mux.js-5.2.1.tgz",
"integrity": "sha512-1t2payD3Y8izfZRq7tfUQlhL2fKzjeLr9v1/2qNCTkEQnd9Abtn1JgzsBgGZubEXh6lM5L8B0iLGoWQiukjtbQ=="
},
"nan": {
"version": "2.13.2",
......@@ -14570,11 +14570,6 @@
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
},
"tsml": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/tsml/-/tsml-1.0.1.tgz",
"integrity": "sha1-ifghi52eJX9H1/a1bQHFpNLGj8M="
},
"tty-browserify": {
"version": "0.0.0",
"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
......@@ -14965,25 +14960,24 @@
}
},
"video.js": {
"version": "7.6.0",
"resolved": "https://registry.npmjs.org/video.js/-/video.js-7.6.0.tgz",
"integrity": "sha512-A0HSKzAmcYkd1xyExqUlM6n8bkghcX54iCvW08bPvvl3UHt8d8zijuylfIWu8vo1Z8fYyk9HPOFs1i3Cldr/cw==",
"version": "7.6.5",
"resolved": "https://registry.npmjs.org/video.js/-/video.js-7.6.5.tgz",
"integrity": "sha512-r0kC9SNJhXz9th/wwbRaLVOIZTvXkF+rhFq9/FWU+e+EJClwClRCgP8STGmfrPHDXrfWiJwH9YY21JZK61vGGQ==",
"requires": {
"@babel/runtime": "^7.4.5",
"@videojs/http-streaming": "1.10.3",
"@videojs/http-streaming": "1.10.6",
"global": "4.3.2",
"keycode": "^2.2.0",
"safe-json-parse": "4.0.0",
"tsml": "1.0.1",
"videojs-font": "3.2.0",
"videojs-vtt.js": "^0.14.1",
"xhr": "2.4.0"
},
"dependencies": {
"@babel/runtime": {
"version": "7.5.5",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.5.5.tgz",
"integrity": "sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==",
"version": "7.6.3",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.3.tgz",
"integrity": "sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA==",
"requires": {
"regenerator-runtime": "^0.13.2"
}
......
package.json
......@@ -80,7 +80,7 @@
"swiper": "^4.5.0",
"terser-webpack-plugin": "1.2.2",
"url-loader": "1.1.2",
"video.js": "^7.6.0",
"video.js": "^7.6.5",
"web-launch-app": "^2.1.9",
"webpack": "4.28.3",
"webpack-dev-server": "3.1.14",
......
src/components/blessingPreheat/ReserveCourse/index.scss
.reserve-course-module {
margin: 20px 15px 0 20px;
padding-bottom: 5px;
.course-list {
ul {
......@@ -119,3 +119,7 @@
}
}
.demo {
font-size: 30px;
color: red;
}
src/components/blessingPreheat/courseList/index.js
......@@ -222,6 +222,7 @@ class CourseList extends Component {
toReceiveCoupon(id, key = '') {
const {isLogin, toLogin} = this.props;
alert(isLogin)
if(isLogin) {
http.post(`${API.home}/sys/activity/coupon/receive`, {
course_id: id
......
src/components/blessingPreheat/index.js
......@@ -35,6 +35,12 @@ class BlessingPreheat extends Component {
this.prevY = 0
this.state = {
userInfoList: [],
// userInfoList: [{
// token:'fcfef221e60ab7a2-92a80d5d30196999',
// uid:'545292',
// uname:'xzhtest2',
// avatar_file:''
// }],
isRule: false,
isCourse: false,
inviteUrl: '',
......@@ -100,6 +106,10 @@ class BlessingPreheat extends Component {
window['getNewData'] = result => {
this.fetchUserBlessing();
}
window['QQWXWBshare'] = result => {
this.handleToAddBlessing(result);
}
}
......@@ -118,8 +128,7 @@ class BlessingPreheat extends Component {
appLogin = () => {
let expires = addDays(new Date(), 90)
this.state.userInfoList.map((item, index) => {
alert(this.props.user.hasError)
Toast.info(String(this.props.user.hasError))
Toast.info(item.uid)
cookie.set("token", item.token, {expires, path: '/', domain: 'julyedu.com'});
cookie.set("plat", item.plat, {expires, path: '/', domain: 'julyedu.com'});
cookie.set("uid", item.uid, {expires, path: '/', domain: 'julyedu.com'});
......@@ -148,6 +157,8 @@ class BlessingPreheat extends Component {
}
getActiveIndex = (arr, n) => {
for (let i = 0, len = arr.length; i < len; i++) {
if (arr[i] > n) {
......@@ -216,6 +227,20 @@ class BlessingPreheat extends Component {
})
}
handleToAddBlessing = (key) => {
http.post(`${API.home}/sys/add/blessing`, {
share_platform: key, // 1 朋友圈 2 微博 3 qq
type: 3 // 1：签到；3：分享；4：浏览课程；
}).then(res => {
const {code } = res.data;
if (code === 200) {
Toast.info('+2点福气值~', 2, null, false);
}
});
}
handleToSign = () => {
http.post(`${API.home}/sys/add/blessing`, {
type: 1 // 1：签到；3：分享；4：浏览课程；
......@@ -242,7 +267,7 @@ class BlessingPreheat extends Component {
// 需要用户登录 并且用户未登录
const isLoginnew = !this.props.user.hasError
if (isLogin && isLoginnew) {
if (isLogin && !isLoginnew) {
this.toLogin()
} else {
let obj = {}
......@@ -405,6 +430,10 @@ class BlessingPreheat extends Component {
{/* 积福气 */}
<ListHeader id={'lucky-value'} text="积福气，享受更多福利" styles={{margin: '60px 0 15px'}}/>
<Link className="luck-draw__button" to="/blessingRank">福气排行榜></Link>
<div className='demo'>{String(!this.props.user.hasError)}</div>
<CollectBlessing
isSign={isSign}
userInfo={userInfo}
......
src/components/blessingPreheat/levelTest/index.js
......@@ -52,7 +52,7 @@ class LevelTest extends Component {
startTest = () => {
const {history, isLogin, toLogin} = this.props;
if(isLogin) {
history.push('/levelTest/testing');
history.push('/levelTest/test');
}else{
toLogin();
}
......@@ -95,7 +95,7 @@ class LevelTest extends Component {
})
}
</div>
<div className="prize__title">— 活动规则 —</div>
<div className="rules__text">
<p>1. 11月5日至11月13日之间每人有一次测试机会，可通过“集福气”活动额外获得2次测试机会；</p>
......
src/components/video/CustomPlayButton/index.js
......@@ -50,4 +50,4 @@ CustomPlayButtonCover.prototype.options_ = {
]
}
Component.registerComponent('CustomPlayButtonCover', CustomPlayButtonCover)
\ No newline at end of file
Component.registerComponent('CustomPlayButtonCover', CustomPlayButtonCover)
src/components/video/index.js
......@@ -18,6 +18,7 @@ import Single from "@/components/detail/single";
import SingleSuccess from "../detail/single/singleSuccess";
import './CustomPlayButton'
let alert = Modal.alert
function ProgressShareModal(props) {
......@@ -606,6 +607,7 @@ class Video extends Component {
activeIndex: index
},
() => {
if (this.hasAuth(this.state.activeIndex)) {
this.setPlayerSrc(this.state.videoList[index]['play_url'])
this.sendLastRecord()
......@@ -708,7 +710,10 @@ class Video extends Component {
}
playVideo = () => {
this.player.play()
this.player.ready(() => {
this.player.play()
})
}
......@@ -917,4 +922,4 @@ class Video extends Component {
export default connect(
state => ({user: state.user}),
null
)(Video);
\ No newline at end of file
)(Video);
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