Merge remote-tracking branch 'origin/master'

rk

2026-04-22 2e3ab7fbbb336cf11ed37b8b0a7871976d597564

 small-program/unpackage/dist/dev/mp-weixin/shop/pages/store-home/store-home.json

@@ -1,11 +1,7 @@
{
  "navigationBarTitleText": "门店首页",
<<<<<<< HEAD
  "navigationStyle": "custom",
  "usingComponents": {
    "custom-tabbar": "/components/custom-tabbar/custom-tabbar"
  }
=======
  "navigationStyle": "custom"
>>>>>>> 50573d8f1149d7020c38afb695116cb2953a3d43
}