From cc05b64dec84132d8952a6a157440e791b7e56ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=8E=AB=E5=94=90=E5=B0=BC?= <1431128779@qq.com>
Date: Wed, 26 Jun 2024 09:47:04 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E9=A1=B6=E9=83=A8=E5=A4=B4=E5=83=8F=E4=B8=BA=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?LOGO=E3=80=81=E8=B0=83=E6=95=B4=E5=90=AF=E5=8A=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E6=AF=8F?=
 =?UTF-8?q?=E6=AC=A1=E9=83=BD=E6=98=BE=E7=A4=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js            |  4 ++--
 pages/index/index.vue      | 25 ++++++++++++++++++-------
 pages/tabbar/home/home.vue | 16 ++++++++++++----
 pagesA/start/start.vue     |  2 +-
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/config/index.js b/config/index.js
index 4df37d1..fd78858 100644
--- a/config/index.js
+++ b/config/index.js
@@ -6,7 +6,7 @@ export const DefaultAppConfigs = {
 	loveConfig: {},
 	imagesConfig: {},
 	authorConfig: {},
-	startConfig: {},
+	appConfig: {},
 	pluginConfig: {},
 	adConfig: {},
 }
@@ -27,4 +27,4 @@ export const getAppConfigs = () => {
  */
 export const setAppConfigs = (configs) => {
 	uni.setStorageSync(_AppConfigKey, JSON.stringify(configs))
-}
\ No newline at end of file
+}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 469c3dc..c15914b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,6 +3,8 @@
 </template>
 
 <script>
+const homePagePath = '/pages/tabbar/home/home'
+const startPagePath = '/pagesA/start/start'
 export default {
     computed: {
         configs() {
@@ -11,33 +13,42 @@ export default {
     },
     onLoad() {
         uni.$tm.vx.actions('config/fetchConfigs').then((res) => {
-            console.log('正常：', res)
             // #ifdef MP-WEIXIN
             uni.$tm.vx.commit('setWxShare', res.shareConfig);
             // #endif
             this.fnCheckShowStarted();
         }).catch((err) => {
-            console.log('异常：', err)
             uni.switchTab({
-                url: '/pages/tabbar/home/home'
+                url: homePagePath
             });
         })
     },
     methods: {
         fnCheckShowStarted() {
-            if (!this.configs.startConfig.enabled) {
+            if (!this.configs.appConfig.startConfig.enabled) {
                 uni.switchTab({
-                    url: '/pages/tabbar/home/home'
+                    url: homePagePath
                 });
                 return;
             }
+
+            // 是否每次都显示启动页
+            if (this.configs.appConfig.startConfig.alwaysShow) {
+                uni.removeStorageSync('APP_HAS_STARTED')
+                uni.redirectTo({
+                    url: startPagePath
+                });
+                return;
+            }
+
+            // 只显示一次启动页
             if (uni.getStorageSync('APP_HAS_STARTED')) {
                 uni.switchTab({
-                    url: '/pages/tabbar/home/home'
+                    url: homePagePath
                 });
             } else {
                 uni.redirectTo({
-                    url: '/pagesA/start/start'
+                    url: startPagePath
                 });
             }
         }
diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue
index 6fe25dc..954085e 100644
--- a/pages/tabbar/home/home.vue
+++ b/pages/tabbar/home/home.vue
@@ -1,7 +1,9 @@
 <template>
     <view class="app-page">
         <tm-menubars iconColor="white" color="white" :flat="true" :showback="false">
-            <image slot="left" class="logo ml-24 round-24" :src="bloggerInfo.avatar" mode="scaleToFill"></image>
+            <view slot="left">
+                <image class="logo ml-24 round-24" :src="appInfo.logo" mode="scaleToFill"/>
+            </view>
             <view class="search-input round-12 pt-12 pb-12 flex pl-24" @click="fnToSearch">
                 <text class="search-input_icon iconfont text-size-m icon-search text-grey"></text>
                 <view class="search-input_text pl-12 text-size-m text-grey">搜索文章...</view>
@@ -118,14 +120,20 @@ export default {
             categoryList: [],
         };
     },
-
     computed: {
+        haloConfigs() {
+            return this.$tm.vx.getters().getConfigs;
+        },
         bloggerInfo() {
-            let blogger = this.$tm.vx.getters().getConfigs.authorConfig.blogger;
-            console.log('blogger----------------', blogger)
+            const blogger = this.$tm.vx.getters().getConfigs.authorConfig.blogger;
             blogger.avatar = this.$utils.checkAvatarUrl(blogger.avatar, true);
             return blogger;
         },
+        appInfo() {
+            const appInfo = this.haloConfigs.appConfig.appInfo;
+            appInfo.logo = this.$utils.checkImageUrl(appInfo.logo)
+            return appInfo;
+        }
     },
     onLoad() {
         this.fnSetPageTitle();
diff --git a/pagesA/start/start.vue b/pagesA/start/start.vue
index 286fe32..b4bf4a8 100644
--- a/pagesA/start/start.vue
+++ b/pagesA/start/start.vue
@@ -68,7 +68,7 @@ export default {
     },
     computed: {
         startConfig() {
-            return this.$tm.vx.getters().getConfigs.startConfig;
+            return this.$tm.vx.getters().getConfigs.appConfig.startConfig;
         },
         pageStyle() {
             if (this.startConfig.bg) {