gxwebsoft/gxtyzx-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复已知问题

Browse Source
This commit is contained in:
赵忠林
2025-01-09 10:28:30 +08:00
parent fc5f51495a
commit febecb146a
6 changed files with 69 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/layout/components/header-tools.vue
+26 -28
View File
@@ -58,7 +58,7 @@
</template> </template>
</a-avatar> </a-avatar>
<span :class="{ 'hidden-sm-and-down': styleResponsive }"> <span :class="{ 'hidden-sm-and-down': styleResponsive }">
{{ merchantName ? merchantName : loginUser.realName }} {{ loginUser.realName || loginUser.nickname }}
</span> </span>
<down-outlined style="margin-left: 6px" /> <down-outlined style="margin-left: 6px" />
</div> </div>
@@ -69,7 +69,12 @@
<div class="user-info"> <div class="user-info">
<div class="nickname"> <div class="nickname">
<div class="ele-text-placeholder"> <div class="ele-text-placeholder">
UID：<span class="ele-text-secondary">{{ 租户：<span class="ele-text-secondary">{{
loginUser.tenantName
}}</span>
</div>
<div class="ele-text-placeholder">
用户ID：<span class="ele-text-secondary">{{
loginUser.userId loginUser.userId
}}</span> }}</span>
<copy-outlined <copy-outlined
@@ -77,21 +82,20 @@
@click="copyText(loginUser.userId)" @click="copyText(loginUser.userId)"
/> />
</div> </div>
<span class="ele-text-placeholder"> <div class="ele-text-placeholder">
昵称： 手机：<span class="ele-text-secondary">{{
<span class="ele-text-secondary">{{ loginUser.phone
loginUser.nickname
}}</span> }}</span>
</span> </div>
<div class="role" style="margin-top: 10px"> <div class="ele-text-placeholder">
角色：
<template <template
v-for="(item, index) in loginUser.roles" v-for="(item, index) in loginUser.roles"
:key="item.roleId" :key="item.roleId"
> >
<a-tag color="blue" v-if="index === 0"> <a-tag v-if="index === 0">
<div class="role-name"> <div class="role-name">
<span>{{ item.roleName }}</span> <span>{{ item.roleName }}</span>
<span v-if="index === 1">等</span>
</div> </div>
</a-tag> </a-tag>
</template> </template>
@@ -103,32 +107,26 @@
<a-menu-divider /> <a-menu-divider />
<a-menu-item key="profile"> <a-menu-item key="profile">
<div class="ele-cell"> <div class="ele-cell">
<div class="ele-cell-content"> 个人中心 </div> <div class="ele-cell-content"> {{ t('layout.header.profile')}} </div>
</div> </div>
</a-menu-item> </a-menu-item>
<a-menu-divider /> <a-menu-divider />
<a-menu-item key="password"> <a-menu-item key="password">
<div class="ele-cell"> <div class="ele-cell">
<div class="ele-cell-content"> 修改密码 </div> <div class="ele-cell-content"> {{ t('layout.header.password') }} </div>
</div> </div>
</a-menu-item> </a-menu-item>
<template v-if="loginUser.username == 'admin'"> <template v-if="loginUser.username == 'admin' || loginUser.username == 'superAdmin'">
<!-- <a-menu-divider />-->
<!-- <a-menu-item key="accessKey">-->
<!-- <div class="ele-cell">-->
<!-- <div class="ele-cell-content"> {{ t('layout.header.accessKey') }} </div>-->
<!-- </div>-->
<!-- </a-menu-item>-->
<a-menu-divider /> <a-menu-divider />
<a-menu-item key="accessKey" v-if="loginUser.username == 'admin'"> <a-menu-item key="system">
<div class="ele-cell"> <div class="ele-cell">
<div class="ele-cell-content"> 秘钥管理 </div> <div class="ele-cell-content"> {{ t('layout.header.system') }} </div>
</div>
</a-menu-item>
<a-menu-divider />
<a-menu-item key="skin" v-if="loginUser.username == 'admin'">
<div class="ele-cell">
<div class="ele-cell-content"> 偏好设置 </div>
</div>
</a-menu-item>
<a-menu-divider />
<a-menu-item key="system" v-if="loginUser.username == 'admin'">
<div class="ele-cell">
<div class="ele-cell-content"> 系统设置 </div>
</div> </div>
</a-menu-item> </a-menu-item>
</template> </template>
@@ -349,7 +347,7 @@
}); });
} }
// 写入缓存 // 写入缓存
if (loginUser.value.merchantId) { if (loginUser.value.merchantId && loginUser.value.merchantName) {
localStorage.setItem('MerchantId', `${loginUser.value.merchantId}`); localStorage.setItem('MerchantId', `${loginUser.value.merchantId}`);
localStorage.setItem('MerchantName', `${loginUser.value.merchantName}`); localStorage.setItem('MerchantName', `${loginUser.value.merchantName}`);
if (loginUser.value.merchantAvatar) { if (loginUser.value.merchantAvatar) {
src/views/cms/article/index.vue
+2 -4
View File
@@ -147,7 +147,7 @@
if (categoryId.value) { if (categoryId.value) {
where.categoryId = categoryId.value; where.categoryId = categoryId.value;
} }
where.merchantId = getMerchantId(); // where.merchantId = getMerchantId();
return pageArticle({ return pageArticle({
...where, ...where,
...orders, ...orders,
@@ -334,9 +334,7 @@
// 加载栏目数据 // 加载栏目数据
if (!navigationList.value) { if (!navigationList.value) {
listNavigation({ listNavigation({}).then((res) => {
merchantId: getMerchantId()
}).then((res) => {
navigationList.value = toTreeData({ navigationList.value = toTreeData({
data: res?.map((d) => { data: res?.map((d) => {
d.value = d.navigationId; d.value = d.navigationId;
src/views/cms/navigation/index.vue
+1 -1
View File
@@ -354,7 +354,7 @@
where.bottom = undefined; where.bottom = undefined;
} }
where.isMpWeixin = false; where.isMpWeixin = false;
where.merchantId = getMerchantId(); // where.merchantId = getMerchantId();
return listNavigation({ ...where }); return listNavigation({ ...where });
}; };
src/views/cms/photo/list.vue
+1 -1
View File
@@ -264,7 +264,7 @@
if (type.value == 'groupId') { if (type.value == 'groupId') {
where.groupId = groupId.value; where.groupId = groupId.value;
} }
where.merchantId = getMerchantId(); // where.merchantId = getMerchantId();
return pageFiles({ ...where, ...orders, page, limit }); return pageFiles({ ...where, ...orders, page, limit });
}; };
src/views/passport/login/index.vue
+1 -1
View File
@@ -158,7 +158,7 @@
<div class="login-copyright"> <div class="login-copyright">
<a-space> <a-space>
<span>© {{ new Date().getFullYear() }}</span> <span>© {{ new Date().getFullYear() }}</span>
<span>{{ config?.copyright || 'websoft.top Inc.' }}</span> <span>{{ config?.copyright || 'WebSoft Inc.' }}</span>
</a-space> </a-space>
</div> </div>
<!-- 编辑弹窗 --> <!-- 编辑弹窗 -->
src/views/system/profile/index.vue
+38 -42
View File
@@ -40,12 +40,15 @@
> >
</a-space> </a-space>
</a-form-item> </a-form-item>
<a-form-item label="专属域名"> <a-form-item label="管理后台">
<a-space class="justify"> <a-space class="justify">
<a class="cursor-pointer" @click="openSpmUrl(`https://${form.domain}`)">{{ `${form.domain}` }}</a> <a class="cursor-pointer" @click="openSpmUrl(`http://admin.gxtyzx.cn`)">{{ `admin.gxtyzx.cn` }}</a>
<a @click="onEdit('专属域名', 'freeDomain', form.freeDomain)">修改</a> <!-- <a @click="onEdit('专属域名', 'freeDomain', form.freeDomain)">修改</a>-->
</a-space> </a-space>
</a-form-item> </a-form-item>
<a-form-item label="租户ID">
<span class="ele-text-heading">{{ form.tenantId }}</span>
</a-form-item>
<!-- <a-form-item label="应用类型">--> <!-- <a-form-item label="应用类型">-->
<!-- <a-space class="justify">--> <!-- <a-space class="justify">-->
<!-- <span>Tenant</span>--> <!-- <span>Tenant</span>-->
@@ -81,21 +84,18 @@
<a-form-item label="主体名称"> <a-form-item label="主体名称">
<a-space class="justify"> <a-space class="justify">
<div class="ele-text-heading"> <div class="ele-text-heading">
<span style="padding-right: 12px">{{ form.companyName ? form.companyName : "-" }}</span> <span style="padding-right: 12px">南宁威宁文化体育发展有限公司</span>
</div> </div>
<a @click="onEdit('主体名称', 'companyName', form.companyName)">修改</a>
</a-space> </a-space>
</a-form-item> </a-form-item>
<a-form-item label="主体类型"> <a-form-item label="主体类型">
<a-space class="justify"> <a-space class="justify">
<a-tag>{{ form.companyType }}</a-tag> <a-tag>{{ form.companyType }}</a-tag>
<a @click="onEdit('主体类型', 'companyType', form.companyType)">修改</a>
</a-space> </a-space>
</a-form-item> </a-form-item>
<a-form-item label="实名认证"> <a-form-item label="实名认证">
<a-space class="justify"> <a-space class="justify">
<a-tag v-if="form.authentication == 1" color="green">已认证</a-tag> <a-tag color="green">已认证</a-tag>
<a-tag v-else color="orange" class="cursor-pointer" @click="openSpmUrl(`https://websoft.top/user/auth`)">未认证</a-tag>
</a-space> </a-space>
</a-form-item> </a-form-item>
<a-form-item label="所属行业"> <a-form-item label="所属行业">
@@ -106,21 +106,21 @@
> >
</a-space> </a-space>
</a-form-item> </a-form-item>
<a-form-item label="用户数量"> <!-- <a-form-item label="用户数量">-->
<a-space class="justify ele-text-heading"> <!-- <a-space class="justify ele-text-heading">-->
<span>{{ form.users }}/{{ form.members }}</span> <!-- <span>{{ form.users }}/{{ form.members }}</span>-->
</a-space> <!-- </a-space>-->
</a-form-item> <!-- </a-form-item>-->
<!-- <a-form-item label="部门数量">--> <!-- <a-form-item label="部门数量">-->
<!-- <a-space class="justify ele-text-heading">--> <!-- <a-space class="justify ele-text-heading">-->
<!-- <span>{{ form.departments }}</span>--> <!-- <span>{{ form.departments }}</span>-->
<!-- </a-space>--> <!-- </a-space>-->
<!-- </a-form-item>--> <!-- </a-form-item>-->
<a-form-item label="存储空间"> <!-- <a-form-item label="存储空间">-->
<a-space class="justify ele-text-heading"> <!-- <a-space class="justify ele-text-heading">-->
<span>{{ getFileSize(form.storage) }}/{{ getFileSize(form.storageMax) }}</span> <!-- <span>{{ getFileSize(form.storage) }}/{{ getFileSize(form.storageMax) }}</span>-->
</a-space> <!-- </a-space>-->
</a-form-item> <!-- </a-form-item>-->
<!-- <a-form-item label="所属地区">--> <!-- <a-form-item label="所属地区">-->
<!-- <a-space class="justify">--> <!-- <a-space class="justify">-->
<!-- <span--> <!-- <span-->
@@ -151,36 +151,32 @@
<!-- <span>{{ form.email }}</span>--> <!-- <span>{{ form.email }}</span>-->
<!-- </a-space>--> <!-- </a-space>-->
<!-- </a-form-item>--> <!-- </a-form-item>-->
<a-divider style="padding-bottom: 20px" /> <!-- <a-form-item label="应用类型">-->
<a-form-item label="租户ID"> <!-- <a-space class="justify">-->
<span class="ele-text-heading">{{ form.tenantId }}</span> <!-- <a-tag>小程序</a-tag>-->
</a-form-item> <!-- <a @click="onEdit('应用类型', 'appType', form.appType)">修改</a>-->
<a-form-item label="应用类型"> <!-- </a-space>-->
<a-space class="justify"> <!-- </a-form-item>-->
<a-tag>{{ form.appType }}</a-tag>
<a @click="onEdit('应用类型', 'appType', form.appType)">修改</a>
</a-space>
</a-form-item>
<!-- <a-form-item label="专属域名">--> <!-- <a-form-item label="专属域名">-->
<!-- <a-space class="justify">--> <!-- <a-space class="justify">-->
<!-- <span class="cursor-pointer" @click="openSpmUrl(`https://${form.domain}`)">{{ `${form.domain}` }}</span>--> <!-- <span class="cursor-pointer" @click="openSpmUrl(`https://${form.domain}`)">{{ `${form.domain}` }}</span>-->
<!-- <a @click="onEdit('专属域名', 'domain', form.domain)">修改</a>--> <!-- <a @click="onEdit('专属域名', 'domain', form.domain)">修改</a>-->
<!-- </a-space>--> <!-- </a-space>-->
<!-- </a-form-item>--> <!-- </a-form-item>-->
<a-form-item label="当前版本"> <!-- <a-form-item label="当前版本">-->
<a-space class="justify ele-text-heading"> <!-- <a-space class="justify ele-text-heading">-->
{{ form.versionName }} <!-- {{ form.versionName }}-->
<a @click="openUrl('/system/version')">更新</a> <!-- <a @click="openUrl('/system/version')">更新</a>-->
</a-space> <!-- </a-space>-->
</a-form-item> <!-- </a-form-item>-->
<a-divider style="padding-bottom: 20px" /> <!-- <a-divider style="padding-bottom: 20px" />-->
<a-form-item <!-- <a-form-item-->
v-if="form.tenantId" <!-- v-if="form.tenantId"-->
label="注销" <!-- label="注销"-->
> <!-- >-->
<a-button @click="destruction(form.tenantId)" :disabled="true">注销</a-button> <!-- <a-button @click="destruction(form.tenantId)" :disabled="true">注销</a-button>-->
<div class="ele-text-placeholder">注销后，当前应用的数据将会销毁,且不可恢复，请谨慎操作</div> <!-- <div class="ele-text-placeholder">注销后，当前应用的数据将会销毁,且不可恢复，请谨慎操作</div>-->
</a-form-item> <!-- </a-form-item>-->
</a-form> </a-form>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>