From 2a2ba187e890c6c6932514b37dfbe03f1c22f692 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Mon, 24 Mar 2025 16:26:24 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=B5=81=E6=B0=B4=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/pay/scanPay.vue           |   2 +-
 src/pages/tabbar/flowStatistics.vue |  66 ++++++++-------
 src/pages/tabbar/order.vue          |  15 ++--
 src/sheep/hooks/use-unit.ts         | 124 ++++++++++++++--------------
 4 files changed, 105 insertions(+), 102 deletions(-)

diff --git a/src/pages/pay/scanPay.vue b/src/pages/pay/scanPay.vue
index f672cd1..ffc974f 100644
--- a/src/pages/pay/scanPay.vue
+++ b/src/pages/pay/scanPay.vue
@@ -149,7 +149,7 @@ const handlePay = () => {
 	})
 }
 
-// handle pay
+// 支付
 const pay = async () => {
 	try {
 		uni.showLoading({ title: "支付中...", mask: true })
diff --git a/src/pages/tabbar/flowStatistics.vue b/src/pages/tabbar/flowStatistics.vue
index fbfa4ed..84e619a 100644
--- a/src/pages/tabbar/flowStatistics.vue
+++ b/src/pages/tabbar/flowStatistics.vue
@@ -17,7 +17,7 @@
 				<view class="h-30rpx" />
 				<view class="bg-white rounded-12rpx p-20rpx flex justify-between items-center">
 					<text class="text-30 font-600">流水统计</text>
-					<tm-text color="#999999">{{ state.formatVal }}</tm-text>
+					<tm-text color="#999999">{{ formatVal }}</tm-text>
 					<view class="flex items-center cursor-pointer">
 						<tm-between-time
 							start="2020-1-1"
@@ -51,38 +51,42 @@
 			<view class="h-20rpx" />
 
 			<view class="bg-white rounded-16rpx p-2 mb-2 shadow-md" v-for="(v, i) in list" :key="i">
-				<view class="text-28 text-gray-800 font-medium px-2 mb-2">
-					{{ "2022-01-01" }}
+				<view class="flex justify-between items-center text-sm text-gray-800 mb-1">
+					<view class="flex items-center">
+						<image class="w-50rpx h-50rpx rounded-8rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
+						<view>{{ v.merchantName }}</view>
+					</view>
+					<view>{{ v.day }}</view>
 				</view>
-				<view class="bg-gray-100 rounded-12rpx p-2">
-					<view class="flex justify-between mb-2">
-						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx mr-1">
-							<text class="flex-1 text-center text-gray-600">流水金额</text>
-							<text class="flex-1 text-center text-26 text-gray-800 font-medium">¥{{ 1145 }}</text>
+				<view class="bg-gray-100 rounded-12rpx p-1">
+					<view class="flex justify-between mb-1">
+						<view class="flex-1 flex items-center p-1 bg-white rounded-8rpx">
+							<text class="flex-1 text-sm text-center text-gray-600">流水金额</text>
+							<text class="flex-1 text-sm text-center text-gray-800">¥ {{ hooks.useMoney(v.totalPayPrice) }}</text>
 						</view>
-						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx ml-1">
-							<text class="flex-1 text-center text-gray-600">流水次数</text>
-							<text class="flex-1 text-center text-26 text-gray-800 font-medium">{{ 1145 }}</text>
+						<view class="flex-1 flex items-center p-1 bg-white rounded-8rpx ml-1">
+							<text class="flex-1 text-sm text-center text-gray-600">流水次数</text>
+							<text class="flex-1 text-sm text-center text-gray-800">{{ v.totalPayCount }}</text>
 						</view>
 					</view>
-					<view class="flex justify-between mb-2">
-						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx mr-1">
-							<text class="flex-1 text-center text-gray-600">退款金额</text>
-							<text class="flex-1 text-center text-26 text-red-500 font-medium">¥{{ 1145 }}</text>
+					<view class="flex justify-between mb-1">
+						<view class="flex-1 flex items-center p-1 bg-white rounded-8rpx">
+							<text class="flex-1 text-sm text-center text-gray-600">盈利金额</text>
+							<text class="flex-1 text-sm text-center text-green-500">¥ {{ hooks.useMoney(v.totalProfitPrice) }}</text>
 						</view>
-						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx ml-1">
-							<text class="flex-1 text-center text-gray-600">退款次数</text>
-							<text class="flex-1 text-center text-26 text-red-500 font-medium">{{ 1145 }}</text>
+						<view class="flex-1 flex items-center p-1 bg-white rounded-8rpx ml-1">
+							<text class="flex-1 text-sm text-center text-gray-600">盈利次数</text>
+							<text class="flex-1 text-sm text-center text-green-500">{{ v.totalProfitCount }}</text>
 						</view>
 					</view>
 					<view class="flex justify-between mb-0">
-						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx mr-1">
-							<text class="flex-1 text-center text-gray-600">盈利金额</text>
-							<text class="flex-1 text-center text-26 text-green-500 font-medium">¥{{ 1145 }}</text>
+						<view class="flex-1 flex items-center p-1 bg-white rounded-8rpx">
+							<text class="flex-1 text-sm text-center text-gray-600">退款金额</text>
+							<text class="flex-1 text-sm text-center text-red-500">¥ {{ hooks.useMoney(v.totalRefundPrice) }}</text>
 						</view>
-						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx ml-1">
-							<text class="flex-1 text-center text-gray-600">盈利次数</text>
-							<text class="flex-1 text-center text-26 text-green-500 font-medium">{{ 1145 }}</text>
+						<view class="flex-1 flex items-center p-1 bg-white rounded-8rpx ml-1">
+							<text class="flex-1 text-sm text-center text-gray-600">退款次数</text>
+							<text class="flex-1 text-sm text-center text-red-500">{{ v.totalRefundCount || 0 }}</text>
 						</view>
 					</view>
 				</view>
@@ -92,9 +96,10 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive } from "vue"
-import { onShow } from "@dcloudio/uni-app"
+import { ref, reactive, computed } from "vue"
+import { onLoad, onShow } from "@dcloudio/uni-app"
 import { hooks } from "@@/index"
+import { filePath } from "@@/utils/file"
 import { flowStatisticsApi } from "@@/api"
 
 const pageRef = ref<any>(null)
@@ -105,8 +110,13 @@ const state = reactive<any>({
 	formatVal: "",
 	date: "",
 })
-const { list, startPage, scroll } = hooks.usePage(pageRef, flowStatisticsApi.page, null, "data.records")
+const formatVal = computed(() => (state.date.length === 2 ? state.formatVal : ""))
+const { list, startPage, scroll } = hooks.usePage(pageRef, flowStatisticsApi.page, null, "data")
 
+onLoad(() => {
+	const app = getApp()
+	app._initTabbar()
+})
 onShow(() => {
 	const isLogin = hooks.useCheckLogin()
 	if (!isLogin) return
@@ -121,8 +131,6 @@ const query = (page: number, pagesize: number) => {
 // 时间范围选择器确认
 const datePickerConfirm = (date: any) => {
 	state.pa.createTimeList = date.map((v: any) => hooks.useTime(v, "{y}-{m}-{d}"))
-	console.log("xx", state.pa.createTimeList)
-
 	pageRef.value.reload(false)
 }
 </script>
diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue
index 1e700f8..70f0b79 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, reactive } from "vue"
+import { ref, reactive, computed } from "vue"
 import { onLoad, onShow } from "@dcloudio/uni-app"
 
 import { hooks, router } from "@@/index"
@@ -24,7 +24,10 @@ const state = reactive<any>({
 	},
 })
 
-onLoad(() => {})
+onLoad(() => {
+	const app = getApp()
+	app._initTabbar()
+})
 onShow(async () => {
 	const isLogin = await hooks.useCheckLogin()
 	if (!isLogin) return
@@ -108,13 +111,11 @@ const doRefund = (v: any) => {
 									{{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}
 								</text>
 							</view>
-							<!-- <view class="second-text-22">
-								{{ hooks.useEnum("hardwareRefundStatusEnum", v.refundStatus) }}
-							</view> -->
+							<view class="second-text-22">{{ hooks.useEnum("hardwareRefundStatusEnum", v.refundStatus) }}</view>
 						</view>
 					</view>
 				</view>
-				<view class="relative h-0rpx m-t-[-10rpx] flex justify-end items-center">
+				<view class="relative h-0rpx m-t-[20rpx] flex justify-end items-center">
 					<!-- <view class="absolute top-0 right-0 bottom-0 left-0 h-180rpx">
 						<scroll-view scroll-x class="flex-row-center whitespace-nowrap">
 							<view class="flex-row items-center">
@@ -152,5 +153,3 @@ const doRefund = (v: any) => {
 		</z-paging>
 	</crud-layout>
 </template>
-
-<style lang="scss" scoped></style>
diff --git a/src/sheep/hooks/use-unit.ts b/src/sheep/hooks/use-unit.ts
index cd4295c..91f4321 100644
--- a/src/sheep/hooks/use-unit.ts
+++ b/src/sheep/hooks/use-unit.ts
@@ -1,70 +1,66 @@
 export const useMoney = (num) => {
-  if (typeof num === "undefined") return "0.00";
-  const parsedNumber = typeof num === "string" ? parseFloat(num) : num;
-  return (parsedNumber / 100.0).toFixed(1);
-};
+	if (typeof num === "undefined") return "0.00"
+	const parsedNumber = typeof num === "string" ? parseFloat(num) : num
+	return (parsedNumber / 100.0).toFixed(2)
+}
 
-export function useFormatNum(
-  prefix: string,
-  type: "exact" | string,
-  num: number
-) {
-  num = num || 0;
-  if (type === "exact") {
-    return prefix + num;
-  }
-  if (num < 10) {
-    return `${prefix}≤10`;
-  }
-  // 情况三：大于 10，除第一位外，其它位都显示为0
-  // 例如：100  - 199  显示为 100+
-  //      9000 - 9999 显示为 9000+
-  const numStr = num.toString();
-  const first = numStr[0];
-  const other = "0".repeat(numStr.length - 1);
-  return `${prefix}${first}${other}+`;
+export function useFormatNum(prefix: string, type: "exact" | string, num: number) {
+	num = num || 0
+	if (type === "exact") {
+		return prefix + num
+	}
+	if (num < 10) {
+		return `${prefix}≤10`
+	}
+	// 情况三：大于 10，除第一位外，其它位都显示为0
+	// 例如：100  - 199  显示为 100+
+	//      9000 - 9999 显示为 9000+
+	const numStr = num.toString()
+	const first = numStr[0]
+	const other = "0".repeat(numStr.length - 1)
+	return `${prefix}${first}${other}+`
 }
 
 export function useTime(time, pattern) {
-  if (arguments.length === 0 || !time) {
-    return null;
-  }
-  const format = pattern || "{y}-{m}-{d} {h}:{i}:{s}";
-  let date;
-  if (typeof time === "object") {
-    date = time;
-  } else {
-    if (typeof time === "string" && /^[0-9]+$/.test(time)) {
-      time = parseInt(time);
-    } else if (typeof time === "string") {
-      time = time
-        .replace(new RegExp(/-/gm), "/")
-        .replace("T", " ")
-        .replace(new RegExp(/\.[\d]{3}/gm), "");
-    }
-    if (typeof time === "number" && time.toString().length === 10) {
-      time = time * 1000;
-    }
-    date = new Date(time);
-  }
-  const formatObj = {
-    y: date.getFullYear(),
-    m: date.getMonth() + 1,
-    d: date.getDate(),
-    h: date.getHours(),
-    i: date.getMinutes(),
-    s: date.getSeconds(),
-    a: date.getDay(),
-  };
-  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
-    let value = formatObj[key];
-    if (key === "a") {
-      return ["日", "一", "二", "三", "四", "五", "六"][value];
-    }
-    if (result.length > 0 && value < 10) {
-      value = "0" + value;
-    }
-    return value || 0;
-  });
-  return time_str;
+	if (arguments.length === 0 || !time) {
+		return null
+	}
+	const format = pattern || "{y}-{m}-{d} {h}:{i}:{s}"
+	let date
+	if (typeof time === "object") {
+		date = time
+	} else {
+		if (typeof time === "string" && /^[0-9]+$/.test(time)) {
+			time = parseInt(time)
+		} else if (typeof time === "string") {
+			time = time
+				.replace(new RegExp(/-/gm), "/")
+				.replace("T", " ")
+				.replace(new RegExp(/\.[\d]{3}/gm), "")
+		}
+		if (typeof time === "number" && time.toString().length === 10) {
+			time = time * 1000
+		}
+		date = new Date(time)
+	}
+	const formatObj = {
+		y: date.getFullYear(),
+		m: date.getMonth() + 1,
+		d: date.getDate(),
+		h: date.getHours(),
+		i: date.getMinutes(),
+		s: date.getSeconds(),
+		a: date.getDay(),
+	}
+	const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+		let value = formatObj[key]
+		if (key === "a") {
+			return ["日", "一", "二", "三", "四", "五", "六"][value]
+		}
+		if (result.length > 0 && value < 10) {
+			value = "0" + value
+		}
+		return value || 0
+	})
+	return time_str
 }

From 30e04320179e73b6b2f36d51bc3f6aee906e87dd Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 25 Mar 2025 10:56:13 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=8A=A8=E6=80=81tabbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                         | 81 +++++++++++++++++++++++++++--
 src/pages/tabbar/flowStatistics.vue |  7 ++-
 src/pages/tabbar/home.vue           |  6 ++-
 src/pages/tabbar/my.vue             |  3 ++
 src/pages/tabbar/order.vue          |  8 +--
 src/pages/tabbar/shop.vue           |  6 ++-
 6 files changed, 98 insertions(+), 13 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 3c9f428..6353446 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,8 +1,79 @@
-<script setup lang="ts">
-import { onLaunch, onShow, onHide } from "@dcloudio/uni-app"
-onLaunch(() => {})
-onShow(() => {})
-onHide(() => {})
+<script lang="ts">
+// import { onLaunch, onShow, onHide } from "@dcloudio/uni-app"
+// onLaunch(() => {})
+// onShow(() => {})
+// onHide(() => {})
+
+const tabbar = [
+	{
+		pagePath: "pages/tabbar/home",
+		text: "首页",
+		iconPath: "/static/tabbar/home.png",
+		selectedIconPath: "/static/tabbar/home-select.png",
+	},
+	// {
+	// 	"pagePath": "pages/tabbar/shop",
+	// 	"text": "超市",
+	// 	"iconPath": "/static/tabbar/shop.png",
+	// 	"selectedIconPath": "/static/tabbar/shop-select.png"
+	// },
+	{
+		pagePath: "pages/tabbar/order",
+		text: "订单",
+		iconPath: "/static/tabbar/order.png",
+		selectedIconPath: "/static/tabbar/order-select.png",
+	},
+	{
+		pagePath: "pages/tabbar/flowStatistics",
+		text: "流水统计",
+		iconPath: "/static/tabbar/order.png",
+		selectedIconPath: "/static/tabbar/order-select.png",
+	},
+	{
+		pagePath: "pages/tabbar/individualOrder",
+		text: "订单",
+		iconPath: "/static/tabbar/order.png",
+		selectedIconPath: "/static/tabbar/order-select.png",
+	},
+	{
+		pagePath: "pages/tabbar/my",
+		text: "我的",
+		iconPath: "/static/tabbar/my.png",
+		selectedIconPath: "/static/tabbar/my-select.png",
+	},
+]
+
+export default {
+	onLaunch() {},
+	onShow() {},
+	onHide() {},
+
+	methods: {
+		_initTabbar() {
+			tabbar.forEach(({ pagePath, text, iconPath, selectedIconPath }, index) => {
+				if (index === 2) {
+					uni.setTabBarItem({
+						index: index,
+						pagePath,
+						text,
+						iconPath,
+						selectedIconPath,
+						visible: true,
+					})
+				} else {
+					uni.setTabBarItem({
+						index: index,
+						pagePath,
+						text,
+						iconPath,
+						selectedIconPath,
+						visible: true,
+					})
+				}
+			})
+		},
+	},
+}
 </script>
 
 <style lang="scss">
diff --git a/src/pages/tabbar/flowStatistics.vue b/src/pages/tabbar/flowStatistics.vue
index 84e619a..67cf5f0 100644
--- a/src/pages/tabbar/flowStatistics.vue
+++ b/src/pages/tabbar/flowStatistics.vue
@@ -50,11 +50,11 @@
 
 			<view class="h-20rpx" />
 
-			<view class="bg-white rounded-16rpx p-2 mb-2 shadow-md" v-for="(v, i) in list" :key="i">
+			<view class="bg-white rounded-16rpx p-2 mb-1 shadow-md" v-for="(v, i) in list" :key="i">
 				<view class="flex justify-between items-center text-sm text-gray-800 mb-1">
 					<view class="flex items-center">
 						<image class="w-50rpx h-50rpx rounded-8rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
-						<view>{{ v.merchantName }}</view>
+						<view class="ml-2">{{ v.merchantName }}</view>
 					</view>
 					<view>{{ v.day }}</view>
 				</view>
@@ -120,6 +120,9 @@ onLoad(() => {
 onShow(() => {
 	const isLogin = hooks.useCheckLogin()
 	if (!isLogin) return
+	if (pageRef.value) {
+		pageRef.value.reload(false)
+	}
 })
 
 const query = (page: number, pagesize: number) => {
diff --git a/src/pages/tabbar/home.vue b/src/pages/tabbar/home.vue
index e32b061..c7a31f4 100644
--- a/src/pages/tabbar/home.vue
+++ b/src/pages/tabbar/home.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, reactive } from "vue"
-import { onShow } from "@dcloudio/uni-app"
+import { onLoad, onShow } from "@dcloudio/uni-app"
 import { hooks, router } from "@@/index"
 import { merchantApi } from "@@/api"
 import { filePath } from "@@/utils/file"
@@ -12,6 +12,10 @@ const state = reactive<any>({
 	},
 })
 
+onLoad(() => {
+	const app = getApp()
+	app._initTabbar()
+})
 onShow(() => {
 	if (pageRef.value) {
 		pageRef.value.reload(false)
diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue
index d15bd16..a1aefd8 100644
--- a/src/pages/tabbar/my.vue
+++ b/src/pages/tabbar/my.vue
@@ -261,6 +261,9 @@ const getStorageUserInfo = () => {
 }
 
 onLoad(() => {
+	const app = getApp()
+	app._initTabbar()
+
 	isDevEnv()
 		? state.menuList.push({
 				text: "测试登录",
diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue
index 70f0b79..7bb6cef 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -31,9 +31,9 @@ onLoad(() => {
 onShow(async () => {
 	const isLogin = await hooks.useCheckLogin()
 	if (!isLogin) return
-	if (pageRef.value) {
-		pageRef.value.reload(false)
-	}
+	// if (pageRef.value) {
+	// 	pageRef.value.reload(false)
+	// }
 })
 const doTab = (e: any) => {
 	const target = data.tabs[e]
@@ -100,7 +100,7 @@ const doRefund = (v: any) => {
 								<!-- <view class="m-l-15rpx color-#999 font-size-26rpx! iconfont icon-youjiantou" /> -->
 							</view>
 							<tm-tag v-if="v.orderStatus == 1" color="info" size="xs">未支付</tm-tag>
-							<tm-tag v-if="v.orderStatus == 5" color="success" size="xs">待核销</tm-tag>
+							<tm-tag v-if="v.orderStatus == 5" color="success" size="xs">已支付</tm-tag>
 							<tm-tag v-if="v.orderStatus == 10" color="error" size="xs">售后</tm-tag>
 							<tm-tag v-if="v.orderStatus == 20" size="xs">已核销</tm-tag>
 						</view>
diff --git a/src/pages/tabbar/shop.vue b/src/pages/tabbar/shop.vue
index 37e43c8..3690736 100644
--- a/src/pages/tabbar/shop.vue
+++ b/src/pages/tabbar/shop.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, reactive } from "vue"
-import { onShow } from "@dcloudio/uni-app"
+import { onLoad, onShow } from "@dcloudio/uni-app"
 import { merchantApi } from "@@/api"
 import { hooks, router } from "@@/index"
 import { filePath } from "@@/utils/file"
@@ -18,6 +18,10 @@ const query = (page: number, pagesize: number) => {
 	startPage(page, pagesize, false, state.pa)
 }
 
+onLoad(() => {
+	const app = getApp()
+	app._initTabbar()
+})
 onShow(() => {
 	pageRef.value && pageRef.value.reload(false)
 })

From 80e3a108d45d9ceddfb5f241ab5ac03479acd5d4 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 25 Mar 2025 10:57:03 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E4=B8=AA=E4=BD=93=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=92=8C=E5=95=86=E5=AE=B6=E9=80=80=E6=AC=BE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/tabbar/individualOrder.vue | 305 ++++++++++++++++++++++-----
 src/sheep/api/individualOrder.ts     |  17 ++
 2 files changed, 275 insertions(+), 47 deletions(-)

diff --git a/src/pages/tabbar/individualOrder.vue b/src/pages/tabbar/individualOrder.vue
index 391bf1f..92d8ed6 100644
--- a/src/pages/tabbar/individualOrder.vue
+++ b/src/pages/tabbar/individualOrder.vue
@@ -22,7 +22,7 @@
 
 			<view class="h-20rpx" />
 
-			<view class="flex-col justify-center card p-x-15rpx p-y-25rpx m-b-20rpx" v-for="(v, i) in list" :key="i">
+			<view class="flex-col justify-center card p-x-15rpx p-y-25rpx m-b-10rpx" v-for="(v, i) in list" :key="i">
 				<view class="flex-row items-center">
 					<image class="w-100rpx h-100rpx rounded-8rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
 					<view class="flex-1 flex-col m-l-20rpx">
@@ -36,11 +36,11 @@
 							<tm-tag v-if="v.orderStatus == 10" color="error" size="xs">售后</tm-tag>
 							<tm-tag v-if="v.orderStatus == 20" size="xs">已核销</tm-tag>
 						</view>
-						<view class="flex justify-between items-end m-t-5rpx">
-							<view class="flex flex-col m-t-5rpx">
+						<view class="flex justify-between items-center">
+							<view class="flex flex-col">
 								<view class="second-text-20">
-									<text>{{ "某个人" }}</text>
-									<text class="m-l-10rpx">{{ "13155555555" }}</text>
+									<text>{{ v.username }}</text>
+									<text class="m-l-10rpx">{{ v.userMobile }}</text>
 								</view>
 								<view class="second-text-20">
 									<text>下单时间</text>
@@ -49,58 +49,181 @@
 									</text>
 								</view>
 							</view>
-							<view class="flex flex-row">
-								<view class="m-t-14rpx m-r-20rpx second-text-26">共 {{ v.carList?.length || "null" }} 件</view>
-								<view class="m-t-10rpx main-text-30 color-red!">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
+							<view class="flex flex-col items-end justify-center m-t-5rpx">
+								<view class="second-text-22">{{ hooks.useEnum("hardwareRefundStatusEnum", v.refundStatus) }}</view>
+								<view class="flex">
+									<view v-if="v.carList?.length" class="m-t-4rpx m-r-10rpx second-text-26">共 {{ v.carList.length }} 件</view>
+									<view class="main-text-30 color-red!">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
+								</view>
 							</view>
 						</view>
 					</view>
 				</view>
-				<view class="h-20rpx m-t-[-10rpx] flex justify-end items-center">
-					<!-- <view class="absolute top-0 right-0 bottom-0 left-0 h-180rpx">
-						<scroll-view scroll-x class="flex-row-center whitespace-nowrap">
-							<view class="flex-row items-center">
-								<view
-									class="inline-flex! flex-col justify-center h-180rpx m-r-20rpx"
-									v-for="(pV, pI) in v.carList"
-									:key="pI"
-									@tap.stop="
-										router.jump('/pages/merchant/product-detail', {
-											id: pV.productId,
-										})
-									"
-								>
-									<image class="w-160rpx h-120rpx rounded-8rpx" :src="filePath(pV.productPic)" mode="aspectFill" />
-									<view class="w-160rpx m-t-10rpx sub-text-24 show-line text-center">
-										{{ pV.productName }}
-									</view>
-								</view>
-								<view class="inline-flex! h-180rpx">
-									<view class="w-160rpx h-full" />
-								</view>
-							</view>
-						</scroll-view>
-					</view> -->
-				</view>
-				<view class="flex-row items-center justify-end">
-					<view class="botder_btn" @tap.stop="">退款</view>
+				<view v-if="v.orderStatus == 10 && v.refundStatus == 0" class="h-50rpx mt-1 flex justify-end items-center">
+					<view class="botder_btn" @tap.stop="doIndividualRefund(v)">退款</view>
 				</view>
 			</view>
 		</z-paging>
 
-		<!-- <tm-drawer ref="calendarView" placement="bottom" v-model:show="state.showDrawer">
-			<view style="height: 1800rpx"></view>
-		</tm-drawer> -->
+		<tm-drawer title="退款" :showClose="true" size="90%" placement="bottom" bgColor="#EBF6FF" v-model:show="state.showDrawer" zIndex="999">
+			<view class="bg-white rounded-16rpx px-10rpx m-b-10rpx animate-both">
+				<z-tabs
+					:list="['同意退款', '拒绝退款']"
+					bar-width="300"
+					bar-height="0"
+					:active-style="{
+						width: '300rpx',
+						height: '70rpx',
+						backgroundColor: '#0779FDdd',
+						color: '#000000',
+						textAlign: 'center',
+						lineHeight: '70rpx',
+						fontWeight: 'bold',
+						fontSize: '30rpx',
+						borderRadius: '10rpx',
+						marginTop: '10rpx',
+					}"
+					:inactive-style="{
+						width: '300rpx',
+						height: '70rpx',
+						color: '#000000',
+						textAlign: 'center',
+						lineHeight: '70rpx',
+						fontWeight: 'bold',
+						fontSize: '30rpx',
+						borderRadius: '10rpx',
+						marginTop: '10rpx',
+					}"
+					@change="refundTabChange"
+				/>
+			</view>
+
+			<view class="flex-col justify-center card p-x-15rpx p-y-25rpx m-b-10rpx">
+				<view class="flex-row items-center">
+					<image class="w-100rpx h-100rpx rounded-8rpx" :src="filePath(state.curOrder.logoPic)" mode="aspectFill" />
+					<view class="flex-1 flex-col m-l-20rpx">
+						<view class="flex-row items-center justify-between">
+							<view class="flex-row items-center">
+								<view class="main-text-28">{{ state.curOrder.merchantName }}</view>
+								<view v-if="false" class="m-l-15rpx color-#999 font-size-26rpx! iconfont icon-youjiantou" />
+							</view>
+							<tm-tag v-if="state.curOrder.orderStatus == 1" color="info" size="xs">未支付</tm-tag>
+							<tm-tag v-if="state.curOrder.orderStatus == 5" color="success" size="xs">已支付</tm-tag>
+							<tm-tag v-if="state.curOrder.orderStatus == 10" color="error" size="xs">售后</tm-tag>
+							<tm-tag v-if="state.curOrder.orderStatus == 20" size="xs">已核销</tm-tag>
+						</view>
+						<view class="flex justify-between items-center">
+							<view class="flex flex-col">
+								<view class="second-text-20">
+									<text>{{ state.curOrder.username }}</text>
+									<text class="m-l-10rpx">{{ state.curOrder.userMobile }}</text>
+								</view>
+								<view class="second-text-20">
+									<text>下单时间</text>
+									<text class="m-l-10rpx">
+										{{ hooks.useTime(state.curOrder.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}
+									</text>
+								</view>
+							</view>
+							<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 class="main-text-30 color-red!">¥ {{ hooks.useMoney(state.curOrder.totalPrice) }}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="flex-col justify-center card p-x-20rpx p-y-30rpx m-b-10rpx">
+				<view class="flex-row items-center justify-between">
+					<view class="sub-text-28">实付款</view>
+					<view class="flex-row items-end">
+						<view class="sub-text-28">¥</view>
+						<view class="m-l-5rpx sub-text-28">{{ hooks.useMoney(state.curOrder.payPrice) }}</view>
+					</view>
+				</view>
+			</view>
+			<view class="flex-row items-center justify-between card p-x-20rpx p-y-30rpx m-b-10rpx">
+				<view class="sub-text-28">退款金额</view>
+				<view class="sub-text-28 color-red!">¥{{ hooks.useMoney(state.curOrder.payPrice) }}</view>
+			</view>
+			<view class="card p-x-20rpx p-y-30rpx space-y-10rpx m-b-10rpx second-text-24">
+				<view class="flex-row items-center">
+					<view>服务单号：</view>
+					<view>{{ state.refundDetail.no }}</view>
+				</view>
+				<view class="flex-row items-center">
+					<view>申请时间：</view>
+					<view>{{ hooks.useTime(state.refundDetail.createTime, "") }}</view>
+				</view>
+				<view class="flex-row items-center">
+					<view>售后类型：</view>
+					<view>{{ state.refundDetail.applyReason }}</view>
+				</view>
+				<view class="flex-row items-center">
+					<view>相关描述：</view>
+					<view>{{ state.refundDetail.applyDescription }}</view>
+				</view>
+			</view>
+			<view v-if="state.refundDetail.status == 62" class="card p-x-20rpx p-y-30rpx space-y-10rpx m-b-10rpx second-text-24">
+				<view class="flex-row items-center">
+					<view>审核人：</view>
+					<view>{{ state.refundDetail.auditUsername }}</view>
+				</view>
+				<view class="flex-row items-center">
+					<view>审核时间：</view>
+					<view>{{ hooks.useTime(state.refundDetail.auditTime, "") }}</view>
+				</view>
+				<view class="flex-row items-center">
+					<view>拒绝原因：</view>
+					<view>{{ state.refundDetail.auditReason }}</view>
+				</view>
+			</view>
+			<view v-if="state.refundScene === 1" class="flex-col justify-center card p-x-20rpx p-y-30rpx m-b-10rpx">
+				<view class="sub-text-28">拒绝原因</view>
+				<view class="m-t-20rpx">
+					<tm-input v-model="state.remark" type="textarea" :showClear="false" placeholder="请描述拒绝原因" />
+				</view>
+			</view>
+			<view v-else class="h-270rpx" />
+			<view class="flex">
+				<tm-modal
+					v-if="state.refundScene === 0"
+					style="flex: 1"
+					height="250"
+					title="确定同意退款吗？"
+					:show-footer="true"
+					@confirm="doAgreeRefund()"
+				>
+					<template v-slot:trigger><tm-button block>同意退款</tm-button></template>
+				</tm-modal>
+				<tm-modal
+					v-if="state.refundScene === 1"
+					style="flex: 1"
+					height="250"
+					title="确定拒绝退款吗？"
+					:show-footer="true"
+					@confirm="doRefuseRefund()"
+				>
+					<template v-slot:trigger><tm-button block color="danger">拒绝退款</tm-button></template>
+				</tm-modal>
+			</view>
+		</tm-drawer>
 	</crud-layout>
 </template>
 
 <script setup lang="ts">
 import { ref, reactive } from "vue"
-import { onShow } from "@dcloudio/uni-app"
+import { onLoad, onShow } from "@dcloudio/uni-app"
 import { hooks } from "@@/index"
 import { filePath } from "@@/utils/file"
 import zTabs from "@@/components/other/z-tabs/z-tabs.vue"
-import { individualOrderApi } from "@@/api"
+import { individualOrderApi, refundApi } from "@@/api"
 
 const pageRef = ref<any>(null)
 // 选项卡
@@ -113,13 +236,24 @@ const state = reactive<any>({
 	pa: {
 		orderStatus: tabs[0].id,
 	},
-	// showDrawer: false,
+	showDrawer: false,
+	refundScene: 0,
+	curOrder: {},
+	refundDetail: {},
+	remark: "",
 })
 const { list, startPage, scroll } = hooks.usePage(pageRef, individualOrderApi.page, null, "data.records")
 
+onLoad(() => {
+	const app = getApp()
+	app._initTabbar()
+})
 onShow(() => {
-	// const isLogin = await hooks.useCheckLogin()
-	// if (!isLogin) return
+	const isLogin = hooks.useCheckLogin()
+	if (!isLogin) return
+	// if (pageRef.value) {
+	// 	pageRef.value.reload(false)
+	// }
 })
 
 // 切换选项卡
@@ -134,8 +268,85 @@ const query = (page: number, pagesize: number) => {
 	startPage(page, pagesize, false, state.pa)
 }
 
+// 重置状态
+const resetState = () => {
+	state.refundScene = 0
+	state.curOrder = {}
+	state.refundDetail = {}
+	state.remark = ""
+}
+
 // 点击退款
-// const tabRefund = (v: any) => {
-// 	state.showDrawer = true
-// }
+const doIndividualRefund = async (v: any) => {
+	if (!v.id) return uni.showToast({ title: "订单id不存在", icon: "none" })
+
+	resetState()
+
+	state.curOrder = v
+	state.showDrawer = true
+	uni.showLoading({ title: "加载中...", mask: true })
+	try {
+		const res: any = await refundApi.get({ id: v.id })
+		if (res.code == 0) {
+			state.refundDetail = res.data
+		} else {
+			uni.showToast({ title: res.msg || "加载退款详情失败", icon: "none" })
+		}
+	} catch (error) {
+		uni.showToast({ title: "错误", icon: "none" })
+	} finally {
+		uni.hideLoading()
+	}
+}
+
+// 退款切换选项卡
+const refundTabChange = (e: number) => {
+	state.refundScene = e
+}
+
+// 同意退款
+const doAgreeRefund = async () => {
+	if (!state.refundDetail.id) {
+		return uni.showToast({ title: "订单不存在", icon: "none" })
+	}
+
+	uni.showLoading({ title: "操作中...", mask: true })
+	try {
+		const res: any = await individualOrderApi.agreeRefund({ id: state.refundDetail.id })
+		if (res.code == 0) {
+			uni.showToast({ title: "操作成功", icon: "success" })
+			state.showDrawer = false
+			pageRef.value.reload(true)
+		} else {
+			uni.showToast({ title: res.msg || "退款失败", icon: "none" })
+		}
+	} catch (error) {
+		uni.showToast({ title: "错误", icon: "none" })
+	} finally {
+		uni.hideLoading()
+	}
+}
+
+// 拒绝退款
+const doRefuseRefund = async () => {
+	if (!state.refundDetail.id) {
+		return uni.showToast({ title: "订单不存在", icon: "none" })
+	}
+
+	uni.showLoading({ title: "操作中...", mask: true })
+	try {
+		const res: any = await individualOrderApi.refuseRefund({ id: state.refundDetail.id, auditReason: state.remark })
+		if (res.code == 0) {
+			uni.showToast({ title: "操作成功", icon: "success" })
+			state.showDrawer = false
+			pageRef.value.reload(true)
+		} else {
+			uni.showToast({ title: res.msg || "拒绝退款失败", icon: "none" })
+		}
+	} catch (error) {
+		uni.showToast({ title: "错误", icon: "none" })
+	} finally {
+		uni.hideLoading()
+	}
+}
 </script>
diff --git a/src/sheep/api/individualOrder.ts b/src/sheep/api/individualOrder.ts
index db28c53..a03969b 100644
--- a/src/sheep/api/individualOrder.ts
+++ b/src/sheep/api/individualOrder.ts
@@ -10,4 +10,21 @@ export default {
 				showLoading: false,
 			},
 		}),
+	refuseRefund: (data: { id: string; auditReason: string }) =>
+		request({
+			url: "/hard/hard-after-sale/app/mch-disagree",
+			method: "POST",
+			data,
+			custom: {
+				showLoading: false,
+			},
+		}),
+	agreeRefund: (params: { id: string }) =>
+		request({
+			url: `/hard/hard-after-sale/app/mch-agree?id=${params.id}`,
+			method: "POST",
+			custom: {
+				showLoading: false,
+			},
+		}),
 }

From f70a8ce90071b20ee77ae244e6ffc200d616d2c4 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 25 Mar 2025 11:30:19 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue    |  4 +--
 src/pages.json | 94 +++++++++++++++++++++++++++++++++++---------------
 2 files changed, 69 insertions(+), 29 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 6353446..c422304 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -51,14 +51,14 @@ export default {
 	methods: {
 		_initTabbar() {
 			tabbar.forEach(({ pagePath, text, iconPath, selectedIconPath }, index) => {
-				if (index === 2) {
+				if (index === 2 || index === 3) {
 					uni.setTabBarItem({
 						index: index,
 						pagePath,
 						text,
 						iconPath,
 						selectedIconPath,
-						visible: true,
+						visible: false,
 					})
 				} else {
 					uni.setTabBarItem({
diff --git a/src/pages.json b/src/pages.json
index dca0775..6c5ab70 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -295,40 +295,80 @@
 		"list": [
 			{
 				"pagePath": "pages/tabbar/home",
-				"text": "首页",
-				"iconPath": "static/tabbar/home.png",
-				"selectedIconPath": "static/tabbar/home-select.png"
+				"text": "",
+				"iconPath": "",
+				"selectedIconPath": ""
 			},
 			// {
 			// 	"pagePath": "pages/tabbar/shop",
+			// 	"text": "",
+			// 	"iconPath": "",
+			// 	"selectedIconPath": ""
+			// },
+			{
+				"pagePath": "pages/tabbar/order",
+				"text": "",
+				"iconPath": "",
+				"selectedIconPath": ""
+			},
+			{
+				"pagePath": "pages/tabbar/flowStatistics",
+				"text": "",
+				"iconPath": "",
+				"selectedIconPath": ""
+			},
+			{
+				"pagePath": "pages/tabbar/individualOrder",
+				"text": "",
+				"iconPath": "",
+				"selectedIconPath": ""
+			},
+			{
+				"pagePath": "pages/tabbar/my",
+				"text": "",
+				"iconPath": "",
+				"selectedIconPath": ""
+			}
+
+			// {
+			// 	"pagePath": "pages/tabbar/home",
+			// 	"text": "首页",
+			// 	"iconPath": "static/tabbar/home.png",
+			// 	"selectedIconPath": "static/tabbar/home-select.png"
+			// },
+			// {
+			// 	"pagePath": "pages/tabbar/shop",
 			// 	"text": "超市",
 			// 	"iconPath": "static/tabbar/shop.png",
 			// 	"selectedIconPath": "static/tabbar/shop-select.png"
 			// },
-			{
-				"pagePath": "pages/tabbar/order",
-				"text": "订单",
-				"iconPath": "static/tabbar/order.png",
-				"selectedIconPath": "static/tabbar/order-select.png"
-			},
-			{
-				"pagePath": "pages/tabbar/flowStatistics",
-				"text": "流水统计",
-				"iconPath": "static/tabbar/order.png",
-				"selectedIconPath": "static/tabbar/order-select.png"
-			},
-			{
-				"pagePath": "pages/tabbar/individualOrder",
-				"text": "订单",
-				"iconPath": "static/tabbar/order.png",
-				"selectedIconPath": "static/tabbar/order-select.png"
-			},
-			{
-				"pagePath": "pages/tabbar/my",
-				"text": "我的",
-				"iconPath": "static/tabbar/my.png",
-				"selectedIconPath": "static/tabbar/my-select.png"
-			}
+			// {
+			// 	"pagePath": "pages/tabbar/order",
+			// 	"text": "订单",
+			// 	"iconPath": "static/tabbar/order.png",
+			// 	"selectedIconPath": "static/tabbar/order-select.png"
+			// },
+
+			// {
+			// 	"pagePath": "pages/tabbar/flowStatistics",
+			// 	"text": "流水统计",
+			// 	"iconPath": "static/tabbar/order.png",
+			// 	"selectedIconPath": "static/tabbar/order-select.png"
+			// },
+
+			// {
+			// 	"pagePath": "pages/tabbar/individualOrder",
+			// 	"text": "订单",
+			// 	"iconPath": "static/tabbar/order.png",
+			// 	"selectedIconPath": "static/tabbar/order-select.png"
+			// },
+
+			// {
+			// 	"pagePath": "pages/tabbar/my",
+			// 	"text": "我的",
+			// 	"iconPath": "static/tabbar/my.png",
+			// 	"selectedIconPath": "static/tabbar/my-select.png"
+			// },
 		]
 	}
 }

From a0155981eb64f5afc9bc23b479dc7ad4b3e84b08 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 25 Mar 2025 11:31:57 +0800
Subject: [PATCH 5/8] 1

---
 .env | 4 ++--
 1 file changed, 2 insertions(+), 2 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 # 线上

From ed79db43ab758a46dcba2c92b8ed2252440a2970 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 25 Mar 2025 13:28:49 +0800
Subject: [PATCH 6/8] =?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/App.vue                                |  83 +++++++++++++++------
 src/pages.json                             |  14 ++--
 src/pages/tabbar/{home.vue => canteen.vue} |   0
 src/sheep/utils/request.ts                 |   2 +
 src/static/tabbar/canteen-select.png       | Bin 0 -> 1797 bytes
 src/static/tabbar/canteen.png              | Bin 0 -> 1731 bytes
 6 files changed, 69 insertions(+), 30 deletions(-)
 rename src/pages/tabbar/{home.vue => canteen.vue} (100%)
 create mode 100644 src/static/tabbar/canteen-select.png
 create mode 100644 src/static/tabbar/canteen.png

diff --git a/src/App.vue b/src/App.vue
index c422304..b89e1e9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,12 +4,14 @@
 // onShow(() => {})
 // onHide(() => {})
 
+// zhezhengding：浙政钉 | shihua：诗画
 const tabbar = [
 	{
-		pagePath: "pages/tabbar/home",
-		text: "首页",
-		iconPath: "/static/tabbar/home.png",
-		selectedIconPath: "/static/tabbar/home-select.png",
+		pagePath: "pages/tabbar/canteen",
+		text: "食堂",
+		iconPath: "/static/tabbar/canteen.png",
+		selectedIconPath: "/static/tabbar/canteen-select.png",
+		auth: ["zhezhengding", "shihua"],
 	},
 	// {
 	// 	"pagePath": "pages/tabbar/shop",
@@ -22,24 +24,28 @@ const tabbar = [
 		text: "订单",
 		iconPath: "/static/tabbar/order.png",
 		selectedIconPath: "/static/tabbar/order-select.png",
+		auth: ["zhezhengding"],
 	},
 	{
 		pagePath: "pages/tabbar/flowStatistics",
 		text: "流水统计",
 		iconPath: "/static/tabbar/order.png",
 		selectedIconPath: "/static/tabbar/order-select.png",
+		auth: ["shihua"],
 	},
 	{
 		pagePath: "pages/tabbar/individualOrder",
 		text: "订单",
 		iconPath: "/static/tabbar/order.png",
 		selectedIconPath: "/static/tabbar/order-select.png",
+		auth: ["shihua"],
 	},
 	{
 		pagePath: "pages/tabbar/my",
 		text: "我的",
 		iconPath: "/static/tabbar/my.png",
 		selectedIconPath: "/static/tabbar/my-select.png",
+		auth: ["zhezhengding", "shihua"],
 	},
 ]
 
@@ -50,27 +56,58 @@ export default {
 
 	methods: {
 		_initTabbar() {
-			tabbar.forEach(({ pagePath, text, iconPath, selectedIconPath }, index) => {
-				if (index === 2 || index === 3) {
-					uni.setTabBarItem({
-						index: index,
-						pagePath,
-						text,
-						iconPath,
-						selectedIconPath,
-						visible: false,
+			console.log("环境判断")
+
+			let appEnv = 1 // 1:浙政钉 2:诗画
+
+			switch (appEnv) {
+				case 1:
+					tabbar.forEach(({ pagePath, text, iconPath, selectedIconPath, auth }, index) => {
+						if (auth.includes("zhezhengding")) {
+							uni.setTabBarItem({
+								index,
+								pagePath,
+								text,
+								iconPath,
+								selectedIconPath,
+								visible: true,
+							})
+						} else {
+							uni.setTabBarItem({
+								index,
+								pagePath,
+								text,
+								iconPath,
+								selectedIconPath,
+								visible: false,
+							})
+						}
 					})
-				} else {
-					uni.setTabBarItem({
-						index: index,
-						pagePath,
-						text,
-						iconPath,
-						selectedIconPath,
-						visible: true,
+					break
+				case 2:
+					tabbar.forEach(({ pagePath, text, iconPath, selectedIconPath, auth }, index) => {
+						if (auth.includes("shihua")) {
+							uni.setTabBarItem({
+								index,
+								pagePath,
+								text,
+								iconPath,
+								selectedIconPath,
+								visible: true,
+							})
+						} else {
+							uni.setTabBarItem({
+								index,
+								pagePath,
+								text,
+								iconPath,
+								selectedIconPath,
+								visible: false,
+							})
+						}
 					})
-				}
-			})
+					break
+			}
 		},
 	},
 }
diff --git a/src/pages.json b/src/pages.json
index 6c5ab70..26907c7 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -10,9 +10,9 @@
 	},
 	"pages": [
 		{
-			"path": "pages/tabbar/home",
+			"path": "pages/tabbar/canteen",
 			"style": {
-				"navigationBarTitleText": "首页",
+				"navigationBarTitleText": "食堂",
 				"disableScroll": true
 			}
 		},
@@ -294,7 +294,7 @@
 	"tabBar": {
 		"list": [
 			{
-				"pagePath": "pages/tabbar/home",
+				"pagePath": "pages/tabbar/canteen",
 				"text": "",
 				"iconPath": "",
 				"selectedIconPath": ""
@@ -331,10 +331,10 @@
 			}
 
 			// {
-			// 	"pagePath": "pages/tabbar/home",
-			// 	"text": "首页",
-			// 	"iconPath": "static/tabbar/home.png",
-			// 	"selectedIconPath": "static/tabbar/home-select.png"
+			// 	"pagePath": "pages/tabbar/canteen",
+			// 	"text": "食堂",
+			// 	"iconPath": "static/tabbar/canteen.png",
+			// 	"selectedIconPath": "static/tabbar/canteen-select.png"
 			// },
 			// {
 			// 	"pagePath": "pages/tabbar/shop",
diff --git a/src/pages/tabbar/home.vue b/src/pages/tabbar/canteen.vue
similarity index 100%
rename from src/pages/tabbar/home.vue
rename to src/pages/tabbar/canteen.vue
diff --git a/src/sheep/utils/request.ts b/src/sheep/utils/request.ts
index 3d07e3a..bba1f5c 100644
--- a/src/sheep/utils/request.ts
+++ b/src/sheep/utils/request.ts
@@ -113,6 +113,8 @@ const checkAndRefreshToken = async (tokenStorage: any) => {
 
 // 请求拦截器
 http.interceptors.request.use(async (config) => {
+	console.log("请求之前")
+
 	const tokenStorage = uni.getStorageSync(TOKEN_KEY)
 	const config_header: any = config?.header || {}
 
diff --git a/src/static/tabbar/canteen-select.png b/src/static/tabbar/canteen-select.png
new file mode 100644
index 0000000000000000000000000000000000000000..7887b99c3e95cbc5897eaf5af9ea52f1df85b336
GIT binary patch
literal 1797
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

literal 0
HcmV?d00001

diff --git a/src/static/tabbar/canteen.png b/src/static/tabbar/canteen.png
new file mode 100644
index 0000000000000000000000000000000000000000..75f82447fd15e721c2edc4024afe9ef684587bfb
GIT binary patch
literal 1731
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
Ze*iERuj1Z?;+g;e002ovPDHLkV1frpH<kbZ

literal 0
HcmV?d00001


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 7/8] =?UTF-8?q?=E6=89=93=E5=BC=80=E8=B6=85=E5=B8=82tabbar?=
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 8/8] 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">