From f6a8721238aaecf9960990ab77f1d8980d6fa8b6 Mon Sep 17 00:00:00 2001
From: yunlongn <yunlongn@outlook.com>
Date: Thu, 27 Nov 2025 10:45:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                 |  4 ++-
 pages.json                                    | 10 +++++-
 .../goods/components/detail/detail-navbar.vue |  5 ++-
 pages/goods/components/list/list-navbar.vue   |  5 ++-
 .../components/s-auth-modal/s-auth-modal.vue  | 34 +++++++++----------
 sheep/components/s-layout/s-layout.vue        |  7 ++--
 sheep/components/s-menu-grid/s-menu-grid.vue  |  4 +--
 sheep/components/s-tabbar/s-tabbar.vue        |  2 +-
 sheep/platform/index.js                       |  7 ++++
 sheep/ui/su-fixed/su-fixed.vue                |  2 +-
 sheep/ui/su-inner-navbar/su-inner-navbar.vue  |  8 +++--
 sheep/ui/su-tabbar-item/su-tabbar-item.vue    |  2 +-
 12 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/manifest.json b/manifest.json
index 5f119db7..ecda35f5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -185,7 +185,9 @@
     "requiredPrivateInfos": ["chooseAddress"]
   },
   "mp-alipay": {
-    "usingComponents": true
+    "usingComponents": true,
+    "styleIsolation": "shared",
+    "mergeVirtualHostAttributes": true
   },
   "mp-baidu": {
     "usingComponents": true
diff --git a/pages.json b/pages.json
index e75ba5a6..36a4a00f 100644
--- a/pages.json
+++ b/pages.json
@@ -675,7 +675,15 @@
 		"navigationBarTitleText": "芋道商城",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#FFFFFF",
-		"navigationStyle": "custom"
+		"navigationStyle": "custom",
+    "mp-alipay": {
+      "titleImage": "",
+      "gestureBack": "YES",
+      "allowsBounceVertical": "NO",
+      "transparentTitle": "always",
+      "navigationStyle": "custom",
+      "titlePenetrate": "YES"
+    }
 	},
 	"tabBar": {
 		"list": [{
diff --git a/pages/goods/components/detail/detail-navbar.vue b/pages/goods/components/detail/detail-navbar.vue
index d454ec0f..b414ba77 100644
--- a/pages/goods/components/detail/detail-navbar.vue
+++ b/pages/goods/components/detail/detail-navbar.vue
@@ -3,7 +3,10 @@
   <su-fixed alway :bgStyles="{ background: '#fff' }" :val="0" noNav opacity :placeholder="false">
     <su-status-bar />
     <view
-      class="ui-bar ss-flex ss-col-center ss-row-between ss-p-x-20"
+      class="ui-bar ss-flex ss-col-center ss-row-between"
+      :class="[{
+           'ss-p-x-20': sheep.$platform.provider !== 'alipay'
+      }]"
       :style="[{ height: sys_navBar - sys_statusBar + 'px' }]"
     >
       <!-- 左 -->
diff --git a/pages/goods/components/list/list-navbar.vue b/pages/goods/components/list/list-navbar.vue
index c21e6793..626b7e2e 100644
--- a/pages/goods/components/list/list-navbar.vue
+++ b/pages/goods/components/list/list-navbar.vue
@@ -11,7 +11,10 @@
   >
     <su-status-bar />
     <view
-      class="ui-bar ss-flex ss-col-center ss-row-between ss-p-x-20"
+      class="ui-bar ss-flex ss-col-center ss-row-between"
+      :class="[{
+           'ss-p-x-20': sheep.$platform.provider !== 'alipay'
+      }]"
       :style="[{ height: sys_navBar - sys_statusBar + 'px' }]"
     >
       <!-- 左 -->
diff --git a/sheep/components/s-auth-modal/s-auth-modal.vue b/sheep/components/s-auth-modal/s-auth-modal.vue
index d1b73787..ee74f323 100644
--- a/sheep/components/s-auth-modal/s-auth-modal.vue
+++ b/sheep/components/s-auth-modal/s-auth-modal.vue
@@ -46,18 +46,6 @@
           <view class="circle" />
         </view>
 
-        <!-- 7.3 支付宝小程序登录 -->
-        <button
-          v-if="sheep.$platform.name === 'alipayMiniProgram'"
-          @tap="thirdLogin('alipay')"
-          class="ss-reset-button auto-login-btn"
-        >
-          <image
-            class="auto-login-img"
-            :src="sheep.$url.static('/static/img/shop/platform/alipay.png')"
-          />
-        </button>
-
         <!-- 7.2 微信的公众号、App、小程序的登录，基于 openid + code -->
         <button
           v-if="
@@ -84,6 +72,18 @@
             :src="sheep.$url.static('/static/img/shop/platform/apple.png')"
           />
         </button>
+
+        <!-- 7.4 支付宝小程序登录 -->
+        <button
+          v-if="sheep.$platform.name === 'alipayMiniProgram'"
+          @tap="thirdLogin('alipay')"
+          class="ss-reset-button auto-login-btn"
+        >
+          <image
+            class="auto-login-img"
+            :src="sheep.$url.static('/static/img/shop/pay/alipay.png')"
+          />
+        </button>
       </view>
 
       <!-- 用户协议的勾选 -->
@@ -97,7 +97,7 @@
         <view class="agreement-options-container">
           <!-- 同意选项 -->
           <view class="agreement-option ss-m-b-20">
-            <label class="radio ss-flex ss-col-center" @tap="onAgree">
+            <view class="radio ss-flex ss-col-center" @tap="onAgree">
               <radio
                 :checked="state.protocol === true"
                 color="var(--ui-BG-Main)"
@@ -110,12 +110,12 @@
                 <view class="agreement-text">与</view>
                 <view class="tcp-text" @tap.stop="onProtocol('隐私协议')"> 《隐私协议》 </view>
               </view>
-            </label>
+            </view>
           </view>
           
           <!-- 拒绝选项 -->
           <view class="agreement-option">
-            <label class="radio ss-flex ss-col-center" @tap="onRefuse">
+            <view class="radio ss-flex ss-col-center" @tap="onRefuse">
               <radio
                 :checked="state.protocol === false"
                 color="#ff4d4f"
@@ -128,7 +128,7 @@
                 <view class="agreement-text">与</view>
                 <view class="tcp-text" @tap.stop="onProtocol('隐私协议')"> 《隐私协议》 </view>
               </view>
-            </label>
+            </view>
           </view>
         </view>
       </view>
@@ -197,7 +197,7 @@
       } else {
         sheep.$helper.toast('请选择是否同意协议');
       }
-      // return;
+      return;
     }
     const loginRes = await sheep.$platform.useProvider(provider).login();
     if (loginRes) {
diff --git a/sheep/components/s-layout/s-layout.vue b/sheep/components/s-layout/s-layout.vue
index e76f675e..78e46569 100644
--- a/sheep/components/s-layout/s-layout.vue
+++ b/sheep/components/s-layout/s-layout.vue
@@ -17,13 +17,11 @@
       />
 
       <!-- 顶部导航栏-情况2：装修组件导航栏-标准 -->
-      <!--#ifndef MP-ALIPAY-->
       <s-custom-navbar
         v-else-if="navbar === 'custom' && navbarMode === 'normal'"
         :data="navbarStyle"
         :showLeftButton="showLeftButton"
       />
-      <!--#endif-->
       <view class="page-body" :style="[bgBody]">
         <!-- 顶部导航栏-情况3：沉浸式头部 -->
         <su-inner-navbar v-if="navbar === 'inner'" :title="title" />
@@ -216,6 +214,11 @@
 
   // 组件中使用 onMounted 监听页面加载，不是页面组件不使用 onShow
   onMounted(()=>{
+    // #ifdef MP-ALIPAY
+    uni.setNavigationBarTitle({
+      title: "",
+    });
+    // #endif
     if (!isEmpty(shareInfo.value)) {
       sheep.$platform.share.updateShareInfo(shareInfo.value);
     }
diff --git a/sheep/components/s-menu-grid/s-menu-grid.vue b/sheep/components/s-menu-grid/s-menu-grid.vue
index d05a49d4..8edf6a38 100644
--- a/sheep/components/s-menu-grid/s-menu-grid.vue
+++ b/sheep/components/s-menu-grid/s-menu-grid.vue
@@ -2,8 +2,8 @@
 <template>
 	<view :style="[bgStyle, { marginLeft: `${data.space}px` }]">
 		<uni-grid :showBorder="Boolean(data.border)" :column="data.column">
-			<uni-grid-item v-for="(item, index) in data.list" :key="index" @tap="sheep.$router.go(item.url)">
-				<view class="grid-item-box ss-flex ss-flex-col ss-row-center ss-col-center">
+			<uni-grid-item v-for="(item, index) in data.list" :key="index" >
+				<view class="grid-item-box ss-flex ss-flex-col ss-row-center ss-col-center" @tap="sheep.$router.go(item.url)">
 					<view class="img-box">
 						<view class="tag-box" v-if="item.badge.show"
 							:style="[{ background: item.badge.bgColor, color: item.badge.textColor }]">
diff --git a/sheep/components/s-tabbar/s-tabbar.vue b/sheep/components/s-tabbar/s-tabbar.vue
index 4ff23404..c9893759 100644
--- a/sheep/components/s-tabbar/s-tabbar.vue
+++ b/sheep/components/s-tabbar/s-tabbar.vue
@@ -20,7 +20,7 @@
         :badgeStyle="tabbar.badgeStyle"
         :isCenter="getTabbarCenter(index)"
         :centerImage="sheep.$url.cdn(item.iconUrl)"
-        @tap="sheep.$router.go(item.url)"
+        @click="sheep.$router.go(item.url)"
       >
         <template v-slot:active-icon>
           <image class="u-page__item__slot-icon" :src="sheep.$url.cdn(item.activeIconUrl)"></image>
diff --git a/sheep/platform/index.js b/sheep/platform/index.js
index b53544fa..bae2b68e 100644
--- a/sheep/platform/index.js
+++ b/sheep/platform/index.js
@@ -58,6 +58,13 @@ provider = 'wechat';
 name = 'alipayMiniProgram';
 platform = 'alipayMiniProgram';
 provider = 'alipay';
+if (!device.safeAreaInsets) {
+  device.safeAreaInsets = uni.getSystemInfoSync().safeAreaInsets
+}
+// 兜底一下。还是没有值时候，就给个默认值
+if (!device.safeAreaInsets) {
+  device.safeAreaInsets = {}
+}
 // #endif
 
 if (isEmpty(name)) {
diff --git a/sheep/ui/su-fixed/su-fixed.vue b/sheep/ui/su-fixed/su-fixed.vue
index 0aa6416a..1c2140bc 100644
--- a/sheep/ui/su-fixed/su-fixed.vue
+++ b/sheep/ui/su-fixed/su-fixed.vue
@@ -3,7 +3,7 @@
     <view
       class="ui-fixed-box"
       :id="`fixed-${uuid}`"
-      :class="['fixed']"
+      :class="[{ fixed: state.fixed }]"
       :style="[
         {
           left: sticky ? 'auto' : '0px',
diff --git a/sheep/ui/su-inner-navbar/su-inner-navbar.vue b/sheep/ui/su-inner-navbar/su-inner-navbar.vue
index 9fc102da..e0e4127a 100644
--- a/sheep/ui/su-inner-navbar/su-inner-navbar.vue
+++ b/sheep/ui/su-inner-navbar/su-inner-navbar.vue
@@ -17,8 +17,12 @@
      -->
     <view class="ui-navbar-box">
       <view
-        class="ui-bar ss-p-x-20"
-        :class="state.isDark ? 'text-white' : 'text-black'"
+        class="ui-bar"
+        :class="[{
+           'text-white': state.isDark,
+           'text-black': !state.isDark,
+           'ss-p-x-20': sheep.$platform.provider !== 'alipay'
+        }]"
         :style="[{ height: sys_navBar - sys_statusBar + 'px' }]"
       >
         <view class="icon-box ss-flex">
diff --git a/sheep/ui/su-tabbar-item/su-tabbar-item.vue b/sheep/ui/su-tabbar-item/su-tabbar-item.vue
index 6807dfe3..fe76d463 100644
--- a/sheep/ui/su-tabbar-item/su-tabbar-item.vue
+++ b/sheep/ui/su-tabbar-item/su-tabbar-item.vue
@@ -1,6 +1,6 @@
 <!-- 自定义底部导航项 -->
 <template>
-  <view class="u-tabbar-item" :style="[addStyle(customStyle)]">
+  <view class="u-tabbar-item" :style="[addStyle(customStyle)]" @click="clickHandler">
     <view v-if="isCenter" class="tabbar-center-item">
       <image class="center-image" :src="centerImage" mode="aspectFill"></image>
     </view>