交易市场h5

ruoyi-jiaoyi/pages/home/index.vue

@@ -21,7 +21,7 @@ import SupplierHomePanel from '@/components/supplier/home-panel.vue'
 import DistributorHomePanel from '@/components/distributor/home-panel.vue'
 import GuestView from '@/components/partner/guest-view.vue'
 import { useUserStore } from '@/store/user'
-import { isDistributorRole, isSupplierRole } from '@/utils/partnerRole'
+import { isEffectiveDistributorRole, isEffectiveSupplierRole } from '@/utils/partnerRole'
 import { refreshTabPanelOnShow } from '@/utils/tabPanel'
 
 export default {
@@ -55,8 +55,8 @@ export default {
       const userStore = useUserStore()
       const roles = userStore.state.roles
       this.isLoggedIn = userStore.isLoggedIn()
-      this.isSupplier = isSupplierRole(roles)
-      this.isDistributor = isDistributorRole(roles)
+      this.isSupplier = isEffectiveSupplierRole(roles)
+      this.isDistributor = isEffectiveDistributorRole(roles)
     },
     goLogin() {
       uni.navigateTo({ url: '/pages/login/index' })

ruoyi-jiaoyi/pages/order/index.vue

@@ -21,7 +21,7 @@ import SupplierOrderPanel from '@/components/supplier/order-panel.vue'
 import DistributorOrderPanel from '@/components/distributor/order-panel.vue'
 import GuestView from '@/components/partner/guest-view.vue'
 import { useUserStore } from '@/store/user'
-import { isDistributorRole, isSupplierRole } from '@/utils/partnerRole'
+import { isEffectiveDistributorRole, isEffectiveSupplierRole } from '@/utils/partnerRole'
 import { refreshTabPanelOnShow } from '@/utils/tabPanel'
 
 export default {
@@ -49,8 +49,8 @@ export default {
       const userStore = useUserStore()
       const roles = userStore.state.roles
       this.isLoggedIn = userStore.isLoggedIn()
-      this.isSupplier = isSupplierRole(roles)
-      this.isDistributor = isDistributorRole(roles)
+      this.isSupplier = isEffectiveSupplierRole(roles)
+      this.isDistributor = isEffectiveDistributorRole(roles)
     },
     goLogin() {
       uni.navigateTo({ url: '/pages/login/index' })

ruoyi-jiaoyi/utils/partnerRole.js

@@ -51,7 +51,10 @@ export function shouldDenyPartnerLogin(roles) {
   return !hasPartnerRole(roles)
 }
 
-/** 当前登录用户的主身份：supplier | distributor | '' */
+/**
+ * 当前登录用户的主身份：supplier | distributor | ''
+ * 同时含 supplier 与 distributor 时固定为 supplier（界面与接口均走供应商）
+ */
 export function getPrimaryPartnerRole(roles) {
   const list = normalizeRoles(roles).map((r) => roleKey(r))
   if (list.includes('supplier')) {
@@ -63,6 +66,16 @@ export function getPrimaryPartnerRole(roles) {
   return ''
 }
 
+/** Tab 业务页是否展示供应商面板（双角色时不展示承销商） */
+export function isEffectiveSupplierRole(roles) {
+  return getPrimaryPartnerRole(roles) === 'supplier'
+}
+
+/** Tab 业务页是否展示承销商面板 */
+export function isEffectiveDistributorRole(roles) {
+  return getPrimaryPartnerRole(roles) === 'distributor'
+}
+
 /** 用户身份展示文案 */
 export function getPartnerIdentityLabel(roles) {
   const kind = getPrimaryPartnerRole(roles)