Merge remote-tracking branch 'origin/master'

rk

2 天以前 c313a253b1fcdc75b6be5db575fc2b29fb407021

 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,137 +18,18 @@
         }
      },
      {
         "path": "pages/seleCity/seleCity",
         "path": "pages/itinerary/itinerary",
         "style": {
            "navigationBarTitleText": "城市选择"
            "navigationBarTitleText": ""
         }
      },
      {
         "path" : "pages/using-workers/using-workers",
         "style" : 
         {
            "navigationBarTitleText" : "采摘工"
         }
      },
      {
         "path" : "pages/sorting/sorting",
         "style" : 
         {
            "navigationBarTitleText" : "分拣工"
         }
      },
      {
         "path" : "pages/packaging-worker/packaging-worker",
         "style" : 
         {
            "navigationBarTitleText" : "包装工"
         }
      },
      {
         "path" : "pages/success/success",
         "style" : 
         {
            "navigationBarTitleText" : "发单成功"
         }
      },
      {
         "path" : "pages/freight/freight",
         "style" : 
         {
            "navigationBarTitleText" : "运货"
         }
      },
      {
         "path" : "pages/order-details/order-details",
         "style" : 
         {
            "navigationBarTitleText" : "订单详情"
         }
      },
      {
         "path" : "pages/freight-order/freight-order",
         "style" : 
         {
            "navigationBarTitleText" : "订单详情"
         }
      },
      {
         "path" : "pages/order-food/order-food",
         "style" : 
         {
            "navigationBarTitleText" : "订单详情"
         }
      },
      {
         "path" : "pages/login/login",
         "style" : 
         {
            "navigationBarTitleText" : "登录页"
         }
      },
      {
         "path" : "pages/balance-details/balance-details",
         "style" : 
         {
            "navigationBarTitleText" : "余额明细"
         }
      }, 
		
      {
         "path" : "pages/rich-text-page/rich-text-page",
         "style" : 
         {
            "navigationBarTitleText" : "富文本页面"
         "path": "pages/message/message",
         "style": {
            "navigationBarTitleText": "消息"
         }
      }
   ], 
   "subPackages": [{ 
      "root": "packageA", // 分包的根目录
      "name": "packageA", // 分包的根目录
       "pages":[
         {
            "path" : "pages/withdrawal/withdrawal",
            "style" : 
            {
               "navigationBarTitleText" : "提现"
            }
         },
         {
            "path" : "pages/withdrawal-successful/withdrawal-successful",
            "style" : 
            {
               "navigationBarTitleText" : "提现成功"
            }
         },  
         {
            "path" : "pages/set-up/set-up",
            "style" : 
            {
               "navigationBarTitleText" : "设置"
            }
         },
          {
            "path" : "pages/employment-certification/employment-certification",
            "style" : 
            {
               "navigationBarTitleText" : "用工认证"
            }
         },
         {
            "path" : "pages/certification-results/certification-results",
            "style" : 
            {
               "navigationBarTitleText" : "认证结果"
            }
         }
      ]
   }],
   "preloadRule":{
      "pages/mine/mine":{
         "network": "all",
         "packages": ["packageA"]
      }
   },
   "globalStyle": {
      "navigationBarTextStyle": "black",
      "navigationBarTitleText": "",
@@ -170,15 +44,21 @@
      "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",