diff --git a/src/App.vue b/src/App.vue
index 01059e3..cd4f8db 100644
--- a/src/App.vue
+++ b/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
}
diff --git a/src/pages/tabbar/individualOrder.vue b/src/pages/tabbar/individualOrder.vue
index 6c5251a..2d99763 100644
--- a/src/pages/tabbar/individualOrder.vue
+++ b/src/pages/tabbar/individualOrder.vue
@@ -25,7 +25,7 @@
@confirm="datePickerConfirm"
format="YYYY-MM-DD"
:quickDate="[]"
- :drawerSize="900"
+ drawerSize="900"
>
筛选
@@ -257,7 +257,7 @@ const state = reactive({
curOrder: {},
refundDetail: {},
remark: "",
- date: "",
+ date: [],
formatVal: "",
})
const formatVal = computed(() => (state.date.length === 2 ? state.formatVal : ""))
diff --git a/src/sheep/utils/request.ts b/src/sheep/utils/request.ts
index 3f76b23..1497d13 100644
--- a/src/sheep/utils/request.ts
+++ b/src/sheep/utils/request.ts
@@ -86,6 +86,7 @@ async function handleShLogin(): Promise {
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 })