-
-
-
-
+
+
+
diff --git a/src/components/IconSelect/index.vue b/src/components/IconSelect/index.vue
index 22126ed9..386404bd 100644
--- a/src/components/IconSelect/index.vue
+++ b/src/components/IconSelect/index.vue
@@ -1,27 +1,40 @@
-
-
-
-
-
+
-
-
-
-
+
+
+
+
-
\ No newline at end of file
+
diff --git a/src/components/LangSelect/index.vue b/src/components/LangSelect/index.vue
index b94de2fb..e97eafcb 100644
--- a/src/components/LangSelect/index.vue
+++ b/src/components/LangSelect/index.vue
@@ -1,49 +1,47 @@
-
+
+
+
+
-
-
-
+
+
+
-
+
+
diff --git a/src/components/RightPanel/index.vue b/src/components/RightPanel/index.vue
index 0d6166cd..83a807d0 100644
--- a/src/components/RightPanel/index.vue
+++ b/src/components/RightPanel/index.vue
@@ -1,154 +1,163 @@
-
-
-
+
-
-
-
-
-
+
+
diff --git a/src/components/Screenfull/index.vue b/src/components/Screenfull/index.vue
index 35c55e70..f2e999a2 100644
--- a/src/components/Screenfull/index.vue
+++ b/src/components/Screenfull/index.vue
@@ -1,12 +1,15 @@
-
+
+
+
+
+
-
+
+
\ No newline at end of file
+
diff --git a/src/components/SizeSelect/index.vue b/src/components/SizeSelect/index.vue
index 92b7031c..1cd04efe 100644
--- a/src/components/SizeSelect/index.vue
+++ b/src/components/SizeSelect/index.vue
@@ -1,43 +1,47 @@
-
-
-
-
+
+
+
-
-
- ![]()
+
+
+
+
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index bff95967..9db17741 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -1,70 +1,79 @@
-
+
+
+ ![]()
-
-
+
+
-
-
-
-
-
+
+
-
-
+
+
+
-
\ No newline at end of file
+
diff --git a/src/directive/index.ts b/src/directive/index.ts
index 984b4016..39edd276 100644
--- a/src/directive/index.ts
+++ b/src/directive/index.ts
@@ -1 +1 @@
-export {hasPerm,hasRole} from "./permission";
\ No newline at end of file
+export { hasPerm, hasRole } from './permission';
diff --git a/src/directive/permission/index.ts b/src/directive/permission/index.ts
index 5c8d4e92..211f9c35 100644
--- a/src/directive/permission/index.ts
+++ b/src/directive/permission/index.ts
@@ -1,55 +1,56 @@
-import useStore from "@/store";
-import { Directive, DirectiveBinding } from "vue";
+import useStore from '@/store';
+import { Directive, DirectiveBinding } from 'vue';
/**
* 按钮权限校验
*/
export const hasPerm: Directive = {
- mounted(el: HTMLElement, binding: DirectiveBinding) {
- // 「超级管理员」拥有所有的按钮权限
- const { user } = useStore()
- const roles = user.roles;
- if (roles.includes('ROOT')) {
- return true
- }
- // 「其他角色」按钮权限校验
- const { value } = binding;
- if (value) {
- const requiredPerms = value; // DOM绑定需要的按钮权限标识
+ mounted(el: HTMLElement, binding: DirectiveBinding) {
+ // 「超级管理员」拥有所有的按钮权限
+ const { user } = useStore();
+ const roles = user.roles;
+ if (roles.includes('ROOT')) {
+ return true;
+ }
+ // 「其他角色」按钮权限校验
+ const { value } = binding;
+ if (value) {
+ const requiredPerms = value; // DOM绑定需要的按钮权限标识
- const hasPerm = user.perms?.some(perm => {
- return requiredPerms.includes(perm)
- })
+ const hasPerm = user.perms?.some(perm => {
+ return requiredPerms.includes(perm);
+ });
- if (!hasPerm) {
- el.parentNode && el.parentNode.removeChild(el);
- }
- } else {
- throw new Error("need perms! Like v-has-perm=\"['sys:user:add','sys:user:edit']\"");
- }
- }
+ if (!hasPerm) {
+ el.parentNode && el.parentNode.removeChild(el);
+ }
+ } else {
+ throw new Error(
+ "need perms! Like v-has-perm=\"['sys:user:add','sys:user:edit']\""
+ );
+ }
+ }
};
/**
* 角色权限校验
*/
export const hasRole: Directive = {
- mounted(el: HTMLElement, binding: DirectiveBinding) {
- const { value } = binding;
-
- if (value) {
- const requiredRoles = value; // DOM绑定需要的角色编码
- const { user } = useStore()
- const hasRole = user.roles.some(perm => {
- return requiredRoles.includes(perm)
- })
+ mounted(el: HTMLElement, binding: DirectiveBinding) {
+ const { value } = binding;
- if (!hasRole) {
- el.parentNode && el.parentNode.removeChild(el);
- }
- } else {
- throw new Error("need roles! Like v-has-role=\"['admin','test']\"");
- }
- }
+ if (value) {
+ const requiredRoles = value; // DOM绑定需要的角色编码
+ const { user } = useStore();
+ const hasRole = user.roles.some(perm => {
+ return requiredRoles.includes(perm);
+ });
+
+ if (!hasRole) {
+ el.parentNode && el.parentNode.removeChild(el);
+ }
+ } else {
+ throw new Error("need roles! Like v-has-role=\"['admin','test']\"");
+ }
+ }
};
-
diff --git a/src/env.d.ts b/src/env.d.ts
index 272014dc..b4958e04 100644
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -1,19 +1,19 @@
///
-
diff --git a/src/layout/components/Sidebar/Link.vue b/src/layout/components/Sidebar/Link.vue
index 0254b59a..108fc26a 100644
--- a/src/layout/components/Sidebar/Link.vue
+++ b/src/layout/components/Sidebar/Link.vue
@@ -1,53 +1,45 @@
-
- 系统布局配置
-
- 主题颜色
-
+
-
-
+
+ 系统布局配置
+
+ 主题颜色
+
-
+
+
- 开启 Tags-View
-
+
+ 开启 Tags-View
+
-
- 固定 Header
-
+
+ 固定 Header
+
-
- 侧边栏 Logo
-
-
+ 侧边栏 Logo
+
+
-
+
+
+
\ No newline at end of file
+ props: {
+ to: {
+ type: String,
+ required: true
+ }
+ },
+ setup(props) {
+ const router = useRouter();
+ const push = () => {
+ if (device.value === 'mobile' && sidebar.value.opened == true) {
+ app.closeSideBar(false);
+ }
+ router.push(props.to).catch(err => {
+ console.log(err);
+ });
+ };
+ return {
+ push,
+ isExternal
+ };
+ }
+});
+
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 39c5a7e1..dfab5090 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -1,85 +1,89 @@
-
-
-
- ![]()
-
-
- ![]()
-
-
-
+ {{ title }}
-{{ title }}
-
+
+
+ ![]()
+
+
+ ![]()
+
+
+
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index 069fe7c2..637b78fe 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -1,102 +1,114 @@
- {{ title }}
+{{ title }}
+
-
-
-
-
-
-
-
-
-
-
+
-
\ No newline at end of file
+
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 3f320d8d..586e362c 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,51 +1,51 @@
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/layout/components/TagsView/ScrollPane.vue b/src/layout/components/TagsView/ScrollPane.vue
index cde627f1..a37def4e 100644
--- a/src/layout/components/TagsView/ScrollPane.vue
+++ b/src/layout/components/TagsView/ScrollPane.vue
@@ -1,25 +1,24 @@
-
-
-
+
-
-
-
-
+
+
diff --git a/src/main.ts b/src/main.ts
index ceaea6aa..eece50cd 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,42 +1,43 @@
-import {createApp, Directive} from 'vue'
-import App from './App.vue'
-import router from "@/router";
+import { createApp, Directive } from 'vue';
+import App from './App.vue';
+import router from '@/router';
-import { createPinia } from "pinia"
+import { createPinia } from 'pinia';
-import ElementPlus from 'element-plus'
-import 'element-plus/theme-chalk/index.css'
-import Pagination from '@/components/Pagination/index.vue'
-import '@/permission'
+import ElementPlus from 'element-plus';
+import 'element-plus/theme-chalk/index.css';
+import Pagination from '@/components/Pagination/index.vue';
+import '@/permission';
// 引入svg注册脚本
import 'virtual:svg-icons-register';
// 国际化
-import i18n from "@/lang/index";
+import i18n from '@/lang/index';
// 自定义样式
-import '@/styles/index.scss'
+import '@/styles/index.scss';
// 根据字典编码获取字典列表全局方法
-import {listDictsByCode} from '@/api/system/dict'
+import { listDictsByCode } from '@/api/system/dict';
-const app = createApp(App)
+const app = createApp(App);
// 自定义指令
-import * as directive from "@/directive";
+import * as directive from '@/directive';
Object.keys(directive).forEach(key => {
- app.directive(key, (directive as { [key: string]: Directive })[key]);
+ app.directive(key, (directive as { [key: string]: Directive })[key]);
});
// 全局方法
-app.config.globalProperties.$listDictsByCode = listDictsByCode
+app.config.globalProperties.$listDictsByCode = listDictsByCode;
// 注册全局组件
-app.component('Pagination', Pagination)
- .use(createPinia())
- .use(router)
- .use(ElementPlus)
- .use(i18n)
- .mount('#app')
+app
+ .component('Pagination', Pagination)
+ .use(createPinia())
+ .use(router)
+ .use(ElementPlus)
+ .use(i18n)
+ .mount('#app');
diff --git a/src/permission.ts b/src/permission.ts
index 9bb38745..194ef8e9 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -1,55 +1,55 @@
-import router from "@/router";
-import { ElMessage } from "element-plus";
-import useStore from "@/store";
+import router from '@/router';
+import { ElMessage } from 'element-plus';
+import useStore from '@/store';
import NProgress from 'nprogress';
-import 'nprogress/nprogress.css'
-NProgress.configure({ showSpinner: false }) // 进度环显示/隐藏
+import 'nprogress/nprogress.css';
+NProgress.configure({ showSpinner: false }); // 进度环显示/隐藏
// 白名单路由
-const whiteList = ['/login', '/auth-redirect']
+const whiteList = ['/login', '/auth-redirect'];
router.beforeEach(async (to, form, next) => {
- NProgress.start()
- const { user, permission } = useStore()
- const hasToken = user.token
- if (hasToken) {
- // 登录成功，跳转到首页
- if (to.path === '/login') {
- next({ path: '/' })
- NProgress.done()
- } else {
- const hasGetUserInfo = user.roles.length > 0
- if (hasGetUserInfo) {
- next()
- } else {
- try {
- await user.getUserInfo()
- const roles = user.roles
- const accessRoutes: any = await permission.generateRoutes(roles)
- accessRoutes.forEach((route: any) => {
- router.addRoute(route)
- })
- next({ ...to, replace: true })
- } catch (error) {
- // 移除 token 并跳转登录页
- await user.resetToken()
- ElMessage.error(error as any || 'Has Error')
- next(`/login?redirect=${to.path}`)
- NProgress.done()
- }
- }
- }
- } else {
- // 未登录可以访问白名单页面(登录页面)
- if (whiteList.indexOf(to.path) !== -1) {
- next()
- } else {
- next(`/login?redirect=${to.path}`)
- NProgress.done()
- }
- }
-})
+ NProgress.start();
+ const { user, permission } = useStore();
+ const hasToken = user.token;
+ if (hasToken) {
+ // 登录成功，跳转到首页
+ if (to.path === '/login') {
+ next({ path: '/' });
+ NProgress.done();
+ } else {
+ const hasGetUserInfo = user.roles.length > 0;
+ if (hasGetUserInfo) {
+ next();
+ } else {
+ try {
+ await user.getUserInfo();
+ const roles = user.roles;
+ const accessRoutes: any = await permission.generateRoutes(roles);
+ accessRoutes.forEach((route: any) => {
+ router.addRoute(route);
+ });
+ next({ ...to, replace: true });
+ } catch (error) {
+ // 移除 token 并跳转登录页
+ await user.resetToken();
+ ElMessage.error((error as any) || 'Has Error');
+ next(`/login?redirect=${to.path}`);
+ NProgress.done();
+ }
+ }
+ }
+ } else {
+ // 未登录可以访问白名单页面(登录页面)
+ if (whiteList.indexOf(to.path) !== -1) {
+ next();
+ } else {
+ next(`/login?redirect=${to.path}`);
+ NProgress.done();
+ }
+ }
+});
router.afterEach(() => {
- NProgress.done()
-})
+ NProgress.done();
+});
diff --git a/src/router/index.ts b/src/router/index.ts
index 6c9674a1..abbdfa04 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,53 +1,53 @@
-import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router'
-import useStore from "@/store";
+import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router';
+import useStore from '@/store';
-export const Layout = () => import('@/layout/index.vue')
+export const Layout = () => import('@/layout/index.vue');
// 参数说明: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
// 静态路由
export const constantRoutes: Array
+
+
+
+
+
+
-
-
- 有来项目简介
-
-
+
\ No newline at end of file
+
diff --git a/src/views/dashboard/components/Team/index.vue b/src/views/dashboard/components/Team/index.vue
index 1313916d..bd69a9c8 100644
--- a/src/views/dashboard/components/Team/index.vue
+++ b/src/views/dashboard/components/Team/index.vue
@@ -1,110 +1,129 @@
-
-
-
- youlai-mall
-
- 是基于Spring Boot 2.6、Spring Cloud 2021 &
- Alibaba 2021、Vue3、Element-Plus、uni-app等主流技术栈构建的一整套全栈开源商城项目，
- 涉及
- 后端微服务
- 、
- 前端管理
- 、
- 微信小程序
-
- 和
- APP应用
- 等多端的开发。
-
+
+ 项目地址
+
+
+ 官方文档(完善中..)
+
+
+ Github
+
+
+ 码云
+
+
+
+ 后端技术栈
+
+ Spring Boot、Spring Cloud & Alibaba、Spring Security
+ OAuth2、JWT、Elastic Stack 、K8s...
+
+
+
+ 前端技术栈
+
+ Vue3、TypeScript、Element-Plus、uni-app、vue3-element-admin ...
+
+
+
+
+
+
+ 有来项目简介
+
+
-
+
+
+
+
+ youlai-mall
+
+ 是基于Spring Boot 2.6、Spring Cloud 2021 & Alibaba
+ 2021、Vue3、Element-Plus、uni-app等主流技术栈构建的一整套全栈开源商城项目，
+ 涉及
+ 后端微服务
+ 、
+ 前端管理
+ 、
+ 微信小程序
+
+ 和
+ APP应用
+ 等多端的开发。
+
-
-
- 项目地址
-
-
-
- 官方文档(完善中..)
-
-
- Github
-
-
- 码云
-
-
-
-
- 后端技术栈
-
-
- Spring Boot、Spring Cloud & Alibaba、Spring Security
- OAuth2、JWT、Elastic Stack 、K8s...
-
-
-
-
- 前端技术栈
-
-
- Vue3、TypeScript、Element-Plus、uni-app、vue3-element-admin ...
-
-
-
-
-
-
- 有来开源组织 & 技术团队
-
-
-
-
+
+
+
+
+
-
diff --git a/src/views/error-page/401.vue b/src/views/error-page/401.vue
index a52ed23b..8f71920e 100644
--- a/src/views/error-page/401.vue
+++ b/src/views/error-page/401.vue
@@ -1,99 +1,103 @@
-
+
diff --git a/src/views/error-page/404.vue b/src/views/error-page/404.vue
index 1791f55a..f576a8e5 100644
--- a/src/views/error-page/404.vue
+++ b/src/views/error-page/404.vue
@@ -1,228 +1,252 @@
-
-
- -
-
-
- --
- -
-
+
+
+ 有来开源组织 & 技术团队
+
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+ -
+
-
+ ++
+ +
+
-
- 群二维码过期可添加开发者微信由其拉入群，备注「有来」即可。
-
+
+
+ 群二维码过期可添加开发者微信由其拉入群，备注「有来」即可。
+
+
-
- 1. 人品良好、善于思考、执行力强；
-2. 熟悉项目，且至少给项目提交(过)一个PR；
-3. Git代码库活跃，个人主页或博客完善者优先；
-4. 过分优秀者我们会主动联系您...
-申请加入方式: 添加开发者微信申请即可。
-
+
+ 1. 人品良好、善于思考、执行力强；
+2. 熟悉项目，且至少给项目提交(过)一个PR；
+3. Git代码库活跃，个人主页或博客完善者优先；
+4. 过分优秀者我们会主动联系您...
+申请加入方式: 添加开发者微信申请即可。
+
-
+
-
-
- 
- 
-
-
-
-
-
-
-
-
-
- OOPS!
- All rights reserved
- wallstreetcn
-
- {{ message }}
- Please check that the URL you entered is correct, or click the button below to return to the homepage.
- Back to home
-
+
diff --git a/src/views/lab/seata/index.vue b/src/views/lab/seata/index.vue
index f2c2827d..5a717f19 100644
--- a/src/views/lab/seata/index.vue
+++ b/src/views/lab/seata/index.vue
@@ -1,7 +1,7 @@
@@ -9,307 +9,367 @@ export default {
import { reactive, onMounted, toRefs } from 'vue';
import SvgIcon from '@/components/SvgIcon/index.vue';
import {
- Money,
- Refresh,
- RefreshLeft,
- Right,
- CircleCheckFilled,
- CircleCloseFilled
-} from "@element-plus/icons-vue";
-import {
- payOrder,
- getSeataData,
- resetSeataData
-} from "@/api/lab/seata";
+ Money,
+ Refresh,
+ RefreshLeft,
+ Right,
+ CircleCheckFilled,
+ CircleCloseFilled
+} from '@element-plus/icons-vue';
+import { payOrder, getSeataData, resetSeataData } from '@/api/lab/seata';
import { ElMessage, ElMessageBox } from 'element-plus';
-import { SeataFormData } from "@/types";
+import { SeataFormData } from '@/types';
const state = reactive({
- // 保留改变前数据
- cacheSeataData: {
- status: undefined,
- stockNum: undefined,
- balance: undefined
- },
- seataData: {
- orderInfo: {
- orderSn: undefined,
- status: undefined
- },
- stockInfo: {
- name: undefined,
- picUrl: undefined,
- stockNum: undefined
- },
- accountInfo: {
- nickName: undefined,
- avatarUrl: undefined,
- balance: undefined
- }
- },
+ // 保留改变前数据
+ cacheSeataData: {
+ status: undefined,
+ stockNum: undefined,
+ balance: undefined
+ },
+ seataData: {
+ orderInfo: {
+ orderSn: undefined,
+ status: undefined
+ },
+ stockInfo: {
+ name: undefined,
+ picUrl: undefined,
+ stockNum: undefined
+ },
+ accountInfo: {
+ nickName: undefined,
+ avatarUrl: undefined,
+ balance: undefined
+ }
+ },
- loading: false,
+ loading: false,
- submitData: {
- openTx: true, // 是否开启事务
- orderEx: true // 订单修改异常
- } as SeataFormData
-})
+ submitData: {
+ openTx: true, // 是否开启事务
+ orderEx: true // 订单修改异常
+ } as SeataFormData
+});
-const { cacheSeataData, seataData, loading, submitData } = toRefs(state)
+const { cacheSeataData, seataData, loading, submitData } = toRefs(state);
/**
* 订单支付(模拟)
*/
function handleOrderPay() {
+ // 数据校验
+ if (
+ (seataData.value.stockInfo.stockNum &&
+ seataData.value.stockInfo.stockNum != 999) ||
+ (seataData.value.accountInfo.balance &&
+ seataData.value.accountInfo.balance != 1000000000) ||
+ (seataData.value.orderInfo.status &&
+ seataData.value.orderInfo.status != 101)
+ ) {
+ ElMessageBox.confirm(
+ '检查到当前数据已被污染，请先重置数据后尝试提交?',
+ '警告',
+ {
+ confirmButtonText: '重置数据',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }
+ )
+ .then(() => {
+ handleDataReset();
+ })
+ .catch(() => {});
+ } else {
+ // 订单支付模拟提交
- // 数据校验
- if (seataData.value.stockInfo.stockNum && seataData.value.stockInfo.stockNum != 999
- || (seataData.value.accountInfo.balance && seataData.value.accountInfo.balance != 1000000000)
- || (seataData.value.orderInfo.status && seataData.value.orderInfo.status != 101)
- ) {
- ElMessageBox.confirm(
- '检查到当前数据已被污染，请先重置数据后尝试提交?',
- '警告',
- {
- confirmButtonText: '重置数据',
- cancelButtonText: '取消',
- type: 'warning'
- }).then(() => {
- handleDataReset()
- }).catch(() => {
- })
- } else {
- // 订单支付模拟提交
-
- loading.value = true
- payOrder(submitData.value).then(() => {
- ElMessage.success('订单支付成功')
- }).finally(() => {
- cacheSeataData.value = {
- status: seataData.value.orderInfo.status,
- stockNum: seataData.value.stockInfo.stockNum,
- balance: seataData.value.accountInfo.balance
- }
- loadData();
- })
- }
+ loading.value = true;
+ payOrder(submitData.value)
+ .then(() => {
+ ElMessage.success('订单支付成功');
+ })
+ .finally(() => {
+ cacheSeataData.value = {
+ status: seataData.value.orderInfo.status,
+ stockNum: seataData.value.stockInfo.stockNum,
+ balance: seataData.value.accountInfo.balance
+ };
+ loadData();
+ });
+ }
}
/**
* 加载数据
*/
function loadData() {
- loading.value = true
- getSeataData().then((response: any) => {
- seataData.value = response.data
- loading.value = false
- })
+ loading.value = true;
+ getSeataData().then((response: any) => {
+ seataData.value = response.data;
+ loading.value = false;
+ });
}
/**
* 刷新数据
*/
function handleDataRefresh() {
- loading.value = true
- loadData();
+ loading.value = true;
+ loadData();
}
/**
* 数据重置
*/
function handleDataReset() {
- loading.value = true
- resetSeataData().then(() => {
- ElMessage.success('数据还原成功')
- loading.value = false;
- cacheSeataData.value = {
- status: undefined,
- stockNum: undefined,
- balance: undefined
- }
- loadData();
- })
+ loading.value = true;
+ resetSeataData().then(() => {
+ ElMessage.success('数据还原成功');
+ loading.value = false;
+ cacheSeataData.value = {
+ status: undefined,
+ stockNum: undefined,
+ balance: undefined
+ };
+ loadData();
+ });
}
onMounted(() => {
- // 第一次加载重置数据测试
- handleDataReset();
+ // 第一次加载重置数据测试
+ handleDataReset();
});
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OOPS!
+
+ All rights reserved
+ wallstreetcn
+
+ {{ message }}
+
+ Please check that the URL you entered is correct, or click the button
+ below to return to the homepage.
+
+ Back to home
+
-
-
\ No newline at end of file
+
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 5e94ab86..e68f7fe5 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,80 +1,125 @@
- - 模拟订单支付流程： - 扣减商品库存 → 扣减会员余额 → 修改订单状态 -
-
- 分布式事务生效判断：
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
- 订单支付
- 刷新数据
-
-
-
- 重置数据
-
-
-
-
+
+ 订单支付
+ 刷新数据
+
+
+
+ 重置数据
+
+
+
+
-
-
-
-
-
+
+
+
+
-
+
+
+
+
-
-
-
+
+
+
+ 搞点异常
+
+
+ {{ seataData.orderInfo.orderSn }}
+
-
-
+
+ 待支付
+ 已支付
-
-
-
-
- 搞点异常
-
-
- {{ seataData.orderInfo.orderSn }}
-
-
-
- 待支付
- 已支付
-
-
-
-
-
-
-
-
+ + 模拟订单支付流程： + 扣减商品库存 → 扣减会员余额 → 修改订单状态 +
+
+ 分布式事务生效判断：
+
- 博客教程：
-
+ 博客教程：
+
-
-
-
- {{ seataData.stockInfo.name }}
-
-
-
-
- {{ cacheSeataData.stockNum }} 部
-
-
-
+
+
+
+
-
+
+ {{ seataData.stockInfo.name }}
+
+
+
+
+
+ {{ cacheSeataData.stockNum }} 部
+
+
+
- {{ seataData.stockInfo.stockNum }} 部
+ {{ seataData.stockInfo.stockNum }} 部
-
-
- 修改成功
-
-
- 修改失败
-
-
-
+
+ 修改成功
+
+
+ 修改失败
+
+
+
+
+
+
+
+ {{ seataData.accountInfo.nickName }}
+
+
+
-
-
+ {{ (cacheSeataData.balance as any) / 100 }} 元
+
+
+
+ {{ (seataData.accountInfo.balance as any) / 100 }} 元
-
-
+
+
-
-
- {{ seataData.accountInfo.nickName }}
-
-
-
+
+
- {{ (cacheSeataData.balance as any) / 100 }} 元
-
-
-
- {{ (seataData.accountInfo.balance as any) / 100 }} 元
+
+
+ 修改成功
+
+
+ 修改失败
+
+
+
-
- 修改成功
-
-
- 修改失败
-
-
-
+ 待支付
+
+
+
+
-
- 待支付
-
-
-
-
-
-
- 修改成功
-
-
- 修改失败
-
-
-
+
+ 修改成功
+
+
+ 修改失败
+
+
+
+
+
+
+
-
-
@@ -214,78 +258,77 @@ $cursor: #fff;
/* reset element-ui css */
.login-container {
- .title-container {
- position: relative;
+ .title-container {
+ position: relative;
- .title {
- font-size: 26px;
- color: $light_gray;
- margin: 0px auto 40px auto;
- text-align: center;
- font-weight: bold;
- }
+ .title {
+ font-size: 26px;
+ color: $light_gray;
+ margin: 0px auto 40px auto;
+ text-align: center;
+ font-weight: bold;
+ }
- .set-language {
- color: #fff;
- position: absolute;
- top: 3px;
- font-size: 18px;
- right: 0px;
- cursor: pointer;
- }
- }
+ .set-language {
+ color: #fff;
+ position: absolute;
+ top: 3px;
+ font-size: 18px;
+ right: 0px;
+ cursor: pointer;
+ }
+ }
- .el-input {
- display: inline-block;
- height: 47px;
- width: 85%;
- .el-input__wrapper {
- padding: 0;
- background: transparent;
- box-shadow:none;
- .el-input__inner {
- background: transparent;
- border: 0px;
- -webkit-appearance: none;
- border-radius: 0px;
- padding: 12px 5px 12px 15px;
- color: $light_gray;
- height: 47px;
- caret-color: $cursor;
+ .el-input {
+ display: inline-block;
+ height: 47px;
+ width: 85%;
+ .el-input__wrapper {
+ padding: 0;
+ background: transparent;
+ box-shadow: none;
+ .el-input__inner {
+ background: transparent;
+ border: 0px;
+ -webkit-appearance: none;
+ border-radius: 0px;
+ padding: 12px 5px 12px 15px;
+ color: $light_gray;
+ height: 47px;
+ caret-color: $cursor;
- &:-webkit-autofill {
- box-shadow: 0 0 0px 1000px $bg inset !important;
- -webkit-text-fill-color: $cursor !important;
- }
- }
- }
+ &:-webkit-autofill {
+ box-shadow: 0 0 0px 1000px $bg inset !important;
+ -webkit-text-fill-color: $cursor !important;
+ }
+ }
+ }
+ }
- }
+ .el-input__inner {
+ &:hover {
+ border-color: var(--el-input-hover-border, var(--el-border-color-hover));
+ box-shadow: none;
+ }
- .el-input__inner {
- &:hover {
- border-color: var(--el-input-hover-border, var(--el-border-color-hover));
- box-shadow: none;
- }
+ box-shadow: none;
+ }
- box-shadow: none;
- }
+ .el-form-item {
+ border: 1px solid rgba(255, 255, 255, 0.1);
+ background: rgba(0, 0, 0, 0.1);
+ border-radius: 5px;
+ color: #454545;
+ }
- .el-form-item {
- border: 1px solid rgba(255, 255, 255, 0.1);
- background: rgba(0, 0, 0, 0.1);
- border-radius: 5px;
- color: #454545;
- }
-
- .copyright {
- width: 100%;
- position: absolute;
- bottom: 0;
- font-size: 12px;
- text-align: center;
- color: #cccccc;
- }
+ .copyright {
+ width: 100%;
+ position: absolute;
+ bottom: 0;
+ font-size: 12px;
+ text-align: center;
+ color: #cccccc;
+ }
}
@@ -295,72 +338,72 @@ $dark_gray: #889aa4;
$light_gray: #eee;
.login-container {
- min-height: 100%;
- width: 100%;
- background-color: $bg;
- overflow: hidden;
+ min-height: 100%;
+ width: 100%;
+ background-color: $bg;
+ overflow: hidden;
- .login-form {
- position: relative;
- width: 520px;
- max-width: 100%;
- padding: 160px 35px 0;
- margin: 0 auto;
- overflow: hidden;
- }
+ .login-form {
+ position: relative;
+ width: 520px;
+ max-width: 100%;
+ padding: 160px 35px 0;
+ margin: 0 auto;
+ overflow: hidden;
+ }
- .tips {
- font-size: 14px;
- color: #fff;
- margin-bottom: 10px;
+ .tips {
+ font-size: 14px;
+ color: #fff;
+ margin-bottom: 10px;
- span {
- &:first-of-type {
- margin-right: 16px;
- }
- }
- }
+ span {
+ &:first-of-type {
+ margin-right: 16px;
+ }
+ }
+ }
- .svg-container {
- padding: 6px 5px 6px 15px;
- color: $dark_gray;
- vertical-align: middle;
- width: 30px;
- display: inline-block;
- }
+ .svg-container {
+ padding: 6px 5px 6px 15px;
+ color: $dark_gray;
+ vertical-align: middle;
+ width: 30px;
+ display: inline-block;
+ }
- .title-container {
- position: relative;
+ .title-container {
+ position: relative;
- .title {
- font-size: 26px;
- color: $light_gray;
- margin: 0px auto 40px auto;
- text-align: center;
- font-weight: bold;
- }
- }
+ .title {
+ font-size: 26px;
+ color: $light_gray;
+ margin: 0px auto 40px auto;
+ text-align: center;
+ font-weight: bold;
+ }
+ }
- .show-pwd {
- position: absolute;
- right: 10px;
- top: 7px;
- font-size: 16px;
- color: $dark_gray;
- cursor: pointer;
- user-select: none;
- }
+ .show-pwd {
+ position: absolute;
+ right: 10px;
+ top: 7px;
+ font-size: 16px;
+ color: $dark_gray;
+ cursor: pointer;
+ user-select: none;
+ }
- .captcha {
- position: absolute;
- right: 0;
- top: 0;
+ .captcha {
+ position: absolute;
+ right: 0;
+ top: 0;
- img {
- height: 52px;
- cursor: pointer;
- vertical-align: middle;
- }
- }
+ img {
+ height: 52px;
+ cursor: pointer;
+ vertical-align: middle;
+ }
+ }
}
diff --git a/src/views/nested/level1/index.vue b/src/views/nested/level1/index.vue
index 6938bf1c..e5d07358 100644
--- a/src/views/nested/level1/index.vue
+++ b/src/views/nested/level1/index.vue
@@ -1,7 +1,7 @@
-
-
+ {{ $t("login.title") }}
-
+
+
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
- {{ $t("login.login") }}
-
+ {{ $t('login.login') }}
+
-
+
+
+
- {{ $t('login.title') }}
+
- ![]()
-
-
+ ![]()
+
+
- {{ $t("login.username") }}: admin
- {{ $t("login.password") }}: 123456
-
-
+ {{ $t('login.username') }}: admin
+ {{ $t('login.password') }}: 123456
+
+
-
-
- {{ $t("login.copyright") }}
-{{ $t("login.icp") }}
-
+
+ {{ $t('login.copyright') }}
+{{ $t('login.icp') }}
+
-
-
-
+
+
+
+
diff --git a/src/views/nested/level1/level2/index.vue b/src/views/nested/level1/level2/index.vue
index a9f31caa..4c21daa3 100644
--- a/src/views/nested/level1/level2/index.vue
+++ b/src/views/nested/level1/level2/index.vue
@@ -1,7 +1,7 @@
-
-
-
-
+
+
+
+
diff --git a/src/views/nested/level1/level2/level3/index1.vue b/src/views/nested/level1/level2/level3/index1.vue
index 94de1f0d..64cb2376 100644
--- a/src/views/nested/level1/level2/level3/index1.vue
+++ b/src/views/nested/level1/level2/level3/index1.vue
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/src/views/nested/level1/level2/level3/index2.vue b/src/views/nested/level1/level2/level3/index2.vue
index e933503a..b027cd25 100644
--- a/src/views/nested/level1/level2/level3/index2.vue
+++ b/src/views/nested/level1/level2/level3/index2.vue
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue
index e00e49ba..f15e84d0 100644
--- a/src/views/oms/order/index.vue
+++ b/src/views/oms/order/index.vue
@@ -1,239 +1,232 @@
-
-
-
-
-
+
-
+
diff --git a/src/views/pms/brand/index.vue b/src/views/pms/brand/index.vue
index 4c540caf..3633d836 100644
--- a/src/views/pms/brand/index.vue
+++ b/src/views/pms/brand/index.vue
@@ -1,232 +1,275 @@
-
-
+
+
+
+
-
-
+
+
-
-
-
-
-
- 查询
- 重置
-
-
+
+
+
+
+
+ 查询
+ 重置
+
+
-
-
-
-
-
-
- ![]()
-
-
-
- {{ scope.row.price }}
-
-
- {{ scope.row.count }}
-
-
-
-
+
+
+
+
+
+
+ ![]()
+
+
+
+ {{ scope.row.price }}
+
+
+ {{ scope.row.count }}
+
+
+
+
-
-
- {{ scope.row.sourceType }}
-
-
+
+
+ {{ scope.row.sourceType }}
+
+
-
-
- {{ scope.row.status }}
-
-
+
+
+ {{ scope.row.status }}
+
+
-
-
- {{ scope.row.totalAmount }}
-
-
+
+
+ {{ scope.row.totalAmount }}
+
+
-
-
- {{ scope.row.payAmount }}
-
-
+
+
+ {{ scope.row.payAmount }}
+
+
-
-
- {{ scope.row.payType }}
-
-
+
+
+ {{ scope.row.payType }}
+
+
-
-
- 查看
-
-
-
+
+
+ 查看
+
+
+
-
-
+
+
-
-
-
- 新增
- 删除
-
+
-
+
diff --git a/src/views/pms/category/components/Attribute.vue b/src/views/pms/category/components/Attribute.vue
index 023cd730..a0fe5f0c 100644
--- a/src/views/pms/category/components/Attribute.vue
+++ b/src/views/pms/category/components/Attribute.vue
@@ -1,143 +1,183 @@
-
+
+
+
+ 新增
+ 删除
+
-
-
+
+
-
- 搜索
- 重置
-
-
+
+ 搜索
+ 重置
+
+
-
-
-
-
-
- ![]()
-
- ![]()
-
-
-
-
+
+
+
+
+
+ ![]()
+
+ ![]()
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
- {{ category.name }} {{ attributeTypeName }}
- 请选择商品分类
-
-
- 提交
-
-
+
+
diff --git a/src/views/pms/category/components/Category.vue b/src/views/pms/category/components/Category.vue
index c7aad993..a5a73f47 100644
--- a/src/views/pms/category/components/Category.vue
+++ b/src/views/pms/category/components/Category.vue
@@ -1,234 +1,291 @@
-
+
+
+
+ {{ category.name }} {{ attributeTypeName }}
+
+ 请选择商品分类
+
+
+ 提交
+
+
-
-
-
-
+
+
+
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/views/pms/category/index.vue b/src/views/pms/category/index.vue
index 7abc51bc..aacc72b5 100644
--- a/src/views/pms/category/index.vue
+++ b/src/views/pms/category/index.vue
@@ -1,73 +1,79 @@
-
-
-
-
-
- {{ scope.data.name }}
-
-
-
-
-
-
-
-
+
+
+
-
+
+
+
+
-
-
-
+
+
-
-
+
+
-
-
+
+
+ 显示
+ 隐藏
+
+
-
-
- 显示
- 隐藏
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.data.name }}
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
diff --git a/src/views/pms/goods/components/GoodsAttribute.vue b/src/views/pms/goods/components/GoodsAttribute.vue
index 89c0c337..4e0745b9 100644
--- a/src/views/pms/goods/components/GoodsAttribute.vue
+++ b/src/views/pms/goods/components/GoodsAttribute.vue
@@ -1,144 +1,178 @@
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
-
diff --git a/src/views/pms/goods/components/GoodsCategory.vue b/src/views/pms/goods/components/GoodsCategory.vue
index 6b3e723e..1081c319 100644
--- a/src/views/pms/goods/components/GoodsCategory.vue
+++ b/src/views/pms/goods/components/GoodsCategory.vue
@@ -1,97 +1,112 @@
-
-
-
- 商品属性
-
- 添加属性
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 商品属性
+
+ 添加属性
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
- 您选择的商品分类:
-
- {{ item }}
-
-
-
-
+
diff --git a/src/views/pms/goods/components/GoodsInfo.vue b/src/views/pms/goods/components/GoodsInfo.vue
index 96e1d3a0..7afb33ed 100644
--- a/src/views/pms/goods/components/GoodsInfo.vue
+++ b/src/views/pms/goods/components/GoodsInfo.vue
@@ -1,185 +1,219 @@
-
+
+
+
+ 您选择的商品分类:
+
+ {{ item }}
+
+
+
-
diff --git a/src/views/pms/goods/components/GoodsStock.vue b/src/views/pms/goods/components/GoodsStock.vue
index 9cb5d6b1..ffab66e8 100644
--- a/src/views/pms/goods/components/GoodsStock.vue
+++ b/src/views/pms/goods/components/GoodsStock.vue
@@ -1,133 +1,208 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
-
+
+
-
-
-
-
-
-
- 商品主图
- 设为主图
-
+
+ 商品主图
+ 设为主图
+
-
-
-
-
+
+
+
-
diff --git a/src/views/pms/goods/detail.vue b/src/views/pms/goods/detail.vue
index a042c3ae..f03e4d28 100644
--- a/src/views/pms/goods/detail.vue
+++ b/src/views/pms/goods/detail.vue
@@ -1,82 +1,110 @@
-
-
-
- 商品规格
-
- 添加规格项
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 商品规格
+
+ 添加规格项
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- 规格值
- （默认第一条规格包含图片）
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 规格值
+ （默认第一条规格包含图片）
+
-
-
- 添加规格值
-
-
-
+
+ 添加规格值
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
- 商品库存
-
-
-
-
-
+
+
+ 商品库存
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.value }}
-
-
+
+
+
+ {{ item.value }}
+
+
-
-
-
+
diff --git a/src/views/pms/goods/index.vue b/src/views/pms/goods/index.vue
index acf4ea45..f78eddc0 100644
--- a/src/views/pms/goods/index.vue
+++ b/src/views/pms/goods/index.vue
@@ -1,266 +1,276 @@
-
+
+
-
+
-
-
- 发布商品
- 删除
-
-
-
-
-
-
- 查询
- 重置
-
-
+
+
+
+
-
+
diff --git a/src/views/redirect/index.vue b/src/views/redirect/index.vue
index 2363a22e..5558ffc3 100644
--- a/src/views/redirect/index.vue
+++ b/src/views/redirect/index.vue
@@ -1,15 +1,15 @@
-
+
diff --git a/src/views/sms/advert/index.vue b/src/views/sms/advert/index.vue
index b745b245..3fd2617d 100644
--- a/src/views/sms/advert/index.vue
+++ b/src/views/sms/advert/index.vue
@@ -1,244 +1,297 @@
-
+
+
+ 发布商品
+ 删除
+
+
+
+
+
+
+ 查询
+ 重置
+
+
-
-
-
-
-
-
- ![]()
-
-
-
- {{
- moneyFormatter(scope.row.price)
- }}
-
-
-
-
-
-
-
- ![]()
-
- ![]()
-
-
-
-
-
- {{
- moneyFormatter(scope.row.originPrice)
- }}
-
-
- {{
- moneyFormatter(scope.row.price)
- }}
-
-
-
+
+
+
+
+
+
+ ![]()
+
+
+
+ {{
+ moneyFormatter(scope.row.price)
+ }}
+
+
+
+
+
+
+
+ ![]()
+
+ ![]()
+
+
+
+
+
+ {{
+ moneyFormatter(scope.row.originPrice)
+ }}
+
+
+ {{
+ moneyFormatter(scope.row.price)
+ }}
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
- 新增
- 删除
-
+
+
diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue
index 79131a07..a2d7ba02 100644
--- a/src/views/system/client/index.vue
+++ b/src/views/system/client/index.vue
@@ -1,300 +1,370 @@
-
+
+
+
+ 新增
+ 删除
+
-
-
-
- 搜索
- 重置
-
-
+
+
+
+ 搜索
+ 重置
+
+
-
-
-
-
- ![]()
-
- ![]()
-
-
-
-
-
-
- 开启
- 关闭
-
-
-
-
-
-
+
+
+
+
+ ![]()
+
+ ![]()
+
+
+
+
+
+
+ 开启
+ 关闭
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
- 开启
- 关闭
-
-
+
+
+ 开启
+ 关闭
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
-
-
-
- 新增
- 删除
-
+
+
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index ce942da3..2fd74897 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -1,168 +1,168 @@
-
+
+
+
+ 新增
+ 删除
+
-
-
+
+
-
- 搜索
- 重置
-
-
+
+ 搜索
+ 重置
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
- 是
- 否
-
-
-
-
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
-
-
- {{
- item.label
- }}
-
-
-
+
+
+ {{ item.label }}
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
-
-
- 新增
- 删除
-
-
+
diff --git a/src/views/system/dict/components/Dict.vue b/src/views/system/dict/components/Dict.vue
index d9514e9a..412d9d6b 100644
--- a/src/views/system/dict/components/Dict.vue
+++ b/src/views/system/dict/components/Dict.vue
@@ -1,221 +1,265 @@
-
+
+
+ 新增
+ 删除
+
+
-
-
+
+
-
-
-
-
-
-
- 搜索
-
- 重置
-
-
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
-
-
-
- 正常
- 禁用
-
-
+
+
+
+ 正常
+ 禁用
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- 正常
- 禁用
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 正常
+ 禁用
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
- 新增
- 删除
-
-
+
+
+
+
+
+
+
+
+ 正常
+ 停用
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/dict/components/DictItem.vue b/src/views/system/dict/components/DictItem.vue
index 0b24a39a..f32a3650 100644
--- a/src/views/system/dict/components/DictItem.vue
+++ b/src/views/system/dict/components/DictItem.vue
@@ -1,250 +1,300 @@
-
+
+
+
+ 新增
+ 删除
+
+
-
-
-
- 搜索
- 重置
-
-
+
+
+
+ 搜索
+ 重置
+
+
-
-
-
-
- 启用
- 禁用
-
-
+
+
+
+
+ 启用
+ 禁用
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
- 正常
- 停用
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
- 新增
- 删除
-
-
-
-
- 搜索
- 重置
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 正常
+ 停用
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 57935565..2d164f35 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -1,54 +1,56 @@
-
+
+
+
+ 新增
+ 删除
+
+
+
+
+ 搜索
+ 重置
+
+
-
-
-
-
- 启用
- 禁用
-
-
-
-
-
-
+
+
+
+
+ 启用
+ 禁用
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- 正常
- 停用
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+ {{
+ dictName
+ }}
+ 未选择字典
+
+
+
+
+
+
diff --git a/src/views/system/menu/components/Menu.vue b/src/views/system/menu/components/Menu.vue
index 074b0f62..09b63d37 100644
--- a/src/views/system/menu/components/Menu.vue
+++ b/src/views/system/menu/components/Menu.vue
@@ -1,360 +1,450 @@
-
+
+
+
+
+
+
-
-
-
- {{dictName }}
- 未选择字典
-
-
-
-
-
-
+
-
-
-
- 新增
-
+
\ No newline at end of file
+
diff --git a/src/views/system/menu/components/Perm.vue b/src/views/system/menu/components/Perm.vue
index 0ee7c54f..b0d2f696 100644
--- a/src/views/system/menu/components/Perm.vue
+++ b/src/views/system/menu/components/Perm.vue
@@ -1,31 +1,30 @@
-
+
+
+
+ 新增
+
-
-
-
- 搜索
- 重置
-
-
+
+
+
+ 搜索
+ 重置
+
+
-
-
-
-
-
+
+
+
+
+
-
-
- 显示
- 隐藏
-
-
+
+
+ 显示
+ 隐藏
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
- 菜单
- 目录
- 外链
-
-
+
+
+ 菜单
+ 目录
+ 外链
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
- src/views/
- .vue
-
-
+
+
+
+ src/views/
+ .vue
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
- 显示
- 隐藏
-
-
+
+
+ 显示
+ 隐藏
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
- 新增
- 删除
-
-
-
-
- 搜索
- 重置
-
-
+
+
+
+
+
+
+
+
-
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index d921d7e4..38d52b55 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -1,56 +1,57 @@
-
+
+
+
+ 新增
+ 删除
+
+
+
+
+ 搜索
+ 重置
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
- {{ urlPerm.requestMethod }}:/{{
- urlPerm.serviceName
- }}{{ urlPerm.requestPath }}
-
-
+
+
+
+
+
+ {{ urlPerm.requestMethod }}:/{{ urlPerm.serviceName
+ }}{{ urlPerm.requestPath }}
+
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
- {{ menuName }}
- 请点击左侧菜单列表选择
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{
+ menuName
+ }}
+ 请点击左侧菜单列表选择
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/src/views/system/role/components/Menu.vue b/src/views/system/role/components/Menu.vue
index 7023bd72..6b01f898 100644
--- a/src/views/system/role/components/Menu.vue
+++ b/src/views/system/role/components/Menu.vue
@@ -1,113 +1,128 @@
-
-
-
- 展开/折叠
-
-
- 提交
-
-
+
diff --git a/src/views/system/role/components/Perm.vue b/src/views/system/role/components/Perm.vue
index 40fca0d6..be4e636b 100644
--- a/src/views/system/role/components/Perm.vue
+++ b/src/views/system/role/components/Perm.vue
@@ -1,144 +1,162 @@
-
+
+
+ 展开/折叠
+
+
+ 提交
+
+
-
+
-
diff --git a/src/views/system/role/components/Role.vue b/src/views/system/role/components/Role.vue
index cc335664..1e44a134 100644
--- a/src/views/system/role/components/Role.vue
+++ b/src/views/system/role/components/Role.vue
@@ -1,228 +1,277 @@
-
-
-
-
- 全选
-
-
-
- 提交
-
-
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+ 全选
+
+
+
+ 提交
+
+
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
+
+
-
-
-
- 新增
- 删除
-
+
-
-
\ No newline at end of file
+
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 5e187a80..4243b730 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,117 +1,116 @@
-
+
+
+
+ 新增
+ 删除
+
-
-
+
+
-
- 搜索
- 重置
-
-
+
+ 搜索
+ 重置
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
- 正常
- 停用
-
-
-
+
+
+ 正常
+ 停用
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+ 请选择菜单
+
+
+
-
+
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 100a1a9f..ae305513 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,61 +1,67 @@
-
-
-
+
+
+
+
+
+
-
-
-
-
-
- 请选择角色
-
-
-
+
+
+
+
+
+ 请选择角色
+
+
+
-
-
-
-
+
+
+
-
-
- 请选择角色
+
+
+
+ 请选择角色
-
-
- 请选择菜单
-
-
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/src/views/ums/member/index.vue b/src/views/ums/member/index.vue
index 8a27fd82..825048e1 100644
--- a/src/views/ums/member/index.vue
+++ b/src/views/ums/member/index.vue
@@ -1,149 +1,174 @@
-
+
+
+
+
+
+
-
-
-
-
-
-
-
- 新增
- 删除
-
+
+
+
+
+
+
+
+ 新增
+ 删除
+
-
-
+
+
-
-
-
-
+
+
+
+
-
- 搜索
- 重置
-
-
+
+ 搜索
+ 重置
+
+
-
-
-
- 导入
-
-
- 下载模板
- 导入数据
-
-
-
- 导出
-
-
-
-
+
+
+
+ 导入
+
+
+ 下载模板
+ 导入数据
+
+
+
+ 导出
+
+
+
+
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
- 正常
- 禁用
-
-
+
+
+ 正常
+ 禁用
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
- 将文件拖到此处，或
- 点击上传
-
-
- xls/xlsx files
-
-
+ 将文件拖到此处，或
+ 点击上传
+
+
+ xls/xlsx files
+
+
-
-
-
-
- 搜索
- 重置
-
-
-
-
-
-
-
-
- {{
- scope.row.province +
- scope.row.city +
- scope.row.area +
- scope.row.address
- }}
-
-
-
-
- 是
- 否
-
-
-
-
-
+
-
+
diff --git a/tsconfig.json b/tsconfig.json
index d8b764c2..9ea54bdf 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,22 +1,22 @@
{
- "compilerOptions": {
- "target": "esnext",
- "useDefineForClassFields": true,
- "module": "esnext",
- "moduleResolution": "node",
- "strict": true,
- "jsx": "preserve",
- "sourceMap": true,
- "resolveJsonModule": true,
- "esModuleInterop": true,
- "lib": ["esnext", "dom"],
- "baseUrl": "./",
- "paths": {
- "@/*": ["src/*"]
- },
- "allowSyntheticDefaultImports": true, // 默认导入
- "skipLibCheck": true, // 不对第三方依赖类型检查 ，element-plus 生产打包报错
- "types": ["element-plus/global"]
- },
- "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"]
+ "compilerOptions": {
+ "target": "esnext",
+ "useDefineForClassFields": true,
+ "module": "esnext",
+ "moduleResolution": "node",
+ "strict": true,
+ "jsx": "preserve",
+ "sourceMap": true,
+ "resolveJsonModule": true,
+ "esModuleInterop": true,
+ "lib": ["esnext", "dom"],
+ "baseUrl": "./",
+ "paths": {
+ "@/*": ["src/*"]
+ },
+ "allowSyntheticDefaultImports": true, // 默认导入
+ "skipLibCheck": true, // 不对第三方依赖类型检查 ，element-plus 生产打包报错
+ "types": ["element-plus/global"]
+ },
+ "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"]
}
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+ {{
+ scope.row.province +
+ scope.row.city +
+ scope.row.area +
+ scope.row.address
+ }}
+
+
+
+
+ 是
+ 否
+
+
+
+
+
-
-
- 未知
- 男
- 女
-
-
-
-
-
- ![]()
-
- ![]()
-
-
-
-
-
-
- 正常
- 禁用
-
-
+
+
+ 未知
+ 男
+ 女
+
+
+
+
+
+ ![]()
+
+ ![]()
+
+
+
+
+
+
+ 正常
+ 禁用
+
+
-
-
- {{ scope.row.balance / 100 }}
-
-
-
+
+
+ {{ scope.row.balance / 100 }}
+
+
+
-
-
+
+