From a222670d6483171ef41cc0f1f7343b9248c59660 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Mon, 21 Apr 2025 15:33:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E7=B3=BB=E7=83=AD=E7=BA=BF=E5=92=8C?=
 =?UTF-8?q?=E6=99=BA=E8=83=BD=E6=9F=9C=E8=A7=92=E8=89=B2=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                         | 30 +++++++++++++++----------
 src/pages/tabbar/flowStatistics.vue |  9 ++++++++
 src/pages/tabbar/my.vue             | 12 ++++++++++
 src/pages/user/userRole.vue         | 34 ++++++++++++++++++++++++-----
 4 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index b937cda..8894340 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,4 @@
 <script lang="ts">
-import { userApi } from "./sheep/api"
 import isDevEnv from "./sheep/utils/isDevEnv"
 import { getAppInfo } from "@@/utils/getAppInfo"
 
@@ -32,7 +31,7 @@ const tabbar: TabbarItem[] = [
 		iconPath: "/static/tabbar/selfMerchant.png",
 		selectedIconPath: "/static/tabbar/selfMerchant-select.png",
 		launchParam: ["selfMerchant"],
-		auth: [],
+		auth: ["user"],
 	},
 	{
 		pagePath: "pages/tabbar/coopMerchant",
@@ -42,14 +41,14 @@ const tabbar: TabbarItem[] = [
 		launchParam: ["selfMerchant"],
 		auth: ["user"],
 	},
-	// {
-	// 	pagePath: "pages/tabbar/cabinet",
-	// 	text: "智能柜",
-	// 	iconPath: "/static/tabbar/cabinet.png",
-	// 	selectedIconPath: "/static/tabbar/cabinet-select.png",
-	// 	launchParam: ["selfMerchant"],
-	// 	auth: ["user"],
-	// },
+	{
+		pagePath: "pages/tabbar/cabinet",
+		text: "智能柜",
+		iconPath: "/static/tabbar/cabinet.png",
+		selectedIconPath: "/static/tabbar/cabinet-select.png",
+		launchParam: ["selfMerchant"],
+		auth: ["cabinetAdmin"],
+	},
 	{
 		pagePath: "pages/tabbar/order",
 		text: "订单",
@@ -112,7 +111,16 @@ const setTabbarByLaunchParam = (launchParam: string) => {
 // 根据用户角色设置tabbar项目
 const setTabbarByUserRole = (role: string) => {
 	tabbar.forEach((item, index) => {
-		const visible = item.auth.includes(role)
+		let visible = false
+		if (item.auth.includes("cabinetAdmin")) {
+			if (uni.getStorageSync("isHardDoorAdmin") == "true") {
+				visible = true
+			} else {
+				visible = false
+			}
+		} else {
+			visible = item.auth.includes(role)
+		}
 		setTabbarItem(index, item, visible)
 	})
 }
diff --git a/src/pages/tabbar/flowStatistics.vue b/src/pages/tabbar/flowStatistics.vue
index a398ffb..8504464 100644
--- a/src/pages/tabbar/flowStatistics.vue
+++ b/src/pages/tabbar/flowStatistics.vue
@@ -3,6 +3,7 @@
 		<z-paging
 			ref="pageRef"
 			:fixed="false"
+			height="100%"
 			v-model="pageHook.list"
 			:default-page-size="10"
 			safe-area-inset-bottom
@@ -111,6 +112,7 @@ onShow(() => {
 	if (pageRef.value) {
 		pageRef.value.reload(false)
 	}
+	// getTotalWatar()
 })
 
 const query = (page: number, pagesize: number) => {
@@ -124,4 +126,11 @@ const datePickerConfirm = (date: any) => {
 	state.pa.createTimeList = formatVal.value.split("~")
 	pageRef.value.reload(false)
 }
+
+// 查询全部流水
+// const getTotalWatar = async () => {
+// 	const res: any = await flowStatisticsApi.mchWaterTotal()
+// 	if (res.code == 0) {
+// 	}
+// }
 </script>
diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue
index 1995305..025548f 100644
--- a/src/pages/tabbar/my.vue
+++ b/src/pages/tabbar/my.vue
@@ -42,6 +42,13 @@
 				切换角色
 			</view>
 		</view>
+
+		<view class="absolute bottom-0 left-0 right-0 second-text-26 text-center my-1">
+			<text>联系热线：</text>
+			<text @click="doPhone('18367908152')">18367908152</text>
+			&nbsp;
+			<text @click="doPhone('15657370065')">15657370065</text>
+		</view>
 	</crud-layout>
 </template>
 
@@ -383,6 +390,11 @@ onShow(() => {
 	// 获取存储中的用户信息
 	storage.getUserInfo()
 })
+
+// 联系客服
+const doPhone = (phone: string) => {
+	hooks.useMakePhoneCall(phone)
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/user/userRole.vue b/src/pages/user/userRole.vue
index b0c86f6..e1e3a4c 100644
--- a/src/pages/user/userRole.vue
+++ b/src/pages/user/userRole.vue
@@ -49,21 +49,45 @@ const selectRole = (role: "user" | "merchant") => (userRole.value = role)
 // 确认选择
 const confirmRole = async () => {
 	if (userRole.value === "user") {
-		uni.setStorageSync("userRole", userRole.value)
-		uni.reLaunch({ url: "/pages/tabbar/coopMerchant" })
-		return
+		uni.showLoading({ title: "正在验证身份", mask: true })
+		const res: any = await userApi.userRole().finally(() => uni.hideLoading())
+		if (res.code == 0) {
+			if (res.data.isHardDoorAdmin) {
+				uni.setStorageSync("userRole", userRole.value)
+				uni.setStorageSync("isHardDoorAdmin", "true")
+				uni.reLaunch({ url: "/pages/tabbar/coopMerchant" })
+				return
+			} else {
+				uni.setStorageSync("userRole", userRole.value)
+				uni.setStorageSync("isHardDoorAdmin", "false")
+				uni.reLaunch({ url: "/pages/tabbar/coopMerchant" })
+				return
+			}
+		} else {
+			uni.setStorageSync("userRole", userRole.value)
+			uni.setStorageSync("isHardDoorAdmin", "false")
+			uni.reLaunch({ url: "/pages/tabbar/coopMerchant" })
+			return
+		}
 	}
 	if (userRole.value === "merchant") {
 		uni.showLoading({ title: "正在验证身份", mask: true })
-		const res = await userApi.isMerchant().finally(() => uni.hideLoading())
+		const res: any = await userApi.userRole().finally(() => uni.hideLoading())
 		if (res.code == 0) {
-			if (res.data) {
+			if (res.data.isMch) {
 				uni.setStorageSync("userRole", userRole.value)
+				if (res.data.isHardDoorAdmin) {
+					uni.setStorageSync("isHardDoorAdmin", "true")
+				} else {
+					uni.setStorageSync("isHardDoorAdmin", "false")
+				}
 				uni.reLaunch({ url: "/pages/tabbar/individualOrder" })
 				return
 			} else {
 				uni.showToast({ title: "您不是商户", icon: "none" })
 			}
+		} else {
+			uni.showToast({ title: "身份验证失败", icon: "none" })
 		}
 	}
 }