Merge remote-tracking branch 'origin/master'

doum

8 天以前 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea

 small-program/pages.json

@@ -27,13 +27,20 @@
      {
         "path": "pages/message/message",
         "style": {
            "navigationBarTitleText": "消息"
            "navigationBarTitleText": "消息",
            "navigationStyle": "custom"
         }
      },
      {
         "path": "pages/storage-point/storage-point",
         "style": {
            "navigationBarTitleText": "寄存点"
         }
      },
      {
         "path": "pages/storage-point-detail/storage-point-detail",
         "style": {
            "navigationBarTitleText": "寄存点详情"
         }
      },
      {
@@ -62,18 +69,6 @@
         }
      },
      {
         "path": "pages/qualification/qualification",
         "style": {
            "navigationBarTitleText": "我的资质"
         }
      },
      {
         "path": "pages/store-info/store-info",
         "style": {
            "navigationBarTitleText": "门店信息"
         }
      },
      {
         "path": "pages/all-orders/all-orders",
         "style": {
            "navigationBarTitleText": "全部订单"
@@ -99,13 +94,6 @@
         }
      },
      {
         "path": "pages/store-home/store-home",
         "style": {
            "navigationBarTitleText": "门店首页",
            "navigationStyle": "custom"
         }
      },
      {
         "path": "pages/address/address",
         "style": {
            "navigationBarTitleText": "地址"
@@ -128,8 +116,146 @@
         "style": {
            "navigationBarTitleText": "门店入驻"
         }
      },
      {
         "path": "pages/select-city/select-city",
         "style": {
            "navigationBarTitleText": "选择城市"
         }
      },
      {
         "path": "pages/evaluate/evaluate",
         "style": {
            "navigationBarTitleText": "评价"
         }
      }
   ],
   "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": "门店钱包",
                  "navigationStyle": "custom"
               }
            },
            {
               "path": "pages/write-off/write-off",
               "style": {
                  "navigationBarTitleText": "订单核验"
               }
            },
            {
               "path": "pages/write-off-a/write-off-a",
               "style": {
                  "navigationBarTitleText": "订单核验"
               }
            },
            {
               "path": "pages/qualification/qualification",
               "style": {
                  "navigationBarTitleText": "我的资质"
               }
            },
            {
               "path": "pages/store-info/store-info",
               "style": {
                  "navigationBarTitleText": "门店信息"
               }
            },
            {
               "path": "pages/message/message",
               "style": {
                  "navigationBarTitleText": "消息",
                  "navigationStyle": "custom"
               }
            },
            {
               "path": "pages/orders/orders",
               "style": {
                  "navigationBarTitleText": "门店订单"
               }
            },
            {
               "path": "pages/order-details/order-details",
               "style": {
                  "navigationBarTitleText": "门店订单详情",
                  "navigationStyle": "custom"
               }
            },
            {
               "path": "pages/withdraw/withdraw",
               "style": {
                  "navigationBarTitleText": "提现"
               }
            },
            {
               "path": "pages/withdraw-success/withdraw-success",
               "style": {
                  "navigationBarTitleText": "提现"
               }
            },
            {
               "path": "pages/settings/settings",
               "style": {
                  "navigationBarTitleText": "设置"
               }
            },
            {
               "path": "pages/change-password/change-password",
               "style": {
                  "navigationBarTitleText": "修改密码"
               }
            },
            {
               "path": "pages/select/select",
               "style": {
                  "navigationBarTitleText": "宁畅行"
               }
            },
            {
               "path": "pages/webview/webview",
               "style": {
                  "navigationBarTitleText": "轮播图详情"
               }
            },
            {
               "path": "pages/article-details/article-details",
               "style": {
                  "navigationBarTitleText": "轮播图详情"
               }
            }
         ]
      }
   ],
   "preloadRule": {
       "pages/index/index": {
         "network": "all",
         "packages": ["shop"]
       }
   },
   "globalStyle": {
      "navigationBarTextStyle": "black",
      "navigationBarTitleText": "",
@@ -141,6 +267,7 @@
      "selectedColor": "#10B2FA",
      "borderStyle": "black",
      "backgroundColor": "#fff",
      "custom": true,
      "list": [
         {
            "pagePath": "pages/index/index",