Merge branch '00' into dev

src/components/activity/newyear-2019/landing/index.js

@@ -144,6 +144,7 @@ class Landing extends Component {
                    src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/PC/treasure-box.png"
                    alt=""
                    onClick={() => {
+                     this.joinSuccessPopup && this.joinSuccessPopup.remove()
                      history.push(`/year/yearTreasure?id=${id}`)
                    }}
             />

src/components/activity/newyear-2019/myTreasure/prize.js

@@ -82,6 +82,12 @@ export default (props) => {
         (!bind_phone && !bind_address && prize_type === 2) &&
         <a className="team-result">已发放至您的账户</a>
       }
+
+      {/* 第三：奖品，任意线上课程兑换券 */}
+      {
+        (!bind_phone && !bind_address && prize_type === 5) &&
+        <a className="team-result">文案待定</a>
+      }
     </>
   )
 }
\ No newline at end of file