Merge branch 'fix/bainian_backurl' into 'master'

fix: 活动页iframe兼容

See merge request !221

src/views/Consultant/index.vue

@@ -86,6 +86,7 @@ export default {
       const res = await getPayState({ consultantOrderNo: this.orderInfo[0].consultantOrderNo });
       if (res.state === 2) {
         setTimeout(() => {
+          this.setIsLoading(false);
           this.getPayState();
         }, 3000);
       } else {

src/views/Home/modules/Modal.vue

@@ -610,4 +610,12 @@ export default {
     }
   }
 }
+.activity-modal-detail {
+  height: 100%;
+  min-width: 100%;
+  *width: 100%;
+  width: 1px;
+  overflow: scroll;
+  -webkit-overflow-scrolling: touch;
+}
 </style>