diff --git a/manifest.json b/manifest.json index 1b3c5f25..6b2e8603 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/mini.project.json b/mini.project.json new file mode 100644 index 00000000..1e6d60a2 --- /dev/null +++ b/mini.project.json @@ -0,0 +1,9 @@ +{ + "format": 2, + "compileOptions": { + "component2": true, + "enableNodeModuleBabelTransform": true, + "transpile": {}, + "globalObjectMode": "enable" + } +} \ No newline at end of file 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 @@ 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 @@ > diff --git a/pages/goods/index.vue b/pages/goods/index.vue index 901c8919..e08ce65c 100644 --- a/pages/goods/index.vue +++ b/pages/goods/index.vue @@ -245,7 +245,7 @@ isDay: true, }; const isLogin = computed(() => sheep.$store('user').isLogin); - const state = reactive({ + let state = reactive({ goodsId: 0, skeletonLoading: true, // SPU 加载中 goodsInfo: {}, // SPU 信息 diff --git a/sheep/components/s-auth-modal/s-auth-modal.vue b/sheep/components/s-auth-modal/s-auth-modal.vue index 2b396893..ee74f323 100644 --- a/sheep/components/s-auth-modal/s-auth-modal.vue +++ b/sheep/components/s-auth-modal/s-auth-modal.vue @@ -72,6 +72,18 @@ :src="sheep.$url.static('/static/img/shop/platform/apple.png')" /> + + + @@ -85,7 +97,7 @@ - - + - - + diff --git a/sheep/components/s-layout/s-layout.vue b/sheep/components/s-layout/s-layout.vue index df15c317..78e46569 100644 --- a/sheep/components/s-layout/s-layout.vue +++ b/sheep/components/s-layout/s-layout.vue @@ -214,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 @@