From a41dad0a99ea255e10723728db01890e83543e2f Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 25 Mar 2025 21:54:20 +0800
Subject: [PATCH] 1

---
 src/pages.json                                |  40 ++--
 src/pages/tabbar/canteen.vue                  |   1 +
 src/pages/tabbar/shop.vue                     |   3 +-
 .../plugs/use-router/vite-router-plug.ts      | 172 +++++++++---------
 4 files changed, 105 insertions(+), 111 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index 3f1a16e..fafaefb 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -57,25 +57,25 @@
 			"root": "pages/order",
 			"pages": []
 		},
-		// {
-		// 	"root": "pages/shop",
-		// 	"pages": [
-		// 		{
-		// 			"path": "detail",
-		// 			"style": {
-		// 				"navigationBarTitleText": "",
-		// 				"disableScroll": true
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "product-detail",
-		// 			"style": {
-		// 				"navigationBarTitleText": "",
-		// 				"disableScroll": true
-		// 			}
-		// 		}
-		// 	]
-		// },
+		{
+			"root": "pages/shop",
+			"pages": [
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "",
+						"disableScroll": true
+					}
+				},
+				{
+					"path": "product-detail",
+					"style": {
+						"navigationBarTitleText": "",
+						"disableScroll": true
+					}
+				}
+			]
+		},
 		{
 			"root": "pages/apply",
 			"pages": [
@@ -371,4 +371,4 @@
 			// },
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/src/pages/tabbar/canteen.vue b/src/pages/tabbar/canteen.vue
index c7a31f4..26c4cb7 100644
--- a/src/pages/tabbar/canteen.vue
+++ b/src/pages/tabbar/canteen.vue
@@ -37,6 +37,7 @@ const toDetail = async (v: any) => {
 </script>
 
 <template>
+	1
 	<crud-layout bg="/static/page/blue-bg.png">
 		<z-paging
 			ref="pageRef"
diff --git a/src/pages/tabbar/shop.vue b/src/pages/tabbar/shop.vue
index 8ad7d42..e89985e 100644
--- a/src/pages/tabbar/shop.vue
+++ b/src/pages/tabbar/shop.vue
@@ -23,7 +23,7 @@ onLoad(() => {
 	app._initTabbar()
 })
 onShow(() => {
-	pageRef.value && pageRef.value.reload(false)
+	// pageRef.value && pageRef.value.reload(false)
 })
 
 const toDetail = async (v: any) => {
@@ -35,6 +35,7 @@ const toDetail = async (v: any) => {
 </script>
 
 <template>
+	1
 	<crud-layout bg="/static/page/blue-bg.png">
 		<z-paging
 			ref="pageRef"
diff --git a/src/sheep/plugs/use-router/vite-router-plug.ts b/src/sheep/plugs/use-router/vite-router-plug.ts
index d9e905e..0b2bae3 100644
--- a/src/sheep/plugs/use-router/vite-router-plug.ts
+++ b/src/sheep/plugs/use-router/vite-router-plug.ts
@@ -1,99 +1,91 @@
-import fs from "fs";
-import stripJsonComments from "./strip-json-comments";
+import fs from "fs"
+import stripJsonComments from "./strip-json-comments"
 
 class TransformPages {
-  routes: any = [];
-  tabbar: any = [];
-  includes = [];
-  uniPagesJSON: any = "";
+	routes: any = []
+	tabbar: any = []
+	includes = []
+	uniPagesJSON: any = ""
 
-  constructor({ includes, pagesJsonDir }: any) {
-    this.includes = includes;
-    this.uniPagesJSON = JSON.parse(
-      stripJsonComments(fs.readFileSync(pagesJsonDir, "utf-8"))
-    );
-    this.routes = this.getPagesRoutes().concat(this.getSubPackagesRoutes());
-    this.tabbar = this.getTabbarRoutes();
-  }
+	constructor({ includes, pagesJsonDir }: any) {
+		this.includes = includes
+		this.uniPagesJSON = JSON.parse(stripJsonComments(fs.readFileSync(pagesJsonDir, "utf-8")))
+		this.routes = this.getPagesRoutes().concat(this.getSubPackagesRoutes())
+		this.tabbar = this.getTabbarRoutes()
+	}
 
-  getPagesRoutes(pages = this.uniPagesJSON.pages, rootPath = null) {
-    let routes = [];
-    for (let i = 0; i < pages.length; i++) {
-      const item = pages[i];
-      let route: any = {};
-      for (let j = 0; j < this.includes.length; j++) {
-        const key = this.includes[j];
-        let value = item[key];
-        if (key === "path") {
-          value = rootPath ? `/${rootPath}/${value}` : `/${value}`;
-        }
-        if (key === "aliasPath" && i == 0 && rootPath == null) {
-          route[key] = route[key] || "/";
-        } else if (value !== undefined) {
-          route[key] = value;
-        }
-      }
-      routes.push(route);
-    }
-    return routes;
-  }
+	getPagesRoutes(pages = this.uniPagesJSON.pages, rootPath = null) {
+		let routes = []
+		for (let i = 0; i < pages.length; i++) {
+			const item = pages[i]
+			let route: any = {}
+			for (let j = 0; j < this.includes.length; j++) {
+				const key = this.includes[j]
+				let value = item[key]
+				if (key === "path") {
+					value = rootPath ? `/${rootPath}/${value}` : `/${value}`
+				}
+				if (key === "aliasPath" && i == 0 && rootPath == null) {
+					route[key] = route[key] || "/"
+				} else if (value !== undefined) {
+					route[key] = value
+				}
+			}
+			routes.push(route)
+		}
+		return routes
+	}
 
-  getSubPackagesRoutes() {
-    if (!(this.uniPagesJSON && this.uniPagesJSON.subPackages)) {
-      return [];
-    }
-    const subPackages = this.uniPagesJSON.subPackages;
-    let routes: any = [];
-    for (let i = 0; i < subPackages.length; i++) {
-      const subPages = subPackages[i].pages;
-      const root = subPackages[i].root;
-      const subRoutes = this.getPagesRoutes(subPages, root);
-      routes = routes.concat(subRoutes);
-    }
-    return routes;
-  }
+	getSubPackagesRoutes() {
+		if (!(this.uniPagesJSON && this.uniPagesJSON.subPackages)) {
+			return []
+		}
+		const subPackages = this.uniPagesJSON.subPackages
+		let routes: any = []
+		for (let i = 0; i < subPackages.length; i++) {
+			const subPages = subPackages[i].pages
+			const root = subPackages[i].root
+			const subRoutes = this.getPagesRoutes(subPages, root)
+			routes = routes.concat(subRoutes)
+		}
+		return routes
+	}
 
-  getTabbarRoutes() {
-    if (
-      !(
-        this.uniPagesJSON &&
-        this.uniPagesJSON.tabBar &&
-        this.uniPagesJSON.tabBar.list
-      )
-    ) {
-      return [];
-    }
-    const tabbar = this.uniPagesJSON.tabBar.list;
-    let tabbarMap: any = [];
-    tabbar.forEach((bar: { pagePath: string }) => {
-      tabbarMap.push("/" + bar.pagePath);
-    });
-    return tabbarMap;
-  }
+	getTabbarRoutes() {
+		if (!(this.uniPagesJSON && this.uniPagesJSON.tabBar && this.uniPagesJSON.tabBar.list)) {
+			return []
+		}
+		const tabbar = this.uniPagesJSON.tabBar.list
+		let tabbarMap: any = []
+		tabbar.forEach((bar: { pagePath: string }) => {
+			tabbarMap.push("/" + bar.pagePath)
+		})
+		return tabbarMap
+	}
 }
 
 export const useRouter = ({ pagesJsonDir, includes = [] }: any) => {
-  let defaultIncludes = ["path", "aliasPath", "name"];
-  includes = [...defaultIncludes, ...includes];
-  let pages = new TransformPages({
-    pagesJsonDir,
-    includes,
-  });
-  if (pages.tabbar && pages.tabbar.length) {
-    console.table(pages.tabbar);
-  }
-  if (pages.routes && pages.routes.length) {
-    console.table(pages.routes);
-  }
-  return {
-    name: "use-router",
-    config() {
-      return {
-        define: {
-          __ROUTES__: JSON.stringify(pages.routes),
-          __TABBAR__: JSON.stringify(pages.tabbar),
-        },
-      };
-    },
-  };
-};
+	let defaultIncludes = ["path", "aliasPath", "name"]
+	includes = [...defaultIncludes, ...includes]
+	let pages = new TransformPages({
+		pagesJsonDir,
+		includes,
+	})
+	if (pages.tabbar && pages.tabbar.length) {
+		console.table(pages.tabbar)
+	}
+	if (pages.routes && pages.routes.length) {
+		console.table(pages.routes)
+	}
+	return {
+		name: "use-router",
+		config() {
+			return {
+				define: {
+					__ROUTES__: JSON.stringify(pages.routes),
+					__TABBAR__: JSON.stringify(pages.tabbar),
+				},
+			}
+		},
+	}
+}