Merge remote-tracking branch 'origin/master'

doum

2026-04-21 3539d67072a5fd179bd44385ebefce0d1a6e8cb4

 small-program/pages.json

@@ -27,7 +27,8 @@
      {
         "path": "pages/message/message",
         "style": {
            "navigationBarTitleText": "消息"
            "navigationBarTitleText": "消息",
            "navigationStyle": "custom"
         }
      },
      {
@@ -99,13 +100,6 @@
         }
      },
      {
         "path": "pages/store-home/store-home",
         "style": {
            "navigationBarTitleText": "门店首页",
            "navigationStyle": "custom"
         }
      },
      {
         "path": "pages/address/address",
         "style": {
            "navigationBarTitleText": "地址"
@@ -128,6 +122,67 @@
         "style": {
            "navigationBarTitleText": "门店入驻"
         }
      },
      {
         "path": "pages/select-city/select-city",
         "style": {
            "navigationBarTitleText": "选择城市"
         }
      },

      {
         "path": "pages/shop-index/shop-index",
         "style": {
            "navigationBarTitleText": "门店首页",
            "navigationStyle": "custom"
         }
      },
      {
         "path": "pages/shop-mine/shop-mine",
         "style": {
            "navigationBarTitleText": "门店我的",
            "navigationStyle": "custom"
         }
      },
      {
         "path": "pages/shop-wallet/shop-wallet",
         "style": {
            "navigationBarTitleText": "门店钱包",
            "navigationStyle": "custom"
         }
      }
   ],
   "subPackages": [
      {
         "root": "shop",
         "pages": [
            {
               "path": "pages/login/login",
               "style": {
                  "navigationBarTitleText": "登录"
               }
            },
            {
               "path": "pages/store-home/store-home",
               "style": {
                  "navigationBarTitleText": "门店首页",
                  "navigationStyle": "custom"
               }
            },
            {
               "path": "pages/mine/mine",
               "style": {
                  "navigationBarTitleText": "我的",
                  "navigationStyle": "custom"
               }
            },
            {
               "path": "pages/wallet/wallet",
               "style": {
                  "navigationBarTitleText": "门店钱包"
               }
            }
         ]
      }
   ],
   "globalStyle": {
@@ -141,6 +196,7 @@
      "selectedColor": "#10B2FA",
      "borderStyle": "black",
      "backgroundColor": "#fff",
      "custom": true,
      "list": [
         {
            "pagePath": "pages/index/index",
@@ -165,6 +221,24 @@
            "iconPath": "static/icon/nav_wode@2x.png",
            "selectedIconPath": "static/icon/nav_wode_sel@2x.png",
            "text": "我的"
         },
         {
            "pagePath": "pages/shop-index/shop-index",
            "iconPath": "static/icon/nav_home@2x.png",
            "selectedIconPath": "static/icon/nav_home_sel@2x.png",
            "text": "门店首页"
         },
         {
            "pagePath": "pages/shop-wallet/shop-wallet",
            "iconPath": "static/icon/nav_home@2x.png",
            "selectedIconPath": "static/icon/nav_home_sel@2x.png",
            "text": "门店钱包"
         },
         {
            "pagePath": "pages/shop-mine/shop-mine",
            "iconPath": "static/icon/nav_wode@2x.png",
            "selectedIconPath": "static/icon/nav_wode_sel@2x.png",
            "text": "门店我的"
         }
      ]
   }