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>