Merge branch 'dev_lqs' into 'master'

修改

See merge request !57

H5/src/App.vue

@@ -28,7 +28,7 @@ export default {
     // }
     // localStorage.setItem('user', JSON.stringify(user));
     console.log("和App开始交互");
-    showBottomBar(false);
+    // showBottomBar(false);
     getAuthToken()
       .then(res => {
         console.log("获取token成功", res);

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

@@ -30,7 +30,7 @@
 </template>
 
 <script>
-import { navigateBack } from "@/utils/bridgeToAppFun";
+import { navigateBack, showBottomBar } from "@/utils/bridgeToAppFun";
 import BaseRefreshScroll from "../../components/BaseRefreshScroll.vue";
 import RankItem from "./compoments/rankItem.vue";
 import { getProgressPrizes } from "@/api/progressPrizes";
@@ -52,6 +52,7 @@ export default {
   methods: {
     handlerBack() {
       navigateBack();
+      showBottomBar(true);
     },
     getProgressPrizes() {
       const _this = this;