Skip to content

M
mr-julyedu
Commit 82f390d0 by FE
Options

pull and solve

parents 77e5e35c 80b6082f
Showing with 55 additions and 60 deletions
build/asset-manifest.json
......@@ -4,8 +4,8 @@
"mrstatic/js/1.5e11f90b.chunk.js": "/mrstatic/js/1.5e11f90b.chunk.js",
"mrstatic/js/1.5e11f90b.chunk.js.map": "/mrstatic/js/1.5e11f90b.chunk.js.map",
"mrstatic/css/2.628f7f46.chunk.css": "/mrstatic/css/2.628f7f46.chunk.css",
"mrstatic/js/2.d2b0d28a.chunk.js": "/mrstatic/js/2.d2b0d28a.chunk.js",
"mrstatic/js/2.d2b0d28a.chunk.js.map": "/mrstatic/js/2.d2b0d28a.chunk.js.map",
"mrstatic/js/2.4f662d87.chunk.js": "/mrstatic/js/2.4f662d87.chunk.js",
"mrstatic/js/2.4f662d87.chunk.js.map": "/mrstatic/js/2.4f662d87.chunk.js.map",
"mrstatic/css/3.bf839917.chunk.css": "/mrstatic/css/3.bf839917.chunk.css",
"mrstatic/js/3.40b98937.chunk.js": "/mrstatic/js/3.40b98937.chunk.js",
"mrstatic/js/3.40b98937.chunk.js.map": "/mrstatic/js/3.40b98937.chunk.js.map",
......@@ -91,9 +91,9 @@
"newyear-2019-landing.css": "/mrstatic/css/newyear-2019-landing.6cf08b5e.chunk.css",
"newyear-2019-landing.js": "/mrstatic/js/newyear-2019-landing.8d7f42c0.chunk.js",
"newyear-2019-landing.js.map": "/mrstatic/js/newyear-2019-landing.8d7f42c0.chunk.js.map",
"newyear-yearIndex.css": "/mrstatic/css/newyear-yearIndex.3f3799ce.chunk.css",
"newyear-yearIndex.js": "/mrstatic/js/newyear-yearIndex.f49a1017.chunk.js",
"newyear-yearIndex.js.map": "/mrstatic/js/newyear-yearIndex.f49a1017.chunk.js.map",
"newyear-yearIndex.css": "/mrstatic/css/newyear-yearIndex.c95a4c79.chunk.css",
"newyear-yearIndex.js": "/mrstatic/js/newyear-yearIndex.f5475c6c.chunk.js",
"newyear-yearIndex.js.map": "/mrstatic/js/newyear-yearIndex.f5475c6c.chunk.js.map",
"prize-winner-list.css": "/mrstatic/css/prize-winner-list.3eee90af.chunk.css",
"prize-winner-list.js": "/mrstatic/js/prize-winner-list.7d121478.chunk.js",
"prize-winner-list.js.map": "/mrstatic/js/prize-winner-list.7d121478.chunk.js.map",
......@@ -103,8 +103,8 @@
"python-class.css": "/mrstatic/css/python-class.49baf51f.chunk.css",
"python-class.js": "/mrstatic/js/python-class.1e8ab05e.chunk.js",
"python-class.js.map": "/mrstatic/js/python-class.1e8ab05e.chunk.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.5ded5577.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.5ded5577.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.e2fe9b29.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.e2fe9b29.js.map",
"search.css": "/mrstatic/css/search.5716d9b3.chunk.css",
"search.js": "/mrstatic/js/search.f250c6e7.chunk.js",
"search.js.map": "/mrstatic/js/search.f250c6e7.chunk.js.map",
......@@ -186,7 +186,7 @@
"mrstatic/css/main.532b6b06.chunk.css.map": "/mrstatic/css/main.532b6b06.chunk.css.map",
"mrstatic/css/myorders.179a42fc.chunk.css.map": "/mrstatic/css/myorders.179a42fc.chunk.css.map",
"mrstatic/css/newyear-2019-landing.6cf08b5e.chunk.css.map": "/mrstatic/css/newyear-2019-landing.6cf08b5e.chunk.css.map",
"mrstatic/css/newyear-yearIndex.3f3799ce.chunk.css.map": "/mrstatic/css/newyear-yearIndex.3f3799ce.chunk.css.map",
"mrstatic/css/newyear-yearIndex.c95a4c79.chunk.css.map": "/mrstatic/css/newyear-yearIndex.c95a4c79.chunk.css.map",
"mrstatic/css/prize-winner-list.3eee90af.chunk.css.map": "/mrstatic/css/prize-winner-list.3eee90af.chunk.css.map",
"mrstatic/css/purchased.bb758677.chunk.css.map": "/mrstatic/css/purchased.bb758677.chunk.css.map",
"mrstatic/css/python-class.49baf51f.chunk.css.map": "/mrstatic/css/python-class.49baf51f.chunk.css.map",
......@@ -200,6 +200,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.0ca4aa4bdef7871e465741691162e962.js": "/precache-manifest.0ca4aa4bdef7871e465741691162e962.js",
"precache-manifest.62a28e8f2ba15387c29044b8008070f2.js": "/precache-manifest.62a28e8f2ba15387c29044b8008070f2.js",
"service-worker.js": "/service-worker.js"
}
\ No newline at end of file
build/mrstatic/js/newyear-yearIndex.f49a1017.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/newyear-yearIndex.f5475c6c.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.0ca4aa4bdef7871e465741691162e962.js → build/precache-manifest.62a28e8f2ba15387c29044b8008070f2.js
......@@ -12,8 +12,8 @@ self.__precacheManifest = [
"url": "/mrstatic/media/redb_chai_bj@2x.8edaf2ff.png"
},
{
"revision": "85af7816c5eb5f30e7d5",
"url": "/mrstatic/js/2.d2b0d28a.chunk.js"
"revision": "93b7a6edd926a4b6c892",
"url": "/mrstatic/js/2.4f662d87.chunk.js"
},
{
"revision": "6902434f8f18a23319d57d0ac8aaea8c",
......@@ -80,16 +80,16 @@ self.__precacheManifest = [
"url": "/mrstatic/js/DrawDocument.c4b2272d.chunk.js"
},
{
"revision": "7aa984cefad739ea18edb76c541aa1fd",
"url": "/mrstatic/media/iconfont.7aa984ce.eot"
"revision": "258b4b114d3d9be3018cd113b2470a13",
"url": "/mrstatic/media/iconfont.258b4b11.ttf"
},
{
"revision": "04e49bc7bb67ee64f72f",
"url": "/mrstatic/js/Examination.2faca438.chunk.js"
},
{
"revision": "258b4b114d3d9be3018cd113b2470a13",
"url": "/mrstatic/media/iconfont.258b4b11.ttf"
"revision": "7aa984cefad739ea18edb76c541aa1fd",
"url": "/mrstatic/media/iconfont.7aa984ce.eot"
},
{
"revision": "da145daddd1676bb4acc",
......@@ -232,8 +232,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/myorders.f62839f5.chunk.js"
},
{
"revision": "d1e4d9b1203838f80374",
"url": "/mrstatic/js/runtime~main.5ded5577.js"
"revision": "982649dcc8070a3926f8",
"url": "/mrstatic/js/runtime~main.e2fe9b29.js"
},
{
"revision": "dbbf205fa67bddfa43d4",
......@@ -244,8 +244,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/python-class.1e8ab05e.chunk.js"
},
{
"revision": "49f833a82b6032dbbb59",
"url": "/mrstatic/js/newyear-yearIndex.f49a1017.chunk.js"
"revision": "b06a5fcb5cfc4dc9f1cb",
"url": "/mrstatic/js/newyear-yearIndex.f5475c6c.chunk.js"
},
{
"revision": "66d0e13b76f15b9ac666",
......@@ -312,8 +312,8 @@ self.__precacheManifest = [
"url": "/mrstatic/css/newyear-2019-landing.6cf08b5e.chunk.css"
},
{
"revision": "49f833a82b6032dbbb59",
"url": "/mrstatic/css/newyear-yearIndex.3f3799ce.chunk.css"
"revision": "b06a5fcb5cfc4dc9f1cb",
"url": "/mrstatic/css/newyear-yearIndex.c95a4c79.chunk.css"
},
{
"revision": "347b68e4678c1f58cf1d",
......@@ -436,11 +436,11 @@ self.__precacheManifest = [
"url": "/mrstatic/css/3.bf839917.chunk.css"
},
{
"revision": "85af7816c5eb5f30e7d5",
"revision": "93b7a6edd926a4b6c892",
"url": "/mrstatic/css/2.628f7f46.chunk.css"
},
{
"revision": "e9aeca842f8b8a7d952fe6e5d617caf2",
"revision": "b2b10d2e85dda030e90536370d3987e2",
"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.0ca4aa4bdef7871e465741691162e962.js"
"/precache-manifest.62a28e8f2ba15387c29044b8008070f2.js"
);
workbox.clientsClaim();
......
src/components/activity/newyear-2019/common/prizes/index.js
......@@ -52,7 +52,7 @@ class Prizes extends Component {
Popup({
title: '组队开宝箱活动规则',
className: 'landing-treasure-rules',
content: <div className="rule-content" dangerouslySetInnerHTML={{__html: this.state.rule}}></div>,
content: <div dangerouslySetInnerHTML={{__html: this.state.rule}}/>,
closeIcon: this.closeIcon
})
}
......
src/components/activity/newyear-2019/landing/landing.scss
......@@ -18,7 +18,7 @@
text-align: center;
#to-square {
position: relative;
position: fixed;
width: 100%;
height: 30px;
background: #FF2121;
......@@ -26,7 +26,7 @@
font-size: 14px;
line-height: 30px;
text-align: center;
z-index: 10;
z-index: 21;
}
.box-container {
......@@ -35,7 +35,7 @@
.snow-deco {
position: absolute;
top: 0;
top: 30px;
left: 0;
display: block;
width: 100%;
......@@ -228,15 +228,6 @@
.landing-treasure-rules {
width: 320px;
.rule-content {
p {
font-size: 14px;
color: #666;
line-height: 18px;
}
}
&.popup-container {
.title {
font-size: 18px;
......
src/components/activity/newyear-2019/preheat/YearCourse/index.js
......@@ -327,11 +327,11 @@ class YearCourse extends Component {
isFollow = (id, key) => {
const _this = this
http.get(`${API.home}/m/live/isFollow`).then(res => {
http.get(`${API.home}/sys/user/isFollowWeChat`).then(res => {
const {code, data, msg} = res.data
if (code === 200) {
_this.setState({
isshowFollow: data.status == 0 ? true : false
isshowFollow: !data.is_follow
})
if (!_this.state.isshowFollow) {
......
src/components/activity/newyear-2019/preheat/index.js
......@@ -10,11 +10,14 @@ import {setCurrentUser, startFetchUser} from "@/store/userAction"
import {SendMessageToApp, getParam, http} from '@/utils'
import {addDays} from "date-fns"
import {connect} from "react-redux"
import { Toast } from 'antd-mobile';
import {Toast} from 'antd-mobile'
import {compose} from "redux"
@connect(state => ({
user: state.user
}))
user: state.user
}),
{setCurrentUser, startFetchUser}
)
export default class index extends Component {
state = {
......@@ -35,8 +38,7 @@ export default class index extends Component {
window['loginInfo'] = result => {
_this.loginInfo(result)
}
_this.getStage();
_this.getStage()
}
// 获取app登录数据
......@@ -107,10 +109,10 @@ export default class index extends Component {
// 跳转到我的宝箱列表页
toBoxList = () => {
const isLogin = !this.props.user.hasError
const {currentOpenId} = this.state;
let search = '';
if(currentOpenId) {
search = `?id=${currentOpenId}`;
const {currentOpenId} = this.state
let search = ''
if (currentOpenId) {
search = `?id=${currentOpenId}`
}
if (isLogin) {
this.props.history.push(`/year/yearTreasure${search}`)
......@@ -126,16 +128,16 @@ export default class index extends Component {
// 获取活动以及宝箱的阶段
getStage = () => {
http.get(`${API.home}/activity/stage`).then(res => {
const { code, data, msg } = res.data;
if(code === 200) {
// treasure_stage，宝箱阶段，0-不在活动时间，1-活动时间内
this.setState({
treasure_stage: data.treasure_stage
})
}else{
Toast.info(msg, 2);
const {code, data, msg} = res.data
if (code === 200) {
// treasure_stage，宝箱阶段，0-不在活动时间，1-活动时间内
this.setState({
treasure_stage: data.treasure_stage
})
} else {
Toast.info(msg, 2)
}
});
})
}
toYearWish = () => {
......@@ -152,9 +154,9 @@ export default class index extends Component {
}
sonToPar(e){
sonToPar(e) {
this.setState({
txt1:e
txt1: e
})
}
......@@ -192,7 +194,7 @@ export default class index extends Component {
{/* 组队开宝箱 */}
{
treasure_stage === 1 && <TreasureBox getRemovable={this.getRemovable} />
treasure_stage === 1 && <TreasureBox getRemovable={this.getRemovable}/>
}
{/*课程*/}
......
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