From 49a52425c55f933e3bf8c8a1e05afcb37ca4826d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Dchenxuelian=E2=80=9C?=
 <“chenxuelian@cjiedata.com”>
Date: Sun, 18 Dec 2022 21:03:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=A1=B5=E3=80=81=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=9A=E6=8A=A5=E5=91=8A=20=20=E5=88=86=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certifiedCj/certifiedCj.vue               |   0
 .../certifiedCjDetail/certifiedCjDetail.vue   |   0
 {pages/report => packageReport}/news/news.vue |   0
 .../xwDetail/xwDetail.vue                     |   0
 .../goods-category-search/category-index.vue  |   0
 .../index => packageSearch}/search/search.vue |   0
 pages.json                                    | 116 ++++++++++--------
 pages/index/index.vue                         |   4 +-
 pages/report/report.vue                       |   4 +-
 9 files changed, 67 insertions(+), 57 deletions(-)
 rename {pages/report => packageReport}/certifiedCj/certifiedCj.vue (100%)
 rename {pages/detail => packageReport}/certifiedCjDetail/certifiedCjDetail.vue (100%)
 rename {pages/report => packageReport}/news/news.vue (100%)
 rename {pages/detail => packageReport}/xwDetail/xwDetail.vue (100%)
 rename {pages/index => packageSearch}/goods-category-search/category-index.vue (100%)
 rename {pages/index => packageSearch}/search/search.vue (100%)

diff --git a/pages/report/certifiedCj/certifiedCj.vue b/packageReport/certifiedCj/certifiedCj.vue
similarity index 100%
rename from pages/report/certifiedCj/certifiedCj.vue
rename to packageReport/certifiedCj/certifiedCj.vue
diff --git a/pages/detail/certifiedCjDetail/certifiedCjDetail.vue b/packageReport/certifiedCjDetail/certifiedCjDetail.vue
similarity index 100%
rename from pages/detail/certifiedCjDetail/certifiedCjDetail.vue
rename to packageReport/certifiedCjDetail/certifiedCjDetail.vue
diff --git a/pages/report/news/news.vue b/packageReport/news/news.vue
similarity index 100%
rename from pages/report/news/news.vue
rename to packageReport/news/news.vue
diff --git a/pages/detail/xwDetail/xwDetail.vue b/packageReport/xwDetail/xwDetail.vue
similarity index 100%
rename from pages/detail/xwDetail/xwDetail.vue
rename to packageReport/xwDetail/xwDetail.vue
diff --git a/pages/index/goods-category-search/category-index.vue b/packageSearch/goods-category-search/category-index.vue
similarity index 100%
rename from pages/index/goods-category-search/category-index.vue
rename to packageSearch/goods-category-search/category-index.vue
diff --git a/pages/index/search/search.vue b/packageSearch/search/search.vue
similarity index 100%
rename from pages/index/search/search.vue
rename to packageSearch/search/search.vue
diff --git a/pages.json b/pages.json
index c1a4d38..b28a2a8 100644
--- a/pages.json
+++ b/pages.json
@@ -47,30 +47,6 @@
 			}
 		},
 		{
-			"path": "pages/report/news/news",
-			"style": {
-				"navigationBarTitleText": "行内新闻",
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#12CA64",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/report/certifiedCj/certifiedCj",
-			"style": {
-				"navigationBarTitleText": "认证厂家",
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#12CA64",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/detail/xwDetail/xwDetail",
-			"style": {
-				"navigationBarTitleText": "行业新闻详情",
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#12CA64",
-				"enablePullDownRefresh": false
-			}
-		}, {
 			"path": "pages/detail/productsDetail/productsDetail",
 			"style": {
 				"navigationBarTitleText": "商品详情",
@@ -78,15 +54,6 @@
 				"navigationBarBackgroundColor": "#12CA64",
 				"enablePullDownRefresh": false
 			}
-		}, {
-			"path": "pages/detail/certifiedCjDetail/certifiedCjDetail",
-			"style": {
-				"navigationBarTitleText": "厂家信息",
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#12CA64",
-				"enablePullDownRefresh": false
-			}
-
 		}, {
 			"path": "pages/my/bindCompony/bindCompony",
 			"style": {
@@ -104,26 +71,6 @@
 				"navigationBarBackgroundColor": "#12CA64",
 				"enablePullDownRefresh": false
 			}
-		},
-		{
-			"path": "pages/index/search/search",
-			"style": {
-				"navigationBarTitleText": "顶部搜索",
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#12CA64",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/index/goods-category-search/category-index",
-			"style": {
-				"navigationBarTitleText": "分类详情",
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#12CA64",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
 		}, {
 			"path": "pages/my/memberCenter/memberCenter",
 			"style": {
@@ -134,6 +81,69 @@
 			}
 		}
 	],
+	"subPackages": [{
+			"root": "packageSearch",
+			"pages": [{
+					"path": "search/search",
+					"style": {
+						"navigationBarTitleText": "顶部搜索",
+						"navigationBarTextStyle": "white",
+						"navigationBarBackgroundColor": "#12CA64",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "goods-category-search/category-index",
+					"style": {
+						"navigationBarTitleText": "分类详情",
+						"navigationBarTextStyle": "white",
+						"navigationBarBackgroundColor": "#12CA64",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				}
+			]
+		},
+		{
+			"root": "packageReport",
+			"pages": [{
+					"path": "news/news",
+					"style": {
+						"navigationBarTitleText": "行内新闻",
+						"navigationBarTextStyle": "white",
+						"navigationBarBackgroundColor": "#12CA64",
+						"enablePullDownRefresh": false
+					}
+				}, {
+					"path": "certifiedCj/certifiedCj",
+					"style": {
+						"navigationBarTitleText": "认证厂家",
+						"navigationBarTextStyle": "white",
+						"navigationBarBackgroundColor": "#12CA64",
+						"enablePullDownRefresh": false
+					}
+				}, {
+					"path": "xwDetail/xwDetail",
+					"style": {
+						"navigationBarTitleText": "行业新闻详情",
+						"navigationBarTextStyle": "white",
+						"navigationBarBackgroundColor": "#12CA64",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "certifiedCjDetail/certifiedCjDetail",
+					"style": {
+						"navigationBarTitleText": "厂家信息",
+						"navigationBarTextStyle": "white",
+						"navigationBarBackgroundColor": "#12CA64",
+						"enablePullDownRefresh": false
+					}
+				}
+			]
+		}
+	],
 	"tabBar": {
 		"color": "#CCCCCC",
 		"selectedColor": "#0EBB5B",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4de14b2..cc5c7f5 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -106,13 +106,13 @@
 			//点击搜索框跳转到搜索页面
 			toSearch() {
 				uni.navigateTo({
-					url: '/pages/index/search/search'
+					url: '../../packageSearch/search/search'
 				})
 			},
 			//点击一级分类跳转到分类页
 			toClassify() {
 				uni.navigateTo({
-					url: '/pages/index/goods-category-search/category-index'
+					url: '../../packageSearch/goods-category-search/category-index'
 				})
 			}
 		}
diff --git a/pages/report/report.vue b/pages/report/report.vue
index 56139b0..3bdead6 100644
--- a/pages/report/report.vue
+++ b/pages/report/report.vue
@@ -70,11 +70,11 @@
 				//点击行内新闻时
 				if (listIndex == 0) {
 					uni.navigateTo({
-						url: '/pages/report/news/news'
+						url: '../../packageReport/news/news'
 					})
 				} else if (listIndex == 2) {
 					uni.navigateTo({
-						url: '/pages/report/certifiedCj/certifiedCj'
+						url: '../../packageReport/certifiedCj/certifiedCj'
 					})
 				}
 			},