diff --git a/flossom-ui/.env.development b/flossom-ui/.env.development
index f24aaee..3f90a15 100644
--- a/flossom-ui/.env.development
+++ b/flossom-ui/.env.development
@@ -9,3 +9,6 @@ VUE_APP_BASE_API = '/prod-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
+
+# 设置端口号
+port=8080
diff --git a/flossom-ui/.env.production b/flossom-ui/.env.production
index eda5aff..4f9dcfb 100644
--- a/flossom-ui/.env.production
+++ b/flossom-ui/.env.production
@@ -6,3 +6,6 @@ ENV = 'production'
 
 # 花至管理系统/生产环境
 VUE_APP_BASE_API = '/prod-api'
+
+# 设置端口号
+# port=8080
\ No newline at end of file
diff --git a/flossom-ui/package.json b/flossom-ui/package.json
index 17c2bef..5324c46 100644
--- a/flossom-ui/package.json
+++ b/flossom-ui/package.json
@@ -5,6 +5,7 @@
   "author": "花至",
   "license": "MIT",
   "scripts": {
+    "local": "vue-cli-service serve --mode local",
     "dev": "vue-cli-service serve --mode development",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
@@ -51,7 +52,8 @@
     "jsencrypt": "3.0.0-rc.1",
     "npm": "^10.2.5",
     "nprogress": "0.2.0",
-    "quill": "^2.0.0-beta.0",
+    "quill": "^2.0.0-dev.3",
+    "quill-better-table": "^1.2.10",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
     "vue": "2.6.12",
diff --git a/flossom-ui/src/components/Editor/index.vue b/flossom-ui/src/components/Editor/index.vue
index 44c545c..b65e664 100644
--- a/flossom-ui/src/components/Editor/index.vue
+++ b/flossom-ui/src/components/Editor/index.vue
@@ -1,274 +1,326 @@
 <template>
-  <div>
-    <el-upload
-      :action="uploadUrl"
-      :before-upload="handleBeforeUpload"
-      :on-success="handleUploadSuccess"
-      :on-error="handleUploadError"
-      name="file"
-      :show-file-list="false"
-      :headers="headers"
-      style="display: none"
-      ref="upload"
-      v-if="this.type == 'url'"
-    >
-    </el-upload>
-    <div class="editor" ref="editor" :style="styles"></div>
-  </div>
+	<div>
+		<el-upload
+			:action="uploadUrl"
+			:before-upload="handleBeforeUpload"
+			:on-success="handleUploadSuccess"
+			:on-error="handleUploadError"
+			name="file"
+			:show-file-list="false"
+			:headers="headers"
+			style="display: none"
+			ref="upload"
+			v-if="this.type == 'url'"
+		>
+		</el-upload>
+		<div class="editor" ref="editor" :style="styles">
+			<div>
+				{{ this.currentValue }}
+			</div>
+		</div>
+	</div>
 </template>
 
 <script>
-import Quill from "quill";
-import "quill/dist/quill.core.css";
-import "quill/dist/quill.snow.css";
-import "quill/dist/quill.bubble.css";
-import { getToken } from "@/utils/auth";
+import Quill from 'quill'
+import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.bubble.css'
+import { getToken } from '@/utils/auth'
+
+import QuillBetterTable from 'quill-better-table'
+import 'quill-better-table/dist/quill-better-table.css'
+Quill.register(
+	{
+		'modules/better-table': QuillBetterTable,
+	},
+	true
+)
 
 export default {
-  name: "Editor",
-  props: {
-    /* 编辑器的内容 */
-    value: {
-      type: String,
-      default: "",
-    },
-    /* 高度 */
-    height: {
-      type: Number,
-      default: null,
-    },
-    /* 最小高度 */
-    minHeight: {
-      type: Number,
-      default: null,
-    },
-    /* 只读 */
-    readOnly: {
-      type: Boolean,
-      default: false,
-    },
-    /* 上传文件大小限制(MB) */
-    fileSize: {
-      type: Number,
-      default: 5,
-    },
-    /* 类型（base64格式、url格式） */
-    type: {
-      type: String,
-      default: "url",
-    }
-  },
-  data() {
-    return {
-      uploadUrl: process.env.VUE_APP_BASE_API + "/file/upload", // 上传的图片服务器地址
-      headers: {
-        Authorization: "Bearer " + getToken()
-      },
-      Quill: null,
-      currentValue: "",
-      options: {
-        theme: "snow",
-        bounds: document.body,
-        debug: "warn",
-        modules: {
-          // 工具栏配置
-          toolbar: [
-            ["bold", "italic", "underline", "strike"],       // 加粗 斜体 下划线 删除线
-            ["blockquote", "code-block"],                    // 引用  代码块
-            [{ list: "ordered" }, { list: "bullet" }],       // 有序、无序列表
-            [{ indent: "-1" }, { indent: "+1" }],            // 缩进
-            [{ size: ["small", false, "large", "huge"] }],   // 字体大小
-            [{ header: [1, 2, 3, 4, 5, 6, false] }],         // 标题
-            [{ color: [] }, { background: [] }],             // 字体颜色、字体背景颜色
-            [{ align: [] }],                                 // 对齐方式
-            ["clean"],                                       // 清除文本格式
-            ["link", "image", "video"]                       // 链接、图片、视频
-          ],
-        },
-        placeholder: "请输入内容",
-        readOnly: this.readOnly,
-      },
-    };
-  },
-  computed: {
-    styles() {
-      let style = {};
-      if (this.minHeight) {
-        style.minHeight = `${this.minHeight}px`;
-      }
-      if (this.height) {
-        style.height = `${this.height}px`;
-      }
-      return style;
-    },
-  },
-  watch: {
-    value: {
-      handler(val) {
-        if (val !== this.currentValue) {
-          this.currentValue = val === null ? "" : val;
-          if (this.Quill) {
-            this.Quill.pasteHTML(this.currentValue);
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  mounted() {
-    this.init();
-  },
-  beforeDestroy() {
-    this.Quill = null;
-  },
-  methods: {
-    init() {
-      const editor = this.$refs.editor;
-      this.Quill = new Quill(editor, this.options);
-      // 如果设置了上传地址则自定义图片上传事件
-      if (this.type == 'url') {
-        let toolbar = this.Quill.getModule("toolbar");
-        toolbar.addHandler("image", (value) => {
-          if (value) {
-            this.$refs.upload.$children[0].$refs.input.click();
-          } else {
-            this.quill.format("image", false);
-          }
-        });
-      }
-      this.Quill.pasteHTML(this.currentValue);
-      this.Quill.on("text-change", (delta, oldDelta, source) => {
-        const html = this.$refs.editor.children[0].innerHTML;
-        const text = this.Quill.getText();
-        const quill = this.Quill;
-        this.currentValue = html;
-        this.$emit("input", html);
-        this.$emit("on-change", { html, text, quill });
-      });
-      this.Quill.on("text-change", (delta, oldDelta, source) => {
-        this.$emit("on-text-change", delta, oldDelta, source);
-      });
-      this.Quill.on("selection-change", (range, oldRange, source) => {
-        this.$emit("on-selection-change", range, oldRange, source);
-      });
-      this.Quill.on("editor-change", (eventName, ...args) => {
-        this.$emit("on-editor-change", eventName, ...args);
-      });
-    },
-    // 上传前校检格式和大小
-    handleBeforeUpload(file) {
-      const type = ["image/jpeg", "image/jpg", "image/png", "image/svg"];
-      const isJPG = type.includes(file.type);
-      // 检验文件格式
-      if (!isJPG) {
-        this.$message.error(`图片格式错误!`);
-        return false;
-      }
-      // 校检文件大小
-      if (this.fileSize) {
-        const isLt = file.size / 1024 / 1024 < this.fileSize;
-        if (!isLt) {
-          this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`);
-          return false;
-        }
-      }
-      return true;
-    },
-    handleUploadSuccess(res, file) {
-      // 如果上传成功
-      if (res.code == 200) {
-        // 获取富文本组件实例
-        let quill = this.Quill;
-        // 获取光标所在位置
-        let length = quill.getSelection().index;
-        // 插入图片  res.url为服务器返回的图片地址
-        quill.insertEmbed(length, "image", res.data.url);
-        // 调整光标到最后
-        quill.setSelection(length + 1);
-      } else {
-        this.$message.error("图片插入失败");
-      }
-    },
-    handleUploadError() {
-      this.$message.error("图片插入失败");
-    },
-  },
-};
+	name: 'Editor',
+	props: {
+		/* 编辑器的内容 */
+		value: {
+			type: String,
+			default: '',
+		},
+		/* 高度 */
+		height: {
+			type: Number,
+			default: null,
+		},
+		/* 最小高度 */
+		minHeight: {
+			type: Number,
+			default: null,
+		},
+		/* 只读 */
+		readOnly: {
+			type: Boolean,
+			default: false,
+		},
+		/* 上传文件大小限制(MB) */
+		fileSize: {
+			type: Number,
+			default: 5,
+		},
+		/* 类型（base64格式、url格式） */
+		type: {
+			type: String,
+			default: 'url',
+		},
+		/* 私有ID 用于同一页面下的不同富文本的表格修改 */
+		tableName: {
+			type: String,
+			default: 'mytable',
+		},
+	},
+
+	data() {
+		return {
+			uploadUrl: process.env.VUE_APP_BASE_API + '/file/upload', // 上传的图片服务器地址
+			headers: {
+				Authorization: 'Bearer ' + getToken(),
+			},
+			Quill: null,
+			currentValue: '',
+			options: {
+				theme: 'snow',
+				bounds: document.body,
+				debug: 'warn',
+				modules: {
+					table: false, // disable table module
+					'better-table': {
+						operationMenu: {
+							items: {
+								unmergeCells: {
+									text: 'Another unmerge cells name',
+								},
+							},
+						},
+					},
+					keyboard: {
+						bindings: QuillBetterTable.keyboardBindings,
+					},
+					// 工具栏配置
+					toolbar: [
+						['bold', 'italic', 'underline', 'strike'], // 加粗 斜体 下划线 删除线
+						['blockquote', 'code-block'], // 引用  代码块
+						[{ list: 'ordered' }, { list: 'bullet' }], // 有序、无序列表
+						[{ indent: '-1' }, { indent: '+1' }], // 缩进
+						[{ size: ['small', false, 'large', 'huge'] }], // 字体大小
+						[{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题
+						[{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
+						[{ align: [] }], // 对齐方式
+						['clean'], // 清除文本格式
+						['table'],
+						['link', 'image', 'video'], // 链接、图片、视频
+					],
+				},
+				placeholder: '请输入内容',
+				readOnly: this.readOnly,
+			},
+		}
+	},
+	computed: {
+		styles() {
+			let style = {}
+			if (this.minHeight) {
+				style.minHeight = `${this.minHeight}px`
+			}
+			if (this.height) {
+				style.height = `${this.height}px`
+			}
+			return style
+		},
+	},
+	watch: {
+		value: {
+			handler(val) {
+				if (val !== this.currentValue) {
+					this.currentValue = val === null ? '' : val
+					let ele = document.body.querySelector(`#${this.tableName} .editor`)
+					if (ele) {
+						ele.children[0].innerHTML = this.currentValue
+					}
+				}
+			},
+			immediate: true,
+		},
+	},
+	mounted() {
+		this.init()
+		// this.addTableButton()
+	},
+	beforeDestroy() {
+		this.Quill = null
+	},
+	methods: {
+		init() {
+			const editor = this.$refs.editor
+			this.Quill = new Quill(editor, this.options)
+			// 如果设置了上传地址则自定义图片上传事件
+			if (this.type == 'url') {
+				let toolbar = this.Quill.getModule('toolbar')
+				toolbar.addHandler('image', (value) => {
+					if (value) {
+						this.$refs.upload.$children[0].$refs.input.click()
+					} else {
+						this.quill.format('image', false)
+					}
+				})
+			}
+			// this.Quill.pasteHTML(this.currentValue)
+			// this.Quill.setText(this.currentValue)
+
+			let tableModule = this.Quill.getModule('better-table')
+			let ele = document.body.querySelector(`#${this.tableName} .ql-table`)
+			if (ele) {
+				ele.onclick = () => {
+					tableModule.insertTable(3, 3)
+				}
+			}
+
+			this.Quill.on('text-change', (delta, oldDelta, source) => {
+				const html = this.$refs.editor.children[0].innerHTML
+				const text = this.Quill.getText()
+				const quill = this.Quill
+				this.currentValue = html
+				this.$emit('input', html)
+				this.$emit('on-change', { html, text, quill })
+			})
+			this.Quill.on('text-change', (delta, oldDelta, source) => {
+				this.$emit('on-text-change', delta, oldDelta, source)
+			})
+			this.Quill.on('selection-change', (range, oldRange, source) => {
+				this.$emit('on-selection-change', range, oldRange, source)
+			})
+			this.Quill.on('editor-change', (eventName, ...args) => {
+				this.$emit('on-editor-change', eventName, ...args)
+			})
+		},
+
+		addTableButton() {
+			let ele = document.getElementsByClassName('.ql-better-table')
+			console.log('ADD table', ele)
+		},
+
+		// 上传前校检格式和大小
+		handleBeforeUpload(file) {
+			const type = ['image/jpeg', 'image/jpg', 'image/png', 'image/svg']
+			const isJPG = type.includes(file.type)
+			// 检验文件格式
+			if (!isJPG) {
+				this.$message.error(`图片格式错误!`)
+				return false
+			}
+			// 校检文件大小
+			if (this.fileSize) {
+				const isLt = file.size / 1024 / 1024 < this.fileSize
+				if (!isLt) {
+					this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`)
+					return false
+				}
+			}
+			return true
+		},
+		handleUploadSuccess(res, file) {
+			// 如果上传成功
+			if (res.code == 200) {
+				// 获取富文本组件实例
+				let quill = this.Quill
+				// 获取光标所在位置
+				let length = quill.getSelection().index
+				// 插入图片  res.url为服务器返回的图片地址
+				quill.insertEmbed(length, 'image', res.data.url)
+				// 调整光标到最后
+				quill.setSelection(length + 1)
+			} else {
+				this.$message.error('图片插入失败')
+			}
+		},
+		handleUploadError() {
+			this.$message.error('图片插入失败')
+		},
+	},
+}
 </script>
 
 <style>
-.editor, .ql-toolbar {
-  white-space: pre-wrap !important;
-  line-height: normal !important;
+.editor,
+.ql-toolbar {
+	white-space: pre-wrap !important;
+	line-height: normal !important;
 }
 .quill-img {
-  display: none;
+	display: none;
 }
-.ql-snow .ql-tooltip[data-mode="link"]::before {
-  content: "请输入链接地址:";
+.ql-snow .ql-tooltip[data-mode='link']::before {
+	content: '请输入链接地址:';
 }
 .ql-snow .ql-tooltip.ql-editing a.ql-action::after {
-  border-right: 0px;
-  content: "保存";
-  padding-right: 0px;
+	border-right: 0px;
+	content: '保存';
+	padding-right: 0px;
 }
-.ql-snow .ql-tooltip[data-mode="video"]::before {
-  content: "请输入视频地址:";
+.ql-snow .ql-tooltip[data-mode='video']::before {
+	content: '请输入视频地址:';
 }
 .ql-snow .ql-picker.ql-size .ql-picker-label::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item::before {
-  content: "14px";
+	content: '14px';
 }
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="small"]::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="small"]::before {
-  content: "10px";
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='small']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='small']::before {
+	content: '10px';
 }
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="large"]::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="large"]::before {
-  content: "18px";
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='large']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='large']::before {
+	content: '18px';
 }
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="huge"]::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="huge"]::before {
-  content: "32px";
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='huge']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='huge']::before {
+	content: '32px';
 }
 .ql-snow .ql-picker.ql-header .ql-picker-label::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item::before {
-  content: "文本";
+	content: '文本';
 }
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="1"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="1"]::before {
-  content: "标题1";
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='1']::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='1']::before {
+	content: '标题1';
 }
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="2"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="2"]::before {
-  content: "标题2";
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='2']::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='2']::before {
+	content: '标题2';
 }
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="3"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="3"]::before {
-  content: "标题3";
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='3']::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='3']::before {
+	content: '标题3';
 }
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="4"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="4"]::before {
-  content: "标题4";
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='4']::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='4']::before {
+	content: '标题4';
 }
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="5"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="5"]::before {
-  content: "标题5";
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='5']::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='5']::before {
+	content: '标题5';
 }
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="6"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
-  content: "标题6";
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='6']::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='6']::before {
+	content: '标题6';
 }
 .ql-snow .ql-picker.ql-font .ql-picker-label::before,
 .ql-snow .ql-picker.ql-font .ql-picker-item::before {
-  content: "标准字体";
+	content: '标准字体';
 }
-.ql-snow .ql-picker.ql-font .ql-picker-label[data-value="serif"]::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="serif"]::before {
-  content: "衬线字体";
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='serif']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='serif']::before {
+	content: '衬线字体';
 }
-.ql-snow .ql-picker.ql-font .ql-picker-label[data-value="monospace"]::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="monospace"]::before {
-  content: "等宽字体";
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='monospace']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='monospace']::before {
+	content: '等宽字体';
 }
 </style>
diff --git a/flossom-ui/src/permission.js b/flossom-ui/src/permission.js
index e1a14da..6ca9cc4 100644
--- a/flossom-ui/src/permission.js
+++ b/flossom-ui/src/permission.js
@@ -1,56 +1,58 @@
-import router from './router'
-import store from './store'
-import { Message } from 'element-ui'
-import NProgress from 'nprogress'
-import 'nprogress/nprogress.css'
-import { getToken } from '@/utils/auth'
-import { isRelogin } from '@/utils/request'
+import router from "./router";
+import store from "./store";
+import { Message } from "element-ui";
+import NProgress from "nprogress";
+import "nprogress/nprogress.css";
+import { getToken } from "@/utils/auth";
+import { isRelogin } from "@/utils/request";
 
-NProgress.configure({ showSpinner: false })
+NProgress.configure({ showSpinner: false });
 
-const whiteList = ['/login', '/register']
+const whiteList = ["/login", "/register"];
 
 router.beforeEach((to, from, next) => {
-  NProgress.start()
+  NProgress.start();
   if (getToken()) {
-    to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
+    to.meta.title && store.dispatch("settings/setTitle", to.meta.title);
     /* has token*/
-    if (to.path === '/login') {
-      next({ path: '/' })
-      NProgress.done()
+    if (to.path === "/login") {
+      next({ path: "/" });
+      NProgress.done();
     } else {
       if (store.getters.roles.length === 0) {
-        isRelogin.show = true
+        isRelogin.show = true;
         // 判断当前用户是否已拉取完user_info信息
-        store.dispatch('GetInfo').then(() => {
-          isRelogin.show = false
-          store.dispatch('GenerateRoutes').then(accessRoutes => {
-            // 根据roles权限生成可访问的路由表
-            router.addRoutes(accessRoutes) // 动态添加可访问路由表
-            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
-          })
-        }).catch(err => {
-            store.dispatch('LogOut').then(() => {
-              Message.error(err)
-              next({ path: '/' })
-            })
+        store
+          .dispatch("GetInfo")
+          .then(() => {
+            isRelogin.show = false;
+            store.dispatch("GenerateRoutes").then((accessRoutes) => {
+              // 根据roles权限生成可访问的路由表
+              router.addRoutes(accessRoutes); // 动态添加可访问路由表
+              next({ ...to, replace: true }); // hack方法 确保addRoutes已完成
+            });
           })
+          .catch((err) => {
+            store.dispatch("LogOut").then(() => {
+              Message.error(err);
+              next({ path: "/" });
+            });
+          });
       } else {
-        next()
+        next();
       }
     }
   } else {
-    // 没有token
     if (whiteList.indexOf(to.path) !== -1) {
       // 在免登录白名单，直接进入
-      next()
+      next();
     } else {
-      next(`/login?redirect=${encodeURIComponent(to.fullPath)}`) // 否则全部重定向到登录页
-      NProgress.done()
+      next(`/login?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页
+      NProgress.done();
     }
   }
-})
+});
 
 router.afterEach(() => {
-  NProgress.done()
-})
+  NProgress.done();
+});
diff --git a/flossom-ui/src/router/index.js b/flossom-ui/src/router/index.js
index 71907b6..47fac3f 100644
--- a/flossom-ui/src/router/index.js
+++ b/flossom-ui/src/router/index.js
@@ -1,10 +1,10 @@
-import Vue from 'vue'
-import Router from 'vue-router'
+import Vue from "vue";
+import Router from "vue-router";
 
-Vue.use(Router)
+Vue.use(Router);
 
 /* Layout */
-import Layout from '@/layout'
+import Layout from "@/layout";
 
 /**
  * Note: 路由配置项
@@ -31,153 +31,153 @@ import Layout from '@/layout'
 // 公共路由
 export const constantRoutes = [
   {
-    path: '/redirect',
+    path: "/redirect",
     component: Layout,
     hidden: true,
     children: [
       {
-        path: '/redirect/:path(.*)',
-        component: () => import('@/views/redirect')
-      }
-    ]
+        path: "/redirect/:path(.*)",
+        component: () => import("@/views/redirect"),
+      },
+    ],
   },
   {
-    path: '/login',
-    component: () => import('@/views/login'),
-    hidden: true
+    path: "/login",
+    component: () => import("@/views/login"),
+    hidden: true,
   },
   {
-    path: '/register',
-    component: () => import('@/views/register'),
-    hidden: true
+    path: "/register",
+    component: () => import("@/views/register"),
+    hidden: true,
   },
   {
-    path: '/404',
-    component: () => import('@/views/error/404'),
-    hidden: true
+    path: "/404",
+    component: () => import("@/views/error/404"),
+    hidden: true,
   },
   {
-    path: '/401',
-    component: () => import('@/views/error/401'),
-    hidden: true
+    path: "/401",
+    component: () => import("@/views/error/401"),
+    hidden: true,
   },
   {
-    path: '',
+    path: "",
     component: Layout,
-    redirect: 'index',
+    redirect: "index",
     children: [
       {
-        path: 'index',
-        component: () => import('@/views/index'),
-        name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
-      }
-    ]
+        path: "index",
+        component: () => import("@/views/index"),
+        name: "Index",
+        meta: { title: "首页", icon: "dashboard", affix: true },
+      },
+    ],
   },
   {
-    path: '/user',
+    path: "/user",
     component: Layout,
     hidden: true,
-    redirect: 'noredirect',
+    redirect: "noredirect",
     children: [
       {
-        path: 'profile',
-        component: () => import('@/views/system/user/profile/index'),
-        name: 'Profile',
-        meta: { title: '个人中心', icon: 'user' }
-      }
-    ]
-  }
-]
+        path: "profile",
+        component: () => import("@/views/system/user/profile/index"),
+        name: "Profile",
+        meta: { title: "个人中心", icon: "user" },
+      },
+    ],
+  },
+];
 
 // 动态路由，基于用户权限动态去加载
 export const dynamicRoutes = [
   {
-    path: '/system/user-auth',
+    path: "/system/user-auth",
     component: Layout,
     hidden: true,
-    permissions: ['system:user:edit'],
+    permissions: ["system:user:edit"],
     children: [
       {
-        path: 'role/:userId(\\d+)',
-        component: () => import('@/views/system/user/authRole'),
-        name: 'AuthRole',
-        meta: { title: '分配角色', activeMenu: '/system/user' }
-      }
-    ]
+        path: "role/:userId(\\d+)",
+        component: () => import("@/views/system/user/authRole"),
+        name: "AuthRole",
+        meta: { title: "分配角色", activeMenu: "/system/user" },
+      },
+    ],
   },
   {
-    path: '/system/role-auth',
+    path: "/system/role-auth",
     component: Layout,
     hidden: true,
-    permissions: ['system:role:edit'],
+    permissions: ["system:role:edit"],
     children: [
       {
-        path: 'user/:roleId(\\d+)',
-        component: () => import('@/views/system/role/authUser'),
-        name: 'AuthUser',
-        meta: { title: '分配用户', activeMenu: '/system/role' }
-      }
-    ]
+        path: "user/:roleId(\\d+)",
+        component: () => import("@/views/system/role/authUser"),
+        name: "AuthUser",
+        meta: { title: "分配用户", activeMenu: "/system/role" },
+      },
+    ],
   },
   {
-    path: '/system/dict-data',
+    path: "/system/dict-data",
     component: Layout,
-    hidden: true,
-    permissions: ['system:dict:list'],
+    hidden: false,
+    // permissions: ["system:dict:list"],
     children: [
       {
-        path: 'index/:dictId(\\d+)',
-        component: () => import('@/views/system/dict/data'),
-        name: 'Data',
-        meta: { title: '字典数据', activeMenu: '/system/dict' }
-      }
-    ]
+        path: "index/:dictId(\\d+)",
+        component: () => import("@/views/system/dict/data"),
+        name: "Data",
+        meta: { title: "字典数据", activeMenu: "/system/dict" },
+      },
+    ],
   },
   {
-    path: '/monitor/job-log',
+    path: "/monitor/job-log",
     component: Layout,
     hidden: true,
-    permissions: ['monitor:job:list'],
+    permissions: ["monitor:job:list"],
     children: [
       {
-        path: 'index/:jobId(\\d+)',
-        component: () => import('@/views/monitor/job/log'),
-        name: 'JobLog',
-        meta: { title: '调度日志', activeMenu: '/monitor/job' }
-      }
-    ]
+        path: "index/:jobId(\\d+)",
+        component: () => import("@/views/monitor/job/log"),
+        name: "JobLog",
+        meta: { title: "调度日志", activeMenu: "/monitor/job" },
+      },
+    ],
   },
   {
-    path: '/tool/gen-edit',
+    path: "/tool/gen-edit",
     component: Layout,
     hidden: true,
-    permissions: ['tool:gen:edit'],
+    permissions: ["tool:gen:edit"],
     children: [
       {
-        path: 'index/:tableId(\\d+)',
-        component: () => import('@/views/tool/gen/editTable'),
-        name: 'GenEdit',
-        meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
-      }
-    ]
-  }
-]
+        path: "index/:tableId(\\d+)",
+        component: () => import("@/views/tool/gen/editTable"),
+        name: "GenEdit",
+        meta: { title: "修改生成配置", activeMenu: "/tool/gen" },
+      },
+    ],
+  },
+];
 
 // 防止连续点击多次路由报错
 let routerPush = Router.prototype.push;
 let routerReplace = Router.prototype.replace;
 // push
 Router.prototype.push = function push(location) {
-  return routerPush.call(this, location).catch(err => err)
-}
+  return routerPush.call(this, location).catch((err) => err);
+};
 // replace
 Router.prototype.replace = function push(location) {
-  return routerReplace.call(this, location).catch(err => err)
-}
+  return routerReplace.call(this, location).catch((err) => err);
+};
 
 export default new Router({
-  mode: 'history', // 去掉url中的#
+  mode: "history", // 去掉url中的#
   scrollBehavior: () => ({ y: 0 }),
-  routes: constantRoutes
-})
+  routes: constantRoutes,
+});
diff --git a/flossom-ui/src/utils/request.js b/flossom-ui/src/utils/request.js
index ffb0d21..2ceba58 100644
--- a/flossom-ui/src/utils/request.js
+++ b/flossom-ui/src/utils/request.js
@@ -1,114 +1,148 @@
-import axios from 'axios'
-import { Notification, MessageBox, Message, Loading } from 'element-ui'
-import store from '@/store'
-import { getToken } from '@/utils/auth'
-import errorCode from '@/utils/errorCode'
+import axios from "axios";
+import { Notification, MessageBox, Message, Loading } from "element-ui";
+import store from "@/store";
+import { getToken } from "@/utils/auth";
+import errorCode from "@/utils/errorCode";
 import { tansParams, blobValidate } from "@/utils/ruoyi";
-import cache from '@/plugins/cache'
-import { saveAs } from 'file-saver'
+import cache from "@/plugins/cache";
+import { saveAs } from "file-saver";
 
 let downloadLoadingInstance;
 // 是否显示重新登录
 export let isRelogin = { show: false };
 
-axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
+axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
-})
+  timeout: 10000,
+});
 
 // request拦截器
-service.interceptors.request.use(config => {
-  // 是否需要设置 token
-  const isToken = (config.headers || {}).isToken === false
-  // 是否需要防止数据重复提交
-  const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
-  if (getToken() && !isToken) {
-    config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-  }
-  // get请求映射params参数
-  if (config.method === 'get' && config.params) {
-    let url = config.url + '?' + tansParams(config.params);
-    url = url.slice(0, -1);
-    config.params = {};
-    config.url = url;
-  }
-  if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
-    const requestObj = {
-      url: config.url,
-      data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
-      time: new Date().getTime()
+service.interceptors.request.use(
+  (config) => {
+    // 是否需要设置 token
+    const isToken = (config.headers || {}).isToken === false;
+    // 是否需要防止数据重复提交
+    const isRepeatSubmit = (config.headers || {}).repeatSubmit === false;
+    if (getToken() && !isToken) {
+      config.headers["Authorization"] = "Bearer " + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
     }
-    const requestSize = Object.keys(JSON.stringify(requestObj)).length; // 请求数据大小
-    const limitSize = 5 * 1024 * 1024; // 限制存放数据5M
-    if (requestSize >= limitSize) {
-      console.warn(`[${config.url}]: ` + '请求数据大小超出允许的5M限制，无法进行防重复提交验证。')
-      return config;
+    // get请求映射params参数
+    if (config.method === "get" && config.params) {
+      let url = config.url + "?" + tansParams(config.params);
+      url = url.slice(0, -1);
+      config.params = {};
+      config.url = url;
     }
-    const sessionObj = cache.session.getJSON('sessionObj')
-    if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
-      cache.session.setJSON('sessionObj', requestObj)
-    } else {
-      const s_url = sessionObj.url;                  // 请求地址
-      const s_data = sessionObj.data;                // 请求数据
-      const s_time = sessionObj.time;                // 请求时间
-      const interval = 1000;                         // 间隔时间(ms)，小于此时间视为重复提交
-      if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
-        const message = '数据正在处理，请勿重复提交';
-        console.warn(`[${s_url}]: ` + message)
-        return Promise.reject(new Error(message))
+    if (
+      !isRepeatSubmit &&
+      (config.method === "post" || config.method === "put")
+    ) {
+      const requestObj = {
+        url: config.url,
+        data:
+          typeof config.data === "object"
+            ? JSON.stringify(config.data)
+            : config.data,
+        time: new Date().getTime(),
+      };
+      const requestSize = Object.keys(JSON.stringify(requestObj)).length; // 请求数据大小
+      const limitSize = 5 * 1024 * 1024; // 限制存放数据5M
+      if (requestSize >= limitSize) {
+        console.warn(
+          `[${config.url}]: ` +
+            "请求数据大小超出允许的5M限制，无法进行防重复提交验证。"
+        );
+        return config;
+      }
+      const sessionObj = cache.session.getJSON("sessionObj");
+      if (
+        sessionObj === undefined ||
+        sessionObj === null ||
+        sessionObj === ""
+      ) {
+        cache.session.setJSON("sessionObj", requestObj);
       } else {
-        cache.session.setJSON('sessionObj', requestObj)
+        const s_url = sessionObj.url; // 请求地址
+        const s_data = sessionObj.data; // 请求数据
+        const s_time = sessionObj.time; // 请求时间
+        const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
+        if (
+          s_data === requestObj.data &&
+          requestObj.time - s_time < interval &&
+          s_url === requestObj.url
+        ) {
+          const message = "数据正在处理，请勿重复提交";
+          console.warn(`[${s_url}]: ` + message);
+          return Promise.reject(new Error(message));
+        } else {
+          cache.session.setJSON("sessionObj", requestObj);
+        }
       }
     }
+    return config;
+  },
+  (error) => {
+    console.log(error);
+    Promise.reject(error);
   }
-  return config
-}, error => {
-    console.log(error)
-    Promise.reject(error)
-})
+);
 
 // 响应拦截器
-service.interceptors.response.use(res => {
+service.interceptors.response.use(
+  (res) => {
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
     // 获取错误信息
-    const msg = errorCode[code] || res.data.msg || errorCode['default']
+    const msg = errorCode[code] || res.data.msg || errorCode["default"];
     // 二进制数据则直接返回
-    if (res.request.responseType ===  'blob' || res.request.responseType ===  'arraybuffer') {
-      return res.data
+    if (
+      res.request.responseType === "blob" ||
+      res.request.responseType === "arraybuffer"
+    ) {
+      return res.data;
     }
     if (code === 401) {
       if (!isRelogin.show) {
         isRelogin.show = true;
-        MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
-          isRelogin.show = false;
-          store.dispatch('LogOut').then(() => {
-            location.href = '/index';
+        MessageBox.confirm(
+          "登录状态已过期，您可以继续留在该页面，或者重新登录",
+          "系统提示",
+          {
+            confirmButtonText: "重新登录",
+            cancelButtonText: "取消",
+            type: "warning",
+          }
+        )
+          .then(() => {
+            isRelogin.show = false;
+            store.dispatch("LogOut").then(() => {
+              location.href = "/index";
+            });
           })
-      }).catch(() => {
-        isRelogin.show = false;
-      });
-    }
-      return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
+          .catch(() => {
+            isRelogin.show = false;
+          });
+      }
+      return Promise.reject("无效的会话，或者会话已过期，请重新登录。");
     } else if (code === 500) {
-      Message({ message: msg, type: 'error' })
-      return Promise.reject(new Error(msg))
+      Message({ message: msg, type: "error" });
+      return Promise.reject(new Error(msg));
     } else if (code === 601) {
-      Message({ message: msg, type: 'warning' })
-      return Promise.reject('error')
+      Message({ message: msg, type: "warning" });
+      return Promise.reject("error");
     } else if (code !== 200) {
-      Notification.error({ title: msg })
-      return Promise.reject('error')
+      Notification.error({ title: msg });
+      return Promise.reject("error");
     } else {
-      return res.data
+      return res.data;
     }
   },
-  error => {
-    console.log('err' + error)
+  (error) => {
+    console.log("err" + error);
     let { message } = error;
     if (message == "Network Error") {
       message = "后端接口连接异常";
@@ -117,36 +151,48 @@ service.interceptors.response.use(res => {
     } else if (message.includes("Request failed with status code")) {
       message = "系统接口" + message.substr(message.length - 3) + "异常";
     }
-    Message({ message: message, type: 'error', duration: 5 * 1000 })
-    return Promise.reject(error)
+    Message({ message: message, type: "error", duration: 5 * 1000 });
+    return Promise.reject(error);
   }
-)
+);
 
 // 通用下载方法
 export function download(url, params, filename, config) {
-  downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
-  return service.post(url, params, {
-    transformRequest: [(params) => { return tansParams(params) }],
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    responseType: 'blob',
-    ...config
-  }).then(async (data) => {
-    const isBlob = blobValidate(data);
-    if (isBlob) {
-      const blob = new Blob([data])
-      saveAs(blob, filename)
-    } else {
-      const resText = await data.text();
-      const rspObj = JSON.parse(resText);
-      const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
-      Message.error(errMsg);
-    }
-    downloadLoadingInstance.close();
-  }).catch((r) => {
-    console.error(r)
-    Message.error('下载文件出现错误，请联系管理员！')
-    downloadLoadingInstance.close();
-  })
+  downloadLoadingInstance = Loading.service({
+    text: "正在下载数据，请稍候",
+    spinner: "el-icon-loading",
+    background: "rgba(0, 0, 0, 0.7)",
+  });
+  return service
+    .post(url, params, {
+      transformRequest: [
+        (params) => {
+          return tansParams(params);
+        },
+      ],
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      responseType: "blob",
+      ...config,
+    })
+    .then(async (data) => {
+      const isBlob = blobValidate(data);
+      if (isBlob) {
+        const blob = new Blob([data]);
+        saveAs(blob, filename);
+      } else {
+        const resText = await data.text();
+        const rspObj = JSON.parse(resText);
+        const errMsg =
+          errorCode[rspObj.code] || rspObj.msg || errorCode["default"];
+        Message.error(errMsg);
+      }
+      downloadLoadingInstance.close();
+    })
+    .catch((r) => {
+      console.error(r);
+      Message.error("下载文件出现错误，请联系管理员！");
+      downloadLoadingInstance.close();
+    });
 }
 
-export default service
+export default service;
diff --git a/flossom-ui/src/views/login.vue b/flossom-ui/src/views/login.vue
index 3785e24..75d382c 100644
--- a/flossom-ui/src/views/login.vue
+++ b/flossom-ui/src/views/login.vue
@@ -1,219 +1,251 @@
 <template>
-  <div class="login">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">花至后台管理系统</h3>
-      <el-form-item prop="username">
-        <el-input
-          v-model="loginForm.username"
-          type="text"
-          auto-complete="off"
-          placeholder="账号"
-        >
-          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="password">
-        <el-input
-          v-model="loginForm.password"
-          type="password"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter.native="handleLogin"
-        >
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="code" v-if="captchaEnabled">
-        <el-input
-          v-model="loginForm.code"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter.native="handleLogin"
-        >
-          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
-        </el-input>
-        <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
-        </div>
-      </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      <el-form-item style="width:100%;">
-        <el-button
-          :loading="loading"
-          size="medium"
-          type="primary"
-          style="width:100%;"
-          @click.native.prevent="handleLogin"
-        >
-          <span v-if="!loading">登 录</span>
-          <span v-else>登 录 中...</span>
-        </el-button>
-        <div style="float: right;" v-if="register">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
-        </div>
-      </el-form-item>
-    </el-form>
-    <!--  底部  -->
-    <div class="el-login-footer">
-      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
-    </div>
-  </div>
+	<div class="login">
+		<el-form
+			ref="loginForm"
+			:model="loginForm"
+			:rules="loginRules"
+			class="login-form"
+		>
+			<h3 class="title">花至后台管理系统</h3>
+			<el-form-item prop="username">
+				<el-input
+					v-model="loginForm.username"
+					type="text"
+					auto-complete="off"
+					placeholder="账号"
+				>
+					<svg-icon
+						slot="prefix"
+						icon-class="user"
+						class="el-input__icon input-icon"
+					/>
+				</el-input>
+			</el-form-item>
+			<el-form-item prop="password">
+				<el-input
+					v-model="loginForm.password"
+					type="password"
+					auto-complete="off"
+					placeholder="密码"
+					@keyup.enter.native="handleLogin"
+				>
+					<svg-icon
+						slot="prefix"
+						icon-class="password"
+						class="el-input__icon input-icon"
+					/>
+				</el-input>
+			</el-form-item>
+			<el-form-item prop="code" v-if="captchaEnabled">
+				<el-input
+					v-model="loginForm.code"
+					auto-complete="off"
+					placeholder="验证码"
+					style="width: 63%"
+					@keyup.enter.native="handleLogin"
+				>
+					<svg-icon
+						slot="prefix"
+						icon-class="validCode"
+						class="el-input__icon input-icon"
+					/>
+				</el-input>
+				<div class="login-code">
+					<img :src="codeUrl" @click="getCode" class="login-code-img" />
+				</div>
+			</el-form-item>
+			<el-checkbox
+				v-model="loginForm.rememberMe"
+				style="margin: 0px 0px 25px 0px"
+				>记住密码</el-checkbox
+			>
+			<el-form-item style="width: 100%">
+				<el-button
+					:loading="loading"
+					size="medium"
+					type="primary"
+					style="width: 100%"
+					@click.native.prevent="handleLogin"
+				>
+					<span v-if="!loading">登 录</span>
+					<span v-else>登 录 中...</span>
+				</el-button>
+				<div style="float: right" v-if="register">
+					<router-link class="link-type" :to="'/register'"
+						>立即注册</router-link
+					>
+				</div>
+			</el-form-item>
+		</el-form>
+		<!--  底部  -->
+		<div class="el-login-footer">
+			<span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
+		</div>
+	</div>
 </template>
 
 <script>
-import { getCodeImg } from "@/api/login";
-import Cookies from "js-cookie";
+import { getCodeImg } from '@/api/login'
+import Cookies from 'js-cookie'
 import { encrypt, decrypt } from '@/utils/jsencrypt'
 
 export default {
-  name: "Login",
-  data() {
-    return {
-      codeUrl: "",
-      loginForm: {
-        username: "admin",
-        password: "admin123",
-        rememberMe: false,
-        code: "",
-        uuid: ""
-      },
-      loginRules: {
-        username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" }
-        ],
-        password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" }
-        ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
-      },
-      loading: false,
-      // 验证码开关
-      captchaEnabled: true,
-      // 注册开关
-      register: false,
-      redirect: undefined
-    };
-  },
-  watch: {
-    $route: {
-      handler: function(route) {
-        this.redirect = route.query && route.query.redirect;
-      },
-      immediate: true
-    }
-  },
-  created() {
-    this.getCode();
-    this.getCookie();
-  },
-  methods: {
-    getCode() {
-      getCodeImg().then(res => {
-        this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
-        if (this.captchaEnabled) {
-          this.codeUrl = "data:image/gif;base64," + res.img;
-          this.loginForm.uuid = res.uuid;
-        }
-      });
-    },
-    getCookie() {
-      const username = Cookies.get("username");
-      const password = Cookies.get("password");
-      const rememberMe = Cookies.get('rememberMe')
-      this.loginForm = {
-        username: username === undefined ? this.loginForm.username : username,
-        password: password === undefined ? this.loginForm.password : decrypt(password),
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
-      };
-    },
-    handleLogin() {
-      this.$refs.loginForm.validate(valid => {
-        if (valid) {
-          this.loading = true;
-          if (this.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, { expires: 30 });
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
-          } else {
-            Cookies.remove("username");
-            Cookies.remove("password");
-            Cookies.remove('rememberMe');
-          }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
-          }).catch(() => {
-            this.loading = false;
-            if (this.captchaEnabled) {
-              this.getCode();
-            }
-          });
-        }
-      });
-    }
-  }
-};
+	name: 'Login',
+	data() {
+		return {
+			codeUrl: '',
+			loginForm: {
+				username: 'admin',
+				password: 'admin123',
+				rememberMe: false,
+				code: '',
+				uuid: '',
+			},
+			loginRules: {
+				username: [
+					{ required: true, trigger: 'blur', message: '请输入您的账号' },
+				],
+				password: [
+					{ required: true, trigger: 'blur', message: '请输入您的密码' },
+				],
+				code: [{ required: true, trigger: 'change', message: '请输入验证码' }],
+			},
+			loading: false,
+			// 验证码开关
+			captchaEnabled: true,
+			// 注册开关
+			register: false,
+			redirect: undefined,
+		}
+	},
+	watch: {
+		$route: {
+			handler: function (route) {
+				this.redirect = route.query && route.query.redirect
+			},
+			immediate: true,
+		},
+	},
+	created() {
+		this.getCode()
+		this.getCookie()
+	},
+	methods: {
+		getCode() {
+			getCodeImg().then((res) => {
+				this.captchaEnabled =
+					res.captchaEnabled === undefined ? true : res.captchaEnabled
+				if (this.captchaEnabled) {
+					this.codeUrl = 'data:image/gif;base64,' + res.img
+					this.loginForm.uuid = res.uuid
+				}
+			})
+		},
+		getCookie() {
+			const username = Cookies.get('username')
+			const password = Cookies.get('password')
+			const rememberMe = Cookies.get('rememberMe')
+			this.loginForm = {
+				username: username === undefined ? this.loginForm.username : username,
+				password:
+					password === undefined ? this.loginForm.password : decrypt(password),
+				rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
+			}
+		},
+		handleLogin() {
+			this.$refs.loginForm.validate((valid) => {
+				if (valid) {
+					this.loading = true
+					if (this.loginForm.rememberMe) {
+						Cookies.set('username', this.loginForm.username, { expires: 30 })
+						Cookies.set('password', encrypt(this.loginForm.password), {
+							expires: 30,
+						})
+						Cookies.set('rememberMe', this.loginForm.rememberMe, {
+							expires: 30,
+						})
+					} else {
+						Cookies.remove('username')
+						Cookies.remove('password')
+						Cookies.remove('rememberMe')
+					}
+					this.$store
+						.dispatch('Login', this.loginForm)
+						.then(() => {
+							this.$router.push({ path: this.redirect || '/' }).catch(() => {})
+						})
+						.catch(() => {
+							this.loading = false
+							if (this.captchaEnabled) {
+								this.getCode()
+							}
+						})
+				}
+			})
+		},
+	},
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
 .login {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
-  background-size: cover;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 100%;
+	background-image: url('../assets/images/login-background.jpg');
+	background-size: cover;
 }
 .title {
-  margin: 0px auto 30px auto;
-  text-align: center;
-  color: #707070;
+	margin: 0px auto 30px auto;
+	text-align: center;
+	color: #707070;
 }
 
 .login-form {
-  border-radius: 6px;
-  background: #ffffff;
-  width: 400px;
-  padding: 25px 25px 5px 25px;
-  .el-input {
-    height: 38px;
-    input {
-      height: 38px;
-    }
-  }
-  .input-icon {
-    height: 39px;
-    width: 14px;
-    margin-left: 2px;
-  }
+	border-radius: 6px;
+	background: #ffffff;
+	width: 400px;
+	padding: 25px 25px 5px 25px;
+	.el-input {
+		height: 38px;
+		input {
+			height: 38px;
+		}
+	}
+	.input-icon {
+		height: 39px;
+		width: 14px;
+		margin-left: 2px;
+	}
 }
 .login-tip {
-  font-size: 13px;
-  text-align: center;
-  color: #bfbfbf;
+	font-size: 13px;
+	text-align: center;
+	color: #bfbfbf;
 }
 .login-code {
-  width: 33%;
-  height: 38px;
-  float: right;
-  img {
-    cursor: pointer;
-    vertical-align: middle;
-  }
+	width: 33%;
+	height: 38px;
+	float: right;
+	img {
+		cursor: pointer;
+		vertical-align: middle;
+	}
 }
 .el-login-footer {
-  height: 40px;
-  line-height: 40px;
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  text-align: center;
-  color: #fff;
-  font-family: Arial;
-  font-size: 12px;
-  letter-spacing: 1px;
+	height: 40px;
+	line-height: 40px;
+	position: fixed;
+	bottom: 0;
+	width: 100%;
+	text-align: center;
+	color: #fff;
+	font-family: Arial;
+	font-size: 12px;
+	letter-spacing: 1px;
 }
 .login-code-img {
-  height: 38px;
+	height: 38px;
 }
 </style>
diff --git a/flossom-ui/src/views/system/setting/index.vue b/flossom-ui/src/views/system/setting/index.vue
index 1551ece..8bf2fe9 100644
--- a/flossom-ui/src/views/system/setting/index.vue
+++ b/flossom-ui/src/views/system/setting/index.vue
@@ -1,489 +1,591 @@
 <template>
-  <div class="app-container">
-    <el-tabs v-model="activeName" @tab-click="handleClick">
-      <el-tab-pane label="用户协议" name="userAgreement">
-        <el-form ref="form" :model="userAgreementFrom" label-width="80px">
-          <el-row>
-            <el-col :span="20">
-                <editor v-model="userAgreementFrom.userAgreement" :min-height="580"/>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-tab-pane>
-      <el-tab-pane label="隐私政策" name="privacyAgreement">
-        <el-form ref="form" :model="privacyAgreementFrom" label-width="80px">
-          <el-row>
-            <el-col :span="20">
-              <editor v-model="privacyAgreementFrom.privacyAgreement" :min-height="580"/>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-tab-pane>
-      <el-tab-pane label="积分规则" name="integralRule">
-        <el-form ref="form" :model="integralRuleFrom" label-width="80px">
-          <el-row>
-            <el-col :span="20">
-              <editor v-model="integralRuleFrom.integralRule" :min-height="580"/>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-tab-pane>
-      <el-tab-pane label="关于我们" name="aboutUs">
-        <el-form ref="form" :model="aboutUsFrom" label-width="80px">
-          <el-row>
-            <el-col :span="20">
-              <editor v-model="aboutUsFrom.aboutUs" :min-height="580"/>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-tab-pane>
-      <el-tab-pane label="蓝牙指引权限" name="bluetoothGuidancePermissions">
-        <el-form ref="form" :model="bluetoothGuidancePermissionsFrom" label-width="80px">
-          <el-row>
-            <el-col :span="20">
-              <editor v-model="bluetoothGuidancePermissionsFrom.bluetoothGuidancePermissions" :min-height="580"/>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-tab-pane>
-      <el-tab-pane label="定位指引权限" name="locationGuidancePermissions">
-        <el-form ref="form" :model="locationGuidancePermissionsFrom" label-width="80px">
-          <el-row>
-            <el-col :span="20">
-              <editor v-model="locationGuidancePermissionsFrom.locationGuidancePermissions" :min-height="580"/>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-tab-pane>
-      <el-tab-pane label="联系客服" name="contactWorker">
-        <div class="block" style="float: left;margin-left: 3%;margin-top: 3%">
-          <el-image :src="contactWorkerFrom.contactWorkerSrc" style="width: 330px;height: 461px;">
-            <div slot="placeholder" class="image-slot"><span class="dot"></span>
-            </div>
-          </el-image>
-        </div>
-        <div style="float: left;margin-left: 10%;margin-top: 10%;">
-          <el-upload
-            ref="upload"
-            :limit="1"
-            accept=".jpg, .png, .jpeg, .mp4"
-            :headers="upload.headers"
-            :action="upload.url"
-            :disabled="upload.isUploading"
-            :on-progress="handleFileUploadProgress"
-            :on-success="handleFileSuccess"
-            drag
-          >
-            <i class="el-icon-upload"></i>
-            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-            <div class="el-upload__tip" slot="tip">请上传联系客服页面图片，建议尺寸为330px*461px</div>
-          </el-upload>
-        </div>
-
-      </el-tab-pane>
-      <el-tab-pane label="商城链接/版本管理" name="otherSetting">
-        <el-form ref="form" :model="otherForm" :rules="rules" label-width="150px" style="margin-top: 1%">
-          <el-divider content-position="left">商城设置</el-divider>
-          <el-form-item label="跳转商城appid：" prop="skipAppid">
-            <el-input v-model="otherForm.skipAppid" style="width: 70%"></el-input>
-          </el-form-item>
-          <el-form-item label="跳转商城路径：" prop="skipPath">
-            <el-input v-model="otherForm.skipPath" style="width: 70%"></el-input>
-          </el-form-item>
-          <el-divider content-position="left">版本管理设置</el-divider>
-          <el-form-item label="当前版本：" prop="sysVersion">
-            <el-input v-model="otherForm.sysVersion" style="width: 70%"></el-input>
-          </el-form-item>
-        </el-form>
-      </el-tab-pane>
-    </el-tabs>
-    <div style="margin-left: 76%;margin-top: 2%"  v-show="this.activeName != 'contactWorker'">
-      <el-button type="primary" @click="submitForm">提 交</el-button>
-    </div>
-  </div>
+	<div class="app-container">
+		<el-tabs v-model="activeName" @tab-click="handleClick">
+			<el-tab-pane label="用户协议" name="userAgreement">
+				<el-form ref="form" :model="userAgreementFrom" label-width="80px">
+					<el-row>
+						<el-col :span="20">
+							<editor
+								id="editor1"
+								tableName="editor1"
+								v-model="userAgreementFrom.userAgreement"
+								:min-height="580"
+							/>
+						</el-col>
+					</el-row>
+				</el-form>
+			</el-tab-pane>
+			<el-tab-pane label="隐私政策" name="privacyAgreement">
+				<el-form ref="form" :model="privacyAgreementFrom" label-width="80px">
+					<el-row>
+						<el-col :span="20">
+							<editor
+								id="editor2"
+								tableName="editor2"
+								v-model="privacyAgreementFrom.privacyAgreement"
+								:min-height="580"
+							/>
+						</el-col>
+					</el-row>
+				</el-form>
+			</el-tab-pane>
+			<el-tab-pane label="积分规则" name="integralRule">
+				<el-form ref="form" :model="integralRuleFrom" label-width="80px">
+					<el-row>
+						<el-col :span="20">
+							<editor
+								id="editor3"
+								tableName="editor3"
+								v-model="integralRuleFrom.integralRule"
+								:min-height="580"
+							/>
+						</el-col>
+					</el-row>
+				</el-form>
+			</el-tab-pane>
+			<el-tab-pane label="关于我们" name="aboutUs">
+				<el-form ref="form" :model="aboutUsFrom" label-width="80px">
+					<el-row>
+						<el-col :span="20">
+							<editor
+								id="editor4"
+								tableName="editor4"
+								v-model="aboutUsFrom.aboutUs"
+								:min-height="580"
+							/>
+						</el-col>
+					</el-row>
+				</el-form>
+			</el-tab-pane>
+			<el-tab-pane label="蓝牙指引权限" name="bluetoothGuidancePermissions">
+				<el-form
+					ref="form"
+					:model="bluetoothGuidancePermissionsFrom"
+					label-width="80px"
+				>
+					<el-row>
+						<el-col :span="20">
+							<editor
+								id="editor5"
+								tableName="editor5"
+								v-model="
+									bluetoothGuidancePermissionsFrom.bluetoothGuidancePermissions
+								"
+								:min-height="580"
+							/>
+						</el-col>
+					</el-row>
+				</el-form>
+			</el-tab-pane>
+			<el-tab-pane label="定位指引权限" name="locationGuidancePermissions">
+				<el-form
+					ref="form"
+					:model="locationGuidancePermissionsFrom"
+					label-width="80px"
+				>
+					<el-row>
+						<el-col :span="20">
+							<editor
+								id="editor6"
+								tableName="editor6"
+								v-model="
+									locationGuidancePermissionsFrom.locationGuidancePermissions
+								"
+								:min-height="580"
+							/>
+						</el-col>
+					</el-row>
+				</el-form>
+			</el-tab-pane>
+			<el-tab-pane label="联系客服" name="contactWorker">
+				<div class="block" style="float: left; margin-left: 3%; margin-top: 3%">
+					<el-image
+						:src="contactWorkerFrom.contactWorkerSrc"
+						style="width: 330px; height: 461px"
+					>
+						<div slot="placeholder" class="image-slot">
+							<span class="dot"></span>
+						</div>
+					</el-image>
+				</div>
+				<div style="float: left; margin-left: 10%; margin-top: 10%">
+					<el-upload
+						ref="upload"
+						:limit="1"
+						accept=".jpg, .png, .jpeg, .mp4"
+						:headers="upload.headers"
+						:action="upload.url"
+						:disabled="upload.isUploading"
+						:on-progress="handleFileUploadProgress"
+						:on-success="handleFileSuccess"
+						drag
+					>
+						<i class="el-icon-upload"></i>
+						<div class="el-upload__text">
+							将文件拖到此处，或<em>点击上传</em>
+						</div>
+						<div class="el-upload__tip" slot="tip">
+							请上传联系客服页面图片，建议尺寸为330px*461px
+						</div>
+					</el-upload>
+				</div>
+			</el-tab-pane>
+			<el-tab-pane label="商城链接/版本管理" name="otherSetting">
+				<el-form
+					ref="form"
+					:model="otherForm"
+					:rules="rules"
+					label-width="150px"
+					style="margin-top: 1%"
+				>
+					<el-divider content-position="left">商城设置</el-divider>
+					<el-form-item label="跳转商城appid：" prop="skipAppid">
+						<el-input
+							v-model="otherForm.skipAppid"
+							style="width: 70%"
+						></el-input>
+					</el-form-item>
+					<el-form-item label="跳转商城路径：" prop="skipPath">
+						<el-input
+							v-model="otherForm.skipPath"
+							style="width: 70%"
+						></el-input>
+					</el-form-item>
+					<el-divider content-position="left">版本管理设置</el-divider>
+					<el-form-item label="当前版本：" prop="sysVersion">
+						<el-input
+							v-model="otherForm.sysVersion"
+							style="width: 70%"
+						></el-input>
+					</el-form-item>
+				</el-form>
+			</el-tab-pane>
+		</el-tabs>
+		<div
+			style="margin-left: 76%; margin-top: 2%"
+			v-show="this.activeName != 'contactWorker'"
+		>
+			<el-button type="primary" @click="submitForm">提 交</el-button>
+		</div>
+	</div>
 </template>
 
 <script>
-import { listSetting, getSetting, delSetting, addSetting, updateSetting } from "@/api/system/systemSetting";
-import { listOtherSetting, addOtherSetting, updateOtherSetting} from "@/api/system/otherSetting";
-import {getToken} from "@/utils/auth";
+import {
+	listSetting,
+	getSetting,
+	delSetting,
+	addSetting,
+	updateSetting,
+} from '@/api/system/systemSetting'
+import {
+	listOtherSetting,
+	addOtherSetting,
+	updateOtherSetting,
+} from '@/api/system/otherSetting'
+import { getToken } from '@/utils/auth'
 
 export default {
-  name: "Setting",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      src: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
-      // 平台参数设置表格数据
-      settingList: [],
-      // 弹出层标题
-      title: "",
-      activeName: 'userAgreement',
-      // 是否显示弹出层
-      open: false,
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/file/upload"
-      },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        key: null,
-        value: null,
-        instructions: null,
-        status: null,
-      },
-      otherQueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        skipAppid: null,
-        skipPath: null,
-        sysVersion: null,
-        status: null,
-      },
-      // 表单参数
-      form: {
-
-      },
-      otherForm: {
-
-      },
-      userAgreementFrom: {
-        userAgreement: null,
-        userAgreementId: null
-      },
-      privacyAgreementFrom: {
-        privacyAgreement: null,
-        privacyAgreementId: null,
-      },
-      integralRuleFrom: {
-        integralRule: null,
-        integralRuleId: null,
-      },
-      aboutUsFrom: {
-        aboutUs: null,
-        aboutUsId: null,
-      },
-      bluetoothGuidancePermissionsFrom: {
-        bluetoothGuidancePermissions: null,
-        bluetoothGuidancePermissionsId: null,
-      },
-      locationGuidancePermissionsFrom: {
-        locationGuidancePermissions: null,
-        locationGuidancePermissionsId: null
-      },
-      contactWorkerFrom: {
-        contactWorkerSrc: null,
-        contactWorkerId: null
-      },
-      // 表单校验
-      rules: {
-        skipAppid: [
-          { required: true, message: '请输入商城apppid', trigger: 'blur' },
-        ],
-        skipPath: [
-          { required: true, message: '请输入商城路径', trigger: 'blur' },
-        ],
-        sysVersion: [
-          { required: true, message: '请输入当前版本', trigger: 'blur' },
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab, event);
-    },
-    /** 提交按钮 */
-    submitForm() {
-      if (this.activeName == 'userAgreement') {
-        if (this.userAgreementFrom.userAgreementId != null) {
-          this.form.id = this.userAgreementFrom.userAgreementId;
-        }
-        this.form.key = 'USER_AGREEMENT';
-        if (!this.userAgreementFrom.userAgreement) {
-          this.$modal.msgError('用户协议内容不能为空');
-          return ;
-        }
-        this.form.value = this.userAgreementFrom.userAgreement;
-        this.form.instructions = '用户协议';
-      }
-      if (this.activeName == 'privacyAgreement') {
-        if (this.privacyAgreementFrom.privacyAgreementId != null) {
-          this.form.id = this.privacyAgreementFrom.privacyAgreementId;
-        }
-        this.form.key = 'PRIVACY_AGREEMENT';
-        if (!this.privacyAgreementFrom.privacyAgreement) {
-          this.$modal.msgError('隐私协议内容不能为空');
-          return ;
-        }
-        this.form.instructions = '隐私协议';
-        this.form.value = this.privacyAgreementFrom.privacyAgreement;
-      }
-      if (this.activeName == 'integralRule') {
-        if (this.integralRuleFrom.integralRuleId != null) {
-          this.form.id = this.integralRuleFrom.integralRuleId;
-        }
-        this.form.key = 'INTEGRAL_RULE';
-        if (!this.integralRuleFrom.integralRule) {
-          this.$modal.msgError('积分规则内容不能为空');
-          return ;
-        }
-        this.form.instructions = '积分规则';
-        this.form.value = this.integralRuleFrom.integralRule;
-      }
-      if (this.activeName == 'aboutUs') {
-        if (this.aboutUsFrom.aboutUsId != null) {
-          this.form.id = this.aboutUsFrom.aboutUsId;
-        }
-        this.form.key = 'ABOUT_US';
-        if (!this.aboutUsFrom.aboutUs) {
-          this.$modal.msgError('关于我们内容不能为空');
-          return ;
-        }
-        this.form.instructions = '关于我们';
-        this.form.value = this.aboutUsFrom.aboutUs;
-      }
-      if (this.activeName == 'bluetoothGuidancePermissions') {
-        if (this.bluetoothGuidancePermissionsFrom.bluetoothGuidancePermissionsId != null) {
-          this.form.id = this.bluetoothGuidancePermissionsFrom.bluetoothGuidancePermissionsId;
-        }
-        this.form.key = 'BLUETOOTH_GUIDANCE_PERMISSIONS';
-        if (!this.bluetoothGuidancePermissionsFrom.bluetoothGuidancePermissions) {
-          this.$modal.msgError('蓝牙指引权限内容不能为空');
-          return ;
-        }
-        this.form.instructions = '蓝牙指引权限';
-        this.form.value = this.bluetoothGuidancePermissionsFrom.bluetoothGuidancePermissions;
-      }
-      if (this.activeName == 'locationGuidancePermissions') {
-        if (this.locationGuidancePermissionsFrom.locationGuidancePermissionsId != null) {
-          this.form.id = this.locationGuidancePermissionsFrom.locationGuidancePermissionsId;
-        }
-        this.form.key = 'LOCATION_GUIDANCE_PERMISSIONS';
-        if (!this.locationGuidancePermissionsFrom.locationGuidancePermissions) {
-          this.$modal.msgError('定位指引权限内容不能为空');
-          return ;
-        }
-        this.form.instructions = '定位指引权限';
-        this.form.value = this.locationGuidancePermissionsFrom.locationGuidancePermissions;
-      }
-      if (this.activeName != 'otherSetting') {
-        if (this.form.id != null) {
-          updateSetting(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-        } else {
-          addSetting(this.form).then(response => {
-            this.$modal.msgSuccess("保存成功");
-            this.open = false;
-            this.getList();
-          });
-        }
-        this.form.id = null;
-        this.form.value = null;
-      } else {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            // 其他设置处理
-            if (this.otherForm.id != null) {
-              updateOtherSetting(this.otherForm).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-            } else {
-              addOtherSetting(this.otherForm).then(response => {
-                this.$modal.msgSuccess("保存成功");
-                this.open = false;
-                this.getList();
-              });
-            }
-          }
-        });
-      }
-    },
-    /** 查询平台参数设置列表 */
-    /** USER_AGREEMENT-用户协议 PRIVACY_AGREEMENT-隐私协议  INTEGRAL_RULE-积分规则 ABOUT_US-关于我们  BLUETOOTH_GUIDANCE_PERMISSIONS-蓝牙指引权限 LOCATION_GUIDANCE_PERMISSIONS - 定位指引权限 CONTACT_WORKER-联系客服 */
-    getList() {
-      this.loading = true;
-      listSetting(this.queryParams).then(response => {
-        this.settingList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-        // 处理回显逻辑
-        this.settingList.forEach((item)=>{
-          if (item.key == 'USER_AGREEMENT') {
-            this.userAgreementFrom.userAgreement = item.value;
-            this.userAgreementFrom.userAgreementId = item.id;
-          }
-          if (item.key == 'PRIVACY_AGREEMENT') {
-            this.privacyAgreementFrom.privacyAgreement = item.value;
-            this.privacyAgreementFrom.privacyAgreementId = item.id;
-          }
-          if (item.key == 'INTEGRAL_RULE') {
-            this.integralRuleFrom.integralRule = item.value;
-            this.integralRuleFrom.integralRuleId = item.id;
-          }
-          if (item.key == 'ABOUT_US') {
-            this.aboutUsFrom.aboutUs = item.value;
-            this.aboutUsFrom.aboutUsId = item.id;
-          }
-          if (item.key == 'BLUETOOTH_GUIDANCE_PERMISSIONS') {
-            this.bluetoothGuidancePermissionsFrom.bluetoothGuidancePermissions = item.value;
-            this.bluetoothGuidancePermissionsFrom.bluetoothGuidancePermissionsId = item.id;
-          }
-          if (item.key == 'LOCATION_GUIDANCE_PERMISSIONS') {
-            this.locationGuidancePermissionsFrom.locationGuidancePermissions = item.value;
-            this.locationGuidancePermissionsFrom.locationGuidancePermissionsId = item.id;
-          }
-          if (item.key == 'CONTACT_WORKER') {
-            this.contactWorkerFrom.contactWorkerSrc = item.pictureUrl;
-            this.contactWorkerFrom.contactWorkerId = item.id;
-          }
-        })
-      });
-      listOtherSetting(this.otherQueryParams).then(response => {
-        this.otherForm = response.rows.length >0 ? response.rows[0]: {};
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        key: null,
-        value: null,
-        instructions: null,
-        status: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        remark: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加平台参数设置";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getSetting(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改平台参数设置";
-      });
-    },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      // this.upload.isUploading = true;
-      console.log('上传处理中==>',JSON.stringify(event))
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      console.log('上传后的结果==>',JSON.stringify(response))
-      if(response.code == '200') {
-        this.contactWorkerFrom.contactWorkerSrc = response.data.url;
-        this.form.key = 'CONTACT_WORKER';
-        this.form.instructions = '联系客服';
-        this.form.pictureUrl = this.contactWorkerFrom.contactWorkerSrc;
-        if (this.contactWorkerFrom.contactWorkerId !=null){
-          this.form.id = this.contactWorkerFrom.contactWorkerId;
-        }
-        // 处理保存处理接口
-        if (this.form.id != null) {
-          updateSetting(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-        } else {
-          addSetting(this.form).then(response => {
-            this.$modal.msgSuccess("保存成功");
-            this.open = false;
-            this.getList();
-          });
-        }
-        this.form.id = null;
-        this.form.pictureUrl = null;
+	name: 'Setting',
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			src: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
+			// 平台参数设置表格数据
+			settingList: [],
+			// 弹出层标题
+			title: '',
+			activeName: 'userAgreement',
+			// 是否显示弹出层
+			open: false,
+			// 用户导入参数
+			upload: {
+				// 是否显示弹出层（用户导入）
+				open: false,
+				// 弹出层标题（用户导入）
+				title: '',
+				// 是否禁用上传
+				isUploading: false,
+				// 是否更新已经存在的用户数据
+				updateSupport: 0,
+				// 设置上传的请求头部
+				headers: { Authorization: 'Bearer ' + getToken() },
+				// 上传的地址
+				url: process.env.VUE_APP_BASE_API + '/file/upload',
+			},
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				key: null,
+				value: null,
+				instructions: null,
+				status: null,
+			},
+			otherQueryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				skipAppid: null,
+				skipPath: null,
+				sysVersion: null,
+				status: null,
+			},
+			// 表单参数
+			form: {},
+			otherForm: {},
+			userAgreementFrom: {
+				userAgreement: null,
+				userAgreementId: null,
+			},
+			privacyAgreementFrom: {
+				privacyAgreement: null,
+				privacyAgreementId: null,
+			},
+			integralRuleFrom: {
+				integralRule: null,
+				integralRuleId: null,
+			},
+			aboutUsFrom: {
+				aboutUs: null,
+				aboutUsId: null,
+			},
+			bluetoothGuidancePermissionsFrom: {
+				bluetoothGuidancePermissions: null,
+				bluetoothGuidancePermissionsId: null,
+			},
+			locationGuidancePermissionsFrom: {
+				locationGuidancePermissions: null,
+				locationGuidancePermissionsId: null,
+			},
+			contactWorkerFrom: {
+				contactWorkerSrc: null,
+				contactWorkerId: null,
+			},
+			// 表单校验
+			rules: {
+				skipAppid: [
+					{ required: true, message: '请输入商城apppid', trigger: 'blur' },
+				],
+				skipPath: [
+					{ required: true, message: '请输入商城路径', trigger: 'blur' },
+				],
+				sysVersion: [
+					{ required: true, message: '请输入当前版本', trigger: 'blur' },
+				],
+			},
+		}
+	},
+	created() {
+		this.getList()
+	},
+	methods: {
+		handleClick(tab, event) {
+			console.log(tab, event)
+		},
+		/** 提交按钮 */
+		submitForm() {
+			if (this.activeName == 'userAgreement') {
+				if (this.userAgreementFrom.userAgreementId != null) {
+					this.form.id = this.userAgreementFrom.userAgreementId
+				}
+				this.form.key = 'USER_AGREEMENT'
+				if (!this.userAgreementFrom.userAgreement) {
+					this.$modal.msgError('用户协议内容不能为空')
+					return
+				}
+				this.form.value = this.userAgreementFrom.userAgreement
+				this.form.instructions = '用户协议'
+			}
+			if (this.activeName == 'privacyAgreement') {
+				if (this.privacyAgreementFrom.privacyAgreementId != null) {
+					this.form.id = this.privacyAgreementFrom.privacyAgreementId
+				}
+				this.form.key = 'PRIVACY_AGREEMENT'
+				if (!this.privacyAgreementFrom.privacyAgreement) {
+					this.$modal.msgError('隐私协议内容不能为空')
+					return
+				}
+				this.form.instructions = '隐私协议'
+				this.form.value = this.privacyAgreementFrom.privacyAgreement
+			}
+			if (this.activeName == 'integralRule') {
+				if (this.integralRuleFrom.integralRuleId != null) {
+					this.form.id = this.integralRuleFrom.integralRuleId
+				}
+				this.form.key = 'INTEGRAL_RULE'
+				if (!this.integralRuleFrom.integralRule) {
+					this.$modal.msgError('积分规则内容不能为空')
+					return
+				}
+				this.form.instructions = '积分规则'
+				this.form.value = this.integralRuleFrom.integralRule
+			}
+			if (this.activeName == 'aboutUs') {
+				if (this.aboutUsFrom.aboutUsId != null) {
+					this.form.id = this.aboutUsFrom.aboutUsId
+				}
+				this.form.key = 'ABOUT_US'
+				if (!this.aboutUsFrom.aboutUs) {
+					this.$modal.msgError('关于我们内容不能为空')
+					return
+				}
+				this.form.instructions = '关于我们'
+				this.form.value = this.aboutUsFrom.aboutUs
+			}
+			if (this.activeName == 'bluetoothGuidancePermissions') {
+				if (
+					this.bluetoothGuidancePermissionsFrom
+						.bluetoothGuidancePermissionsId != null
+				) {
+					this.form.id =
+						this.bluetoothGuidancePermissionsFrom.bluetoothGuidancePermissionsId
+				}
+				this.form.key = 'BLUETOOTH_GUIDANCE_PERMISSIONS'
+				if (
+					!this.bluetoothGuidancePermissionsFrom.bluetoothGuidancePermissions
+				) {
+					this.$modal.msgError('蓝牙指引权限内容不能为空')
+					return
+				}
+				this.form.instructions = '蓝牙指引权限'
+				this.form.value =
+					this.bluetoothGuidancePermissionsFrom.bluetoothGuidancePermissions
+			}
+			if (this.activeName == 'locationGuidancePermissions') {
+				if (
+					this.locationGuidancePermissionsFrom.locationGuidancePermissionsId !=
+					null
+				) {
+					this.form.id =
+						this.locationGuidancePermissionsFrom.locationGuidancePermissionsId
+				}
+				this.form.key = 'LOCATION_GUIDANCE_PERMISSIONS'
+				if (!this.locationGuidancePermissionsFrom.locationGuidancePermissions) {
+					this.$modal.msgError('定位指引权限内容不能为空')
+					return
+				}
+				this.form.instructions = '定位指引权限'
+				this.form.value =
+					this.locationGuidancePermissionsFrom.locationGuidancePermissions
+			}
+      if (this.form.value) {
+        this.form.value = this.form.value.replace(/\\/g, '') // 兼容表格
+        console.log("	this.form.value",	this.form.value)
       }
-      // this.upload.open = false;
-      // this.upload.isUploading = false;
-      // this.$refs.upload.clearFiles();
-      // this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-      // this.getList();
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除平台参数设置编号为"' + ids + '"的数据项？').then(function() {
-        return delSetting(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/setting/export', {
-        ...this.queryParams
-      }, `setting_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
+      
+			if (this.activeName != 'otherSetting') {
+				if (this.form.id != null) {
+					updateSetting(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功')
+						this.open = false
+						this.getList()
+					})
+				} else {
+					addSetting(this.form).then((response) => {
+						this.$modal.msgSuccess('保存成功')
+						this.open = false
+						this.getList()
+					})
+				}
+				this.form.id = null
+				this.form.value = null
+			} else {
+				this.$refs['form'].validate((valid) => {
+					if (valid) {
+						// 其他设置处理
+						if (this.otherForm.id != null) {
+							updateOtherSetting(this.otherForm).then((response) => {
+								this.$modal.msgSuccess('修改成功')
+								this.open = false
+								this.getList()
+							})
+						} else {
+							addOtherSetting(this.otherForm).then((response) => {
+								this.$modal.msgSuccess('保存成功')
+								this.open = false
+								this.getList()
+							})
+						}
+					}
+				})
+			}
+		},
+		/** 查询平台参数设置列表 */
+		/** USER_AGREEMENT-用户协议 PRIVACY_AGREEMENT-隐私协议  INTEGRAL_RULE-积分规则 ABOUT_US-关于我们  BLUETOOTH_GUIDANCE_PERMISSIONS-蓝牙指引权限 LOCATION_GUIDANCE_PERMISSIONS - 定位指引权限 CONTACT_WORKER-联系客服 */
+		getList() {
+			this.loading = true
+			listSetting(this.queryParams).then((response) => {
+				this.settingList = JSON.parse(JSON.stringify(response.rows))
+				this.total = response.total
+				this.loading = false
+				// 处理回显逻辑
+				this.settingList.forEach((item) => {
+					if (item.key == 'USER_AGREEMENT') {
+						this.userAgreementFrom.userAgreement = item.value
+						this.userAgreementFrom.userAgreementId = item.id
+					}
+					if (item.key == 'PRIVACY_AGREEMENT') {
+						this.privacyAgreementFrom.privacyAgreement = item.value
+						this.privacyAgreementFrom.privacyAgreementId = item.id
+					}
+					if (item.key == 'INTEGRAL_RULE') {
+						this.integralRuleFrom.integralRule = item.value
+						this.integralRuleFrom.integralRuleId = item.id
+					}
+					if (item.key == 'ABOUT_US') {
+						this.aboutUsFrom.aboutUs = item.value
+						this.aboutUsFrom.aboutUsId = item.id
+					}
+					if (item.key == 'BLUETOOTH_GUIDANCE_PERMISSIONS') {
+						this.bluetoothGuidancePermissionsFrom.bluetoothGuidancePermissions =
+							item.value
+						this.bluetoothGuidancePermissionsFrom.bluetoothGuidancePermissionsId =
+							item.id
+					}
+					if (item.key == 'LOCATION_GUIDANCE_PERMISSIONS') {
+						this.locationGuidancePermissionsFrom.locationGuidancePermissions =
+							item.value
+						this.locationGuidancePermissionsFrom.locationGuidancePermissionsId =
+							item.id
+					}
+					if (item.key == 'CONTACT_WORKER') {
+						this.contactWorkerFrom.contactWorkerSrc = item.pictureUrl
+						this.contactWorkerFrom.contactWorkerId = item.id
+					}
+				})
+			})
+			listOtherSetting(this.otherQueryParams).then((response) => {
+				this.otherForm = response.rows.length > 0 ? response.rows[0] : {}
+				this.loading = false
+			})
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false
+			this.reset()
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				id: null,
+				key: null,
+				value: null,
+				instructions: null,
+				status: null,
+				createBy: null,
+				createTime: null,
+				updateBy: null,
+				updateTime: null,
+				remark: null,
+			}
+			this.resetForm('form')
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1
+			this.getList()
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm('queryForm')
+			this.handleQuery()
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map((item) => item.id)
+			this.single = selection.length !== 1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset()
+			this.open = true
+			this.title = '添加平台参数设置'
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset()
+			const id = row.id || this.ids
+			getSetting(id).then((response) => {
+				this.form = response.data
+				this.open = true
+				this.title = '修改平台参数设置'
+			})
+		},
+		// 文件上传中处理
+		handleFileUploadProgress(event, file, fileList) {
+			// this.upload.isUploading = true;
+			console.log('上传处理中==>', JSON.stringify(event))
+		},
+		// 文件上传成功处理
+		handleFileSuccess(response, file, fileList) {
+			console.log('上传后的结果==>', JSON.stringify(response))
+			if (response.code == '200') {
+				this.contactWorkerFrom.contactWorkerSrc = response.data.url
+				this.form.key = 'CONTACT_WORKER'
+				this.form.instructions = '联系客服'
+				this.form.pictureUrl = this.contactWorkerFrom.contactWorkerSrc
+				if (this.contactWorkerFrom.contactWorkerId != null) {
+					this.form.id = this.contactWorkerFrom.contactWorkerId
+				}
+				// 处理保存处理接口
+				if (this.form.id != null) {
+					updateSetting(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功')
+						this.open = false
+						this.getList()
+					})
+				} else {
+					addSetting(this.form).then((response) => {
+						this.$modal.msgSuccess('保存成功')
+						this.open = false
+						this.getList()
+					})
+				}
+				this.form.id = null
+				this.form.pictureUrl = null
+			}
+			// this.upload.open = false;
+			// this.upload.isUploading = false;
+			// this.$refs.upload.clearFiles();
+			// this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+			// this.getList();
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const ids = row.id || this.ids
+			this.$modal
+				.confirm('是否确认删除平台参数设置编号为"' + ids + '"的数据项？')
+				.then(function () {
+					return delSetting(ids)
+				})
+				.then(() => {
+					this.getList()
+					this.$modal.msgSuccess('删除成功')
+				})
+				.catch(() => {})
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download(
+				'system/setting/export',
+				{
+					...this.queryParams,
+				},
+				`setting_${new Date().getTime()}.xlsx`
+			)
+		},
+	},
+}
 </script>
diff --git a/flossom-ui/vue.config.js b/flossom-ui/vue.config.js
index 332e1bf..f86123f 100644
--- a/flossom-ui/vue.config.js
+++ b/flossom-ui/vue.config.js
@@ -11,6 +11,14 @@ const name = process.env.VUE_APP_TITLE || "花至管理系统"; // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80; // 端口
 
+function getTargetUrl() {
+  if (process.env.NODE_ENV === "local") {
+    return "http://110.41.134.131:8080";
+  } else {
+    return `http://localhost:8080`;
+  }
+}
+
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
 // 这里只列一部分，具体配置参考文档
@@ -35,7 +43,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://110.41.134.131:8080`,
+        // target: `http://110.41.134.131:8080`,
+        target: `http://192.168.10.147:8080`,
+
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",