修改部分判断条件

src/App.vue

@@ -134,9 +134,14 @@ export default {
 		} else {
 			// 是诗画环境
 			const userRole = uni.getStorageSync("userRole")
-			if (!userRole) return uni.redirectTo({ url: "/pages/user/userRole" })
-			if (userRole === "user") return uni.switchTab({ url: "/pages/tabbar/coopMerchant" })
-			if (userRole === "merchant") return uni.switchTab({ url: "/pages/tabbar/individualOrder" })
+			switch (userRole) {
+				case "merchant":
+					return uni.switchTab({ url: "/pages/tabbar/individualOrder" })
+				case "user":
+					return uni.switchTab({ url: "/pages/tabbar/coopMerchant" })
+				default:
+					return uni.redirectTo({ url: "/pages/user/userRole" })
+			}
 		}
 	},
 	onShow() {},
@@ -175,6 +180,7 @@ export default {
 						break
 					default:
 						uni.hideTabBar()
+						uni.removeStorageSync("userRole")
 						uni.showToast({ title: "用户身份未确认", icon: "none" })
 						break
 				}

src/pages/tabbar/individualOrder.vue

@@ -25,7 +25,7 @@
 						@confirm="datePickerConfirm"
 						format="YYYY-MM-DD"
 						:quickDate="[]"
-						:drawerSize="900"
+						drawerSize="900"
 					>
 						<view class="w-100rpx text-center second-text-28 text-30 mb-4rpx">筛选</view>
 					</tm-between-time>
@@ -257,7 +257,7 @@ const state = reactive<any>({
 	curOrder: {},
 	refundDetail: {},
 	remark: "",
-	date: "",
+	date: [],
 	formatVal: "",
 })
 const formatVal = computed(() => (state.date.length === 2 ? state.formatVal : ""))

src/sheep/utils/request.ts

@@ -86,6 +86,7 @@ async function handleShLogin(): Promise<boolean> {
 
 		const { accountId, sessionId } = userInfo.data
 		const response = await userApi.authsh({ accountId, sessionId })
+		// const response = await userApi.authsh({ accountId: "67186e49d63fea141aad6772", sessionId: "67186e49d63fea141aad6776" }) // 测试
 
 		if (response.code == 0) {
 			uni.setStorageSync(TOKEN_KEY, { accessToken: response.data.accessToken })