From ac855b089eeb704bab38f1e21113f4ed9092ba2e Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 25 Mar 2025 16:58:36 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=89=93=E5=BC=80=E8=B6=85=E5=B8=82tabba?=
 =?UTF-8?q?r?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                 | 13 +++++++------
 src/pages.json              | 26 +++++++++++++-------------
 src/pages/merchant/food.vue | 20 ++++++++++----------
 src/pages/tabbar/shop.vue   | 13 +++++++------
 4 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index b89e1e9..69941a5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,12 +13,13 @@ const tabbar = [
 		selectedIconPath: "/static/tabbar/canteen-select.png",
 		auth: ["zhezhengding", "shihua"],
 	},
-	// {
-	// 	"pagePath": "pages/tabbar/shop",
-	// 	"text": "超市",
-	// 	"iconPath": "/static/tabbar/shop.png",
-	// 	"selectedIconPath": "/static/tabbar/shop-select.png"
-	// },
+	{
+		pagePath: "pages/tabbar/shop",
+		text: "超市",
+		iconPath: "/static/tabbar/shop.png",
+		selectedIconPath: "/static/tabbar/shop-select.png",
+		auth: ["zhezhengding", "shihua"],
+	},
 	{
 		pagePath: "pages/tabbar/order",
 		text: "订单",
diff --git a/src/pages.json b/src/pages.json
index 26907c7..fafaefb 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -16,13 +16,13 @@
 				"disableScroll": true
 			}
 		},
-		// {
-		// 	"path": "pages/tabbar/shop",
-		// 	"style": {
-		// 		"navigationBarTitleText": "超市",
-		// 		"disableScroll": true
-		// 	}
-		// },
+		{
+			"path": "pages/tabbar/shop",
+			"style": {
+				"navigationBarTitleText": "超市",
+				"disableScroll": true
+			}
+		},
 		{
 			"path": "pages/tabbar/order",
 			"style": {
@@ -299,12 +299,12 @@
 				"iconPath": "",
 				"selectedIconPath": ""
 			},
-			// {
-			// 	"pagePath": "pages/tabbar/shop",
-			// 	"text": "",
-			// 	"iconPath": "",
-			// 	"selectedIconPath": ""
-			// },
+			{
+				"pagePath": "pages/tabbar/shop",
+				"text": "",
+				"iconPath": "",
+				"selectedIconPath": ""
+			},
 			{
 				"pagePath": "pages/tabbar/order",
 				"text": "",
diff --git a/src/pages/merchant/food.vue b/src/pages/merchant/food.vue
index 98739e5..00cd8fa 100644
--- a/src/pages/merchant/food.vue
+++ b/src/pages/merchant/food.vue
@@ -150,17 +150,17 @@ const doProduct = (v: any) => {
 					<template #default="{ item, url, index }">
 						<div class="card">
 							<LazyImg class="rounded-2" :url="item.picUrl" />
-							<view class="p-x-15rpx p-y-25rpx">
+							<view class="p-x-15rpx p-y-25rpx flex items-center justify-between">
 								<view class="sub-text-28 show-line">{{ item.name }}</view>
-								<view class="m-t-10rpx flex-row items-center">
-									<view class="second-text-32 color-#f63a36!"> ¥{{ hooks.useMoney(item.price) }} </view>
-									<view class="m-l-20rpx mt-1 second-text-24 line-through">¥{{ hooks.useMoney(item.marketPrice) }}</view>
-								</view>
-								<view class="flex-col items-start">
-									<view class="second-text-24">{{ hooks.useFormatNum("库存", "", item.stock) }}</view>
-									<!-- <view class="w-1px h-20rpx m-x-5rpx bg-#999" /> -->
-									<view class="second-text-24">{{ hooks.useFormatNum("销量", "", item.salesCount) }}</view>
-								</view>
+								<!-- <view class="m-t-10rpx flex-row items-center"> -->
+								<view class="second-text-32 color-#f63a36!"> ¥{{ hooks.useMoney(item.price) }} </view>
+								<!-- <view class="m-l-20rpx mt-1 second-text-24 line-through">¥{{ hooks.useMoney(item.marketPrice) }}</view> -->
+								<!-- </view> -->
+								<!-- <view class="flex-col items-start"> -->
+								<!-- <view class="second-text-24">{{ hooks.useFormatNum("库存", "", item.stock) }}</view> -->
+								<!-- <view class="w-1px h-20rpx m-x-5rpx bg-#999" /> -->
+								<!-- <view class="second-text-24">{{ hooks.useFormatNum("销量", "", item.salesCount) }}</view> -->
+								<!-- </view> -->
 							</view>
 						</div>
 					</template>
diff --git a/src/pages/tabbar/shop.vue b/src/pages/tabbar/shop.vue
index 3690736..93c7753 100644
--- a/src/pages/tabbar/shop.vue
+++ b/src/pages/tabbar/shop.vue
@@ -27,10 +27,10 @@ onShow(() => {
 })
 
 const toDetail = async (v: any) => {
-	const isLogin = await hooks.useCheckLogin()
-	if (isLogin) {
-		router.jump("/pages/shop/detail", { id: v.id })
-	}
+	// const isLogin = await hooks.useCheckLogin()
+	// if (isLogin) {
+	// 	router.jump("/pages/shop/detail", { id: v.id })
+	// }
 }
 </script>
 
@@ -57,11 +57,12 @@ const toDetail = async (v: any) => {
 					<view class="flex-1 flex-col m-l-20rpx">
 						<view class="flex-row items-center justify-between">
 							<view class="flex-row-center sub-text-34">{{ v.name }}</view>
-							<tm-tag size="s">{{ v.deptName }}</tm-tag>
+							<!-- <tm-tag size="s">{{ v.deptName }}</tm-tag> -->
+							<tm-tag size="s">老县府超市</tm-tag>
 						</view>
 						<view class="second-text-24">{{ v.phone }}</view>
 						<view class="second-text-24">
-							<view class="second-text-28">营业时间：</view>
+							<view v-if="v.jobTime != ',,'" class="second-text-28">营业时间：</view>
 							<view>{{ v.jobTime?.split(",")[0] ? "早：" + v.jobTime?.split(",")[0] : "" }}</view>
 							<view>{{ v.jobTime?.split(",")[1] ? "中：" + v.jobTime?.split(",")[1] : "" }}</view>
 							<view>{{ v.jobTime?.split(",")[2] ? "晚：" + v.jobTime?.split(",")[2] : "" }}</view>

From eb05a664eb65ecfc9ce3237358705996d9c89e62 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 25 Mar 2025 17:32:55 +0800
Subject: [PATCH 02/10] 1

---
 src/pages/tabbar/shop.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/tabbar/shop.vue b/src/pages/tabbar/shop.vue
index 93c7753..8ad7d42 100644
--- a/src/pages/tabbar/shop.vue
+++ b/src/pages/tabbar/shop.vue
@@ -57,8 +57,7 @@ const toDetail = async (v: any) => {
 					<view class="flex-1 flex-col m-l-20rpx">
 						<view class="flex-row items-center justify-between">
 							<view class="flex-row-center sub-text-34">{{ v.name }}</view>
-							<!-- <tm-tag size="s">{{ v.deptName }}</tm-tag> -->
-							<tm-tag size="s">老县府超市</tm-tag>
+							<tm-tag size="s">{{ v.deptName }}</tm-tag>
 						</view>
 						<view class="second-text-24">{{ v.phone }}</view>
 						<view class="second-text-24">

From 4e09579931b8c61f8cdd95f46c304e65dc874a03 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 25 Mar 2025 20:46:04 +0800
Subject: [PATCH 03/10] 11

---
 .env           | 4 ++--
 src/pages.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index b162418..bc55261 100644
--- a/.env
+++ b/.env
@@ -26,9 +26,9 @@ VITE_OAUTH2_APP_CLIENT='mini:mini'
 VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上
 
 # ******************** start 开发环境 start ********************
-# VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
+VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
 # VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/app-api
-VITE_APP_DEV_SERVICE = http://192.168.101.64:9999 # 邓-本地
+# VITE_APP_DEV_SERVICE = http://192.168.101.64:9999 # 邓-本地
 # VITE_APP_DEV_SERVICE = http://127.0.0.1:9999
 # VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api/ # 线上
 # VITE_APP_DEV_SERVICE = http://220.191.229.171:8090/api # 线上
diff --git a/src/pages.json b/src/pages.json
index dca0775..65e83f7 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -331,4 +331,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file

From 30fe98dcee2e3ed5394bd80262e506de95e93e97 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 25 Mar 2025 21:19:14 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                       | 38 ++++++++++++++--------------
 src/pages/tabbar/individualOrder.vue |  6 ++---
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index fafaefb..55cd939 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": [
diff --git a/src/pages/tabbar/individualOrder.vue b/src/pages/tabbar/individualOrder.vue
index 92d8ed6..d67e428 100644
--- a/src/pages/tabbar/individualOrder.vue
+++ b/src/pages/tabbar/individualOrder.vue
@@ -128,9 +128,9 @@
 							<view class="flex flex-col items-end justify-center m-t-5rpx">
 								<view class="second-text-22">{{ hooks.useEnum("hardwareRefundStatusEnum", state.curOrder.refundStatus) }}</view>
 								<view class="flex">
-									<view v-if="state.curOrder.carList?.length" class="m-t-4rpx m-r-10rpx second-text-26"
-										>共 {{ state.curOrder.carList.length }} 件</view
-									>
+									<view v-if="state.curOrder.carList?.length" class="m-t-4rpx m-r-10rpx second-text-26">
+										共 {{ state.curOrder.carList.length }} 件
+									</view>
 									<view class="main-text-30 color-red!">¥ {{ hooks.useMoney(state.curOrder.totalPrice) }}</view>
 								</view>
 							</view>

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 05/10] 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),
+				},
+			}
+		},
+	}
+}

From 6c0d0f1e67512c7bf06d7065e1200b9a36090152 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 25 Mar 2025 22:10:23 +0800
Subject: [PATCH 06/10] 11

---
 src/pages/tabbar/shop.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/tabbar/shop.vue b/src/pages/tabbar/shop.vue
index 8ad7d42..c3a61da 100644
--- a/src/pages/tabbar/shop.vue
+++ b/src/pages/tabbar/shop.vue
@@ -12,10 +12,10 @@ const state = reactive<any>({
 		type: "2",
 	},
 })
-const { startPage, list, scroll } = hooks.usePage(pageRef, merchantApi.page, null, "data.records")
+const pageHook = hooks.usePage(pageRef, merchantApi.page, null, "data.records")
 
 const query = (page: number, pagesize: number) => {
-	startPage(page, pagesize, false, state.pa)
+	pageHook.startPage(page, pagesize, false, state.pa)
 }
 
 onLoad(() => {
@@ -40,7 +40,7 @@ const toDetail = async (v: any) => {
 			ref="pageRef"
 			height="100%"
 			:fixed="false"
-			v-model="list"
+			v-model="pageHook.list"
 			:default-page-size="10"
 			safe-area-inset-bottom
 			:loading-more-enabled="true"
@@ -48,10 +48,10 @@ const toDetail = async (v: any) => {
 			@query="query"
 			:auto-clean-list-when-reload="false"
 			:auto-scroll-to-top-when-reload="false"
-			@scroll="scroll"
+			@scroll="pageHook.scroll"
 		>
 			<view class="h-20rpx" />
-			<view class="flex-col card p-20rpx m-b-20rpx" v-for="(v, i) in list" :key="i" @tap="toDetail(v)">
+			<view class="flex-col card p-20rpx m-b-20rpx" v-for="(v, i) in pageHook.list" :key="i" @tap="toDetail(v)">
 				<view class="flex-row-center">
 					<image class="w-180rpx h-180rpx rounded-12rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
 					<view class="flex-1 flex-col m-l-20rpx">

From c4e5719b0d54d9b941ba604ffc93ebcdd17d9ba0 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 25 Mar 2025 22:10:56 +0800
Subject: [PATCH 07/10] 111

---
 src/pages/tabbar/shop.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/tabbar/shop.vue b/src/pages/tabbar/shop.vue
index 297aa89..a5459c2 100644
--- a/src/pages/tabbar/shop.vue
+++ b/src/pages/tabbar/shop.vue
@@ -23,19 +23,19 @@ onLoad(() => {
 	app._initTabbar()
 })
 onShow(() => {
-	// pageRef.value && pageRef.value.reload(false)
+	pageRef.value && pageRef.value.reload(false)
 })
 
 const toDetail = async (v: any) => {
-	// const isLogin = await hooks.useCheckLogin()
-	// if (isLogin) {
-	// 	router.jump("/pages/shop/detail", { id: v.id })
-	// }
+	return
+	const isLogin = await hooks.useCheckLogin()
+	if (isLogin) {
+		router.jump("/pages/shop/detail", { id: v.id })
+	}
 }
 </script>
 
 <template>
-	1
 	<crud-layout bg="/static/page/blue-bg.png">
 		<z-paging
 			ref="pageRef"

From 47ab068e6adbfa601e2a09ebdcc00b1875511aaa Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 25 Mar 2025 22:22:57 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/tabbar/canteen.vue | 1 -
 src/pages/tabbar/order.vue   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/tabbar/canteen.vue b/src/pages/tabbar/canteen.vue
index 26c4cb7..c7a31f4 100644
--- a/src/pages/tabbar/canteen.vue
+++ b/src/pages/tabbar/canteen.vue
@@ -37,7 +37,6 @@ 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/order.vue b/src/pages/tabbar/order.vue
index 7bb6cef..4443598 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -141,7 +141,7 @@ const doRefund = (v: any) => {
 						</scroll-view>
 					</view> -->
 					<!-- <view class="absolute top-0 right-0 bottom-0 z-10 flex-col items-end w-160rpx p-x-20rpx bg-white bg-opacity-95"> -->
-					<view class="m-t-2rpx m-r-20rpx second-text-26">共 {{ v.carList.length }} 件</view>
+					<view v-if="v.carList?.length" class="m-t-2rpx m-r-20rpx second-text-26">共 {{ v.carList.length }} 件</view>
 					<view class="main-text-30 color-red!">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
 					<!-- </view> -->
 				</view>

From 3451ce3dd42db97cd703870a0cf93d56eaa725b8 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 26 Mar 2025 10:00:58 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E5=90=88=E4=BD=9C=E5=95=86=E5=AE=B6tabba?=
 =?UTF-8?q?r?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                           |   7 +++
 src/pages.json                        |  21 ++++++-
 src/pages/pay/scanPay.vue             |   2 +-
 src/pages/tabbar/coopShop.vue         |  79 ++++++++++++++++++++++++++
 src/static/tabbar/coopShop-select.png | Bin 0 -> 498 bytes
 src/static/tabbar/coopShop.png        | Bin 0 -> 493 bytes
 6 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/tabbar/coopShop.vue
 create mode 100644 src/static/tabbar/coopShop-select.png
 create mode 100644 src/static/tabbar/coopShop.png

diff --git a/src/App.vue b/src/App.vue
index 69941a5..dde7a33 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -20,6 +20,13 @@ const tabbar = [
 		selectedIconPath: "/static/tabbar/shop-select.png",
 		auth: ["zhezhengding", "shihua"],
 	},
+	{
+		pagePath: "pages/tabbar/coopShop",
+		text: "合作商家",
+		iconPath: "/static/tabbar/coopShop.png",
+		selectedIconPath: "/static/tabbar/coopShop-select.png",
+		auth: ["zhezhengding"],
+	},
 	{
 		pagePath: "pages/tabbar/order",
 		text: "订单",
diff --git a/src/pages.json b/src/pages.json
index fafaefb..277aa80 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -23,6 +23,13 @@
 				"disableScroll": true
 			}
 		},
+		{
+			"path": "pages/tabbar/coopShop",
+			"style": {
+				"navigationBarTitleText": "合作商家",
+				"disableScroll": true
+			}
+		},
 		{
 			"path": "pages/tabbar/order",
 			"style": {
@@ -277,7 +284,7 @@
 				{
 					"path": "scanPay",
 					"style": {
-						"navigationBarTitleText": "",
+						"navigationBarTitleText": "支付",
 						"disableScroll": true
 					}
 				}
@@ -305,6 +312,12 @@
 				"iconPath": "",
 				"selectedIconPath": ""
 			},
+			{
+				"pagePath": "pages/tabbar/coopShop",
+				"text": "",
+				"iconPath": "",
+				"selectedIconPath": ""
+			},
 			{
 				"pagePath": "pages/tabbar/order",
 				"text": "",
@@ -343,6 +356,12 @@
 			// 	"selectedIconPath": "static/tabbar/shop-select.png"
 			// },
 			// {
+			// 	pagePath: "pages/tabbar/coopShop",
+			// 	text: "合作商家",
+			// 	iconPath: "static/tabbar/coopShop.png",
+			// 	selectedIconPath: "static/tabbar/coopShop-select.png",
+			// },
+			// {
 			// 	"pagePath": "pages/tabbar/order",
 			// 	"text": "订单",
 			// 	"iconPath": "static/tabbar/order.png",
diff --git a/src/pages/pay/scanPay.vue b/src/pages/pay/scanPay.vue
index ffc974f..19ee234 100644
--- a/src/pages/pay/scanPay.vue
+++ b/src/pages/pay/scanPay.vue
@@ -1,7 +1,7 @@
 <template>
 	<crud-layout bg="/static/page/blue-bg.png">
 		<view class="h-screen flex flex-col position-relative">
-			<view class="mx-auto text-34 py-2">支付</view>
+			<view class="mx-auto text-34 py-2">{{ scanData.name }}</view>
 
 			<tm-sheet class="flex flex-row">
 				<span class="text-2xl text-[#333] mr-1 line-height-normal">¥</span>
diff --git a/src/pages/tabbar/coopShop.vue b/src/pages/tabbar/coopShop.vue
new file mode 100644
index 0000000..86d2b2c
--- /dev/null
+++ b/src/pages/tabbar/coopShop.vue
@@ -0,0 +1,79 @@
+<script setup lang="ts">
+import { ref, reactive } from "vue"
+import { onLoad, onShow } from "@dcloudio/uni-app"
+import { merchantApi } from "@@/api"
+import { hooks, router } from "@@/index"
+import { filePath } from "@@/utils/file"
+
+const pageRef = ref<any>(null)
+const state = reactive<any>({
+	pa: {
+		pagesize: 10,
+		type: "3",
+	},
+})
+const pageHook = hooks.usePage(pageRef, merchantApi.page, null, "data.records")
+
+const query = (page: number, pagesize: number) => {
+	pageHook.startPage(page, pagesize, false, state.pa)
+}
+
+onLoad(() => {
+	const app = getApp()
+	app._initTabbar()
+})
+onShow(() => {
+	pageRef.value && pageRef.value.reload(false)
+})
+
+const toDetail = async (v: any) => {
+	return
+	const isLogin = await hooks.useCheckLogin()
+	if (isLogin) {
+		router.jump("/pages/shop/detail", { id: v.id })
+	}
+}
+</script>
+
+<template>
+	<crud-layout bg="/static/page/blue-bg.png">
+		<z-paging
+			ref="pageRef"
+			height="100%"
+			:fixed="false"
+			v-model="pageHook.list"
+			:default-page-size="10"
+			safe-area-inset-bottom
+			:loading-more-enabled="true"
+			:show-scrollbar="false"
+			@query="query"
+			:auto-clean-list-when-reload="false"
+			:auto-scroll-to-top-when-reload="false"
+			@scroll="pageHook.scroll"
+		>
+			<view class="h-20rpx" />
+			<view class="flex-col card p-20rpx m-b-20rpx" v-for="(v, i) in pageHook.list" :key="i" @tap="toDetail(v)">
+				<view class="flex-row-center">
+					<image class="w-180rpx h-180rpx rounded-12rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
+					<view class="flex-1 flex-col m-l-20rpx">
+						<view class="flex-row items-center justify-between">
+							<view class="flex-row-center sub-text-34">{{ v.name }}</view>
+							<tm-tag size="s">{{ v.deptName }}</tm-tag>
+						</view>
+						<view class="second-text-24">{{ v.phone }}</view>
+						<view class="second-text-24">
+							<view v-if="v.jobTime != ',,'" class="second-text-28">营业时间：</view>
+							<view>{{ v.jobTime?.split(",")[0] ? "早：" + v.jobTime?.split(",")[0] : "" }}</view>
+							<view>{{ v.jobTime?.split(",")[1] ? "中：" + v.jobTime?.split(",")[1] : "" }}</view>
+							<view>{{ v.jobTime?.split(",")[2] ? "晚：" + v.jobTime?.split(",")[2] : "" }}</view>
+						</view>
+						<view v-if="v.addressDes" class="m-t-10rpx second-text-28">
+							<text>地址</text>
+							<text class="m-l-10rpx">{{ v.addressDes }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</z-paging>
+	</crud-layout>
+</template>
diff --git a/src/static/tabbar/coopShop-select.png b/src/static/tabbar/coopShop-select.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa72a06bb16623c0f044a14645ed5251c42622cb
GIT binary patch
literal 498
zcmV<O0S*3%P)<h;3K|Lk000e1NJLTq001@s001xu1^@s6S{#YM00001b5ch_0Itp)
z=>Px$tVu*cRA@u(n6XO4KoExix!jdjT9`ZG-oVnrLKNS?#zM5Q)J{kgdr2&;^Z~R`
zJ6}LhE3x(kEQFkJo!y!2$R%PDygN5X;M_P{C6Ha_n}7D-><}`;b|cQdoA%74Rytne
zz8^OUm;v&MVg`tm3-SLcW|~5y;?23DfEkd1Z^dSv-U5;JWI)VALu6pL<6CFB1G?$*
z4nv)q3<mIJ;MX^DV742b1K2Vf3@;yCo9`aedt8b$4o@|po<V3E4h9gf1z!Co25ULI
zsz}`$50wC%1irNwgV|1W0K!ofz?kT<<JA@uFgJVvXsHTd2}7+-bBElDLiJi5D1eB!
zsktAnGt+gIz`%S(wi8}}XtPpaz#G|a)CDkIF);MOjP7#`6GXsFD^;>xb(aRs%aZ}1
zxMfys42m^f=TEfXvb_o&xI~PfV1;`gfp3*^)7A+{z(le5XL#_LCZ+hx29Z5hLV~pH
zUP`fqOpD!%-HYAp?1I7Hh~1Z9LSpyh7hpP5N>NHNpMk;`%`(bx)EX1JK?~TJ84$(3
o5~t&?TIbl9LTFDD#R@3)2_!Ez4-omWsQ>@~07*qoM6N<$f>GMrssI20

literal 0
HcmV?d00001

diff --git a/src/static/tabbar/coopShop.png b/src/static/tabbar/coopShop.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffb65d11d23c5b5725e8333c98d0dcfd93f168ce
GIT binary patch
literal 493
zcmV<J0TTX+P)<h;3K|Lk000e1NJLTq001@s001xu1^@s6S{#YM00001b5ch_0Itp)
z=>Px$r%6OXRA@u(n4wO@KoExiX=+hO#JvF$fgljx0D~Z4Dz*(c6fb~8acQ?n1qi_L
z0wjPUXkGw;A;Dpr4%tFUo0RKbuF0{zsk-L2oBx}CX0{zd?b2Fv{ob|TMNw=;QS@MR
zlYlv3pE%}#NezjM=a_2_P14)wiUQ_91b!Wh<9N;Uyk`eAPm*|~lo~e<Xsz`jfOE&e
zu9Q-H4X`v#FPQnjaj;k4_g8};_$*T~%d(|B&tCwH90x;D6gyEA-IicUl57*vo$F9W
zKQo_&VR&4Doe<IK5WoODDW%p+Fs=0?fQ^BG8H^FdalGPr-rInnKtus0NwP~sH$wtr
z=4;YgUjo=45*UDY1NH%6d0=2LU{23D{xU?sTuW6-)AYU)&CHwg03f1rWH!y!rnSD$
zzZk#OXB9SZ#*8+wsb?Nasb0RcZ3GEeOWBBHRa!_Yb`*%zSPucRYWI?gJw#gCy|nx9
z*+=UqjMSLaSTh3h68sYnn}c4?F`M(HYmH5$yY?{u+w8O0j@d+UmNj#09<zwHc~-#s
j?us^1pJk0WCXNAL9X`N5aK>CO00000NkvXXu0mjfVrJJ7

literal 0
HcmV?d00001


From 7c6dcdcb9f132113e39dc1b4f6f3ddac4abf89a5 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 26 Mar 2025 10:09:17 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/tabbar/coopShop.vue | 2 +-
 src/pages/tabbar/shop.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/tabbar/coopShop.vue b/src/pages/tabbar/coopShop.vue
index 86d2b2c..a5459c2 100644
--- a/src/pages/tabbar/coopShop.vue
+++ b/src/pages/tabbar/coopShop.vue
@@ -9,7 +9,7 @@ const pageRef = ref<any>(null)
 const state = reactive<any>({
 	pa: {
 		pagesize: 10,
-		type: "3",
+		type: "2",
 	},
 })
 const pageHook = hooks.usePage(pageRef, merchantApi.page, null, "data.records")
diff --git a/src/pages/tabbar/shop.vue b/src/pages/tabbar/shop.vue
index a5459c2..86d2b2c 100644
--- a/src/pages/tabbar/shop.vue
+++ b/src/pages/tabbar/shop.vue
@@ -9,7 +9,7 @@ const pageRef = ref<any>(null)
 const state = reactive<any>({
 	pa: {
 		pagesize: 10,
-		type: "2",
+		type: "3",
 	},
 })
 const pageHook = hooks.usePage(pageRef, merchantApi.page, null, "data.records")