~admin/hmy_farmer-main.git

			@@ -19,23 +19,23 @@
			"navigationBarTitleText": "收货地址"
			}
			},
			// #endif
			{
			"path": "pages/login/supplier-login",
			"style": {
			"navigationBarTitleText": "登录",
			"enablePullDownRefresh": false,
			"navigationStyle": "custom"
			}
			},
			{
			"path": "pages/home/supplier-home",
			"style": {
			"navigationBarTitleText": "首页",
			"enablePullDownRefresh": true,
			"navigationStyle": "custom"
			}
			},
			// #endif
			{
			"path": "pages/login/supplier-login",
			"style": {
			"navigationBarTitleText": "登录",
			"enablePullDownRefresh": false,
			"navigationStyle": "custom"
			}
			},
			{
			"path": "pages/home/supplier-home",
			"style": {
			"navigationBarTitleText": "首页",
			"enablePullDownRefresh": true,
			"navigationStyle": "custom"
			}
			},
			{
			"path": "pages/login/supplier-reg",
			"style": {
			@@ -108,13 +108,13 @@
			{
			"path": "pages/order/order-delivery-detail",
			"style": {
			"navigationBarTitleText": "订单详情"
			"navigationBarTitleText": "配送单详情"
			}
			},
			{
			"path": "pages/order/order-delivery",
			"style": {
			"navigationBarTitleText": "订单列表"
			"navigationBarTitleText": "配送单列表"
			}
			},
			{
			@@ -129,14 +129,44 @@
			"style": {
			"navigationBarTitleText": "理赔单详情"
			}
			},
			{
			"path": "pages/user/user-bind-wx/user-bind-wx",
			"style": {
			"navigationBarTitleText": "绑定微信"
			}
			},
			{
			"path": "pages/home/components/home-search",
			"style": {
			"navigationBarTitleText": "搜鲜花"
			}
			},
			{
			"path": "pages/home/components/home-banner-detail",
			"style": {
			"navigationBarTitleText": "公告"
			}
			}
			],
			"subPackages": [{
			"root": "sub_pages/supplier",
			"pages": [
			"pages": [{
			"path": "protocol",
			"style": {
			"navigationBarTitleText": "协议",
			"enablePullDownRefresh": false
			}
			}
			// #ifdef PUB_SUPPLIER
			{
			, {
			"path": "supplier-info/supplier-info",
			"style": {
			"navigationBarTitleText": "店铺信息维护",
			"enablePullDownRefresh": false
			}
			}, {
			"path": "supplier-info/supplier-info-update",
			"style": {
			"navigationBarTitleText": "信息维护",
			"enablePullDownRefresh": false
			@@ -165,23 +195,65 @@
			"navigationBarBackgroundColor": "#E6F2EB"
			}
			},

			{
			"path": "protocol",
			"path": "print/print-list",
			"style": {
			"navigationBarTitleText": "协议",
			"navigationBarTitleText": "打印",
			"enablePullDownRefresh": false
			}
			},
			// #endif
			// #ifdef PUB_PARTNER \|\| PUB_SUPPLIER
			{

			}, {
			"path": "order-settlement/order-settlement",
			"style": {
			"navigationBarTitleText": "账单结算",
			"enablePullDownRefresh": true
			}
			},
			{
			"path": "order-settlement/order-settlement-detail",
			"style": {
			"navigationBarTitleText": "结算单详情"
			}
			},
			{
			"path": "order-manage/order-manage",
			"style": {
			"navigationBarTitleText": "订单管理",
			"enablePullDownRefresh": true
			}
			},
			{
			"path" : "order-manage/order-manage-settlement",
			"style" :
			{
			"navigationBarTitleText" : "配送结算明细"
			}
			},
			{
			"path" : "order-manage/order-manage-flower",
			"style" :
			{
			"navigationBarTitleText" : "配送商品明细"
			}
			}
			// #endif
			// #ifdef PUB_PARTNER
			, {
			"path": "order-settlement/order-settlement",
			"style": {
			"navigationBarTitleText": "账单结算",
			"enablePullDownRefresh": true
			}
			},
			{
			"path": "print/print-list",
			"style": {
			"navigationBarTitleText": "打印",
			"enablePullDownRefresh": false
			}

			},
			{
			"path": "order-settlement/order-settlement-detail",
			"style": {
			@@ -201,15 +273,22 @@
			"navigationBarTitleText": "信息维护",
			"enablePullDownRefresh": false
			}
			},
			{
			"path": "partner-info/partner-code",
			"style": {
			"navigationBarTitleText": "二维码",
			"enablePullDownRefresh": false
			}
			},

			},
			{
			"path": "partner-info/partner-code",
			"style": {
			"navigationBarTitleText": "合伙人推广二维码",
			"enablePullDownRefresh": false
			}
			},
			{
			"path": "partner-info/partner-code-v2",
			"style": {
			"navigationBarTitleText": "合伙人推广二维码",
			"enablePullDownRefresh": false
			}
			},

			{
			"path": "order-manage/order-manage",
			"style": {
			@@ -243,6 +322,12 @@
			"style": {
			"navigationBarTitleText": "",
			"navigationStyle": "custom"
			}
			},
			{
			"path": "delivery/station-delivery",
			"style": {
			"navigationBarTitleText": "集货站"
			}
			}
			// #endif
			@@ -296,7 +381,8 @@
			{
			"path": "shop/shop",
			"style": {
			"navigationBarTitleText": "商家主页"
			"navigationBarTitleText": "商家主页",
			"enablePullDownRefresh": true
			}
			},
			{
			@@ -305,13 +391,13 @@
			"navigationBarTitleText": "我的关注",
			"enablePullDownRefresh": true
			}
			},
			{
			"path": "self/history",
			"style": {
			"navigationBarTitleText": "浏览记录",
			"enablePullDownRefresh": true
			}
			},
			{
			"path": "self/history",
			"style": {
			"navigationBarTitleText": "浏览记录",
			"enablePullDownRefresh": true
			}
			},
			{
			"path": "self/collect",