diff --git a/src/api/modules/mer_admin.js b/src/api/modules/mer_admin.js index b9aaf73..4fe0cbc 100644 --- a/src/api/modules/mer_admin.js +++ b/src/api/modules/mer_admin.js @@ -192,6 +192,10 @@ export const mer_admin = { changePassword: (data) => { return $http.put(`/merchant-api/auth/change/pwd`, data); }, + //修改简单密码 + simplePassword: (data) => { + return $http.put(`/merchant-api/auth/update_password`, data); + }, //修改管理员 editAdmin: (data) => { return $http.put(`/merchant-api/brand/change/administrator`, data); diff --git a/src/utils/index.js b/src/utils/index.js index 1696752..31f271d 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,22 +1,27 @@ -import Vue from 'vue' -import router from '@/router' -import store from '@/store' +import Vue from "vue"; +import router from "@/router"; +import store from "@/store"; /** * 获取uuid */ -export function getUUID () { - return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => { - return (c === 'x' ? (Math.random() * 16 | 0) : ('r&0x3' | '0x8')).toString(16) - }) +export function getUUID() { + return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => { + return (c === "x" ? (Math.random() * 16) | 0 : "r&0x3" | "0x8").toString( + 16 + ); + }); } /** * 是否有权限 * @param {*} key */ -export function isAuth (key) { - return JSON.parse(sessionStorage.getItem('permissions') || '[]').indexOf(key) !== -1 || false +export function isAuth(key) { + return ( + JSON.parse(sessionStorage.getItem("permissions") || "[]").indexOf(key) !== + -1 || false + ); } /** @@ -25,83 +30,89 @@ export function isAuth (key) { * @param {*} id * @param {*} pid */ -export function treeDataTranslate (data, id = 'id', pid = 'parentId') { - var res = [] - var temp = {} +export function treeDataTranslate(data, id = "id", pid = "parentId") { + var res = []; + var temp = {}; for (var i = 0; i < data.length; i++) { - temp[data[i][id]] = data[i] + temp[data[i][id]] = data[i]; } for (var k = 0; k < data.length; k++) { if (temp[data[k][pid]] && data[k][id] !== data[k][pid]) { - if (!temp[data[k][pid]]['children']) { - temp[data[k][pid]]['children'] = [] + if (!temp[data[k][pid]]["children"]) { + temp[data[k][pid]]["children"] = []; } - if (!temp[data[k][pid]]['_level']) { - temp[data[k][pid]]['_level'] = 1 + if (!temp[data[k][pid]]["_level"]) { + temp[data[k][pid]]["_level"] = 1; } - data[k]['_level'] = temp[data[k][pid]]._level + 1 - temp[data[k][pid]]['children'].push(data[k]) + data[k]["_level"] = temp[data[k][pid]]._level + 1; + temp[data[k][pid]]["children"].push(data[k]); } else { - res.push(data[k]) + res.push(data[k]); } } - return res + return res; } /** * 清除登录信息 */ -export function clearLoginInfo () { - Vue.cookie.delete('token') - store.commit('resetStore') - router.options.isAddDynamicMenuRoutes = false +export function clearLoginInfo() { + Vue.cookie.delete("token"); + store.commit("resetStore"); + sessionStorage.removeItem("password"); + sessionStorage.removeItem("role"); + sessionStorage.removeItem("userInfo"); + router.options.isAddDynamicMenuRoutes = false; } - // 深拷贝对象 export function deepClone(obj) { - const _toString = Object.prototype.toString + const _toString = Object.prototype.toString; // null, undefined, non-object, function - if (!obj || typeof obj !== 'object') { - return obj + if (!obj || typeof obj !== "object") { + return obj; } // DOM Node - if (obj.nodeType && 'cloneNode' in obj) { - return obj.cloneNode(true) + if (obj.nodeType && "cloneNode" in obj) { + return obj.cloneNode(true); } // Date - if (_toString.call(obj) === '[object Date]') { - return new Date(obj.getTime()) + if (_toString.call(obj) === "[object Date]") { + return new Date(obj.getTime()); } // RegExp - if (_toString.call(obj) === '[object RegExp]') { - const flags = [] - if (obj.global) { - flags.push('g') - } - if (obj.multiline) { - flags.push('m') - } - if (obj.ignoreCase) { - flags.push('i') - } + if (_toString.call(obj) === "[object RegExp]") { + const flags = []; + if (obj.global) { + flags.push("g"); + } + if (obj.multiline) { + flags.push("m"); + } + if (obj.ignoreCase) { + flags.push("i"); + } - return new RegExp(obj.source, flags.join('')) + return new RegExp(obj.source, flags.join("")); } - const result = Array.isArray(obj) ? [] : obj.constructor ? new obj.constructor() : {} + const result = Array.isArray(obj) + ? [] + : obj.constructor + ? new obj.constructor() + : {}; for (const key in obj) { - result[key] = deepClone(obj[key]) + result[key] = deepClone(obj[key]); } - return result + return result; } export function isNumberStr(str) { - return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str) -} \ No newline at end of file + return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str); +} diff --git a/src/views/common/home.vue b/src/views/common/home.vue index 956afbe..1eb348b 100644 --- a/src/views/common/home.vue +++ b/src/views/common/home.vue @@ -9,17 +9,42 @@ diff --git a/src/views/modules/bank-card/popup/add-or-update.vue b/src/views/modules/bank-card/popup/add-or-update.vue index 221e783..3e80f4a 100644 --- a/src/views/modules/bank-card/popup/add-or-update.vue +++ b/src/views/modules/bank-card/popup/add-or-update.vue @@ -630,7 +630,7 @@ export default { return callback(new Error("请输入银行卡号")); } else if (!Number.isInteger(+value)) { callback(new Error("银行卡号必须全为数字")); - } else if (value.trim().length < 12 || value.trim().length > 19) { + } else if (value.trim().length < 12 || value.trim().length > 20) { callback(new Error("银行卡号长度必须在12到19之间")); } else if (strBin.indexOf(value.substring(0, 2)) === -1) { callback(new Error("银行卡号开头6位不符合规范"));