代码合并

pages.json

@@ -203,7 +203,7 @@
 				}
 			}
 		}, {
-			"path": "pages/chasingDrama/chasingDrama",
+			"path": "pages/yodwbsHlmJ/yodwbsHlmJ",
 			"style": {
 				"navigationBarTitleText": "追剧",
 				"enablePullDownRefresh": false
@@ -268,7 +268,7 @@
 			}
 		},
 		{
-			"path": "pages/first/first",
+			"path": "pages/BdwbOqUuVz/BdwbOqUuVz",
 			"style": {
 				"navigationBarTitleText": "开屏广告",
 				"navigationStyle": "custom"
@@ -284,10 +284,14 @@
 						"navigationBarBackgroundColor": "#FFFFFF"
 					}
 				}, {
-					"path": "balance/index",
+					"path": "HEWZtgyqRH/HEWZtgyqRH",
 					"style": {
 						"navigationBarTitleText": "我的余额"
 					}
+				}, {
+					"path": "HEWZtgyqRH/YGivHgyqkI"
+				}, {
+					"path": "HEWZtgyqRH/EsBgyqacOi"
 				}, {
 					"path": "feedbackIndex/feedbackIndex",
 					"style": {
@@ -321,7 +325,7 @@
 					}
 				},
 				{
-					"path": "course/index",
+					"path": "XxSqJQgyqr/XxSqJQgyqr",
 					"style": {
 						"navigationBarTitleText": "我的课程",
 						"enablePullDownRefresh": true,
@@ -356,7 +360,7 @@
 					}
 				},
 				{
-					"path": "yaoqing/ymg-yaoqing-tixain",
+					"path": "yaoqing/ymg-yaoqing-tixian",
 					"style": {
 						"navigationBarTitleText": "申请提现",
 						"h5": {
@@ -411,7 +415,7 @@
 					}
 				},
 				{
-					"path": "collect/index",
+					"path": "doJbYBgyqb/doJbYBgyqb",
 					"style": {
 						"navigationBarTitleText": "我的收藏",
 						"enablePullDownRefresh": true,
@@ -422,6 +426,12 @@
 						}
 					}
 				},
+				{
+					"path": "doJbYBgyqb/KtvdsgyqtH"
+				},
+				{
+					"path": "doJbYBgyqb/UUInDgyqbb"
+				},
 				{
 					"path": "setting/index",
 					"style": {
@@ -473,7 +483,7 @@
 					}
 				},
 				{
-					"path": "setting/bind",
+					"path": "setting/FdwbsxoKnh",
 					"style": {
 						"navigationBarTitleText": "换绑手机号",
 						"h5": {
@@ -571,14 +581,14 @@
 					}
 
 				}, {
-					"path": "wallet/wallet",
+					"path": "FrdwbsihPr/FrdwbsihPr",
 					"style": {
 						"navigationBarTitleText": "金币充值",
 						"enablePullDownRefresh": false
 					}
 
 				}, {
-					"path": "wallet/wallet_detail",
+					"path": "FrdwbsihPr/RSKjJIdwbH",
 					"style": {
 						"navigationBarTitleText": "金币明细",
 						"enablePullDownRefresh": true
@@ -697,7 +707,6 @@
 						"navigationBarTitleText": "剧情介绍",
 						"enablePullDownRefresh": true
 					}
-
 				},
 				{
 					"path": "juqing/new/first-select",
@@ -714,9 +723,8 @@
 						"enablePullDownRefresh": true
 					}
 
-				},
-				{
-					"path": "wallpaper/wallpaper",
+				},{
+					"path": "mFYpdwbMdk/mFYpdwbMdk",
 					"style": {
 						"navigationBarTitleText": "壁纸",
 						"enablePullDownRefresh": true
@@ -724,7 +732,7 @@
 
 				},
 				{
-					"path": "assistance/assistance",
+					"path": "rHTgyqGoIV/rHTgyqGoIV",
 					"style": {
 						"navigationBarTitleText": "助力领会员",
 						"navigationBarBackgroundColor": "#F22947",
@@ -736,6 +744,12 @@
 						// #endif
 					}
 				},
+				{
+					"path": "rHTgyqGoIV/MrGTFgyqGE"
+				},
+				{
+					"path": "rHTgyqGoIV/ugyqNYtnJi"
+				},
 				{
 					"path": "setting/payXieYi",
 					"style": {
@@ -744,7 +758,7 @@
 					}
 				},
 				{
-					"path": "wallet/wallets",
+					"path": "FrdwbsihPr/vkRFXBdwbe",
 					"style": {
 						"navigationBarTitleText": "充值",
 						"enablePullDownRefresh": false,
@@ -752,12 +766,18 @@
 					}
 				},
 				{
-					"path": "choujiang/choujiang",
+					"path": "VjgyqAzklr/VjgyqAzklr",
 					"style": {
 						"navigationBarTitleText": "抽奖",
 						"navigationStyle": "custom"
 					}
 				},
+				{
+					"path": "VjgyqAzklr/mEfjXGgyqJ"
+				},
+				{
+					"path": "VjgyqAzklr/YQqgyqeKub"
+				},
 				{
 					"path": "gift/gift",
 					"style": {