Merge branch 'dev'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pig-ui",
-  "version": "3.6.5",
+  "version": "3.6.6",
   "scripts": {
     "dev": "vite --host",
     "build": "vite build",

src/api/admin/user.js

@@ -55,9 +55,9 @@ export function putObj(obj) {
   })
 }
 
-export function isExsit(params) {
+export function isExist(params) {
   return request({
-    url: '/admin/user/check/exsit',
+    url: '/admin/user/check/exist',
     method: 'get',
     params: params
   })

src/config/website.js

@@ -1,5 +1,5 @@
 export default {
-    version: "v3.6.5", // 控制首页显示的版本号
+    version: "v3.6.6", // 控制首页显示的版本号
     logo: "PIG",   // 侧边栏搜索的时候顶部展示的文案
     key: "pig", //配置主键,目前用于存储
     title: "PIG 快速开发框架",

src/const/crud/admin/user.js

@@ -14,7 +14,7 @@
  * this software without specific prior written permission.
  * Author: lengleng ([email protected])
  */
-import { isExsit } from '@/api/admin/user'
+import { isExist } from '@/api/admin/user'
 
 export const validateUsername = (rule, value, callback) => {
   if (!value) {
@@ -24,7 +24,7 @@ export const validateUsername = (rule, value, callback) => {
   if (!flag) {
     callback(new Error('用户名支持小写英文、数字'))
   }
-  isExsit({ username: value }).then(response => {
+  isExist({ username: value }).then(response => {
     if (window.boxType === 'edit') callback()
     const result = response.data.data
     if (result) {
@@ -60,7 +60,7 @@ export const checkPhone = (rule, value, callback) => {
     }
   }
 
-  isExsit({ phone: value }).then(response => {
+  isExist({ phone: value }).then(response => {
     if (window.boxType === 'edit') callback()
     const result = response.data.data
     if (result) {

src/page/login/userRegister.vue

@@ -22,16 +22,13 @@
     <el-form-item prop="password">
       <el-input
         v-model="registerForm.password"
-        :type="passwordType"
+        size="small"
+        type="password"
         auto-complete="off"
+        show-password
         placeholder="请输入密码"
         @keyup.enter.native="handleRegister"
       >
-        <i
-          slot="suffix"
-          class="el-icon-view el-input__icon"
-          @click="showPassword"
-        ></i>
         <template #prefix>
           <i class="icon-mima"></i>
         </template>
@@ -87,8 +84,7 @@ export default {
             trigger: 'blur'
           }
         ]
-      },
-      passwordType: 'password'
+      }
     }
   },
   created() {
@@ -100,11 +96,6 @@ export default {
     validatePhone(rule, value, callback) {
       checkPhone(rule, value, callback)
     },
-    showPassword() {
-      this.passwordType === ''
-        ? (this.passwordType = 'password')
-        : (this.passwordType = '')
-    },
     handleRegister() {
       this.$refs.registerForm.validate(valid => {
         if (valid) {

src/views/admin/dict/index.vue

@@ -32,7 +32,7 @@
         @size-change="sizeChange"
         @current-change="currentChange"
         @row-del="rowDel">
-        <template slot="menuLeft">
+        <template #menu-left>
           <el-button
             v-if="permissions.sys_dict_del"
             class="filter-item"

src/views/admin/param/index.vue

@@ -33,7 +33,7 @@
         @row-update="handleUpdate"
         @row-save="handleSave"
         @row-del="rowDel">
-        <template slot="menuLeft">
+        <template #menu-left>
           <el-button
             v-if="permissions.sys_publicparam_del"
             class="filter-item"