diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue index 8e3d39d..c9c04de 100644 --- a/src/components/page/GlobalLayout.vue +++ b/src/components/page/GlobalLayout.vue @@ -3,65 +3,65 @@ + :class="[layoutMode, `content-width-${contentWidth}`]" + :style="{ paddingLeft: fixSiderbar && isDesktop() ? `${sidebarOpened ? 200 : 80}px` : '0' }"> @@ -70,9 +70,9 @@ - - - + + + @@ -82,20 +82,20 @@ @@ -684,6 +684,11 @@ body { display: block; margin-bottom: 24px; white-space: nowrap; + margin-left: 10px; + + .ant-btn { + margin-right: 8px; + } } } diff --git a/src/utils/validate.js b/src/utils/validate.js index 9e51ac7..83036d7 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -4,7 +4,7 @@ * 之前的正则 /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/ */ export function isEmail(s) { - return /^\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/.test(s) + return /^\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/.test(s) } /** @@ -12,7 +12,7 @@ export function isEmail(s) { * @param {*} s */ export function isPhone(s) { - return /^([0-9]{3,4}-)?[0-9]{7,8}$/.test(s) + return /^([0-9]{3,4}-)?[0-9]{7,8}$/.test(s) } /** @@ -20,7 +20,7 @@ export function isPhone(s) { * @param {*} s */ export function isURL(s) { - return /^http[s]?:\/\/.*/.test(s) + return /^http[s]?:\/\/.*/.test(s) } /** @@ -28,19 +28,28 @@ export function isURL(s) { * message: 密码长度至少8位,并包括数字、小写字母、大写字母和特殊符号4类中的3类 */ export function passwordReg(s) { - return /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,30}$/.test(s) + return /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,30}$/.test(s) } /** * 手机号 * */ export function phoneReg(s) { - return /^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\d{8}$/.test(s) + return /^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\d{8}$/.test(s) } /** * 不可输入中文 */ -export function chineseReg(s){ - return /[\u4E00-\u9FA5]/g.test(s) +export function chineseReg(s) { + return /[\u4E00-\u9FA5]/g.test(s) +} + +/** + * 邮编 + * @param s + * @returns {boolean} + */ +export function postcode(s) { + return /^[0-9]\d{5}$/.test(s) } diff --git a/src/views/businessManagement/BusinessManagement.vue b/src/views/businessManagement/BusinessManagement.vue new file mode 100644 index 0000000..33cf5a6 --- /dev/null +++ b/src/views/businessManagement/BusinessManagement.vue @@ -0,0 +1,149 @@ + + + + + \ No newline at end of file diff --git a/src/views/businessManagement/modules/BusinessMangementModules.vue b/src/views/businessManagement/modules/BusinessMangementModules.vue new file mode 100644 index 0000000..f7dc477 --- /dev/null +++ b/src/views/businessManagement/modules/BusinessMangementModules.vue @@ -0,0 +1,215 @@ + + + + + \ No newline at end of file