fix 修复冲突

pages.json

@@ -2,7 +2,7 @@
 	"easycom": {
 			"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
-	"pages": [ 
+	"pages": [
 		{
 			"path": "pages/login",
 			"style": {
@@ -12,7 +12,7 @@
 		},
 		{
 			"path" : "pages/lgz/index/index",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "梅山古镇",
 				"navigationStyle": "custom"
@@ -20,7 +20,7 @@
 		},
 		{
 			"path" : "pages/lgz/record/record",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "扫码记录",
 				"navigationStyle": "custom"
@@ -28,7 +28,7 @@
 		},
 		{
 			"path" : "pages/cjx/record/record",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "扫码记录",
 				"navigationStyle": "custom"
@@ -36,7 +36,7 @@
 		},
 		{
 			"path" : "pages/lgz/traceability/traceability",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "溯源信息",
 				"navigationStyle": "custom"
@@ -44,7 +44,7 @@
 		},
 		{
 			"path" : "pages/cjx/traceability/traceability",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "溯源信息",
 				"navigationStyle": "custom"
@@ -52,7 +52,7 @@
 		},
 		{
 			"path" : "pages/lgz/feedback/feedback",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "意见反馈",
 				"navigationStyle": "custom"
@@ -60,7 +60,7 @@
 		},
 		{
 			"path" : "pages/cjx/feedback/feedback",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "意见反馈",
 				"navigationStyle": "custom"
@@ -68,7 +68,7 @@
 		},
 		{
 			"path" : "pages/lgz/introduction/introduction",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "公司简介",
 				"navigationStyle": "custom"
@@ -76,7 +76,7 @@
 		},
 		{
 			"path" : "pages/cjx/introduction/introduction",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "公司简介",
 				"navigationStyle": "custom"
@@ -84,7 +84,7 @@
 		},
 		{
 			"path" : "pages/lgz/index/claim",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "中奖记录",
 				"navigationStyle": "custom"
@@ -92,7 +92,7 @@
 		},
 		{
 			"path" : "pages/cjx/index/claim",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "中奖记录",
 				"navigationStyle": "custom"
@@ -100,7 +100,7 @@
 		},
 		{
 			"path" : "pages/lgz/index/rules",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "活动规则",
 				"navigationStyle": "custom"
@@ -108,7 +108,7 @@
 		},
 		{
 			"path" : "pages/cjx/index/rules",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "活动规则",
 				"navigationStyle": "custom"
@@ -116,7 +116,7 @@
 		},
 		{
 			"path" : "pages/lgz/error",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "梅干古筝",
 				"navigationStyle": "custom"
@@ -124,7 +124,7 @@
 		},
 		{
 			"path" : "pages/lgz/address/address",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "",
 				"navigationStyle": "custom"
@@ -132,7 +132,7 @@
 		},
 		{
 			"path" : "pages/lgz/my/my",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "",
 				"navigationStyle": "custom"
@@ -141,7 +141,7 @@
 
 		{
 			"path" : "pages/lgz/index/winPrize",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "",
 				"navigationStyle": "custom"
@@ -149,7 +149,7 @@
 		},
 		{
 			"path" : "pages/lgz/index/unWinPrize",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "",
 				"navigationStyle": "custom"
@@ -157,7 +157,7 @@
 		},
 		{
 			"path" : "pages/cjx/index/index",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "",
 				"navigationStyle": "custom"
@@ -165,7 +165,7 @@
 		},
 		{
 			"path" : "pages/cjx/index/authCode",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "",
 				"navigationStyle": "custom"
@@ -173,15 +173,95 @@
 		},
 		{
 			"path" : "pages/cjx/my/my",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "",
 				"navigationStyle": "custom"
 			}
+		},
+
+		{
+			"path" : "pages/cjx/hexiao/ywy/index",
+			"style" :
+			{
+				"navigationBarTitleText" : "首页",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path" : "pages/cjx/hexiao/ywy/retail",
+			"style" :
+			{
+				"navigationBarTitleText" : "门店",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/cjx/hexiao/ywy/my",
+			"style" :
+			{
+				"navigationBarTitleText" : "我的",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/cjx/hexiao/ywy/scan_code",
+			"style" :
+			{
+				"navigationBarTitleText" : "上货扫描",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/cjx/hexiao/ywy/add_retail",
+			"style" :
+			{
+				"navigationBarTitleText" : "门店信息",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/cjx/hexiao/ywy/add_goods_record",
+			"style" :
+			{
+				"navigationBarTitleText" : "上货记录",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/cjx/hexiao/jxs/index",
+			"style" :
+			{
+				"navigationBarTitleText" : "",
+				"navigationStyle": "custom"
+			}
+		},{
+			"path" : "pages/cjx/hexiao/jxs/my",
+			"style" :
+			{
+				"navigationBarTitleText" : "我的",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/cjx/hexiao/jxs/ywy_list",
+			"style" :
+			{
+				"navigationBarTitleText" : "业务员管理",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/cjx/hexiao/jxs/add_ywy",
+			"style" :
+			{
+				"navigationBarTitleText" : "业务员信息",
+				"enablePullDownRefresh" : false
+			}
 		}
-		
+
 	],
-	
+
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",