Skip to content

M
mr-julyedu
Commit d3727a48 by wangshuo
Options

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

parents 0e08cb39 a78696c7
Showing with 49 additions and 54 deletions
build/asset-manifest.json
......@@ -38,8 +38,8 @@
"Orderinfo.js": "/mrstatic/js/Orderinfo.57e0641d.chunk.js",
"Orderinfo.js.map": "/mrstatic/js/Orderinfo.57e0641d.chunk.js.map",
"PayOrder.css": "/mrstatic/css/PayOrder.7eb7d317.chunk.css",
"PayOrder.js": "/mrstatic/js/PayOrder.da800e1a.chunk.js",
"PayOrder.js.map": "/mrstatic/js/PayOrder.da800e1a.chunk.js.map",
"PayOrder.js": "/mrstatic/js/PayOrder.21e0b5d0.chunk.js",
"PayOrder.js.map": "/mrstatic/js/PayOrder.21e0b5d0.chunk.js.map",
"Preferential.css": "/mrstatic/css/Preferential.0c91fa43.chunk.css",
"Preferential.js": "/mrstatic/js/Preferential.a868f51f.chunk.js",
"Preferential.js.map": "/mrstatic/js/Preferential.a868f51f.chunk.js.map",
......@@ -56,8 +56,8 @@
"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.7c7b79ec.chunk.js",
"blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.7c7b79ec.chunk.js.map",
"blessing-preheat.js": "/mrstatic/js/blessing-preheat.6dff43d3.chunk.js",
"blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.6dff43d3.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",
......@@ -74,19 +74,19 @@
"detail.js": "/mrstatic/js/detail.34640f52.chunk.js",
"detail.js.map": "/mrstatic/js/detail.34640f52.chunk.js.map",
"main.css": "/mrstatic/css/main.f9f26bcf.chunk.css",
"main.js": "/mrstatic/js/main.e50a2e09.chunk.js",
"main.js.map": "/mrstatic/js/main.e50a2e09.chunk.js.map",
"main.js": "/mrstatic/js/main.2b14c8b9.chunk.js",
"main.js.map": "/mrstatic/js/main.2b14c8b9.chunk.js.map",
"myorders.css": "/mrstatic/css/myorders.494a90ad.chunk.css",
"myorders.js": "/mrstatic/js/myorders.5cdbf8f6.chunk.js",
"myorders.js.map": "/mrstatic/js/myorders.5cdbf8f6.chunk.js.map",
"myorders.js": "/mrstatic/js/myorders.5b24e8bb.chunk.js",
"myorders.js.map": "/mrstatic/js/myorders.5b24e8bb.chunk.js.map",
"prize-winner-list.css": "/mrstatic/css/prize-winner-list.7ff5ff63.chunk.css",
"prize-winner-list.js": "/mrstatic/js/prize-winner-list.44109093.chunk.js",
"prize-winner-list.js.map": "/mrstatic/js/prize-winner-list.44109093.chunk.js.map",
"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.b262433f.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.b262433f.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.867a9d58.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.867a9d58.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",
......@@ -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.e12c4aa7f7a32ed7a01bb6564544cbe9.js": "/precache-manifest.e12c4aa7f7a32ed7a01bb6564544cbe9.js",
"precache-manifest.adc2d73282fb1dc223c86cdc4ce50684.js": "/precache-manifest.adc2d73282fb1dc223c86cdc4ce50684.js",
"service-worker.js": "/service-worker.js"
}
\ No newline at end of file
build/mrstatic/js/PayOrder.da800e1a.chunk.js → build/mrstatic/js/PayOrder.21e0b5d0.chunk.js
(window.webpackJsonp=window.webpackJsonp||[]).push([[14],{1213:function(e,a,t){"use strict";t.r(a),t.d(a,"default",function(){return P});t(155);var n=t(74),i=t.n(n),c=(t(90),t(26)),o=t.n(c),r=(t(154),t(35)),s=t.n(r),l=(t(41),t(12)),d=t.n(l),p=t(4),u=t(7),m=t(5),y=t(8),f=t(89),g=t(9),h=(t(639),t(640)),b=t.n(h),v=(t(118),t(47)),w=t.n(v),E=t(0),S=t.n(E),x=t(3),_=t(27),k=t(15),j=(t(916),w.a.Item.Brief,b.a.RadioItem),I=[];I=x.b.isWeixin?[{value:1,label:"\u5fae\u4fe1\u652f\u4ed8",icon:"iconweixinzhifu"}]:[{value:1,label:"\u5fae\u4fe1\u652f\u4ed8",icon:"iconweixinzhifu"},{value:0,label:"\u652f\u4ed8\u5b9d",icon:"iconalipay"}];var P=function(e){function a(e){var t;return Object(p.a)(this,a),(t=Object(m.a)(this,Object(y.a)(a).call(this,e))).redirectAfterPay=function(){var e=Object(x.c)("status"),a=Object(x.c)("type"),n=Object(x.c)("oid"),i=t.props.history;if(e||a)if(0===parseInt(e,10))if(2===parseInt(a,10))i.push("/togroup?id=".concat(n));else if(4===parseInt(a,10)){c&&window.localStorage.setItem("payCourse",c);var c=window.localStorage.getItem("payCourse");c&&i.push("/detail?id=".concat(c),{oid:n})}else i.push("/purchased");else d.a.info("\u652f\u4ed8\u5f02\u5e38",2)},t.onChange=function(e){t.setState({payType:e,checkPeriod:!1}),2===e&&t.setState({huabei:!0})},t.checkStaging=function(e){t.setState({huabei:!1,stageNumber:e.value,singleMoney:e.everyTotal,periodNumber:e.stage,checkPeriod:!0})},t.print=function(){for(var e=arguments.length,a=new Array(e),t=0;t<e;t++)a[t]=arguments[t];console.log(a)},t.pay=function(){var e=t.state,a=e.payType,n=e.orderId;0===a?t.alipayPay(n):1===a&&t.weixinPay(n)},t.weixinPay=function(e){Object(x.f)()?window.location.href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri="+encodeURIComponent(window.location.href+"&aa=bb").toLowerCase()+"&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect":x.d.get("".concat(API["base-api"],"/pay/wxpay/wap_charge/oid/").concat(e)).then(function(e){0===e.data.errno?window.location.href=e.data.data.url+"&redirect_url="+encodeURIComponent(window.location.href+"&weixinpay=1").toLowerCase():d.a.info(e.data.msg,2)})},t.isweixinPay=function(){var e=Object(f.a)(t),a=Object(x.c)("code");if(a){if(void 0===Object(x.c)("oid"))return;x.d.get("".concat(API["base-api"],"/pay/wxpay/pub_charge/oid/").concat(Object(x.c)("oid"),"/code/").concat(a)).then(function(a){if(0===a.data.errno){var t=function(){WeixinJSBridge.invoke("getBrandWCPayRequest",{appId:n.appId,timeStamp:n.timeStamp,nonceStr:n.nonceStr,package:n.package,signType:n.signType,paySign:n.paySign},function(a){"get_brand_wcpay_request:ok"==a.err_msg?(d.a.info("\u652f\u4ed8\u6210\u529f",2),e.intervalPayStatus=setInterval(function(){x.d.get("".concat(API["base-api"],"/m/orderState/oid/").concat(Object(x.c)("oid"))).then(function(a){401===a.data.errno&&(clearInterval(e.intervalPayStatus),e.intervalPayStatus=null,x.d.get("".concat(API["base-api"],"/m/app_order/detail/").concat(Object(x.c)("oid"))).then(function(a){2===Number(a.data.data.course_type)?e.props.history.replace("/togroup?id=".concat(Object(x.c)("oid"))):e.props.history.replace("/purchased")}))})},1e3)):alert("\u652f\u4ed8\u5931\u8d25")})},n=a.data.data;"undefined"==typeof WeixinJSBridge?document.addEventListener?document.addEventListener("WeixinJSBridgeReady",t,!1):document.attachEvent&&(document.attachEvent("WeixinJSBridgeReady",t),document.attachEvent("onWeixinJSBridgeReady",t)):t()}else d.a.info(a.data.msg,2)})}},t.payCallback=function(){var e=Object(f.a)(t);e.intervalPayStatus=setInterval(function(){x.d.get("".concat(API["base-api"],"/m/orderState/oid/").concat(Object(x.c)("oid"))).then(function(a){401===a.data.errno&&(clearInterval(e.intervalPayStatus),e.intervalPayStatus=null,x.d.get("".concat(API["base-api"],"/m/app_order/detail/").concat(Object(x.c)("oid"))).then(function(a){2===Number(a.data.data.course_type)?e.props.history.replace("/togroup?id=".concat(Object(x.c)("oid"))):e.props.history.replace("/purchased")}))})},1e3)},t.onBridgeReady1=function(e){var a=Object(f.a)(t);e=e||a.BridgeData,WeixinJSBridge.invoke("getBrandWCPayRequest",{appId:"wx23dac6775ac82877",timeStamp:e.timeStamp,nonceStr:e.nonceStr,package:e.package,signType:e.signType,paySign:e.paySign},function(e){"get_brand_wcpay_request:ok"==e.err_msg?(d.a.info("\u652f\u4ed8\u6210\u529f",2),a.payCallback()):alert("\u652f\u4ed8\u5931\u8d25")})},t.alipayPay=function(e){x.d.get("".concat(API["base-api"],"/pay/alipay/wap_charge_new/oid/").concat(e)).then(function(e){0===e.data.errno?(t.payCallback(),window.location=e.data.data.url):d.a.info(e.data.msg,2)})},t.huabeiPay=function(e){var a=t.state,n=(a.singleMoney,a.periodNumber);x.d.get("/pay/alipay/wap_charge/oid/".concat(e,"/plat/{plat} /hb_num/").concat(n)).then(function(e){0===e.data.errno?window.location=e.data.data.url:d.a.info(e.data.msg,2)})},t.state={pay_amount:0,payType:1,stageNumber:0,checkPeriod:!1,singleMoney:0,periodNumber:0,orderId:Object(x.c)("oid"),huabei:!1,fenqiList:[{value:"zhifubao",qishu:"3",lilv:"2.30%",everyMoney:300,feiyong:2.3},{value:"weixin",qishu:"6",lilv:"4.50%",everyMoney:150,feiyong:4.5},{value:"huabei",qishu:"9",lilv:"7.50%",everyMoney:100,feiyong:7.5}],categoryList:[]},t}return Object(g.a)(a,e),Object(u.a)(a,[{key:"componentDidMount",value:function(){var e=this;this.redirectAfterPay();var a={};a=this.props.location.state&&this.props.location.state.group?{order_id:this.state.orderId,type:2}:{order_id:this.state.orderId},x.d.post("".concat(API["base-api"],"/m/order/detail"),a).then(function(a){if(200===a.data.errno){var t=a.data.data,n=t.course,i=t.pay_amount,c=[];[1,2,3].map(function(e){var a={};a.value=e,1===e?(a.stage=3,a.moneyRate="2.30%",a.rate=.023,a.periodic=(i/3).toFixed(2)):2===e?(a.stage=6,a.moneyRate="4.50%",a.rate=.045,a.periodic=(i/6).toFixed(2)):(a.stage=12,a.moneyRate="7.50%",a.rate=.075,a.periodic=(i/9).toFixed(2)),a.serviceFee=(i*a.rate/a.stage).toFixed(2),a.everyTotal=(parseFloat(a.periodic)+parseFloat(a.serviceFee)).toFixed(2),c.push(a)}),e.setState({pay_amount:i,categoryList:n,fenqiList:c})}else d.a.info(a.data.msg,2)}),(1===Object(x.c)("is_class")||Object(x.c)("weixinpay"))&&this.payCallback(),Object(x.f)()&&(this.setState({payType:1}),this.isweixinPay())}},{key:"render",value:function(){var e=this,a=this.state,t=a.orderId,n=a.pay_amount,c=a.payType,r=a.checkPeriod,l=a.singleMoney,d=a.periodNumber,p=a.huabei,u=a.fenqiList,m=a.categoryList,y=a.stageNumber;return S.a.createElement("div",{className:"pay-order"},S.a.createElement(_.e,{title:"\u786e\u8ba4\u652f\u4ed8",arrow:!0}),S.a.createElement(s.a,{size:"sm"}),S.a.createElement("div",{className:"order-number"},S.a.createElement(i.a,null,S.a.createElement(o.a,{justify:"between",align:"center",style:{height:"44px"}},S.a.createElement("span",null,"\u8ba2\u5355\u53f7"),S.a.createElement("span",{className:"number"},t)))),S.a.createElement(s.a,{size:"md"}),m.map(function(a,t){var n=S.a.createElement("div",{className:"order-info"},S.a.createElement("p",{className:"order-title text-overflow-one"},S.a.createElement(k.b,{to:"/detail?id=".concat(a.course_id)},a.course_title)),S.a.createElement("p",{className:"order-content text-overflow-2"},a.simpledescription),S.a.createElement("p",{className:"order-des"},S.a.createElement("span",{className:"order-newprice"},"\xa5",a.price1),S.a.createElement("span",{className:"order-price"},"\xa5",a.price0)));return S.a.createElement(_.j,{handleClick:e.print,key:t,img:a.image_name,id:a.course_id,info:n})}),S.a.createElement(s.a,{size:"md"}),S.a.createElement("div",{className:"order-number"},S.a.createElement(i.a,null,S.a.createElement(o.a,{justify:"between",align:"center",style:{height:"44px"}},S.a.createElement("span",null,"\u652f\u4ed8\u91d1\u989d"),S.a.createElement("span",{className:"money"},"\uffe5".concat(n))))),S.a.createElement(s.a,{size:"md"}),S.a.createElement(w.a,{renderHeader:function(){return"\u652f\u4ed8\u65b9\u5f0f"},className:"pay-type-list"},I.map(function(a){return S.a.createElement(j,{thumb:S.a.createElement("i",{className:"iconfont ".concat(a.icon," ").concat(c===a.value?"checked":"")}),key:a.value,checked:c===a.value,onChange:function(){return e.onChange(a.value)}},2===a.value?S.a.createElement(o.a,{direction:"column",align:"start",style:{width:"100%",marginTop:"6px"}},S.a.createElement(o.a,{direction:"row",justify:"between",style:{width:"100%",paddingRight:"30px"}},S.a.createElement("span",{style:{color:"#555555",fontSize:"14px"}},a.label),r?S.a.createElement("span",{style:{color:"#333333",fontSize:"12px"}},"".concat(l,"\u5143 \xd7 ").concat(d,"\u671f")):null),S.a.createElement(o.a,{justify:"start"},S.a.createElement("span",{style:{color:"#999999",fontSize:"12px"}},"\u652f\u4ed8\u4e0a\u9650\u53d7\u9650\u4e8e\u60a8\u7684\u82b1\u5457\u989d\u5ea6"))):a.label)})),S.a.createElement("div",{className:"pay-tip"},"\u8bf7\u572815\u5206\u949f\u5185\u5b8c\u6210\u652f\u4ed8\uff0c\u5426\u5219\u5c4a\u65f6\u7cfb\u7edf\u5c06\u5173\u95ed\u8be5\u8ba2\u5355\u3002"),S.a.createElement("div",{className:"pay-button",onClick:this.pay},"\u786e\u8ba4\u652f\u4ed8"),p?S.a.createElement("div",{className:"check-staging"},S.a.createElement("div",{className:"container"},S.a.createElement("p",{className:"check-title"},"\u8bf7\u9009\u62e9\u5206\u671f"),u.map(function(a){return S.a.createElement(j,{key:a.value,checked:y===a.value,onChange:function(){return e.checkStaging(a)}},"".concat(a.everyTotal,"\u5143 \xd7 ").concat(a.stage,"\u671f"),S.a.createElement(w.a.Item.Brief,null,"\u624b\u7eed\u8d39".concat(a.serviceFee,"\u5143/\u671f\uff0c\u8d39\u7387").concat(a.moneyRate)))}))):null)}}]),a}(E.Component)},916:function(e,a,t){}}]);
//# sourceMappingURL=PayOrder.da800e1a.chunk.js.map
\ No newline at end of file
//# sourceMappingURL=PayOrder.21e0b5d0.chunk.js.map
\ No newline at end of file
build/mrstatic/js/blessing-preheat.6dff43d3.chunk.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/blessing-preheat.7c7b79ec.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/main.2b14c8b9.chunk.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/main.2b14c8b9.chunk.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/main.e50a2e09.chunk.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/main.e50a2e09.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/precache-manifest.e12c4aa7f7a32ed7a01bb6564544cbe9.js → build/precache-manifest.adc2d73282fb1dc223c86cdc4ce50684.js
......@@ -16,16 +16,16 @@ self.__precacheManifest = [
"url": "/mrstatic/js/2.f02a0573.chunk.js"
},
{
"revision": "6902434f8f18a23319d57d0ac8aaea8c",
"url": "/mrstatic/media/redb_sp_bj@2x.6902434f.png"
"revision": "c79abf5cb7ae8a82009cf68fe44d1078",
"url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
},
{
"revision": "f8b11e0088ed6e17f173",
"url": "/mrstatic/js/Activity.73c8f0a9.chunk.js"
},
{
"revision": "c79abf5cb7ae8a82009cf68fe44d1078",
"url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
"revision": "6902434f8f18a23319d57d0ac8aaea8c",
"url": "/mrstatic/media/redb_sp_bj@2x.6902434f.png"
},
{
"revision": "9a7afeee0f7f7550064e",
......@@ -100,8 +100,8 @@ self.__precacheManifest = [
"url": "/mrstatic/media/iconfont.7aa984ce.eot"
},
{
"revision": "ad77c0ffe9f4fe01787f",
"url": "/mrstatic/js/PayOrder.da800e1a.chunk.js"
"revision": "17e2d9973e72bb3206ae",
"url": "/mrstatic/js/PayOrder.21e0b5d0.chunk.js"
},
{
"revision": "e0655d4da66dce391e6b5227b400e037",
......@@ -148,8 +148,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/38.6484232f.chunk.js"
},
{
"revision": "ecaaaeb6203b603b4d03",
"url": "/mrstatic/js/blessing-preheat.7c7b79ec.chunk.js"
"revision": "dfdbc575880c062a3a79",
"url": "/mrstatic/js/blessing-preheat.6dff43d3.chunk.js"
},
{
"revision": "ce643559cbe26713d628",
......@@ -196,20 +196,20 @@ self.__precacheManifest = [
"url": "/mrstatic/js/shareposter.bc3debb9.chunk.js"
},
{
"revision": "74643f400c1c978a8c14",
"url": "/mrstatic/js/main.e50a2e09.chunk.js"
"revision": "2f35198047ffa9a2f863",
"url": "/mrstatic/js/main.2b14c8b9.chunk.js"
},
{
"revision": "137ceebdec9f801afd6c",
"url": "/mrstatic/js/search.589ab26a.chunk.js"
},
{
"revision": "70ccea8c2752e40f6481",
"url": "/mrstatic/js/myorders.5cdbf8f6.chunk.js"
"revision": "3d9dd8e8732c2b017b64",
"url": "/mrstatic/js/myorders.5b24e8bb.chunk.js"
},
{
"revision": "b83ecb0e6f73aeb6a3e5",
"url": "/mrstatic/js/runtime~main.b262433f.js"
"revision": "6230249f57b7cc4a91dc",
"url": "/mrstatic/js/runtime~main.867a9d58.js"
},
{
"revision": "480dec355e65b21ce336",
......@@ -256,11 +256,11 @@ self.__precacheManifest = [
"url": "/mrstatic/css/detail.c31f1b41.chunk.css"
},
{
"revision": "74643f400c1c978a8c14",
"revision": "2f35198047ffa9a2f863",
"url": "/mrstatic/css/main.f9f26bcf.chunk.css"
},
{
"revision": "70ccea8c2752e40f6481",
"revision": "3d9dd8e8732c2b017b64",
"url": "/mrstatic/css/myorders.494a90ad.chunk.css"
},
{
......@@ -288,7 +288,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/38.bff100af.chunk.css"
},
{
"revision": "ecaaaeb6203b603b4d03",
"revision": "dfdbc575880c062a3a79",
"url": "/mrstatic/css/blessing-preheat.3ea8b615.chunk.css"
},
{
......@@ -328,7 +328,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/Preferential.0c91fa43.chunk.css"
},
{
"revision": "ad77c0ffe9f4fe01787f",
"revision": "17e2d9973e72bb3206ae",
"url": "/mrstatic/css/PayOrder.7eb7d317.chunk.css"
},
{
......@@ -372,7 +372,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/2.bf839917.chunk.css"
},
{
"revision": "7d84d307ad21f40c05c977dca4a7ec3b",
"revision": "d55f7bf9048a9672b9d46014caa7f175",
"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.e12c4aa7f7a32ed7a01bb6564544cbe9.js"
"/precache-manifest.adc2d73282fb1dc223c86cdc4ce50684.js"
);
workbox.clientsClaim();
......
src/common/closable-popup/index.js
......@@ -14,9 +14,9 @@ class ClosablePopup extends Component {
close ? close() : this.setState({visible: false})
}
componentDidUpdate(prevProps) {
componentDidUpdate(prevProps, prevState) {
const {visible} = this.props
if (prevProps.visible !== visible) {
if (prevState.visible !== this.props.visible) {
this.setState({
visible
})
......
src/components/blessingPreheat/index.js
......@@ -34,7 +34,6 @@ class BlessingPreheat extends Component {
this.navTop = 183
this.prevY = 0
this.state = {
isLogin: false,
userInfoList: [],
isRule: false,
isCourse: false,
......@@ -104,16 +103,6 @@ class BlessingPreheat extends Component {
}
componentDidUpdate(prevProps, prevState){
let {user} = this.props
if (this.props.user.hasError !== this.state.userHasError) {
const uid = user && user.data && user.data.uid;
this.setState({
isLogin: !uid ? false : true,
userHasError: user.hasError
})
}
}
// 获取app登录数据
loginInfo = (result) => {
......@@ -205,7 +194,6 @@ class BlessingPreheat extends Component {
}
fetchUserBlessing() {
// 判断登录未登录 根据this.state.isLogin
Toast.info('fetchUserBlessing', 2)
const {userInfo} = this.state;
......@@ -253,7 +241,9 @@ class BlessingPreheat extends Component {
handleToShow = (key, isLogin = false) => {
// 需要用户登录 并且用户未登录
if (isLogin && !this.state.isLogin) {
const isLoginnew = !this.props.user.hasError
if (isLogin && isLoginnew) {
this.toLogin()
} else {
let obj = {}
......@@ -266,7 +256,7 @@ class BlessingPreheat extends Component {
// 邀请好友注册
handleToShowInvite = () => {
const {isLogin} = this.state;
const isLogin = !this.props.user.hasError
if (isLogin) {
if (!getParam('version')) {
QRCode.toDataURL(`${API.m}/invite`, {
......@@ -390,7 +380,6 @@ class BlessingPreheat extends Component {
const {
navs,
userInfo,
isLogin,
isRule,
isCourse,
inviteUrl,
......@@ -404,6 +393,7 @@ class BlessingPreheat extends Component {
index
} = this.state;
const {history} = this.props;
const isLogin = !this.props.user.hasError
return (
<div id={'blessing-preheat'}>
<Banner
......
src/components/blessingPreheat/live/index.js
......@@ -115,6 +115,7 @@ class Live extends Component {
tabBarInactiveTextColor={'#FFF604'}
tabBarUnderlineStyle={{display: 'none'}}
initialPage={today}
swipeable={false}
>
{
this.props.isFormal
......
src/components/blessingPreheat/luckDraw/index.js
......@@ -37,9 +37,9 @@ class LuckDraw extends Component {
const { tabs, prizes } = this.state;
return (
<div className="luck-draw__container">
<Tabs
<Tabs swipeable={false}
tabs={tabs}
tabBarBackgroundColor="transparent"
tabBarBackgroundColor="transparent"
tabBarUnderlineStyle={{
display: 'none'
}}
......
src/components/detail/index.scss
......@@ -60,6 +60,7 @@
font-size: 14px;
color: $color_666;
margin-top: 10px;
line-height: 16px;
}
.des {
......
src/components/expand/share.js
......@@ -164,8 +164,7 @@ class ExpandShare extends Component {
step: 2,
helpData: data
})
console.log(data)
this.getListorData()
} else if (errno === 17018 || errno === 17020) {
this.setState({
isShow: true,
......
src/components/expand/share.scss
......@@ -569,6 +569,7 @@
color: #fff;
font-size: 15px;
margin-top: 20px;
border: none;
}
}
......@@ -596,6 +597,7 @@
border-radius: 17px;
color: #fff;
font-size: 15px;
border: 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