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

src/components/activity/newyear-2019/common/prizes/index.js

@@ -114,7 +114,7 @@ class Prizes extends Component {
                         item.grant_max
                           ?
                           <div className='bottom-bar'>
-                            <div className="progress-bar"><span className={'progress'}/></div>
+                            <div className="progress-bar"><span className={'progress'} style={{width: `${(item.surplus / item.grant_max) * 100}%`}}/></div>
                             <span>限量{item.grant_max}份</span>
                           </div>
                           : <span className='no-limit'>不限量</span>

src/components/activity/newyear-2019/common/prizes/prizes.scss

@@ -178,7 +178,7 @@
                     position: absolute;
                     right: 0;
                     top: 0;
-                    width: 80%;
+                    //width: 80%;
                     height: 100%;
                     background: linear-gradient(-90deg, rgba(255, 140, 0, 1) 0%, rgba(255, 23, 0, 1) 100%);
                     border-radius: 1px;