Skip to content

M
mr-julyedu
Commit 63389b41 by FE
Options

redpacket bug modify and contry page create

parent 3a89cca8
Showing with 224 additions and 111 deletions
build/asset-manifest.json
......@@ -42,8 +42,8 @@
"coupons.js": "/mrstatic/js/coupons.5cbae7b3.chunk.js",
"coupons.js.map": "/mrstatic/js/coupons.5cbae7b3.chunk.js.map",
"detail.css": "/mrstatic/css/detail.7350e105.chunk.css",
"detail.js": "/mrstatic/js/detail.4966a462.chunk.js",
"detail.js.map": "/mrstatic/js/detail.4966a462.chunk.js.map",
"detail.js": "/mrstatic/js/detail.9ecd1386.chunk.js",
"detail.js.map": "/mrstatic/js/detail.9ecd1386.chunk.js.map",
"main.css": "/mrstatic/css/main.4eddc7cb.chunk.css",
"main.js": "/mrstatic/js/main.0ee0b3eb.chunk.js",
"main.js.map": "/mrstatic/js/main.0ee0b3eb.chunk.js.map",
......@@ -53,8 +53,8 @@
"purchased.css": "/mrstatic/css/purchased.c9466779.chunk.css",
"purchased.js": "/mrstatic/js/purchased.8995b9ed.chunk.js",
"purchased.js.map": "/mrstatic/js/purchased.8995b9ed.chunk.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.3e6f6331.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.3e6f6331.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.d013cc35.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.d013cc35.js.map",
"search.css": "/mrstatic/css/search.e26f3ee9.chunk.css",
"search.js": "/mrstatic/js/search.cb0ee550.chunk.js",
"search.js.map": "/mrstatic/js/search.cb0ee550.chunk.js.map",
......@@ -68,8 +68,8 @@
"togroup.js": "/mrstatic/js/togroup.79f5e0b8.chunk.js",
"togroup.js.map": "/mrstatic/js/togroup.79f5e0b8.chunk.js.map",
"video.css": "/mrstatic/css/video.b8d615d9.chunk.css",
"video.js": "/mrstatic/js/video.85e6dd23.chunk.js",
"video.js.map": "/mrstatic/js/video.85e6dd23.chunk.js.map",
"video.js": "/mrstatic/js/video.a3d88f5b.chunk.js",
"video.js.map": "/mrstatic/js/video.a3d88f5b.chunk.js.map",
"mrstatic/css/25.320181c4.chunk.css": "/mrstatic/css/25.320181c4.chunk.css",
"mrstatic/js/25.17d3242d.chunk.js": "/mrstatic/js/25.17d3242d.chunk.js",
"mrstatic/js/25.17d3242d.chunk.js.map": "/mrstatic/js/25.17d3242d.chunk.js.map",
......@@ -122,6 +122,6 @@
"mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.f983caa7.svg",
"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.a1adebf4c3d343c9550906ade2cad034.js": "/precache-manifest.a1adebf4c3d343c9550906ade2cad034.js",
"precache-manifest.6594864d4b9a0adf06cf0036a33d0831.js": "/precache-manifest.6594864d4b9a0adf06cf0036a33d0831.js",
"service-worker.js": "/service-worker.js"
}
\ No newline at end of file
build/mrstatic/js/runtime~main.3e6f6331.js → build/mrstatic/js/runtime~main.d013cc35.js
!function(e){function r(r){for(var n,a,i=r[0],d=r[1],u=r[2],f=0,l=[];f<i.length;f++)a=i[f],o[a]&&l.push(o[a][0]),o[a]=0;for(n in d)Object.prototype.hasOwnProperty.call(d,n)&&(e[n]=d[n]);for(s&&s(r);l.length;)l.shift()();return c.push.apply(c,u||[]),t()}function t(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,a=1;a<t.length;a++){var d=t[a];0!==o[d]&&(n=!1)}n&&(c.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},a={19:0},o={19:0},c=[];function i(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.e=function(e){var r=[];a[e]?r.push(a[e]):0!==a[e]&&{1:1,2:1,3:1,4:1,5:1,7:1,9:1,10:1,11:1,12:1,13:1,14:1,15:1,17:1,18:1,20:1,21:1,22:1,23:1,24:1,27:1,28:1,29:1,30:1,31:1}[e]&&r.push(a[e]=new Promise(function(r,t){for(var n="mrstatic/css/"+({1:"BargainMiddlePage",2:"Classify",3:"CourseList",4:"DrawDocument",5:"Examination",6:"MyEdit",7:"Order",8:"Orderinfo",9:"PayOrder",10:"Preferential",11:"SearchResult",12:"ShopCart",13:"aist-share",14:"coupons",15:"detail",17:"myorders",18:"purchased",20:"search",21:"shareposter",22:"study",23:"togroup",24:"video"}[e]||e)+"."+{0:"31d6cfe0",1:"5acd226b",2:"127d35ae",3:"6d999ce9",4:"1bd3da48",5:"17af9370",6:"31d6cfe0",7:"e46f87f2",8:"31d6cfe0",9:"68a25070",10:"312f2a43",11:"4d5f97fe",12:"887eb690",13:"f4398072",14:"4b4cf239",15:"7350e105",17:"e3d68b58",18:"c9466779",20:"e26f3ee9",21:"cde549fc",22:"c5bde985",23:"ffd8be6c",24:"b8d615d9",26:"31d6cfe0",27:"0710e3e3",28:"e292ab6b",29:"1133c967",30:"37fb0c23",31:"6e885738"}[e]+".chunk.css",o=i.p+n,c=document.getElementsByTagName("link"),d=0;d<c.length;d++){var u=(s=c[d]).getAttribute("data-href")||s.getAttribute("href");if("stylesheet"===s.rel&&(u===n||u===o))return r()}var f=document.getElementsByTagName("style");for(d=0;d<f.length;d++){var s;if((u=(s=f[d]).getAttribute("data-href"))===n||u===o)return r()}var l=document.createElement("link");l.rel="stylesheet",l.type="text/css",l.onload=r,l.onerror=function(r){var n=r&&r.target&&r.target.src||o,c=new Error("Loading CSS chunk "+e+" failed.\n("+n+")");c.request=n,delete a[e],l.parentNode.removeChild(l),t(c)},l.href=o,document.getElementsByTagName("head")[0].appendChild(l)}).then(function(){a[e]=0}));var t=o[e];if(0!==t)if(t)r.push(t[2]);else{var n=new Promise(function(r,n){t=o[e]=[r,n]});r.push(t[2]=n);var c,d=document.createElement("script");d.charset="utf-8",d.timeout=120,i.nc&&d.setAttribute("nonce",i.nc),d.src=function(e){return i.p+"mrstatic/js/"+({1:"BargainMiddlePage",2:"Classify",3:"CourseList",4:"DrawDocument",5:"Examination",6:"MyEdit",7:"Order",8:"Orderinfo",9:"PayOrder",10:"Preferential",11:"SearchResult",12:"ShopCart",13:"aist-share",14:"coupons",15:"detail",17:"myorders",18:"purchased",20:"search",21:"shareposter",22:"study",23:"togroup",24:"video"}[e]||e)+"."+{0:"a95999a7",1:"75cebaa2",2:"86086f05",3:"b960bd0b",4:"28f4499d",5:"e336773b",6:"6aae3e26",7:"8bdfe9c9",8:"66d19cfc",9:"1b8faebd",10:"f8e2c261",11:"c1361403",12:"bd7f7a59",13:"dae271ce",14:"5cbae7b3",15:"4966a462",17:"ef5ab328",18:"8995b9ed",20:"cb0ee550",21:"23329f95",22:"69f29301",23:"79f5e0b8",24:"85e6dd23",26:"26789b9b",27:"0bee7544",28:"6d5977ce",29:"bd42dc20",30:"9d4068ea",31:"27f305da"}[e]+".chunk.js"}(e),c=function(r){d.onerror=d.onload=null,clearTimeout(u);var t=o[e];if(0!==t){if(t){var n=r&&("load"===r.type?"missing":r.type),a=r&&r.target&&r.target.src,c=new Error("Loading chunk "+e+" failed.\n("+n+": "+a+")");c.type=n,c.request=a,t[1](c)}o[e]=void 0}};var u=setTimeout(function(){c({type:"timeout",target:d})},12e4);d.onerror=d.onload=c,document.head.appendChild(d)}return Promise.all(r)},i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},i.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="/",i.oe=function(e){throw console.error(e),e};var d=window.webpackJsonp=window.webpackJsonp||[],u=d.push.bind(d);d.push=r,d=d.slice();for(var f=0;f<d.length;f++)r(d[f]);var s=u;t()}([]);
//# sourceMappingURL=runtime~main.3e6f6331.js.map
\ No newline at end of file
!function(e){function r(r){for(var n,a,i=r[0],d=r[1],u=r[2],f=0,l=[];f<i.length;f++)a=i[f],o[a]&&l.push(o[a][0]),o[a]=0;for(n in d)Object.prototype.hasOwnProperty.call(d,n)&&(e[n]=d[n]);for(s&&s(r);l.length;)l.shift()();return c.push.apply(c,u||[]),t()}function t(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,a=1;a<t.length;a++){var d=t[a];0!==o[d]&&(n=!1)}n&&(c.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},a={19:0},o={19:0},c=[];function i(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.e=function(e){var r=[];a[e]?r.push(a[e]):0!==a[e]&&{1:1,2:1,3:1,4:1,5:1,7:1,9:1,10:1,11:1,12:1,13:1,14:1,15:1,17:1,18:1,20:1,21:1,22:1,23:1,24:1,27:1,28:1,29:1,30:1,31:1}[e]&&r.push(a[e]=new Promise(function(r,t){for(var n="mrstatic/css/"+({1:"BargainMiddlePage",2:"Classify",3:"CourseList",4:"DrawDocument",5:"Examination",6:"MyEdit",7:"Order",8:"Orderinfo",9:"PayOrder",10:"Preferential",11:"SearchResult",12:"ShopCart",13:"aist-share",14:"coupons",15:"detail",17:"myorders",18:"purchased",20:"search",21:"shareposter",22:"study",23:"togroup",24:"video"}[e]||e)+"."+{0:"31d6cfe0",1:"5acd226b",2:"127d35ae",3:"6d999ce9",4:"1bd3da48",5:"17af9370",6:"31d6cfe0",7:"e46f87f2",8:"31d6cfe0",9:"68a25070",10:"312f2a43",11:"4d5f97fe",12:"887eb690",13:"f4398072",14:"4b4cf239",15:"7350e105",17:"e3d68b58",18:"c9466779",20:"e26f3ee9",21:"cde549fc",22:"c5bde985",23:"ffd8be6c",24:"b8d615d9",26:"31d6cfe0",27:"0710e3e3",28:"e292ab6b",29:"1133c967",30:"37fb0c23",31:"6e885738"}[e]+".chunk.css",o=i.p+n,c=document.getElementsByTagName("link"),d=0;d<c.length;d++){var u=(s=c[d]).getAttribute("data-href")||s.getAttribute("href");if("stylesheet"===s.rel&&(u===n||u===o))return r()}var f=document.getElementsByTagName("style");for(d=0;d<f.length;d++){var s;if((u=(s=f[d]).getAttribute("data-href"))===n||u===o)return r()}var l=document.createElement("link");l.rel="stylesheet",l.type="text/css",l.onload=r,l.onerror=function(r){var n=r&&r.target&&r.target.src||o,c=new Error("Loading CSS chunk "+e+" failed.\n("+n+")");c.request=n,delete a[e],l.parentNode.removeChild(l),t(c)},l.href=o,document.getElementsByTagName("head")[0].appendChild(l)}).then(function(){a[e]=0}));var t=o[e];if(0!==t)if(t)r.push(t[2]);else{var n=new Promise(function(r,n){t=o[e]=[r,n]});r.push(t[2]=n);var c,d=document.createElement("script");d.charset="utf-8",d.timeout=120,i.nc&&d.setAttribute("nonce",i.nc),d.src=function(e){return i.p+"mrstatic/js/"+({1:"BargainMiddlePage",2:"Classify",3:"CourseList",4:"DrawDocument",5:"Examination",6:"MyEdit",7:"Order",8:"Orderinfo",9:"PayOrder",10:"Preferential",11:"SearchResult",12:"ShopCart",13:"aist-share",14:"coupons",15:"detail",17:"myorders",18:"purchased",20:"search",21:"shareposter",22:"study",23:"togroup",24:"video"}[e]||e)+"."+{0:"a95999a7",1:"75cebaa2",2:"86086f05",3:"b960bd0b",4:"28f4499d",5:"e336773b",6:"6aae3e26",7:"8bdfe9c9",8:"66d19cfc",9:"1b8faebd",10:"f8e2c261",11:"c1361403",12:"bd7f7a59",13:"dae271ce",14:"5cbae7b3",15:"9ecd1386",17:"ef5ab328",18:"8995b9ed",20:"cb0ee550",21:"23329f95",22:"69f29301",23:"79f5e0b8",24:"a3d88f5b",26:"26789b9b",27:"0bee7544",28:"6d5977ce",29:"bd42dc20",30:"9d4068ea",31:"27f305da"}[e]+".chunk.js"}(e),c=function(r){d.onerror=d.onload=null,clearTimeout(u);var t=o[e];if(0!==t){if(t){var n=r&&("load"===r.type?"missing":r.type),a=r&&r.target&&r.target.src,c=new Error("Loading chunk "+e+" failed.\n("+n+": "+a+")");c.type=n,c.request=a,t[1](c)}o[e]=void 0}};var u=setTimeout(function(){c({type:"timeout",target:d})},12e4);d.onerror=d.onload=c,document.head.appendChild(d)}return Promise.all(r)},i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},i.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="/",i.oe=function(e){throw console.error(e),e};var d=window.webpackJsonp=window.webpackJsonp||[],u=d.push.bind(d);d.push=r,d=d.slice();for(var f=0;f<d.length;f++)r(d[f]);var s=u;t()}([]);
//# sourceMappingURL=runtime~main.d013cc35.js.map
\ No newline at end of file
build/mrstatic/js/video.a3d88f5b.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.a1adebf4c3d343c9550906ade2cad034.js → build/precache-manifest.6594864d4b9a0adf06cf0036a33d0831.js
self.__precacheManifest = [
{
"revision": "70b6277c259ecb7fe592",
"url": "/mrstatic/js/runtime~main.3e6f6331.js"
"revision": "ab55545c1437ef3e7dd9",
"url": "/mrstatic/js/runtime~main.d013cc35.js"
},
{
"revision": "983f9ba3dae8adddaefc",
......@@ -20,8 +20,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/Classify.86086f05.chunk.js"
},
{
"revision": "79139f6aad350256e151f9f73c226348",
"url": "/mrstatic/media/hb_bj.79139f6a.png"
"revision": "5f30ed5620a93a581089dd0296b90045",
"url": "/mrstatic/media/redb_sp_bj.5f30ed56.png"
},
{
"revision": "be9509fb30cfee5e71a3",
......@@ -36,8 +36,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/DrawDocument.28f4499d.chunk.js"
},
{
"revision": "5f30ed5620a93a581089dd0296b90045",
"url": "/mrstatic/media/redb_sp_bj.5f30ed56.png"
"revision": "79139f6aad350256e151f9f73c226348",
"url": "/mrstatic/media/hb_bj.79139f6a.png"
},
{
"revision": "4a7c8514445d10d7b8cc",
......@@ -76,16 +76,16 @@ self.__precacheManifest = [
"url": "/mrstatic/js/Preferential.f8e2c261.chunk.js"
},
{
"revision": "145742789ab409c81f28938b15b5dee7",
"url": "/mrstatic/media/iconfont.14574278.ttf"
"revision": "cd1c41437a2e35a283e4b16b620a8c9e",
"url": "/mrstatic/media/iconfont.cd1c4143.eot"
},
{
"revision": "90023e9414c5663fb86a",
"url": "/mrstatic/js/SearchResult.c1361403.chunk.js"
},
{
"revision": "cd1c41437a2e35a283e4b16b620a8c9e",
"url": "/mrstatic/media/iconfont.cd1c4143.eot"
"revision": "145742789ab409c81f28938b15b5dee7",
"url": "/mrstatic/media/iconfont.14574278.ttf"
},
{
"revision": "edfbf8a2c42424b66afd",
......@@ -112,8 +112,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/30.9d4068ea.chunk.js"
},
{
"revision": "c5f4215eff5e41bdce53",
"url": "/mrstatic/js/detail.4966a462.chunk.js"
"revision": "2d41c1687936ccf738e0",
"url": "/mrstatic/js/detail.9ecd1386.chunk.js"
},
{
"revision": "c65b92d87958fa7bdc0b",
......@@ -152,8 +152,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/search.cb0ee550.chunk.js"
},
{
"revision": "6ea09f37995bf6282119",
"url": "/mrstatic/js/video.85e6dd23.chunk.js"
"revision": "cec1f3855c0cdaabfea9",
"url": "/mrstatic/js/video.a3d88f5b.chunk.js"
},
{
"revision": "6e8443fed487b455856c",
......@@ -168,7 +168,7 @@ self.__precacheManifest = [
"url": "/mrstatic/js/study.69f29301.chunk.js"
},
{
"revision": "c5f4215eff5e41bdce53",
"revision": "2d41c1687936ccf738e0",
"url": "/mrstatic/css/detail.7350e105.chunk.css"
},
{
......@@ -176,7 +176,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/togroup.ffd8be6c.chunk.css"
},
{
"revision": "6ea09f37995bf6282119",
"revision": "cec1f3855c0cdaabfea9",
"url": "/mrstatic/css/video.b8d615d9.chunk.css"
},
{
......@@ -276,7 +276,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/25.320181c4.chunk.css"
},
{
"revision": "f2d3c98e8c7444f82ee669c92fd4108c",
"revision": "9ccda86cd89004abf9f022c73bf9e5b6",
"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.a1adebf4c3d343c9550906ade2cad034.js"
"/precache-manifest.6594864d4b9a0adf06cf0036a33d0831.js"
);
workbox.clientsClaim();
......
src/components/country/index.scss 0 → 100644
body {
height: 100%;
}
#root {
height: 100%;
// background-color: #F5F5F5;
}
.page-body {
height: 100%;
// background-color: #F5F5F5;
}
.country-header {
margin: 0;
padding: 0 13px;
font-size: 15px;
font-family: Hiragino Sans GB;
font-weight: normal;
color: #3E3E3E;
line-height: 28px;
background-color: #F5F5F5;
}
.country-list {
.country-item {
&:nth-child(n+2) {
border-top: 1px solid #ECECEC;
}
}
}
.country-item {
margin: 0 12px;
}
.country-item__link {
display: flex;
align-items: center;
justify-content: space-between;
height: 50px;
}
.country-name {
font-size: 15px;
font-family: Hiragino Sans GB;
color: #3E3E3E;
}
.country-num {
font-size: 15px;
font-family: Hiragino Sans GB;
color: #555;
}
// NAV
.letter-nav {
position: fixed;
top: 0;
right: 2px;
}
.letter-nav__item {
width: 12px;
// height: 12px;
margin-bottom: 6px;
font-size: 10px;
font-family: Hiragino Sans GB;
color: #0099FF;
text-align: center;
line-height: 12px;
}
.letter-nav__item--active {
border-radius: 50%;
color: #fff;
background-color: #0099FF;
}
\ No newline at end of file
src/components/detail/redPacket/index.js
......@@ -35,6 +35,7 @@ class RedPacket extends PureComponent {
txt: '手机号绑定超时，红包已失效!',
// txt: '今日已领取5.6元代金券碎片！',
// txt: '今日已领取5.6元现金！',
desc: ''
},
money: '', // 红包金额,
endTime: 10, // 手机绑定时限
......@@ -52,12 +53,90 @@ class RedPacket extends PureComponent {
const { shareInfo } = this.state;
if(share_code) {
this.setState({
type: browser.isWeixin? 2 : 3,
shareInfo: {
...shareInfo,
share_code
}
});
// 检查收否领取过
http.post(
`${API.home}/sys/redPacket/split`,
{
action: 'check',
share_code
}
).then(res => {
const {code, data} = res.data;
if(code === 200) {
// is_overdue 红包是否过期 0-否 1-是
if(data.is_overdue) {
this.setState({
type: 7
});
}else {
// is_receive 是否领取过 0-否 1-是
if(data.is_receive) {
this.judgeReceiveStatus(data);
}else {
this.setState({
type: 3
});
}
}
}
if(code === 4030 || code === 4040) {
this.setState({
type: browser.isWeixin? 2 : 3
});
}
});
}
}
// 判断领取状态--领取后
judgeReceiveStatus = (data) => {
// receive_status 领取状态 1-已领取 2-已领取未绑定 3-已失效
if(data.receive_status === 1) {
let txt = '';
let desc = '';
// receive_type 领取类型 1自己 2别人
if(data.receive_type === 1) {
txt = data.red_packet_type === 1? `今日已领取${data.amount}元现金！`: `今日已领取${data.amount}元代金券碎片！`;
desc = '越多好友领取，你所得越多！';
}
if(data.receive_type === 2) {
txt = data.red_packet_type === 1? `您已经领过该红包 ${data.amount}元现金！`: `您已经领过该红包 ${data.amount}元代金券碎片！`;
desc = '每天只能帮好友领取一次哦~';
}
this.setState({
type: 9,
doneInfo: {
status: 1,
txt,
desc
}
});
}else if(data.receive_status === 2) {
this.setState({
type: 4,
money: data.amount,
endTime: data.end_time
});
this.startCountDown();
}else if(data.receive_status === 3) {
this.setState({
type: 9,
doneInfo: {
status: 2,
txt: '手机号绑定超时，红包已失效!',
desc
}
});
}
}
......@@ -92,8 +171,14 @@ class RedPacket extends PureComponent {
http.get(`${API.home}/sys/redPacket/shareUrl/${getParam('id')}`).then(res => {
const { code, data } = res.data;
if(code === 4030 || code === 4040) {
if(browser.isWeixin) {
this.setState({
type: 2
});
}else {
history.push('/passport/login');
}
}
if(code === 200) {
this.setState({
shareInfo: data,
......@@ -129,50 +214,9 @@ class RedPacket extends PureComponent {
const { code, data } = res.data;
if(code === 200) {
// is_overdue 红包是否过期 0-否 1-是
if(data.is_overdue) {
this.setState({
type: 7
});
}else {
// is_receive 是否领取过 0-否 1-是
if(data.is_receive) {
// receive_status 领取状态 1-已领取 2-已领取未绑定 3-已失效
if(data.receive_status === 1) {
let txt = '';
// receive_type 领取类型 1自己 2别人
if(data.receive_type === 1) {
txt = data.red_packet_type === 1? `今日已领取${data.amount}元现金！`: `今日已领取${data.amount}元代金券碎片！`;
}
if(data.receive_type === 2) {
txt = data.red_packet_type === 1? `您已经领过该红包 ${data.amount}元现金！`: `您已经领过该红包 ${data.amount}元代金券碎片！`;
}
this.setState({
type: 9,
doneInfo: {
status: 1,
txt
}
});
}else if(data.receive_status === 2) {
this.setState({
type: 4,
money: data.amount,
endTime: data.end_time
});
this.startCountDown();
}else if(data.receive_status === 3) {
this.setState({
type: 9,
doneInfo: {
status: 2,
txt: '手机号绑定超时，红包已失效!'
}
});
}
this.judgeReceiveStatus(data);
}else {
// red_packet_type 红包类型 1-现金 2-代金券
......@@ -208,13 +252,13 @@ class RedPacket extends PureComponent {
type: 9,
doneInfo: {
status: 2,
txt: '手机号绑定超时，红包已失效!'
txt: '手机号绑定超时，红包已失效!',
desc: data.receive_type === 1? '越多好友领取，你所得越多！' : data.receive_type === 2? '每天只能帮好友领取一次哦~' : ''
}
});
}
}
}
}
}else if(code === 4030 || code === 4040) {
history.push('/passport/login');
}
......@@ -239,46 +283,13 @@ class RedPacket extends PureComponent {
// is_receive 是否领取过 0-否 1-是
if(data.is_receive) {
// receive_status 领取状态 1-已领取 2-已领取未绑定 3-已失效
if(data.receive_status === 1) {
this.setState({
type: 9,
doneInfo: {
status: 1,
txt: data.red_packet_type === 1? `今日已领取${data.amount}元现金！`: `今日已领取${data.amount}元代金券碎片！`
}
});
}else if(data.receive_status === 2) {
this.setState({
type: 4,
money: data.amount,
endTime: data.end_time
});
this.startCountDown();
}else if(data.receive_status === 3) {
this.setState({
type: 9,
doneInfo: {
status: 2,
txt: '手机号绑定超时，红包已失效!'
}
});
}
}else {
// is_overdue 红包是否过期 0-否 1-是
if(data.is_overdue) {
this.setState({
type: 7
});
this.judgeReceiveStatus(data);
}else {
this.setState({
type: 3
});
}
}
}
});
}else {
if(isShare) {
......@@ -291,6 +302,16 @@ class RedPacket extends PureComponent {
}
}
// 微信内点击蒙层
clickMask = () => {
const { type } = this.state;
if(type === 2) {
this.setState({
type: 0
});
}
}
// 复制口令
handleToCopy = () => {
this.setState({
......@@ -404,7 +425,8 @@ class RedPacket extends PureComponent {
type: 9,
doneInfo: {
status: 2,
txt: '手机号绑定超时，红包已失效!'
txt: '手机号绑定超时，红包已失效!',
desc: data.receive_type === 1? '越多好友领取，你所得越多！' : data.receive_type === 2? '每天只能帮好友领取一次哦~' : ''
}
});
}
......@@ -467,7 +489,7 @@ class RedPacket extends PureComponent {
bindInfo
} = this.state;
const cls = classnames('popup-mask',{
'popup-mask--no': type !== 0
'popup-mask--no': type !== 2
});
return (
<>
......@@ -479,7 +501,7 @@ class RedPacket extends PureComponent {
{/* popup */}
{
type !== 0 &&
<div className={cls}>
<div className={cls} onClick={this.clickMask}>
{/* wechat */}
{
......@@ -758,7 +780,7 @@ class RedPacket extends PureComponent {
}
{doneInfo.txt}
</h4>
<p className="popup-done__desc">每天只能帮好友领取一次哦~</p>
<p className="popup-done__desc">{doneInfo.desc}</p>
<button
className="popup-packet__button--bundle"
data-status="do"
......
src/router/router-config.js
......@@ -30,6 +30,7 @@ const Classify = loadable(() => import(/* webpackChunkName: 'Classify'*/'@/compo
const CampTest = loadable(() => import(/* webpackChunkName: 'Classify'*/'@/components/video/camp/campTest'))
const CampResolve = loadable(() => import(/* webpackChunkName: 'Classify'*/'@/components/video/camp/campResolve'))
const ShareCourse = loadable(() => import('@/components/ShareCourse/index'))
const Country = loadable(() => import('@/components/country/index'))
export default [
{
path: '/',
......@@ -154,6 +155,12 @@ export default [
path: '/ShareCourse',
component: ShareCourse
},
// 区号
{
path: '/country',
component: Country
},
{
path: '/togroup',
component: ToGroup
......
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