Skip to content

M
mr-julyedu
Commit 22d84015 by FE
Options

pull 00 again

parent 57928bc2
Showing with 74 additions and 24 deletions
build/index.html 0 → 100644
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/manifest.json"/><title>七月在线 - 国内领先的人工智能教育平台</title><link href="/mrstatic/css/43.2c78a65e.chunk.css" rel="stylesheet"><link href="/mrstatic/css/main.532b6b06.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="/api.js"></script><script>!function(f){function e(e){for(var r,t,a=e[0],n=e[1],o=e[2],c=0,i=[];c<a.length;c++)t=a[c],l[t]&&i.push(l[t][0]),l[t]=0;for(r in n)Object.prototype.hasOwnProperty.call(n,r)&&(f[r]=n[r]);for(p&&p(e);i.length;)i.shift()();return d.push.apply(d,o||[]),s()}function s(){for(var e,r=0;r<d.length;r++){for(var t=d[r],a=!0,n=1;n<t.length;n++){var o=t[n];0!==l[o]&&(a=!1)}a&&(d.splice(r--,1),e=b(b.s=t[0]))}return e}var t={},u={36:0},l={36:0},d=[];function b(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return f[e].call(r.exports,r,r.exports,b),r.l=!0,r.exports}b.e=function(d){var e=[];u[d]?e.push(u[d]):0!==u[d]&&{2:1,3:1,4:1,5:1,6:1,7:1,8:1,9:1,10:1,11:1,12:1,14:1,16:1,17:1,18:1,19:1,20:1,21:1,22:1,23:1,24:1,25:1,26:1,27:1,28:1,30:1,31:1,32:1,33:1,34:1,35:1,37:1,38:1,39:1,40:1,41:1,42:1,44:1,45:1,47:1,48:1,49:1,50:1,51:1}[d]&&e.push(u[d]=new Promise(function(e,a){for(var r="mrstatic/css/"+({5:"Activity",6:"BargainMiddlePage",7:"Classify",8:"Country",9:"CourseList",10:"DrawDocument",11:"Examination",12:"Invite",13:"MyEdit",14:"Order",15:"Orderinfo",16:"PayOrder",17:"Preferential",18:"SearchResult",19:"ShareCourse",20:"ShopCart",21:"aist-share",22:"blessing-getPrize",23:"blessing-preheat",24:"blessing-rank",25:"coupons",26:"deposit-order",27:"deposit-pay-order",28:"detail",30:"myorders",31:"newyear-2019-landing",32:"newyear-yearIndex",33:"prize-winner-list",34:"purchased",35:"python-class",37:"search",38:"shareposter",39:"study",40:"system-notices",41:"togroup",42:"video"}[d]||d)+"."+{0:"31d6cfe0",1:"31d6cfe0",2:"628f7f46",3:"bf839917",4:"b22f3911",5:"6260646a",6:"eb686c74",7:"fb4bedde",8:"2d34330b",9:"afc8902e",10:"aeb3f822",11:"7bb0622b",12:"6260646a",13:"31d6cfe0",14:"8c058a7a",15:"31d6cfe0",16:"7eb7d317",17:"12a8297c",18:"cdf852c1",19:"8046fb41",20:"92ab48a3",21:"40873df0",22:"5a935f68",23:"4e9bf434",24:"91e559d5",25:"466858c7",26:"5ea077aa",27:"09ce6fd5",28:"54d9956e",30:"179a42fc",31:"6cf08b5e",32:"c95a4c79",33:"3eee90af",34:"bb758677",35:"49baf51f",37:"5716d9b3",38:"76774ba4",39:"bf6b9b43",40:"259243a4",41:"f08bc5f3",42:"1c1131c9",44:"a156a0a0",45:"bff100af",46:"31d6cfe0",47:"820320a6",48:"35e22f8c",49:"befec011",50:"b02d1de6",51:"1146f09d"}[d]+".chunk.css",n=b.p+r,t=document.getElementsByTagName("link"),o=0;o<t.length;o++){var c=(f=t[o]).getAttribute("data-href")||f.getAttribute("href");if("stylesheet"===f.rel&&(c===r||c===n))return e()}var i=document.getElementsByTagName("style");for(o=0;o<i.length;o++){var f;if((c=(f=i[o]).getAttribute("data-href"))===r||c===n)return e()}var s=document.createElement("link");s.rel="stylesheet",s.type="text/css",s.onload=e,s.onerror=function(e){var r=e&&e.target&&e.target.src||n,t=new Error("Loading CSS chunk "+d+" failed.\n("+r+")");t.request=r,delete u[d],s.parentNode.removeChild(s),a(t)},s.href=n,document.getElementsByTagName("head")[0].appendChild(s)}).then(function(){u[d]=0}));var t=l[d];if(0!==t)if(t)e.push(t[2]);else{var r=new Promise(function(e,r){t=l[d]=[e,r]});e.push(t[2]=r);var a,o=document.createElement("script");o.charset="utf-8",o.timeout=120,b.nc&&o.setAttribute("nonce",b.nc),o.src=b.p+"mrstatic/js/"+({5:"Activity",6:"BargainMiddlePage",7:"Classify",8:"Country",9:"CourseList",10:"DrawDocument",11:"Examination",12:"Invite",13:"MyEdit",14:"Order",15:"Orderinfo",16:"PayOrder",17:"Preferential",18:"SearchResult",19:"ShareCourse",20:"ShopCart",21:"aist-share",22:"blessing-getPrize",23:"blessing-preheat",24:"blessing-rank",25:"coupons",26:"deposit-order",27:"deposit-pay-order",28:"detail",30:"myorders",31:"newyear-2019-landing",32:"newyear-yearIndex",33:"prize-winner-list",34:"purchased",35:"python-class",37:"search",38:"shareposter",39:"study",40:"system-notices",41:"togroup",42:"video"}[d]||d)+"."+{0:"6a735dfd",1:"5e11f90b",2:"4f662d87",3:"40b98937",4:"47a5f8ea",5:"fe1663e4",6:"468e6568",7:"17c490c9",8:"b822c930",9:"79f5ad37",10:"c4b2272d",11:"2faca438",12:"2c2a4251",13:"d378afbb",14:"b72873ad",15:"5f8b65c2",16:"f934caa4",17:"054e0650",18:"4b63135c",19:"ad8b0a8b",20:"e162463a",21:"aeeb4d76",22:"f8ddc5f9",23:"f5740203",24:"882cc9a1",25:"350385c3",26:"cdc2b660",27:"a5efbbb2",28:"052f174e",30:"f62839f5",31:"8d7f42c0",32:"f5475c6c",33:"7d121478",34:"360f4f10",35:"1e8ab05e",37:"f250c6e7",38:"a0e797f0",39:"bbf6a7de",40:"2f42c302",41:"1a765e4d",42:"03953161",44:"1f09d16b",45:"7763efee",46:"420a3f4b",47:"77e14ca9",48:"8cced5a9",49:"68773c03",50:"6b6986cb",51:"75153711"}[d]+".chunk.js",a=function(e){o.onerror=o.onload=null,clearTimeout(c);var r=l[d];if(0!==r){if(r){var t=e&&("load"===e.type?"missing":e.type),a=e&&e.target&&e.target.src,n=new Error("Loading chunk "+d+" failed.\n("+t+": "+a+")");n.type=t,n.request=a,r[1](n)}l[d]=void 0}};var c=setTimeout(function(){a({type:"timeout",target:o})},12e4);o.onerror=o.onload=a,document.head.appendChild(o)}return Promise.all(e)},b.m=f,b.c=t,b.d=function(e,r,t){b.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},b.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},b.t=function(r,e){if(1&e&&(r=b(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(b.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var a in r)b.d(t,a,function(e){return r[e]}.bind(null,a));return t},b.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(r,"a",r),r},b.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},b.p="/",b.oe=function(e){throw console.error(e),e};var r=window.webpackJsonp=window.webpackJsonp||[],a=r.push.bind(r);r.push=e,r=r.slice();for(var n=0;n<r.length;n++)e(r[n]);var p=a;s()}([])</script><script src="/mrstatic/js/43.59f89515.chunk.js"></script><script src="/mrstatic/js/main.0d06e907.chunk.js"></script></body></html>
\ No newline at end of file
build/manifest.json 0 → 100644
{
"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/service-worker.js 0 → 100644
/**
* Welcome to your Workbox-powered service worker!
*
* You'll need to register this file in your web app and you should
* disable HTTP caching for this file too.
* See https://goo.gl/nhQhGp
*
* The rest of the code is auto-generated. Please don't update this file
* directly; instead, make changes to your Workbox build configuration
* and re-run your build process.
* See https://goo.gl/2aRDsh
*/
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
importScripts(
"/precache-manifest.62a28e8f2ba15387c29044b8008070f2.js"
);
workbox.clientsClaim();
/**
* The workboxSW.precacheAndRoute() method efficiently caches and responds to
* requests for URLs in the manifest.
* See https://goo.gl/S9QRab
*/
self.__precacheManifest = [].concat(self.__precacheManifest || []);
workbox.precaching.suppressWarnings();
workbox.precaching.precacheAndRoute(self.__precacheManifest, {});
workbox.routing.registerNavigationRoute("/index.html", {
blacklist: [/^\/_/,/\/[^\/]+\.[^\/]+$/],
});
src/components/activity/newyear-2019/landing/index.js
...@@ -158,7 +158,7 @@ class Landing extends Component { ...@@ -158,7 +158,7 @@ class Landing extends Component {
this.fetchPageData() this.fetchPageData()
this.getFollowStatus() this.getFollowStatus()
.then(isFollow => { .then(isFollow => {
!isFollow && this.remind('join', this.state.treasure_code, 2) !isFollow && this.remind('join', getParam('treasure_code'))
}) })
} }
}) })
...@@ -191,7 +191,7 @@ class Landing extends Component { ...@@ -191,7 +191,7 @@ class Landing extends Component {
return code === 200 && data['is_follow'] return code === 200 && data['is_follow']
}) })
createTeamSuccess = ({member, team_num, lack_member, treasure_code}) => { createTeamSuccess = (member, team_num, lack_member, treasure_code) => {
this.joinSuccessPopup && this.joinSuccessPopup.remove() && (this.joinSuccessPopup = null) this.joinSuccessPopup && this.joinSuccessPopup.remove() && (this.joinSuccessPopup = null)
this.getFollowStatus() this.getFollowStatus()
.then(isFollow => { .then(isFollow => {
...@@ -233,7 +233,7 @@ class Landing extends Component { ...@@ -233,7 +233,7 @@ class Landing extends Component {
}) })
} }
remind = (type = 'create', treasure_code, origin = 1) => { remind = (type = 'create', treasure_code) => {
const {match, history, user} = this.props const {match, history, user} = this.props
http.get(`${API["base-api"]}/wx/user_temporary_qrcode/${user.data.uid}`) http.get(`${API["base-api"]}/wx/user_temporary_qrcode/${user.data.uid}`)
.then(res => { .then(res => {
...@@ -255,7 +255,7 @@ class Landing extends Component { ...@@ -255,7 +255,7 @@ class Landing extends Component {
// history.replace(`${match.path}?treasure_code=${treasure_code}&origin=1`) // history.replace(`${match.path}?treasure_code=${treasure_code}&origin=1`)
this.fetchPageData({ this.fetchPageData({
treasure_code, treasure_code,
origin origin: '1'
}) })
} }
}) })
...@@ -290,7 +290,7 @@ class Landing extends Component { ...@@ -290,7 +290,7 @@ class Landing extends Component {
sessionStorage.removeItem('showShareTip') sessionStorage.removeItem('showShareTip')
this.getFollowStatus() this.getFollowStatus()
.then(isFollow => { .then(isFollow => {
!isFollow && this.remind('create', getParam('treasure_code'), 1) !isFollow && this.remind('create', getParam('treasure_code'))
}) })
} }
}) })
......
src/components/activity/newyear-2019/myTreasure/index.js
...@@ -77,7 +77,7 @@ class MyTreasure extends Component { ...@@ -77,7 +77,7 @@ class MyTreasure extends Component {
// 获取当前需要绑定手机的队伍id，当拆到需要绑定手机号/地址的宝箱时，如果不进行绑定则无法拆下一个 // 获取当前需要绑定手机的队伍id，当拆到需要绑定手机号/地址的宝箱时，如果不进行绑定则无法拆下一个
fetchCurrentTeamId = (data = []) => { fetchCurrentTeamId = (data = []) => {
const arr = data.filter(item => item.is_open && (item.bind_phone || item.bind_address)); const arr = data.filter(item => item.is_open && (item.bind_address || item.bind_address));
if(arr.length > 0) { if(arr.length > 0) {
return arr[0]['id']; return arr[0]['id'];
}else { }else {
......
src/components/activity/newyear-2019/preheat/YearCourse/index.js
...@@ -585,11 +585,11 @@ class YearCourse extends Component { ...@@ -585,11 +585,11 @@ class YearCourse extends Component {
</div> </div>
<div className="price"> <div className="price">
{item.type == 2 ? '到手最低:¥' : '¥'} {item.type == 2 ? '到手最低:¥' : '¥'}
<span className="new-price">{item.price2}</span> <span className="new-price">{item.price1}</span>
<span <span
className="old-price"> className="old-price">
{item.type == 2 ? '' : '现价：'} {item.type == 2 ? '' : '现价：'}
<s>¥{item.price1}</s></span> <s>¥{item.price0}</s></span>
</div> </div>
<div className="status"> <div className="status">
...@@ -676,11 +676,11 @@ class YearCourse extends Component { ...@@ -676,11 +676,11 @@ class YearCourse extends Component {
</div> </div>
<div className="price"> <div className="price">
{item.type == 2 ? '到手最低:¥' : '¥'} {item.type == 2 ? '到手最低:¥' : '¥'}
<span className="new-price">{item.price2}</span> <span className="new-price">{item.price1}</span>
<span <span
className="old-price"> className="old-price">
{item.type == 2 ? '' : '现价：'} {item.type == 2 ? '' : '现价：'}
<s>¥{item.price1}</s></span> <s>¥{item.price0}</s></span>
</div> </div>
<div className="status"> <div className="status">
...@@ -767,11 +767,11 @@ class YearCourse extends Component { ...@@ -767,11 +767,11 @@ class YearCourse extends Component {
</div> </div>
<div className="price"> <div className="price">
{item.type == 2 ? '到手最低:¥' : '¥'} {item.type == 2 ? '到手最低:¥' : '¥'}
<span className="new-price">{item.price2}</span> <span className="new-price">{item.price1}</span>
<span <span
className="old-price"> className="old-price">
{item.type == 2 ? '' : '现价：'} {item.type == 2 ? '' : '现价：'}
<s>¥{item.price1}</s></span> <s>¥{item.price0}</s></span>
</div> </div>
<div className="status"> <div className="status">
...@@ -858,11 +858,11 @@ class YearCourse extends Component { ...@@ -858,11 +858,11 @@ class YearCourse extends Component {
</div> </div>
<div className="price"> <div className="price">
{item.type == 2 ? '到手最低:¥' : '¥'} {item.type == 2 ? '到手最低:¥' : '¥'}
<span className="new-price">{item.price2}</span> <span className="new-price">{item.price1}</span>
<span <span
className="old-price"> className="old-price">
{item.type == 2 ? '' : '现价：'} {item.type == 2 ? '' : '现价：'}
<s>¥{item.price1}</s></span> <s>¥{item.price0}</s></span>
</div> </div>
<div className="status"> <div className="status">
......
src/components/activity/newyear-2019/year-wish/index.js
...@@ -61,7 +61,7 @@ class YarnWish extends Component { ...@@ -61,7 +61,7 @@ class YarnWish extends Component {
const {list, activityStage} = this.state const {list, activityStage} = this.state
return ( return (
<div className='year-wish'> <div className='yarn-wish'>
<div className="banner"><img <div className="banner"><img
src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/xy_banner_bj.png" alt=""/></div> src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/xy_banner_bj.png" alt=""/></div>
{ {
...@@ -73,7 +73,7 @@ class YarnWish extends Component { ...@@ -73,7 +73,7 @@ class YarnWish extends Component {
toCourse={this.toCourse}> toCourse={this.toCourse}>
{ {
item.type == 4 && item.is_buy != 1 && item.type == 4 &&
<div className="group-num">限量300个</div> <div className="group-num">限量300个</div>
} }
...@@ -99,7 +99,7 @@ class YarnWish extends Component { ...@@ -99,7 +99,7 @@ class YarnWish extends Component {
</> </>
} }
{ {
(item.type == 1 || item.type == 4) && item.type == 1 &&
<> <>
<span className="tag">拼团价</span> <span className="tag">拼团价</span>
<span className="time">12.23开团</span> <span className="time">12.23开团</span>
...@@ -116,8 +116,11 @@ class YarnWish extends Component { ...@@ -116,8 +116,11 @@ class YarnWish extends Component {
</div> </div>
<div className="price"> <div className="price">
{item.type == 2 ? '到手最低:¥' : '¥'} {item.type == 2 ? '到手最低:¥' : '¥'}
<span className="new-price">{item.type == 4?'0.01':item.price2}</span> <span className="new-price">{item.price1}</span>
<span className="old-price"> 现价：<s>¥{item.price1}</s></span> <span
className="old-price">
{item.type == 2 ? '' : '现价：'}
<s>¥{item.price0}</s></span>
</div> </div>
<div className="status"> <div className="status">
......
src/components/activity/newyear-2019/year-wish/index.scss
...@@ -2,7 +2,7 @@ html, body, #root { ...@@ -2,7 +2,7 @@ html, body, #root {
height: 100%; height: 100%;
} }
.year-wish { .yarn-wish {
min-height: 100%; min-height: 100%;
background-color: #BA2C21; background-color: #BA2C21;
padding-bottom: 35px; padding-bottom: 35px;
...@@ -214,7 +214,3 @@ html, body, #root { ...@@ -214,7 +214,3 @@ html, body, #root {
} }
} }
.year-wish + .year19-index {
display: none;
}
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