companyProjecet.git

			@@ -36,13 +36,14 @@
			}
			}
			}, {
			"path": "pages/user/userinfo/userinfo",
			"path": "pages/tabBar/user/index",
			"style": {
			"navigationBarTitleText": "用户信息",
			"navigationStyle": "custom",
			"navigationBarTitleText": "个人中心",
			"enablePullDownRefresh": true,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			"titleNView": false,
			"animationType": "none"
			}
			}
			}, {
			@@ -77,27 +78,6 @@
			}
			}
			}, {
			"path": "pages/user/address/address",
			"style": {
			"navigationBarTitleText": "设置地址",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "pages/user/index/index",
			"style": {
			"navigationStyle": "custom",
			"navigationBarTitleText": "个人中心",
			"enablePullDownRefresh": true,
			"app-plus": {
			"titleNView": false,
			"animationType": "none"
			}
			}
			}, {
			"path": "pages/order/myorder",
			"style": {
			"navigationBarTitleText": "我的订单",
			@@ -118,50 +98,9 @@
			}
			}
			}, {
			"path": "pages/user/my-wallet/my-wallet",
			"style": {
			"navigationStyle": "custom",
			"navigationBarTitleText": "我的钱包",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "pages/user/my-wallet/my-balance",
			"style": {
			"navigationBarTitleText": "钱包明细",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "pages/user/my-wallet/my-supplier-balance",
			"style": {
			"navigationBarTitleText": "商户余额",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "pages/order/recharge",
			"style": {
			"navigationBarTitleText": "充值",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "pages/user/address/add/add",
			"style": {
			"navigationBarTitleText": "添加收货地址",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			@@ -239,50 +178,8 @@
			}
			}
			}, {
			"path": "pages/user/address/edit/edit",
			"style": {
			"navigationBarTitleText": "地址编辑",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "components/upload/upload",
			"style": {
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "pages/user/my-coupon/my-coupon",
			"style": {
			"navigationBarTitleText": "我的优惠券",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "pages/user/my-coupon/my-detail",
			"style": {
			"navigationStyle": "custom",
			"navigationBarTitleText": "优惠券",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "pages/user/my-qrcode/my-qrcode",
			"style": {
			"navigationStyle": "custom",
			"navigationBarTitleText": "会员码",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			@@ -324,16 +221,6 @@
			"path": "pages/agent/cash/list/list",
			"style": {
			"navigationBarTitleText": "提现明细",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "pages/user/points/points",
			"style": {
			"navigationBarTitleText": "积分",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			@@ -412,30 +299,9 @@
			}
			}
			}, {
			"path": "pages/user/my-bargain/my-bargain",
			"style": {
			"navigationStyle": "custom",
			"navigationBarTitleText": "我的砍价",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "pages/order/pay-h5/pay-h5",
			"style": {
			"navigationBarTitleText": "订单支付",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "pages/user/set/set",
			"style": {
			"navigationBarTitleText": "设置",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			@@ -485,59 +351,10 @@
			}
			}
			}, {
			"path": "pages/user/my_attention/my_attention",
			"style": {
			"navigationBarTitleText": "我的收藏",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}

			}, {
			"path": "pages/user/my_collect/my_collect",
			"style": {
			"navigationBarTitleText": "我的关注",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}

			}, {
			"path": "pages/shop/shop",
			"style": {
			"navigationStyle": "custom",
			"navigationBarTitleText": "店铺首页",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}

			}, {
			"path": "pages/user/my_shop/my_shop",
			"style": {
			"navigationStyle": "custom",
			"navigationBarTitleText": "我的店铺",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}

			}, {
			"path": "pages/user/register/register",
			"style": {
			"navigationBarTitleText": "注册",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			@@ -558,73 +375,6 @@
			}
			}
			}, {
			"path": "pages/user/my_shop/my_shop_order",
			"style": {
			"navigationBarTitleText": "店铺订单",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}

			}, {
			"path": "pages/user/my_shop/after_sale",
			"style": {
			"navigationBarTitleText": "",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "pages/user/my_shop/my_shop_password",
			"style": {
			"navigationBarTitleText": "修改密码",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "pages/user/modify-phone/modify-phone",
			"style": {
			"navigationBarTitleText": "绑定手机号",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "pages/user/modify-real/modify-real",
			"style": {
			"navigationBarTitleText": "实名认证",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "pages/user/modify-real/modify-edit",
			"style": {
			"navigationBarTitleText": "修改银行卡",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "pages/order/deposit-pay",
			"style": {
			"navigationBarTitleText": "缴纳保证金",
			@@ -635,42 +385,6 @@
			//#endif
			}
			}
			}, {
			"path": "pages/user/my_shop/pro_admin",
			"style": {
			"navigationBarTitleText": "商品管理",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}

			}, {
			"path": "pages/user/my_shop/my_shop_data",
			"style": {
			"navigationBarTitleText": "店铺数据",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}

			}, {
			"path": "pages/user/my_shop/my_shop_detail",
			"style": {
			"navigationBarTitleText": "订单详情",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}

			}/* , {
			"path": "pages/user/my_shop/my_live/notice/notice",
			"style": {
			@@ -809,31 +523,6 @@

			}
			,{
			"path" : "pages/user/cash/apply",
			"style" :
			{
			"navigationBarTitleText": "提现申请",
			"enablePullDownRefresh": false,
			"app-plus": {
			"titleNView": false, //禁用原生导航栏
			"scrollIndicator": "none"
			}
			}

			}
			,{
			"path" : "pages/user/cash/list",
			"style" :
			{
			"navigationBarTitleText": "余额提现",
			"enablePullDownRefresh": false,
			"app-plus": {
			"titleNView": false, //禁用原生导航栏
			"scrollIndicator": "none"
			}
			}

			},{
			"path" : "pages/shop/index",
			"style" :
			{
			@@ -841,36 +530,519 @@
			"enablePullDownRefresh": false
			}

			},{
			"path" : "pages/user/card/card",
			"style" :
			{
			"navigationBarTitleText": "会员卡",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}

			}
			,{
			"path" : "pages/user/card/list",
			"style" :
			{
			"navigationBarTitleText": "会员卡列表 ",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}

			}
			],
			"subPackages": [
			{
			"root": "pages/branch",
			"pages": [
			{
			"path": "activity/index/index",
			"style": {
			"navigationBarTitleText": "活动",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			},
			{
			"path": "activity/detail/detail",
			"style": {
			"navigationBarTitleText": "活动详情",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			},
			{
			"path" : "admin/index",
			"style" :
			{
			"navigationBarTitleText" : "分会管理中心",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			},
			{
			"path" : "admin/activity/index",
			"style" :
			{
			"navigationBarTitleText" : "活动管理",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			},
			{
			"path" : "admin/activity/add",
			"style" :
			{
			"navigationBarTitleText" : "添加活动",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			},
			{
			"path" : "admin/activity/edit",
			"style" :
			{
			"navigationBarTitleText" : "编辑活动",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			},
			{
			"path" : "admin/activity/user",
			"style" :
			{
			"navigationBarTitleText" : "报名名单",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			},
			{
			"path" : "admin/activity/album",
			"style" :
			{
			"navigationBarTitleText" : "活动相册",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			},
			{
			"path" : "admin/member/index",
			"style" :
			{
			"navigationBarTitleText" : "会员管理",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			},
			{
			"path" : "admin/branch/index",
			"style" :
			{
			"navigationBarTitleText" : "分会管理",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			},
			{
			"path" : "admin/branch/add",
			"style" :
			{
			"navigationBarTitleText" : "添加分会",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			},
			{
			"path" : "admin/branch/edit",
			"style" :
			{
			"navigationBarTitleText" : "编辑分会",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}
			]
			},
			{
			"root": "pages/user",
			"pages": [
			{
			"path": "userinfo/userinfo",
			"style": {
			"navigationBarTitleText": "用户信息",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "address/address",
			"style": {
			"navigationBarTitleText": "设置地址",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "my-wallet/my-wallet",
			"style": {
			"navigationStyle": "custom",
			"navigationBarTitleText": "我的钱包",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "my-wallet/my-balance",
			"style": {
			"navigationBarTitleText": "钱包明细",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "my-wallet/my-supplier-balance",
			"style": {
			"navigationBarTitleText": "商户余额",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "address/add/add",
			"style": {
			"navigationBarTitleText": "添加收货地址",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "address/edit/edit",
			"style": {
			"navigationBarTitleText": "地址编辑",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "my-coupon/my-coupon",
			"style": {
			"navigationBarTitleText": "我的优惠券",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "my-coupon/my-detail",
			"style": {
			"navigationStyle": "custom",
			"navigationBarTitleText": "优惠券",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "my-qrcode/my-qrcode",
			"style": {
			"navigationStyle": "custom",
			"navigationBarTitleText": "会员码",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "points/points",
			"style": {
			"navigationBarTitleText": "积分",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "my-bargain/my-bargain",
			"style": {
			"navigationStyle": "custom",
			"navigationBarTitleText": "我的砍价",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "set/set",
			"style": {
			"navigationBarTitleText": "设置",
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "my_attention/my_attention",
			"style": {
			"navigationBarTitleText": "我的收藏",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}

			}, {
			"path": "my_collect/my_collect",
			"style": {
			"navigationBarTitleText": "我的关注",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}

			}, {
			"path": "my_shop/my_shop",
			"style": {
			"navigationStyle": "custom",
			"navigationBarTitleText": "我的店铺",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}

			}, {
			"path": "register/register",
			"style": {
			"navigationBarTitleText": "注册",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}

			}, {
			"path": "my_shop/my_shop_order",
			"style": {
			"navigationBarTitleText": "店铺订单",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}

			}, {
			"path": "my_shop/after_sale",
			"style": {
			"navigationBarTitleText": "",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "my_shop/my_shop_password",
			"style": {
			"navigationBarTitleText": "修改密码",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "modify-phone/modify-phone",
			"style": {
			"navigationBarTitleText": "绑定手机号",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "modify-real/modify-real",
			"style": {
			"navigationBarTitleText": "实名认证",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "modify-real/modify-edit",
			"style": {
			"navigationBarTitleText": "修改银行卡",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path": "my_shop/pro_admin",
			"style": {
			"navigationBarTitleText": "商品管理",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}

			}, {
			"path": "my_shop/my_shop_data",
			"style": {
			"navigationBarTitleText": "店铺数据",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}

			}, {
			"path": "my_shop/my_shop_detail",
			"style": {
			"navigationBarTitleText": "订单详情",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path" : "cash/apply",
			"style" :
			{
			"navigationBarTitleText": "提现申请",
			"enablePullDownRefresh": false,
			"app-plus": {
			"titleNView": false, //禁用原生导航栏
			"scrollIndicator": "none"
			}
			}

			}, {
			"path" : "cash/list",
			"style" :
			{
			"navigationBarTitleText": "余额提现",
			"enablePullDownRefresh": false,
			"app-plus": {
			"titleNView": false, //禁用原生导航栏
			"scrollIndicator": "none"
			}
			}
			}, {
			"path" : "card/card",
			"style" :
			{
			"navigationBarTitleText": "会员卡",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}

			}, {
			"path" : "card/list",
			"style" :
			{
			"navigationBarTitleText": "会员卡列表",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path" : "my_activity/index",
			"style" :
			{
			"navigationBarTitleText": "我参与的活动",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}, {
			"path" : "my_activity/detail",
			"style" :
			{
			"navigationBarTitleText": "报名详情",
			"enablePullDownRefresh": false,
			"app-plus": {
			//#ifdef H5
			"titleNView": false
			//#endif
			}
			}
			}
			]
			},
			{
			"root": "pages/store",
			"pages": [
			@@ -1739,7 +1911,7 @@
			"text": ""
			},
			{
			"pagePath": "pages/user/index/index",
			"pagePath": "pages/tabBar/user/index",
			"iconPath": "static/tabbar/no.png",
			"selectedIconPath": "static/tabbar/no.png",
			"text": ""