From 97ecc2ffd5fba0940a297e0fd5fe632d02de614e Mon Sep 17 00:00:00 2001
From: Wen Fangping <front_wenfp@163.com>
Date: Mon, 14 Mar 2022 12:03:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8A=9F=E5=BE=B7=E7=AE=B1?=
 =?UTF-8?q?=E6=9C=AA=E6=98=BE=E7=A4=BA=E5=AE=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                     | 28 ++++++++++++++++++++--------
 src/pages/merit-box/index.vue   |  6 +++++-
 src/pages/temple-home/index.vue |  9 ++++++++-
 src/pages/temple-list/index.vue | 14 ++++++++------
 wap/index.html                  |  2 +-
 5 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 1da4333..47664c5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,8 +2,8 @@
     <div class="app-safe-area" :style="{minHeight: minHeight + 'px'}">
         <div id="app" :data-height="minHeight - tabHeight" :style="{ minHeight: minHeight - tabHeight + 'px', paddingBottom: tabHeight + 'px'}">
             <router-view />
-            <van-tabbar v-if="showTabbar" class="tabbar" ref="tabbar" route active-color="#CF9E3B" inactive-color="#999">
-                <van-tabbar-item replace name v-for="(tab, index) in tabbar" :key="index" :to="tab.path">
+            <van-tabbar v-if="showTabbar" class="tabbar" v-model="actionRoute" ref="tabbar" active-color="#CF9E3B" inactive-color="#999">
+                <van-tabbar-item replace name v-for="(tab, index) in tabbar" :key="index" @click="onNavigation(tab)">
                     <span>{{ tab.title }}</span>
                     <template #icon="props">
                         <img :src="props.active ? tab.active: tab.inactive" alt="">
@@ -25,6 +25,7 @@ export default {
             minHeight: 0,
             tabbar,
             tabHeight: 0,
+            // actionRoute: 0
         };
     },
     provide() {
@@ -56,22 +57,33 @@ export default {
         }
     },
     mounted(){
-        console.log('launch', this.$route.query)
         this.$store.commit('SET_LAUNCH', this.$route.query)
-
-        console.log( safeAreaInsets.bottom)
         setTimeout(() => {
-            console.log( safeAreaInsets.bottom)
             this.minHeight = window.innerHeight - safeAreaInsets.bottom;
         }, 30)
     },
+    methods: {
+        onNavigation(tab){
+            const { path } = this.$route;
+            if(path === tab.path) return;
+            this.$router.push({ path: tab.path, query: { temple_id: this.$route.query.temple_id}})
+        }
+    },
     computed: {
+        actionRoute: {
+            get(){
+                const { tabbar } = this;
+                return tabbar.map(tab => tab.name).indexOf(this.$route.name)
+            },
+            set(){ }
+        },
         showTabbar() {
             const path = tabbar.map(tab => tab.path);
-            const { name, query: { temple_id } } = this.$route;
+            const { name, query: { temple_id, hideTab } } = this.$route;
 
             // 等于寺庙功德箱时隐藏底部导航
-            if(name === 'merit-box' && temple_id !== '1'){
+            console.log(name,  temple_id !== '1')
+            if(name === 'merit-box' || (name === 'temple-list' && hideTab === '1')){
                 return false
             }
 
diff --git a/src/pages/merit-box/index.vue b/src/pages/merit-box/index.vue
index a251ed2..875e897 100644
--- a/src/pages/merit-box/index.vue
+++ b/src/pages/merit-box/index.vue
@@ -90,7 +90,11 @@ export default {
 	},
 	methods: {
         back(){
-            this.$router.push({ name: 'home', query: { temple_id: this.query.temple_id } })
+            if(this.query.fromPathName){
+                this.$router.replace({ name: this.query.fromPathName,query: { temple_id: this.query.temple_id } })
+                return;
+            }
+            this.$router.replace({ name: 'home', query: { temple_id: this.query.temple_id }});
         },
         openBox(){
             this.randVisible = true
diff --git a/src/pages/temple-home/index.vue b/src/pages/temple-home/index.vue
index 203c96c..f3f4a1a 100644
--- a/src/pages/temple-home/index.vue
+++ b/src/pages/temple-home/index.vue
@@ -124,6 +124,7 @@
             </p>
         </van-popup>
 
+<!--        功德箱-->
         <img src="@/assets/img/gongdexiang.png" class="gongdexiang" @click="openBox"/>
     </div>
 </template>
@@ -148,7 +149,7 @@ export default {
         openBox(){
             this.$router.push({
                 name: 'merit-box',
-                query: { temple_id : this.query.temple_id, open_box: 1 }
+                query: { temple_id : this.query.temple_id, open_box: 1, fromPathName: this.$route.name }
             })
         },
         locationTo(nav) {
@@ -197,6 +198,12 @@ export default {
             }
         },
         onPushForRouteName(routeName){
+            if(routeName === 'merit-box'){
+                return this.openBox();
+            }
+            if(routeName === 'temple-list'){
+                return this.$router.push({ name: routeName, query: { hideTab: '1'}})
+            }
             this.$router.push({ name: routeName })
         },
         async getUserData(){
diff --git a/src/pages/temple-list/index.vue b/src/pages/temple-list/index.vue
index b489e60..6ccbcbb 100644
--- a/src/pages/temple-list/index.vue
+++ b/src/pages/temple-list/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="temple-list" :style="{height: root.minHeight - root.tabHeight + 'px'}">
+    <div class="temple-list" :style="{height: root.minHeight + 'px'}">
         <div class="topbar" ref="topbar">
             <van-nav-bar left-arrow :title="$route.meta.title" v-if="$route.meta.showNavBar" @click-left="$router.back()" :style="{backgroundColor: $route.meta.navBarBackgroundColor}" />
             <van-search v-model="keyword" show-action action-text="搜索" placeholder="请输入寺院、方丈、监院名称" @search="onSearch" @cancel="onCancel">
@@ -73,11 +73,13 @@ export default {
         }
     },
     mounted(){
-        console.log(this.parentHeight)
-        this.$nextTick(() => {
-            console.log(this.$refs.topbar.offsetHeight)
-            this.containerHeight = this.parentHeight - this.$refs.topbar.offsetHeight - 100;
-        })
+        setTimeout(() => {
+            if(this.query.hideTab === '1'){
+                this.containerHeight = this.root.minHeight - this.$refs.topbar.offsetHeight;
+            } else {
+                this.containerHeight = this.root.minHeight - this.$refs.topbar.offsetHeight - 100;
+            }
+        }, 50)
 
         if(this.query.search){
             this.keyword = this.query.search;
diff --git a/wap/index.html b/wap/index.html
index 9327c29..98903e1 100644
--- a/wap/index.html
+++ b/wap/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="" manifest="IGNORE.manifest"><head><meta charset="utf-8"><meta http-equiv="Pragma" content="no-cache"><meta http-equiv="Cache" content="no-cache"><meta http-equiv="Cache-control" content="no-cache,must-revalidate"><meta http-equiv="cache-control" content="max-age=0"><meta http-equiv="cache-control" content="no-cache"><meta http-equiv="expires" content="0"><meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT"><meta name="referrer" content="never"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"><script src="https://res2.wx.qq.com/open/js/jweixin-1.6.0.js"></script><link rel="icon" href="/wap/favicon.ico"><title></title><link href="/wap/css/chunk-06989813.11a08ec7.css" rel="prefetch"><link href="/wap/css/chunk-0c2fb5ff.06c9d006.css" rel="prefetch"><link href="/wap/css/chunk-0fc99fae.fe91d988.css" rel="prefetch"><link href="/wap/css/chunk-12af3aac.9bd8c9fd.css" rel="prefetch"><link href="/wap/css/chunk-149b8711.af81736f.css" rel="prefetch"><link href="/wap/css/chunk-1582e689.bf578cd7.css" rel="prefetch"><link href="/wap/css/chunk-1ee67cda.66128e1b.css" rel="prefetch"><link href="/wap/css/chunk-33624dbc.593a2807.css" rel="prefetch"><link href="/wap/css/chunk-355d1160.8d4cfd1c.css" rel="prefetch"><link href="/wap/css/chunk-37c4f528.24fb5406.css" rel="prefetch"><link href="/wap/css/chunk-54116e46.1f056a1e.css" rel="prefetch"><link href="/wap/css/chunk-56baad82.09d4c509.css" rel="prefetch"><link href="/wap/css/chunk-5b54acba.8c0d8dd3.css" rel="prefetch"><link href="/wap/css/chunk-5fa963a1.21386f22.css" rel="prefetch"><link href="/wap/css/chunk-605a7b47.299c97b2.css" rel="prefetch"><link href="/wap/css/chunk-659d3025.a841f655.css" rel="prefetch"><link href="/wap/css/chunk-680bff6b.01366e41.css" rel="prefetch"><link href="/wap/css/chunk-6812afb4.608e618d.css" rel="prefetch"><link href="/wap/css/chunk-68aed67e.5e008df0.css" rel="prefetch"><link href="/wap/css/chunk-72193536.252a5106.css" rel="prefetch"><link href="/wap/css/chunk-72ac2317.eed886f8.css" rel="prefetch"><link href="/wap/css/chunk-7754aff9.0c5a593c.css" rel="prefetch"><link href="/wap/css/chunk-784c5176.9040e0cc.css" rel="prefetch"><link href="/wap/css/chunk-7bc42cc8.071327ae.css" rel="prefetch"><link href="/wap/css/chunk-b19dfaea.df6dc1f1.css" rel="prefetch"><link href="/wap/css/chunk-b775401a.32e6b154.css" rel="prefetch"><link href="/wap/css/chunk-becd0956.d458deaa.css" rel="prefetch"><link href="/wap/css/chunk-d228c670.0893d4d5.css" rel="prefetch"><link href="/wap/css/chunk-d3d22b26.6a63377f.css" rel="prefetch"><link href="/wap/css/chunk-de2b197c.f58bf23a.css" rel="prefetch"><link href="/wap/css/chunk-f3521632.5aaa535a.css" rel="prefetch"><link href="/wap/css/chunk-f35d22b6.fad02444.css" rel="prefetch"><link href="/wap/css/chunk-f5214612.7322f29c.css" rel="prefetch"><link href="/wap/js/chunk-06989813.a6d0c67d.js" rel="prefetch"><link href="/wap/js/chunk-0c2fb5ff.4d20ef58.js" rel="prefetch"><link href="/wap/js/chunk-0fc99fae.1cf8a344.js" rel="prefetch"><link href="/wap/js/chunk-12af3aac.658a693a.js" rel="prefetch"><link href="/wap/js/chunk-149b8711.e109e1f2.js" rel="prefetch"><link href="/wap/js/chunk-1582e689.2be1e931.js" rel="prefetch"><link href="/wap/js/chunk-1ee67cda.dcebccc2.js" rel="prefetch"><link href="/wap/js/chunk-2d229265.282fee6c.js" rel="prefetch"><link href="/wap/js/chunk-33624dbc.9235a7e8.js" rel="prefetch"><link href="/wap/js/chunk-355d1160.f0f64ee6.js" rel="prefetch"><link href="/wap/js/chunk-37c4f528.35b8604e.js" rel="prefetch"><link href="/wap/js/chunk-3d7f52ef.f769c2d5.js" rel="prefetch"><link href="/wap/js/chunk-54116e46.773e278b.js" rel="prefetch"><link href="/wap/js/chunk-56baad82.88b86ae2.js" rel="prefetch"><link href="/wap/js/chunk-5b54acba.5142d9f5.js" rel="prefetch"><link href="/wap/js/chunk-5fa963a1.92763f29.js" rel="prefetch"><link href="/wap/js/chunk-605a7b47.c45d34d7.js" rel="prefetch"><link href="/wap/js/chunk-659d3025.08a51bd9.js" rel="prefetch"><link href="/wap/js/chunk-680bff6b.8edd26c1.js" rel="prefetch"><link href="/wap/js/chunk-6812afb4.b4450d09.js" rel="prefetch"><link href="/wap/js/chunk-68aed67e.8bbd0055.js" rel="prefetch"><link href="/wap/js/chunk-72193536.331ddfa2.js" rel="prefetch"><link href="/wap/js/chunk-72ac2317.002a9d9d.js" rel="prefetch"><link href="/wap/js/chunk-7754aff9.cfaad158.js" rel="prefetch"><link href="/wap/js/chunk-784c5176.ac90be76.js" rel="prefetch"><link href="/wap/js/chunk-7bc42cc8.3a7521bc.js" rel="prefetch"><link href="/wap/js/chunk-b19dfaea.10dd3ba9.js" rel="prefetch"><link href="/wap/js/chunk-b775401a.7d3d1612.js" rel="prefetch"><link href="/wap/js/chunk-becd0956.4934a97b.js" rel="prefetch"><link href="/wap/js/chunk-d228c670.4a0e4f21.js" rel="prefetch"><link href="/wap/js/chunk-d3d22b26.9e96c817.js" rel="prefetch"><link href="/wap/js/chunk-de2b197c.b04bff32.js" rel="prefetch"><link href="/wap/js/chunk-f3521632.79e4fe5c.js" rel="prefetch"><link href="/wap/js/chunk-f35d22b6.2c320492.js" rel="prefetch"><link href="/wap/js/chunk-f5214612.db1a7d9d.js" rel="prefetch"><link href="/wap/css/app.4afad500.css" rel="preload" as="style"><link href="/wap/css/chunk-vendors.acea0471.css" rel="preload" as="style"><link href="/wap/js/app.e4926a57.js" rel="preload" as="script"><link href="/wap/js/chunk-vendors.20541610.js" rel="preload" as="script"><link href="/wap/css/chunk-vendors.acea0471.css" rel="stylesheet"><link href="/wap/css/app.4afad500.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but 自在福田 - 寺庙联盟 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/wap/js/chunk-vendors.20541610.js"></script><script src="/wap/js/app.e4926a57.js"></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="" manifest="IGNORE.manifest"><head><meta charset="utf-8"><meta http-equiv="Pragma" content="no-cache"><meta http-equiv="Cache" content="no-cache"><meta http-equiv="Cache-control" content="no-cache,must-revalidate"><meta http-equiv="cache-control" content="max-age=0"><meta http-equiv="cache-control" content="no-cache"><meta http-equiv="expires" content="0"><meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT"><meta name="referrer" content="never"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"><script src="https://res2.wx.qq.com/open/js/jweixin-1.6.0.js"></script><link rel="icon" href="/wap/favicon.ico"><title></title><link href="/wap/css/chunk-06989813.11a08ec7.css" rel="prefetch"><link href="/wap/css/chunk-0c2fb5ff.801176d5.css" rel="prefetch"><link href="/wap/css/chunk-0fc99fae.fe91d988.css" rel="prefetch"><link href="/wap/css/chunk-12af3aac.9bd8c9fd.css" rel="prefetch"><link href="/wap/css/chunk-149b8711.af81736f.css" rel="prefetch"><link href="/wap/css/chunk-1582e689.bf578cd7.css" rel="prefetch"><link href="/wap/css/chunk-1ee67cda.66128e1b.css" rel="prefetch"><link href="/wap/css/chunk-33624dbc.593a2807.css" rel="prefetch"><link href="/wap/css/chunk-355d1160.8d4cfd1c.css" rel="prefetch"><link href="/wap/css/chunk-37c4f528.24fb5406.css" rel="prefetch"><link href="/wap/css/chunk-54116e46.1f056a1e.css" rel="prefetch"><link href="/wap/css/chunk-56baad82.09d4c509.css" rel="prefetch"><link href="/wap/css/chunk-5b54acba.8c0d8dd3.css" rel="prefetch"><link href="/wap/css/chunk-5fa963a1.21386f22.css" rel="prefetch"><link href="/wap/css/chunk-605a7b47.299c97b2.css" rel="prefetch"><link href="/wap/css/chunk-659d3025.a841f655.css" rel="prefetch"><link href="/wap/css/chunk-680bff6b.01366e41.css" rel="prefetch"><link href="/wap/css/chunk-6812afb4.608e618d.css" rel="prefetch"><link href="/wap/css/chunk-68aed67e.5e008df0.css" rel="prefetch"><link href="/wap/css/chunk-72193536.252a5106.css" rel="prefetch"><link href="/wap/css/chunk-72ac2317.eed886f8.css" rel="prefetch"><link href="/wap/css/chunk-7754aff9.0c5a593c.css" rel="prefetch"><link href="/wap/css/chunk-784c5176.9040e0cc.css" rel="prefetch"><link href="/wap/css/chunk-7bc42cc8.071327ae.css" rel="prefetch"><link href="/wap/css/chunk-b19dfaea.df6dc1f1.css" rel="prefetch"><link href="/wap/css/chunk-b775401a.32e6b154.css" rel="prefetch"><link href="/wap/css/chunk-becd0956.d458deaa.css" rel="prefetch"><link href="/wap/css/chunk-d228c670.0893d4d5.css" rel="prefetch"><link href="/wap/css/chunk-d3d22b26.6a63377f.css" rel="prefetch"><link href="/wap/css/chunk-de2b197c.f58bf23a.css" rel="prefetch"><link href="/wap/css/chunk-f3521632.5aaa535a.css" rel="prefetch"><link href="/wap/css/chunk-f35d22b6.fad02444.css" rel="prefetch"><link href="/wap/css/chunk-f5214612.7322f29c.css" rel="prefetch"><link href="/wap/js/chunk-06989813.5d8b64e0.js" rel="prefetch"><link href="/wap/js/chunk-0c2fb5ff.709f793c.js" rel="prefetch"><link href="/wap/js/chunk-0fc99fae.1cf8a344.js" rel="prefetch"><link href="/wap/js/chunk-12af3aac.658a693a.js" rel="prefetch"><link href="/wap/js/chunk-149b8711.e109e1f2.js" rel="prefetch"><link href="/wap/js/chunk-1582e689.2be1e931.js" rel="prefetch"><link href="/wap/js/chunk-1ee67cda.dcebccc2.js" rel="prefetch"><link href="/wap/js/chunk-2d229265.282fee6c.js" rel="prefetch"><link href="/wap/js/chunk-33624dbc.9235a7e8.js" rel="prefetch"><link href="/wap/js/chunk-355d1160.f0f64ee6.js" rel="prefetch"><link href="/wap/js/chunk-37c4f528.35b8604e.js" rel="prefetch"><link href="/wap/js/chunk-3d7f52ef.f769c2d5.js" rel="prefetch"><link href="/wap/js/chunk-54116e46.773e278b.js" rel="prefetch"><link href="/wap/js/chunk-56baad82.88b86ae2.js" rel="prefetch"><link href="/wap/js/chunk-5b54acba.5142d9f5.js" rel="prefetch"><link href="/wap/js/chunk-5fa963a1.92763f29.js" rel="prefetch"><link href="/wap/js/chunk-605a7b47.c45d34d7.js" rel="prefetch"><link href="/wap/js/chunk-659d3025.08a51bd9.js" rel="prefetch"><link href="/wap/js/chunk-680bff6b.8edd26c1.js" rel="prefetch"><link href="/wap/js/chunk-6812afb4.b4450d09.js" rel="prefetch"><link href="/wap/js/chunk-68aed67e.8bbd0055.js" rel="prefetch"><link href="/wap/js/chunk-72193536.331ddfa2.js" rel="prefetch"><link href="/wap/js/chunk-72ac2317.002a9d9d.js" rel="prefetch"><link href="/wap/js/chunk-7754aff9.cfaad158.js" rel="prefetch"><link href="/wap/js/chunk-784c5176.ac90be76.js" rel="prefetch"><link href="/wap/js/chunk-7bc42cc8.3a7521bc.js" rel="prefetch"><link href="/wap/js/chunk-b19dfaea.10dd3ba9.js" rel="prefetch"><link href="/wap/js/chunk-b775401a.7d3d1612.js" rel="prefetch"><link href="/wap/js/chunk-becd0956.4934a97b.js" rel="prefetch"><link href="/wap/js/chunk-d228c670.4a0e4f21.js" rel="prefetch"><link href="/wap/js/chunk-d3d22b26.9e96c817.js" rel="prefetch"><link href="/wap/js/chunk-de2b197c.b04bff32.js" rel="prefetch"><link href="/wap/js/chunk-f3521632.79e4fe5c.js" rel="prefetch"><link href="/wap/js/chunk-f35d22b6.2c320492.js" rel="prefetch"><link href="/wap/js/chunk-f5214612.db1a7d9d.js" rel="prefetch"><link href="/wap/css/app.6a66ba47.css" rel="preload" as="style"><link href="/wap/css/chunk-vendors.acea0471.css" rel="preload" as="style"><link href="/wap/js/app.56cc96df.js" rel="preload" as="script"><link href="/wap/js/chunk-vendors.20541610.js" rel="preload" as="script"><link href="/wap/css/chunk-vendors.acea0471.css" rel="stylesheet"><link href="/wap/css/app.6a66ba47.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but 自在福田 - 寺庙联盟 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/wap/js/chunk-vendors.20541610.js"></script><script src="/wap/js/app.56cc96df.js"></script></body></html>
\ No newline at end of file