Merge branch 'master' of http://gitlab.oytour.com/youjie/boyuecend

src/stores/systemConfig.ts

@@ -157,15 +157,14 @@ export const useSystemConfigStore = defineStore('systemConfig', {
     },
   },
   actions: {
-    async getTenantAsync(tenantId: string) {
-      const data = await SystemConfigService.getTenantAsync(tenantId)
-      this.groupId = data.erpGroupId || 0
-      return
-      const groupInfo = await ErpUserService.GetGroupInfoAsync(this.groupId)
-      if(groupInfo.data.resultCode === ApiResult.SUCCESS) {
-        this.erpAdminUserId = groupInfo.data.data.pageData[0].EmployeeId || 0
-       
-      }
+    /**
+     * 获取分组信息
+     */
+    async getGroupInfoAsync(groupId:number) {
+      //   const groupInfo = await ErpUserService.GetGroupInfoAsync(groupId)
+      //   if(groupInfo.data.resultCode === ApiResult.SUCCESS) {
+      //     this.erpAdminUserId = groupInfo.data.data.pageData[0].EmployeeId || 0
+      //   }
     },
 
     /**
@@ -194,13 +193,15 @@ export const useSystemConfigStore = defineStore('systemConfig', {
         this.platformConfig = data.platform || null
         
         this.config = data.config
-
+        this.groupId = data.erpGroupId || 2
         // 如果有租户ID，加载代理商配置
         if (this.tenantId) {
-          await this.getTenantAsync(this.tenantId)
+          await this.getGroupInfoAsync(this.groupId)
           try {
             const partnerConfig = await PartnerCenterConfigService.getConfigByTenantIdAsync(this.tenantId)
-            this.partnerCenterConfig = partnerConfig
+            this.partnerCenterConfig = partnerConfig || {
+              isEnabled: false
+            }
           } catch (error) {
             console.warn('Failed to load partner center config:', error)
             // 代理商配置加载失败不影响整体初始化，设置默认值
@@ -209,15 +210,6 @@ export const useSystemConfigStore = defineStore('systemConfig', {
             }
           }
         }
-        // if(this.tenantId) {
-        //   this.partnerCenterConfig = data.config || null
-        // }else{
-        //   this.partnerCenterConfig = {
-        //     isEnabled: false
-        //   }
-        // }
-        
-        
         // 如果有默认语言，应用到 i18n
         if (this.platformConfig?.defaultLanguage) {
           const savedLocale = localStorage.getItem('locale')

src/types/systemConfig.ts

@@ -136,4 +136,5 @@ export interface TenantInfoByDomainDto {
   config: WebSiteConfigDto
   navList: NavItemDto[]
   platform: PlatformConfigDto
+  erpGroupId: number
 }
\ No newline at end of file

src/views/personalCenter/accountPage/account.vue

 <template>
-    <div class="w-full h-full overflow-hidden"  >
+    <div class="w-full h-full overflow-hidden" >
         <a-scrollbar class="overflow-auto h-[100%]">
             <div class="accountCenter rounded-[14px] border-[1px] mb-[28px] flex items-center py-[30px] pl-[43px] pr-[35px]">
                 <div class="w-[102px] mr-[43px]">