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

src/components/activity/treasure-box/landing/index.js

@@ -160,7 +160,9 @@ class Landing extends Component {
 
 
         } else {
-          Toast.info(msg, 2, null, false)
+          if (code !== 520) {
+            Toast.info(msg, 2, null, false)
+          }
         }
       })
   }
@@ -352,9 +354,9 @@ class Landing extends Component {
         const {data} = res.data
         return data.url
       }).then(text => {
-        //todo 更换正式二维码
+      //todo 更换正式二维码
       // QRCode.toDataURL('aaa')
-        QRCode.toDataURL(text)
+      QRCode.toDataURL(text)
         .then(url => {
           Popup({
             title: '提醒服务',

src/components/activity/treasure-box/landing/landing.scss

@@ -183,7 +183,7 @@
             width: 320px;
             height: 44px;
             line-height: 44px;
-            margin: 14.5px auto 57px;
+            margin: 14.5px auto 14px;
             color: #0B7B45;
             font-size: 15px;
             background: #FFE300;
@@ -195,7 +195,6 @@
         }
 
         .certainly-prompt {
-            margin-top: 27px;
             padding-bottom: 16px;
             font-size: 14px;
             color: #FFE300;