Merge branch 'dev_lqs' into 'master'

修改

See merge request !67

H5/src/views/airDropPool.vue

@@ -55,7 +55,7 @@ export default {
     queryData() {
       const _this = this;
       queryAerialDelivery().then(res => {
-        console.log(res);
+        console.log('空投池', res);
         if (res.code === 0) {
           _this.total = res.data.total;
           _this.userPoolVos = res.data.userPoolVos;

H5/src/views/rewards/fastest-progress.vue

@@ -30,7 +30,6 @@
 </template>
 
 <script>
-import { navigateBack, showBottomBar } from "@/utils/bridgeToAppFun";
 import BaseRefreshScroll from "../../components/BaseRefreshScroll.vue";
 import RankItem from "./compoments/rankItem.vue";
 import { getProgressPrizes } from "@/api/progressPrizes";
@@ -49,7 +48,7 @@ export default {
   beforeRouteEnter(to, from, next) {
     console.log("路由前");
     try {
-      showBottomBar(false);
+      this.$bridgeToAppFun.showBottomBar(false);
     } catch {
       console.log("无法请求App");
       next();
@@ -58,7 +57,7 @@ export default {
   beforeRouteLeave(to, form, next) {
     console.log("离开");
     try {
-      showBottomBar(true);
+      this.$bridgeToAppFun.showBottomBar(true);
     } catch {
       console.log("未能和App交互");
       next();
@@ -70,7 +69,7 @@ export default {
   methods: {
     handlerBack() {
       try {
-        navigateBack();
+        this.$bridgeToAppFun.navigateBack();
       } catch {
         console.log("不能和App交互");
         this.$router.go(-1);