From 374717bc5c20985f16d65b132b0fd4d7d519e05b Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 1 Apr 2025 20:13:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E8=A7=92=E8=89=B2=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                  |  2 --
 src/App.vue           | 21 ++++++++++++++++++---
 src/sheep/api/user.ts |  9 +++++++++
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/.env b/.env
index 0638fa6..a089ef7 100644
--- a/.env
+++ b/.env
@@ -19,7 +19,6 @@ VITE_OAUTH2_APP_CLIENT='mini:mini'
 # 图片访问基础地址
 #VITE_IMAGE_BASE_PATH = http://localhost:9999
 # VITE_IMAGE_BASE_PATH = http://192.168.101.81:9999 # 邓-本地
-# VITE_IMAGE_BASE_PATH = https://123.156.230.15:8089/api # 线上
 # VITE_IMAGE_BASE_PATH = http://220.191.229.171:8090/api # 线上
 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # 张
 #VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上
@@ -30,7 +29,6 @@ VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api # 域名线上
 VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/api # 域名线上
 # VITE_APP_DEV_SERVICE = http://192.168.101.81: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 # 线上
 # VITE_APP_DEV_SERVICE = http://localhost:9999
 # ******************** end 开发环境 end ********************
diff --git a/src/App.vue b/src/App.vue
index 31363ba..75f3258 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,4 +1,5 @@
 <script lang="ts">
+import user from "./sheep/api/user"
 import isDevEnv from "./sheep/utils/isDevEnv"
 
 // import { onLaunch, onShow, onHide } from "@dcloudio/uni-app"
@@ -69,8 +70,8 @@ export default {
 	onLaunch() {
 		console.log("环境判断")
 		// 诗画浦江获取用户信息进行环境判断
-		;(window as any).CP2.getAppInfo().then((res) => {
-			if (res.code == 0) {
+		;(window as any).CP2.getAppInfo().then(async (res) => {
+			if (res.code !== 0) {
 				// 不是诗画环境
 				const launchParam = new URL(window.location.href).searchParams.get("launchParam")
 				console.log("app launch 启动路径参数", launchParam)
@@ -86,7 +87,21 @@ export default {
 				}
 			} else {
 				// 是诗画环境
-				return uni.redirectTo({ url: "/pages/user/userRole" })
+				const userRole = uni.getStorageSync("userRole")
+				if (userRole && userRole == "user") uni.switchTab({ url: "/pages/tabbar/coopMerchant" })
+				if (userRole && userRole == "merchant") uni.switchTab({ url: "/pages/tabbar/individualOrder" })
+
+				const res = await user.isMerchant()
+				if (res.code == 0) {
+					if (res.data) {
+						return uni.redirectTo({ url: "/pages/user/userRole" })
+					} else {
+						uni.setStorageSync("userRole", "user")
+						uni.switchTab({ url: "/pages/tabbar/coopMerchant" })
+					}
+				} else {
+					uni.showToast({ title: "角色身份判断失败", icon: "none" })
+				}
 			}
 		})
 	},
diff --git a/src/sheep/api/user.ts b/src/sheep/api/user.ts
index c58e76a..376a2a7 100644
--- a/src/sheep/api/user.ts
+++ b/src/sheep/api/user.ts
@@ -87,4 +87,13 @@ export default {
 			},
 		})
 	},
+	// 判断是否是商户角色
+	isMerchant: (): Promise<any> =>
+		request({
+			url: "/admin/role/isMchUser",
+			method: "GET",
+			custom: {
+				showLoading: false,
+			},
+		}),
 }