Merge remote-tracking branch 'origin/master'

doum

8 天以前 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea

 small-program/pages.json

@@ -11,13 +11,6 @@
         }
      },
      {
         "path": "pages/demand-hall/demand-hall",
         "style": {
            "navigationBarTitleText": "我的订单",
            "navigationStyle": "custom"
         }
      },
      {
         "path": "pages/mine/mine",
         "style": {
            "navigationBarTitleText": "我的",
@@ -25,136 +18,243 @@
         }
      },
      {
         "path": "pages/seleCity/seleCity",
         "path": "pages/itinerary/itinerary",
         "style": {
            "navigationBarTitleText": "城市选择"
            "navigationBarTitleText": "行程",
            "navigationStyle": "custom"
         }
      },
      {
         "path" : "pages/using-workers/using-workers",
         "style" : 
         {
            "navigationBarTitleText" : "采摘工"
         "path": "pages/message/message",
         "style": {
            "navigationBarTitleText": "消息",
            "navigationStyle": "custom"
         }
      },
      {
         "path" : "pages/sorting/sorting",
         "style" : 
         {
            "navigationBarTitleText" : "分拣工"
         "path": "pages/storage-point/storage-point",
         "style": {
            "navigationBarTitleText": "寄存点"
         }
      },
      {
         "path" : "pages/packaging-worker/packaging-worker",
         "style" : 
         {
            "navigationBarTitleText" : "包装工"
         "path": "pages/storage-point-detail/storage-point-detail",
         "style": {
            "navigationBarTitleText": "寄存点详情"
         }
      },
      {
         "path" : "pages/success/success",
         "style" : 
         {
            "navigationBarTitleText" : "发单成功"
         "path": "pages/luggage-storage/luggage-storage",
         "style": {
            "navigationBarTitleText": "行李寄存"
         }
      },
      {
         "path" : "pages/freight/freight",
         "style" : 
         {
            "navigationBarTitleText" : "运货"
         "path": "pages/payment-success/payment-success",
         "style": {
            "navigationBarTitleText": "支付成功"
         }
      },
      {
         "path" : "pages/order-details/order-details",
         "style" : 
         {
            "navigationBarTitleText" : "订单详情"
         "path": "pages/settings/settings",
         "style": {
            "navigationBarTitleText": "设置"
         }
      },
      {
         "path" : "pages/freight-order/freight-order",
         "style" : 
         {
            "navigationBarTitleText" : "订单详情"
         "path": "pages/storage-order-detail/storage-order-detail",
         "style": {
            "navigationBarTitleText": "寄存订单详情",
            "navigationStyle": "custom"
         }
      },
      {
         "path" : "pages/order-food/order-food",
         "style" : 
         {
            "navigationBarTitleText" : "订单详情"
         "path": "pages/all-orders/all-orders",
         "style": {
            "navigationBarTitleText": "全部订单"
         }
      },
      {
         "path" : "pages/login/login",
         "style" : 
         {
            "navigationBarTitleText" : "登录页"
         "path": "pages/store-apply/store-apply",
         "style": {
            "navigationBarTitleText": "门店入驻"
         }
      },
      {
         "path" : "pages/balance-details/balance-details",
         "style" : 
         {
            "navigationBarTitleText" : "余额明细"
         "path": "pages/delivery-order-detail/delivery-order-detail",
         "style": {
            "navigationBarTitleText": "寄送订单详情",
            "navigationStyle": "custom"
         }
      }, 
		
      },
      {
         "path" : "pages/rich-text-page/rich-text-page",
         "style" : 
         {
            "navigationBarTitleText" : "富文本页面"
         "path": "pages/orders/orders",
         "style": {
            "navigationBarTitleText": "全部订单"
         }
      },
      {
         "path": "pages/address/address",
         "style": {
            "navigationBarTitleText": "地址"
         }
      },
      {
         "path": "pages/new-address/new-address",
         "style": {
            "navigationBarTitleText": "新增地址"
         }
      },
      {
         "path": "pages/rich-text/rich-text",
         "style": {
            "navigationBarTitleText": "协议"
         }
      },
      {
         "path": "pages/details-entry/details-entry",
         "style": {
            "navigationBarTitleText": "门店入驻"
         }
      },
      {
         "path": "pages/select-city/select-city",
         "style": {
            "navigationBarTitleText": "选择城市"
         }
      },
      {
         "path": "pages/evaluate/evaluate",
         "style": {
            "navigationBarTitleText": "评价"
         }
      }
   ], 
   "subPackages": [{ 
      "root": "packageA", // 分包的根目录
      "name": "packageA", // 分包的根目录
       "pages":[
         {
            "path" : "pages/withdrawal/withdrawal",
            "style" : 
   ],
   "subPackages": [
      {
         "root": "shop",
         "pages": [
            {
               "navigationBarTitleText" : "提现"
            }
         },
         {
            "path" : "pages/withdrawal-successful/withdrawal-successful",
            "style" : 
               "path": "pages/login/login",
               "style": {
                  "navigationBarTitleText": "登录"
               }
            },
            {
               "navigationBarTitleText" : "提现成功"
            }
         },  
         {
            "path" : "pages/set-up/set-up",
            "style" : 
               "path": "pages/store-home/store-home",
               "style": {
                  "navigationBarTitleText": "门店首页",
                  "navigationStyle": "custom"
               }
            },
            {
               "navigationBarTitleText" : "设置"
            }
         },
          {
            "path" : "pages/employment-certification/employment-certification",
            "style" : 
               "path": "pages/mine/mine",
               "style": {
                  "navigationBarTitleText": "我的",
                  "navigationStyle": "custom"
               }
            },
            {
               "navigationBarTitleText" : "用工认证"
            }
         },
         {
            "path" : "pages/certification-results/certification-results",
            "style" : 
               "path": "pages/wallet/wallet",
               "style": {
                  "navigationBarTitleText": "门店钱包",
                  "navigationStyle": "custom"
               }
            },
            {
               "navigationBarTitleText" : "认证结果"
               "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/mine/mine":{
         ]
      }
   ],
   "preloadRule": {
       "pages/index/index": {
         "network": "all",
         "packages": ["packageA"]
      }
         "packages": ["shop"]
       }
   },
   "globalStyle": {
      "navigationBarTextStyle": "black",
@@ -164,26 +264,33 @@
   },
   "tabBar": {
      "color": "#999999",
      "selectedColor": "#222222",
      "selectedColor": "#10B2FA",
      "borderStyle": "black",
      "backgroundColor": "#fff",
      "custom": true,
      "list": [
         {
            "pagePath": "pages/index/index",
            "iconPath": "static/icon/nav_home_sel@2x (1).png",
            "iconPath": "static/icon/nav_home@2x.png",
            "selectedIconPath": "static/icon/nav_home_sel@2x.png",
            "text": "首页"
         },
         {
            "pagePath": "pages/demand-hall/demand-hall",
            "iconPath": "static/icon/nav_order@2x.png",
            "selectedIconPath": "static/icon/nav_order_sel@2x.png",
            "text": "订单"
            "pagePath": "pages/itinerary/itinerary",
            "iconPath": "static/icon/nav_xingcheng@2x.png",
            "selectedIconPath": "static/icon/nav_xingcheng_sel@2x.png",
            "text": "行程"
         },
         {
            "pagePath": "pages/message/message",
            "iconPath": "static/icon/nav_xiaoxi@2x.png",
            "selectedIconPath": "static/icon/nav_xiaoxi_sel@2x.png",
            "text": "消息"
         },
         {
            "pagePath": "pages/mine/mine",
            "iconPath": "static/icon/nav_mine@2x.png",
            "selectedIconPath": "static/icon/nav_mine_sel@2x.png",
            "iconPath": "static/icon/nav_wode@2x.png",
            "selectedIconPath": "static/icon/nav_wode_sel@2x.png",
            "text": "我的"
         }
      ]