From ace3289a450f707fdcffc7371b3588a4afe8cde1 Mon Sep 17 00:00:00 2001
From: hdx <handongxun@dcloud.io>
Date: Mon, 14 Nov 2022 17:32:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=AF=E4=BB=98=E5=AE=9D=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=20page-meta=20=E7=BB=84=E4=BB=B6=20root-font?=
 =?UTF-8?q?-size=20=E5=B1=9E=E6=80=A7=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=AE=9D=E5=86=85=E7=BD=AE=E7=9A=84page-meta?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/uni-cli-shared/components/navigation-bar.vue | 6 ++++++
 packages/uni-cli-shared/lib/pages.js                  | 6 +++++-
 packages/uni-template-compiler/lib/mp.js              | 3 ++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/uni-cli-shared/components/navigation-bar.vue b/packages/uni-cli-shared/components/navigation-bar.vue
index bce547cdb..48a7e4932 100644
--- a/packages/uni-cli-shared/components/navigation-bar.vue
+++ b/packages/uni-cli-shared/components/navigation-bar.vue
@@ -125,18 +125,24 @@ export default {
   methods: {
     setNavigationBarTitle () {
       uni.setNavigationBarTitle({
+        // #ifndef MP
         __page__: this.__$page,
+        // #endif
         title: this.title
       })
     },
     setNavigationBarLoading () {
       uni[(this.loading ? 'show' : 'hide') + 'NavigationBarLoading']({
+        // #ifndef MP
         __page__: this.__$page
+        // #endif
       })
     },
     setNavigationBarColor () {
       uni.setNavigationBarColor({
+        // #ifndef MP
         __page__: this.__$page,
+        // #endif
         frontColor: this.frontColor,
         backgroundColor: this.backgroundColor,
         animation: {
diff --git a/packages/uni-cli-shared/lib/pages.js b/packages/uni-cli-shared/lib/pages.js
index 0f70942ea..8ba2754e4 100644
--- a/packages/uni-cli-shared/lib/pages.js
+++ b/packages/uni-cli-shared/lib/pages.js
@@ -463,7 +463,10 @@ function initAutoImportComponents (easycom = {}) {
   }
   initBuiltInEasycom(BUILT_IN_EASYCOMS, usingAutoImportComponents)
   // 目前仅 mp-weixin 内置支持 page-meta 等组件
-  if (process.env.UNI_PLATFORM !== 'mp-weixin') {
+  if (process.env.UNI_PLATFORM === 'mp-weixin') {
+  } else if (process.env.UNI_PLATFORM === 'mp-alipay') {
+    initBuiltInEasycom(BUILT_IN_COMPONENTS_ALIPAY, usingAutoImportComponents)
+  } else {
     initBuiltInEasycom(BUILT_IN_COMPONENTS, usingAutoImportComponents)
   }
 
@@ -530,6 +533,7 @@ function parseUsingAutoImportComponents (usingAutoImportComponents) {
 }
 
 const BUILT_IN_COMPONENTS = ['page-meta', 'navigation-bar', 'uni-match-media']
+const BUILT_IN_COMPONENTS_ALIPAY = ['navigation-bar']
 
 const BUILT_IN_EASYCOMS = ['unicloud-db', 'uniad', 'ad-rewarded-video', 'ad-fullscreen-video', 'ad-interstitial',
   'ad-interactive'
diff --git a/packages/uni-template-compiler/lib/mp.js b/packages/uni-template-compiler/lib/mp.js
index f495a4b28..d7f1d691e 100644
--- a/packages/uni-template-compiler/lib/mp.js
+++ b/packages/uni-template-compiler/lib/mp.js
@@ -77,7 +77,8 @@ const tags = {
     'ix-native-grid',
     'ix-native-list',
     'mkt',
-    'page-container'
+    'page-container',
+    'page-meta'
   ]
 }
 
-- 
GitLab