Merge remote-tracking branch 'origin/master'

src/components/drawnoprizepop/drawnoprizepop.tsx

@@ -18,8 +18,8 @@ class Drawnoprizepop extends React.Component {
     return (
       <div className="drawnoprizepop modal_center">
         <span className="bg"></span>
-        <Button className="close" onClick={this.closePop}></Button>
-        <Button className="btn" onClick={this.closePop}></Button>
+        <Button className="close md30" onClick={this.closePop}></Button>
+        <Button className="btn md29" onClick={this.closePop}></Button>
       </div>
     );
   }

src/components/drawpop/drawpop.tsx

@@ -70,7 +70,7 @@ class Drawpop extends React.Component<{}, DrawpopState> {
           }}></SvgaPlayer>
         }
         <span className="title"></span>
-        <Button className={"drawbtn" + (this.state.remainDrawTimes > 0 ? " btnBreath" : "")} onClick={this.drawPrize}>
+        <Button className={"drawbtn md25" + (this.state.remainDrawTimes > 0 ? " btnBreath" : "")} onClick={this.drawPrize}>
           <span className="drawbg"></span>
           <span className="drawnum">剩余次数：{this.state.remainDrawTimes}</span>
         </Button>
@@ -86,7 +86,7 @@ class Drawpop extends React.Component<{}, DrawpopState> {
             })
           }
         </div>
-        <Button className="back" onClick={this.closePop}></Button>
+        <Button className="back md26" onClick={this.closePop}></Button>
       </div>
     );
   }

src/components/drawprizepop/drawprizepop.tsx

@@ -33,8 +33,8 @@ class Drawprizepop extends React.Component<DrawprizepopProps> {
         </span>
         <span className="prizename">{this.props.optionName}</span>
         <span className="tips">奖品可在首页 我的奖品 中查看</span>
-        <span className="close" onClick={this.closePop}></span>
-        <span className="btn" onClick={this.goPrize}></span>
+        <span className="close md28" onClick={this.closePop}></span>
+        <span className="btn md27" onClick={this.goPrize}></span>
       </div>
     );
   }

src/components/posterpop/posterpop.tsx

@@ -36,7 +36,7 @@ class Posterpop extends React.Component<{}, PosterpopState> {
   }
   render() {
     return (
-      <div className="posterpop modal_center">
+      <div className="posterpop modal_center md33">
         <div className='back' onClick={this.closePop}></div>
         <div className="poster" id='poster'>
           <span className="posteriimg"></span>

src/components/rankprizepop/rankprizepop.tsx

@@ -39,8 +39,8 @@ class Rankprizepop extends React.Component<RankprizepopProps> {
         <span className="name">{this.props.prizeName}</span>
         <span className="ranklab">最终排名为{this.props.rank}</span>
         <span className="tips">奖品可在首页 我的奖品 中查看</span>
-        <Button className="close" onClick={this.closePop}></Button>
-        <Button className="btn" onClick={this.goPrize}></Button>
+        <Button className="close md36" onClick={this.closePop}></Button>
+        <Button className="btn md35" onClick={this.goPrize}></Button>
       </div>
     );
   }

src/components/rulepop/rulepop.tsx

@@ -21,7 +21,7 @@ class Rulepop extends React.Component {
   render() {
     return (
       <div className="rulepop modal_center">
-        <span className="close" onClick={this.close}></span>
+        <span className="close md37" onClick={this.close}></span>
         <span className="bg"></span>
         <span className="ruletxt" dangerouslySetInnerHTML={{
           __html: store.ruleInfo,

src/pages/prizepage/prizepage.tsx

@@ -64,7 +64,7 @@ class Prizepage extends React.Component {
         {
           store.prizeList.length == 0 && <span className="empty"></span>
         }
-        <Button className="back" onClick={this.back}></Button>
+        <Button className="back md38" onClick={this.back}></Button>
       </div>
     );
   }

src/pages/rankpage/rankpage.tsx

@@ -161,7 +161,7 @@ class Rankpage extends React.Component<{}, RankpageState> {
           </span>
         </div>
         <span className="title"></span>
-        <Button className="back" onClick={this.back}></Button>
+        <Button className="back md34" onClick={this.back}></Button>
       </div>
     );
   }

src/panels/BackPanel/BackPanel.tsx

@@ -34,8 +34,8 @@ class BackPanel extends React.Component<IFailPanelProps> {
   render() {
     return <div className="BackPanel">
       <div className="bg"/>
-      <Button className="ok" onClick={this.clickOk}/>
-      <Button className="cancel" onClick={this.clickCancel}/>
+      <Button className="ok md32" onClick={this.clickOk}/>
+      <Button className="cancel md31" onClick={this.clickCancel}/>
     </div>;
   }
 }