Commit f90ab653 by wangshuo

合并formal

parents 42c08446 a19cdb3e
......@@ -55,12 +55,17 @@
"aist-share.css": "/mrstatic/css/aist-share.7510d5bb.chunk.css",
"aist-share.js": "/mrstatic/js/aist-share.1afdcdd8.chunk.js",
"aist-share.js.map": "/mrstatic/js/aist-share.1afdcdd8.chunk.js.map",
"blessing-getPrize.css": "/mrstatic/css/blessing-getPrize.7451a8f4.chunk.css",
"blessing-getPrize.js": "/mrstatic/js/blessing-getPrize.cfb6a779.chunk.js",
"blessing-getPrize.js.map": "/mrstatic/js/blessing-getPrize.cfb6a779.chunk.js.map",
"blessing-getPrize.css": "/mrstatic/css/blessing-getPrize.57758140.chunk.css",
"blessing-getPrize.js": "/mrstatic/js/blessing-getPrize.ae4e34e9.chunk.js",
"blessing-getPrize.js.map": "/mrstatic/js/blessing-getPrize.ae4e34e9.chunk.js.map",
"blessing-preheat.css": "/mrstatic/css/blessing-preheat.4d8e9342.chunk.css",
<<<<<<< HEAD
"blessing-preheat.js": "/mrstatic/js/blessing-preheat.f010d335.chunk.js",
"blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.f010d335.chunk.js.map",
=======
"blessing-preheat.js": "/mrstatic/js/blessing-preheat.a65422c6.chunk.js",
"blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.a65422c6.chunk.js.map",
>>>>>>> 11-11-formal
"blessing-rank.css": "/mrstatic/css/blessing-rank.4f55b203.chunk.css",
"blessing-rank.js": "/mrstatic/js/blessing-rank.bee5d18f.chunk.js",
"blessing-rank.js.map": "/mrstatic/js/blessing-rank.bee5d18f.chunk.js.map",
......@@ -88,8 +93,13 @@
"purchased.css": "/mrstatic/css/purchased.28c23daa.chunk.css",
"purchased.js": "/mrstatic/js/purchased.2f92d794.chunk.js",
"purchased.js.map": "/mrstatic/js/purchased.2f92d794.chunk.js.map",
<<<<<<< HEAD
"runtime~main.js": "/mrstatic/js/runtime~main.f41ecf8e.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.f41ecf8e.js.map",
=======
"runtime~main.js": "/mrstatic/js/runtime~main.9680697f.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.9680697f.js.map",
>>>>>>> 11-11-formal
"search.css": "/mrstatic/css/search.85280180.chunk.css",
"search.js": "/mrstatic/js/search.15481409.chunk.js",
"search.js.map": "/mrstatic/js/search.15481409.chunk.js.map",
......@@ -150,7 +160,7 @@
"mrstatic/css/ShareCourse.c571c49e.chunk.css.map": "/mrstatic/css/ShareCourse.c571c49e.chunk.css.map",
"mrstatic/css/ShopCart.f39ca42e.chunk.css.map": "/mrstatic/css/ShopCart.f39ca42e.chunk.css.map",
"mrstatic/css/aist-share.7510d5bb.chunk.css.map": "/mrstatic/css/aist-share.7510d5bb.chunk.css.map",
"mrstatic/css/blessing-getPrize.7451a8f4.chunk.css.map": "/mrstatic/css/blessing-getPrize.7451a8f4.chunk.css.map",
"mrstatic/css/blessing-getPrize.57758140.chunk.css.map": "/mrstatic/css/blessing-getPrize.57758140.chunk.css.map",
"mrstatic/css/blessing-preheat.4d8e9342.chunk.css.map": "/mrstatic/css/blessing-preheat.4d8e9342.chunk.css.map",
"mrstatic/css/blessing-rank.4f55b203.chunk.css.map": "/mrstatic/css/blessing-rank.4f55b203.chunk.css.map",
"mrstatic/css/coupons.940f5632.chunk.css.map": "/mrstatic/css/coupons.940f5632.chunk.css.map",
......@@ -170,6 +180,10 @@
"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",
<<<<<<< HEAD
"precache-manifest.f30beec100c7eb9ad7fe7a17778711ff.js": "/precache-manifest.f30beec100c7eb9ad7fe7a17778711ff.js",
=======
"precache-manifest.c222d40e07dac8272036fac74238b683.js": "/precache-manifest.c222d40e07dac8272036fac74238b683.js",
>>>>>>> 11-11-formal
"service-worker.js": "/service-worker.js"
}
\ No newline at end of file
(window.webpackJsonp=window.webpackJsonp||[]).push([[20],{1205:function(e,a,t){},1235:function(e,a,t){"use strict";t.r(a);t(39);var n,s=t(12),r=t.n(s),c=t(20),i=t(5),l=t(7),d=t(6),m=t(8),o=t(9),u=t(0),p=t.n(u),_=(t(1205),t(621)),h=t(3),f=t(730),v=t(27),E=t(22),b=Object(E.b)(function(e){return{uid:e.user.data.uid||""}})(n=function(e){function a(e){var t;return Object(i.a)(this,a),(t=Object(d.a)(this,Object(m.a)(a).call(this,e))).popupInstance=null,t.showAddress=function(e){var a=t.props,n=a.history,s=a.uid,r=t.state.name;e&&!s?n.push("/passport"):e&&!t.popupInstance?t.popupInstance=Object(v.h)({title:"\u606d\u559c\u60a8",content:p.a.createElement(f.a,{tip:"\u586b\u5199\u60a8\u7684\u8054\u7cfb\u65b9\u5f0f",prize:r,handleToHide:function(){return t.showAddress(!1)}})}):(t.popupInstance.close(),t.popupInstance=null)},t.state={date:"",next_date:"",name:"",is_winning:0,is_virtual:1,prize_data:[],address:!1},t}return Object(o.a)(a,e),Object(l.a)(a,[{key:"componentDidMount",value:function(){var e=this;h.d.get("".concat(API.home,"/sys/lottery_result?id=").concat(Object(h.c)("id"))).then(function(a){var t=a.data,n=t.code,s=t.msg,i=t.data;200===n?e.setState(Object(c.a)({},i.info,{prize_data:i.prize_data.slice(0,6)})):r.a.info(s)})}},{key:"render",value:function(){var e=this,a=this.state,t=a.date,n=a.next_date,s=a.name,r=a.is_winning,c=a.is_virtual,i=a.prize_data;a.address;return p.a.createElement("div",{className:"blessing_get_prize"},p.a.createElement("div",{className:"is__get_prize"},p.a.createElement("div",{className:"get_piriz__info"},p.a.createElement("div",{className:"result"},t,"\u4e2d\u5956\u7ed3\u679c"),0===r&&p.a.createElement("div",{className:"no_prize"},"\u5f88\u9057\u61be\uff0c\u4f60\u672a\u4e2d\u5956\uff5e"),1===r&&0===c&&p.a.createElement("div",{className:"real__prize"},p.a.createElement("div",null,"\u606d\u559c\u4f60\uff0c\u5df2\u62bd\u4e2d",s,"\u5956\u54c1"),p.a.createElement("span",{onClick:function(){return e.showAddress(!0)},className:"address"},"\u586b\u5199\u6536\u8d27\u5730\u5740")),1===r&&1===c&&p.a.createElement("div",{className:"virtual "},p.a.createElement("div",null,"\u606d\u559c\u4f60\u62bd\u4e2d",s,"\uff0c"),p.a.createElement("div",null,"\u5956\u54c1\u5df2\u5b58\u653e\u5230\u4f60\u7684\u8d26\u6237")))),i&&i.length>0&&p.a.createElement(p.a.Fragment,null,p.a.createElement("div",{className:"current_stage"},n),p.a.createElement(_.a,{text:"\u62bd\u5956\u5df2\u5f00\u542f",styles:{margin:"16px 0 18px"}}),p.a.createElement("div",{className:"prize_list_container"},i.length>0&&i.map(function(e,a){return p.a.createElement("div",{className:"prize__item",key:a},p.a.createElement("img",{className:"prize__image",src:e.img}),p.a.createElement("div",{className:"name__num"},p.a.createElement("span",null,e.name),p.a.createElement("span",null,"\uff08","*".concat(e.num),"\uff09")))})),p.a.createElement("a",{href:"/blessingPreheat",className:"join__button"},"\u7acb\u5373\u53c2\u4e0e\u62bd\u5956"),p.a.createElement("div",{className:"prize__tip"},p.a.createElement("div",{className:"line"}),p.a.createElement("span",null,"\u4e2d\u5956\u5c0ftips"),p.a.createElement("div",{className:"line"})),p.a.createElement("div",{className:"blessing__des"},"\u79ef\u6512\u7684\u798f\u6c14\u503c\u8d8a\u9ad8\uff0c\u4e2d\u5956\u6982\u7387\u8d8a\u5927\u54e6"),p.a.createElement("a",{className:"to__preheat",href:"/invite"},"\u79ef\u6512\u66f4\u591a\u798f\u6c14\u503c")),(!i||0===i.length)&&p.a.createElement("div",{className:"active_over_container"},p.a.createElement("img",{src:"https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/acitve__over.png",alt:""}),p.a.createElement("p",null,"\u4e03\u6708\u5728\u7ebf\u53cc\u5341\u4e00\u62bd\u5956\u6d3b\u52a8\u5df2\u7ed3\u675f\uff0c \u611f\u8c22\u4f60\u7684\u53c2\u4e0e\uff01")))}}]),a}(u.Component))||n;a.default=b},621:function(e,a,t){"use strict";var n=t(5),s=t(7),r=t(6),c=t(8),i=t(9),l=t(0),d=t.n(l),m=t(17),o=t.n(m),u=(t(732),function(e){function a(){return Object(n.a)(this,a),Object(r.a)(this,Object(c.a)(a).apply(this,arguments))}return Object(i.a)(a,e),Object(s.a)(a,[{key:"render",value:function(){var e=this.props,a=e.text,t=e.size,n=e.styles,s=e.id,r=t?"list-header--".concat(t):"";return d.a.createElement("div",{id:s,className:o()("list-header",r),style:n},d.a.createElement("i",{className:"list-header__decorate","data-position":"left"}),a?d.a.createElement("h2",{className:"list-header__content"},a):this.props.children,d.a.createElement("i",{className:"list-header__decorate","data-position":"right"}))}}]),a}(l.Component));a.a=u},730:function(e,a,t){"use strict";var n=t(20),s=(t(39),t(12)),r=t.n(s),c=t(5),i=t(7),l=t(6),d=t(8),m=t(9),o=t(0),u=t.n(o),p=(t(40),t(3)),_=t(19),h=(t(731),function(e){function a(e){var t;return Object(c.a)(this,a),(t=Object(l.a)(this,Object(d.a)(a).call(this,e))).fetchUserAddress=function(){var e=t.state.addressInfo;p.d.get("".concat(API.home,"/sys/user_address_info")).then(function(a){var n=a.data,s=n.code,r=n.data;n.msg;200===s&&t.setState({addressInfo:Object.assign({},e,{name:r.name,phone:r.phone,address:r.address}),isLoading:!0})})},t.handleToSubmit=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},a=t.props.handleToHide;p.d.post("".concat(API.home,"/sys/collect_info"),e).then(function(e){var t=e.data,n=t.code,s=t.msg;200===n?a():r.a.info(s,2,null,!1)})},t.state={isLoading:!1,addressInfo:{name:"",phone:"",address:""}},t}return Object(m.a)(a,e),Object(i.a)(a,[{key:"componentDidMount",value:function(){this.fetchUserAddress()}},{key:"render",value:function(){var e=this,a=this.state,t=a.isLoading,s=a.addressInfo,r=this.props,c=r.tip,i=r.prize;return u.a.createElement(u.a.Fragment,null,t&&u.a.createElement(_.d,{initialValues:Object(n.a)({},s),validate:function(e){var a=e.name,t=e.phone,n=e.address,s={};return a||(s.name="\u8bf7\u8f93\u5165\u6536\u4ef6\u4eba"),/^1[3-9]\d{9}$/.test(t)||(s.phone="\u8bf7\u586b\u5199\u6b63\u786e\u683c\u5f0f\u7684\u624b\u673a\u53f7"),n||(s.address="\u8bf7\u8f93\u5165\u6536\u8d27\u5730\u5740"),s},validateOnBlur:!1,validateOnChange:!1,onSubmit:function(a){e.handleToSubmit(a)},render:function(e){var a=e.errors;return u.a.createElement(_.c,{className:"address-form"},i?u.a.createElement("p",{className:"address__prize"},"\u60a8\u62bd\u4e2d\u4e86",i,u.a.createElement("span",{style:{color:"#FF4000"}},"\u5b9e\u7269\u5956\u54c1")):null,c?u.a.createElement("p",{className:"address-form__desc"},c):u.a.createElement("p",{className:"address-form__desc"},"\u8bf7\u53ca\u65f6\u586b\u5199\u6536\u8d27\u4fe1\u606f\uff0c\u83b7\u5f97\u5b9e\u7269\u5956\u54c1\u540e\u5c06\u7b2c\u4e00\u65f6\u95f4\u4e3a\u60a8\u90ae\u5bc4"),u.a.createElement(_.b,{name:"name",render:function(e){var t=e.field;return u.a.createElement("div",{className:"address-form__item"},u.a.createElement("input",Object.assign({},t,{className:"address-form__ipt",type:"text",placeholder:"\u6536\u4ef6\u4eba"})),a.name&&u.a.createElement("p",{className:"address-form__tip"},a.name))}}),u.a.createElement(_.b,{name:"phone",render:function(e){var t=e.field;return u.a.createElement("div",{className:"address-form__item"},u.a.createElement("input",Object.assign({},t,{className:"address-form__ipt",type:"text",placeholder:"\u8054\u7cfb\u65b9\u5f0f"})),a.phone&&u.a.createElement("p",{className:"address-form__tip"},a.phone))}}),u.a.createElement(_.b,{name:"address",render:function(e){var t=e.field;return u.a.createElement("div",{className:"address-form__item"},u.a.createElement("input",Object.assign({},t,{className:"address-form__ipt",type:"text",placeholder:"\u6536\u8d27\u5730\u5740"})),a.address&&u.a.createElement("p",{className:"address-form__tip"},a.address))}}),u.a.createElement("button",{className:"address-form__submit","data-status":"do",type:"submit"},"\u63d0\u4ea4"))}}))}}]),a}(o.Component));a.a=h},731:function(e,a,t){},732:function(e,a,t){}}]);
//# sourceMappingURL=blessing-getPrize.ae4e34e9.chunk.js.map
\ No newline at end of file
(window.webpackJsonp=window.webpackJsonp||[]).push([[20],{1205:function(e,a,t){},1235:function(e,a,t){"use strict";t.r(a);t(39);var n,s=t(12),r=t.n(s),i=t(20),c=t(5),l=t(7),d=t(6),m=t(8),o=t(9),u=t(0),p=t.n(u),_=(t(1205),t(621)),f=t(3),h=t(730),v=t(27),E=t(22),b=Object(E.b)(function(e){return{uid:e.user.data.uid||""}})(n=function(e){function a(e){var t;return Object(c.a)(this,a),(t=Object(d.a)(this,Object(m.a)(a).call(this,e))).popupInstance=null,t.showAddress=function(e){var a=t.props,n=a.history,s=a.uid,r=t.state.name;e&&!s?n.push("/passport"):e&&!t.popupInstance?t.popupInstance=Object(v.h)({title:"\u606d\u559c\u60a8",content:p.a.createElement(h.a,{tip:"\u586b\u5199\u60a8\u7684\u8054\u7cfb\u65b9\u5f0f",prize:r,handleToHide:function(){return t.showAddress(!1)}})}):(t.popupInstance.close(),t.popupInstance=null)},t.state={date:"",next_date:"",name:"",is_winning:1,is_virtual:1,prize_data:[],address:!1},t}return Object(o.a)(a,e),Object(l.a)(a,[{key:"componentDidMount",value:function(){var e=this;f.d.get("".concat(API.home,"/sys/lottery_result?id=").concat(Object(f.c)("id"))).then(function(a){var t=a.data,n=t.code,s=t.msg,c=t.data;200===n?e.setState(Object(i.a)({},c.info,{prize_data:c.prize_data.slice(0,6)})):r.a.info(s)})}},{key:"render",value:function(){var e=this,a=this.state,t=a.date,n=a.next_date,s=a.name,r=a.is_winning,i=a.is_virtual,c=a.prize_data;a.address;return p.a.createElement("div",{className:"blessing_get_prize"},p.a.createElement("div",{className:"is__get_prize"},p.a.createElement("div",{className:"get_piriz__info"},p.a.createElement("div",{className:"result"},t,"\u4e2d\u5956\u7ed3\u679c"),0===r&&p.a.createElement("div",{className:"no_prize"},"\u5f88\u9057\u61be\uff0c\u4f60\u672a\u4e2d\u5956\uff5e"),1===r&&0===i&&p.a.createElement("div",{className:"real__prize"},p.a.createElement("div",null,"\u606d\u559c\u4f60\uff0c\u5df2\u62bd\u4e2d",s,"\u5956\u54c1"),p.a.createElement("span",{onClick:function(){return e.showAddress(!0)},className:"address"},"\u586b\u5199\u6536\u8d27\u5730\u5740")),1===r&&1===i&&p.a.createElement("div",{className:"virtual "},p.a.createElement("div",null,"\u606d\u559c\u4f60\u62bd\u4e2d",s,"\uff0c"),p.a.createElement("div",null,"\u5956\u54c1\u5df2\u5b58\u653e\u5230\u4f60\u7684\u8d26\u6237")))),p.a.createElement("div",{className:"current_stage"},n),p.a.createElement(_.a,{text:"\u62bd\u5956\u5df2\u5f00\u542f",styles:{margin:"16px 0 18px"}}),p.a.createElement("div",{className:"prize_list_container"},c.length>0&&c.map(function(e,a){return p.a.createElement("div",{className:"prize__item",key:a},p.a.createElement("img",{className:"prize__image",src:e.img}),p.a.createElement("div",{className:"name__num"},p.a.createElement("span",null,e.name),p.a.createElement("span",null,"\uff08","*".concat(e.num),"\uff09")))})),p.a.createElement("a",{href:"/blessingPreheat",className:"join__button"},"\u7acb\u5373\u53c2\u4e0e\u62bd\u5956"),p.a.createElement("div",{className:"prize__tip"},p.a.createElement("div",{className:"line"}),p.a.createElement("span",null,"\u4e2d\u5956\u5c0ftips"),p.a.createElement("div",{className:"line"})),p.a.createElement("div",{className:"blessing__des"},"\u79ef\u6512\u7684\u798f\u6c14\u503c\u8d8a\u9ad8\uff0c\u4e2d\u5956\u6982\u7387\u8d8a\u5927\u54e6"),p.a.createElement("a",{className:"to__preheat",href:"/invite"},"\u79ef\u6512\u66f4\u591a\u798f\u6c14\u503c"))}}]),a}(u.Component))||n;a.default=b},621:function(e,a,t){"use strict";var n=t(5),s=t(7),r=t(6),i=t(8),c=t(9),l=t(0),d=t.n(l),m=t(17),o=t.n(m),u=(t(732),function(e){function a(){return Object(n.a)(this,a),Object(r.a)(this,Object(i.a)(a).apply(this,arguments))}return Object(c.a)(a,e),Object(s.a)(a,[{key:"render",value:function(){var e=this.props,a=e.text,t=e.size,n=e.styles,s=e.id,r=t?"list-header--".concat(t):"";return d.a.createElement("div",{id:s,className:o()("list-header",r),style:n},d.a.createElement("i",{className:"list-header__decorate","data-position":"left"}),a?d.a.createElement("h2",{className:"list-header__content"},a):this.props.children,d.a.createElement("i",{className:"list-header__decorate","data-position":"right"}))}}]),a}(l.Component));a.a=u},730:function(e,a,t){"use strict";var n=t(20),s=(t(39),t(12)),r=t.n(s),i=t(5),c=t(7),l=t(6),d=t(8),m=t(9),o=t(0),u=t.n(o),p=(t(40),t(3)),_=t(19),f=(t(731),function(e){function a(e){var t;return Object(i.a)(this,a),(t=Object(l.a)(this,Object(d.a)(a).call(this,e))).fetchUserAddress=function(){var e=t.state.addressInfo;p.d.get("".concat(API.home,"/sys/user_address_info")).then(function(a){var n=a.data,s=n.code,r=n.data;n.msg;200===s&&t.setState({addressInfo:Object.assign({},e,{name:r.name,phone:r.phone,address:r.address}),isLoading:!0})})},t.handleToSubmit=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},a=t.props.handleToHide;p.d.post("".concat(API.home,"/sys/collect_info"),e).then(function(e){var t=e.data,n=t.code,s=t.msg;200===n?a():r.a.info(s,2,null,!1)})},t.state={isLoading:!1,addressInfo:{name:"",phone:"",address:""}},t}return Object(m.a)(a,e),Object(c.a)(a,[{key:"componentDidMount",value:function(){this.fetchUserAddress()}},{key:"render",value:function(){var e=this,a=this.state,t=a.isLoading,s=a.addressInfo,r=this.props,i=r.tip,c=r.prize;return u.a.createElement(u.a.Fragment,null,t&&u.a.createElement(_.d,{initialValues:Object(n.a)({},s),validate:function(e){var a=e.name,t=e.phone,n=e.address,s={};return a||(s.name="\u8bf7\u8f93\u5165\u6536\u4ef6\u4eba"),/^1[3-9]\d{9}$/.test(t)||(s.phone="\u8bf7\u586b\u5199\u6b63\u786e\u683c\u5f0f\u7684\u624b\u673a\u53f7"),n||(s.address="\u8bf7\u8f93\u5165\u6536\u8d27\u5730\u5740"),s},validateOnBlur:!1,validateOnChange:!1,onSubmit:function(a){e.handleToSubmit(a)},render:function(e){var a=e.errors;return u.a.createElement(_.c,{className:"address-form"},c?u.a.createElement("p",{className:"address__prize"},"\u60a8\u62bd\u4e2d\u4e86",c,u.a.createElement("span",{style:{color:"#FF4000"}},"\u5b9e\u7269\u5956\u54c1")):null,i?u.a.createElement("p",{className:"address-form__desc"},i):u.a.createElement("p",{className:"address-form__desc"},"\u8bf7\u53ca\u65f6\u586b\u5199\u6536\u8d27\u4fe1\u606f\uff0c\u83b7\u5f97\u5b9e\u7269\u5956\u54c1\u540e\u5c06\u7b2c\u4e00\u65f6\u95f4\u4e3a\u60a8\u90ae\u5bc4"),u.a.createElement(_.b,{name:"name",render:function(e){var t=e.field;return u.a.createElement("div",{className:"address-form__item"},u.a.createElement("input",Object.assign({},t,{className:"address-form__ipt",type:"text",placeholder:"\u6536\u4ef6\u4eba"})),a.name&&u.a.createElement("p",{className:"address-form__tip"},a.name))}}),u.a.createElement(_.b,{name:"phone",render:function(e){var t=e.field;return u.a.createElement("div",{className:"address-form__item"},u.a.createElement("input",Object.assign({},t,{className:"address-form__ipt",type:"text",placeholder:"\u8054\u7cfb\u65b9\u5f0f"})),a.phone&&u.a.createElement("p",{className:"address-form__tip"},a.phone))}}),u.a.createElement(_.b,{name:"address",render:function(e){var t=e.field;return u.a.createElement("div",{className:"address-form__item"},u.a.createElement("input",Object.assign({},t,{className:"address-form__ipt",type:"text",placeholder:"\u6536\u8d27\u5730\u5740"})),a.address&&u.a.createElement("p",{className:"address-form__tip"},a.address))}}),u.a.createElement("button",{className:"address-form__submit","data-status":"do",type:"submit"},"\u63d0\u4ea4"))}}))}}]),a}(o.Component));a.a=f},731:function(e,a,t){},732:function(e,a,t){}}]);
//# sourceMappingURL=blessing-getPrize.cfb6a779.chunk.js.map
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -148,16 +148,21 @@ self.__precacheManifest = [
"url": "/mrstatic/js/39.78c9803f.chunk.js"
},
{
"revision": "371500df64c72258ead7",
"url": "/mrstatic/js/blessing-getPrize.cfb6a779.chunk.js"
"revision": "936816bae646c3891e43",
"url": "/mrstatic/js/blessing-getPrize.ae4e34e9.chunk.js"
},
{
"revision": "8a0450ea8c3fd361cd16",
"url": "/mrstatic/js/38.370e9886.chunk.js"
},
{
<<<<<<< HEAD:build/precache-manifest.f30beec100c7eb9ad7fe7a17778711ff.js
"revision": "af5f027beeb9a4c40f17",
"url": "/mrstatic/js/blessing-preheat.f010d335.chunk.js"
=======
"revision": "b64835e4dcaf2032bb82",
"url": "/mrstatic/js/blessing-preheat.a65422c6.chunk.js"
>>>>>>> 11-11-formal:build/precache-manifest.c222d40e07dac8272036fac74238b683.js
},
{
"revision": "09b88e54a9cc39411d90",
......@@ -216,8 +221,13 @@ self.__precacheManifest = [
"url": "/mrstatic/js/myorders.1749cfb1.chunk.js"
},
{
<<<<<<< HEAD:build/precache-manifest.f30beec100c7eb9ad7fe7a17778711ff.js
"revision": "251342d9d7d761f7464e",
"url": "/mrstatic/js/runtime~main.f41ecf8e.js"
=======
"revision": "15b24c64e4b32a4593b6",
"url": "/mrstatic/js/runtime~main.9680697f.js"
>>>>>>> 11-11-formal:build/precache-manifest.c222d40e07dac8272036fac74238b683.js
},
{
"revision": "8e12fcb571d471b1be86",
......@@ -288,7 +298,11 @@ self.__precacheManifest = [
"url": "/mrstatic/css/38.2833f269.chunk.css"
},
{
<<<<<<< HEAD:build/precache-manifest.f30beec100c7eb9ad7fe7a17778711ff.js
"revision": "af5f027beeb9a4c40f17",
=======
"revision": "b64835e4dcaf2032bb82",
>>>>>>> 11-11-formal:build/precache-manifest.c222d40e07dac8272036fac74238b683.js
"url": "/mrstatic/css/blessing-preheat.4d8e9342.chunk.css"
},
{
......@@ -296,8 +310,8 @@ self.__precacheManifest = [
"url": "/mrstatic/css/39.6b450e29.chunk.css"
},
{
"revision": "371500df64c72258ead7",
"url": "/mrstatic/css/blessing-getPrize.7451a8f4.chunk.css"
"revision": "936816bae646c3891e43",
"url": "/mrstatic/css/blessing-getPrize.57758140.chunk.css"
},
{
"revision": "ae9429ae3cfaa94181b2",
......@@ -380,7 +394,11 @@ self.__precacheManifest = [
"url": "/mrstatic/css/2.fd1b61f1.chunk.css"
},
{
<<<<<<< HEAD:build/precache-manifest.f30beec100c7eb9ad7fe7a17778711ff.js
"revision": "0fc7eea60d0d4e01b0e06e8cbf7f10b5",
=======
"revision": "18a6fbf2a9af497c5480150cacfce860",
>>>>>>> 11-11-formal:build/precache-manifest.c222d40e07dac8272036fac74238b683.js
"url": "/index.html"
}
];
\ No newline at end of file
......@@ -14,7 +14,11 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
importScripts(
<<<<<<< HEAD
"/precache-manifest.f30beec100c7eb9ad7fe7a17778711ff.js"
=======
"/precache-manifest.c222d40e07dac8272036fac74238b683.js"
>>>>>>> 11-11-formal
);
workbox.clientsClaim();
......
......@@ -19,7 +19,7 @@ class BlessingGetPrize extends Component {
date: '',
next_date: '',
name: '',
is_winning: 1, //是否中奖
is_winning: 0, //是否中奖
is_virtual: 1, // 实物奖品 虚拟奖品
prize_data: [],
address: false,
......@@ -88,6 +88,9 @@ class BlessingGetPrize extends Component {
}
</div>
</div>
{
prize_data && prize_data.length > 0 && <>
<div className='current_stage'>
{next_date}
</div>
......@@ -118,6 +121,16 @@ class BlessingGetPrize extends Component {
</div>
<div className='blessing__des'>积攒的福气值越高,中奖概率越大哦</div>
<a className='to__preheat' href='/invite'>积攒更多福气值</a>
</>
}
{
(!prize_data || prize_data.length === 0) && (
<div className="active_over_container">
<img src='https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/acitve__over.png' alt=''/>
<p>七月在线双十一抽奖活动已结束, 感谢你的参与!</p>
</div>
)
}
</div>
)
}
......
......@@ -192,6 +192,29 @@
color:rgba(255,255,255, .6);
text-align: center;
}
.active_over_container {
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: center;
margin-top: 70px;
img {
width: 170px;
height: 134px;
}
p {
width:238px;
height:39px;
font-size:16px;
font-weight:400;
color:rgba(255,255,255,1);
line-height:24px;
text-align: center;
text-align-last: center;
margin-top: 20px;
}
}
}
.address__prize {
......
......@@ -76,8 +76,6 @@ class FormalDraw extends Component {
}
draw = id => {
var _czc = _czc || []
_czc.push(["_trackEvent", '点击抽奖', 'm端双十一正式活动-点击抽奖'])
let {surplus, is_prize, hot_value} = this.state.userValue
if(hot_value<50){
Toast.info('你的福气值未达到参与抽奖所需福气值分数,快去积攒福气值吧', 2, null, false)
......@@ -91,6 +89,8 @@ class FormalDraw extends Component {
}).then(res => {
const {code, msg, data} = res.data
if (code == 200) {
var _czc = _czc || []
_czc.push(["_trackEvent", '点击抽奖', 'm端双十一正式活动-点击抽奖'])
QRCode.toDataURL(data.url, (err, url) => {
this.popupInstance = Popup({
title: '你已成功参与本时段抽奖',
......
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