Merge branch 'wyz' into 'test'

Wyz See merge request !16

Merge branch 'wyz' into 'test'
Wyz See merge request !16
7bce20a8 · yuzhenWang · 12e86736 · 87ade056 · 7bce20a8 · 7bce20a8
Commit 7bce20a8 authored May 15, 2026 by yuzhenWang
Show whitespace changes
Inline Side-by-side

Showing with 36 additions and 23 deletions

src/store/modules/user.js
+32 -22

src/views/merchandise/components/productBaseInfo.vue
+4 -1

No files found.
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
 import router from '@/router'
-import { ElMessageBox, } from 'element-plus'
+import { ElMessageBox } from 'element-plus'
 import { login, logout, getInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
-import { isHttp, isEmpty } from "@/utils/validate"
+import { isHttp, isEmpty } from '@/utils/validate'
 import defAva from '@/assets/images/profile.jpg'
 import usePermissionStore from '@/store/modules/permission'
-const useUserStore = defineStore(
+const useUserStore = defineStore('user', {
-  'user',
-  {
  state: () => ({
    token: getToken(),
    id: '',
@@ -29,11 +27,13 @@ const useUserStore = defineStore(
      const code = userInfo.code
      const uuid = userInfo.uuid
      return new Promise((resolve, reject) => {
-          login(username, password, code, uuid).then(res => {
+        login(username, password, code, uuid)
+          .then(res => {
            setToken(res.data.token)
            this.token = res.data.token
            resolve()
-          }).catch(error => {
+          })
+          .catch(error => {
            reject(error)
          })
      })
@@ -41,19 +41,19 @@ const useUserStore = defineStore(
    // 获取用户信息
    getInfo() {
      return new Promise((resolve, reject) => {
-          getInfo().then(res => {
+        getInfo()
+          .then(res => {
            const user = res.data.apiLoginUserInfoResponse
-            let avatar = user.avatar || ""
+            let avatar = user.avatar || ''
            if (!isHttp(avatar)) {
-              avatar = (isEmpty(avatar)) ? defAva : import.meta.env.VITE_APP_BASE_API + avatar
+              avatar = isEmpty(avatar) ? defAva : import.meta.env.VITE_APP_BASE_API + avatar
            }
            // 设置租户列表
            this.tenants = res.data.apiLoginTenantResponseList || []
            // 尝试从本地存储获取当前租户，否则使用第一个
-            const savedTenant = JSON.parse(localStorage.getItem('' +
+            const savedTenant = JSON.parse(localStorage.getItem('' + ''))
-                ''))
            const currentTenant = savedTenant || (this.tenants.length > 0 ? this.tenants[0] : null)
            if (currentTenant) {
@@ -74,36 +74,44 @@ const useUserStore = defineStore(
            this.nickName = user.nickName
            this.avatar = avatar
            this.isSuperAdmin = user.isSuperAdmin
+            console.log('====================================')
+            console.log('user', user)
+            console.log('====================================')
            /* 初始密码提示 */
-            if(res.data.isDefaultModifyPwd) {
+            if (res.data.isDefaultModifyPwd) {
              ElMessageBox.confirm('您的密码还是初始密码，请修改密码！', '安全提示', {
                confirmButtonText: '确定',
                cancelButtonText: '取消',
                type: 'warning'
-              }).then(() => {
+              })
+                .then(() => {
                  router.push({ name: 'Profile', params: { activeTab: 'resetPwd' } })
-              }).catch(() => {})
+                })
+                .catch(() => {})
            }
            /* 过期密码提示 */
-            if(!res.data.isDefaultModifyPwd && res.isPasswordExpired) {
+            if (!res.data.isDefaultModifyPwd && res.isPasswordExpired) {
              ElMessageBox.confirm('您的密码已过期，请尽快修改密码！', '安全提示', {
                confirmButtonText: '确定',
                cancelButtonText: '取消',
                type: 'warning'
-              }).then(() => {
+              })
+                .then(() => {
                  router.push({ name: 'Profile', params: { activeTab: 'resetPwd' } })
-              }).catch(() => {})
+                })
+                .catch(() => {})
            }
            resolve(res)
-          }).catch(error => {
+          })
+          .catch(error => {
            reject(error)
          })
      })
    },
    //切换租户
    switchTenant(tenant) {
-        return new Promise((resolve) => {
+      return new Promise(resolve => {
        this.currentTenant = tenant
        localStorage.setItem('currentTenant', JSON.stringify(tenant))
@@ -118,7 +126,9 @@ const useUserStore = defineStore(
          this.roles = ['ROLE_DEFAULT']
        }
-          usePermissionStore().generateRoutes().then(accessRoutes => {
+        usePermissionStore()
+          .generateRoutes()
+          .then(accessRoutes => {
            // 移除旧路由
            const currentRoutes = router.getRoutes()
            currentRoutes.forEach(route => {
@@ -168,6 +178,6 @@ const useUserStore = defineStore(
      })
    }
  }
-  })
+})
 export default useUserStore
--- a/src/views/merchandise/components/productBaseInfo.vue
+++ b/src/views/merchandise/components/productBaseInfo.vue
@@ -895,6 +895,7 @@ import useUserStore from '@/store/modules/user'
 import { ref, computed, watch, nextTick } from 'vue'
 import ImageUpload from '@/components/ImageUpload/index.vue' //图片上传组件
 import CategoryTable from '@/components/CategoryTable/index.vue' //图片上传组件
 const emit = defineEmits(['handleSuccess'])
 const props = defineProps({
  // 类型，是新增还是编辑,
@@ -1105,7 +1106,9 @@ const confirmPlatform = () => {
 const choosePlatform = async () => {
  platFormOpen.value = true
  platFormQueryParams.value.pageNo = 1
+  if (userStore.isSuperAdmin == '0') {
+    platFormQueryParams.value.loginTenantBizId = userStore.currentTenant.apiLoginTenantInfoResponse.tenantBizId
+  }
  // 获取列表数据
  await getPlatFormList()
 }