Merge remote-tracking branch 'origin/master'

rk

2026-04-22 2e3ab7fbbb336cf11ed37b8b0a7871976d597564

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

@@ -1,11 +1,9 @@
{
<<<<<<< HEAD
  "navigationBarTitleText": "门店钱包",
  "navigationStyle": "custom",
  "usingComponents": {
    "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon",
    "u-popup": "/node-modules/uview-ui/components/u-popup/u-popup",
    "custom-tabbar": "/components/custom-tabbar/custom-tabbar"
  }
=======
  "navigationBarTitleText": "门店钱包"
>>>>>>> 50573d8f1149d7020c38afb695116cb2953a3d43
}