From 1136aa1cfe593250345e7b13625463b827e0c972 Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Fri, 20 Sep 2024 01:39:06 +0800
Subject: [PATCH 1/4] ```
---
src/components/ImagePreview/index.vue | 3 ++-
src/views/company/staff/form/StaffForm.vue | 6 +-----
src/views/login.vue | 3 +--
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/components/ImagePreview/index.vue b/src/components/ImagePreview/index.vue
index 0d2ebe0..df30e47 100644
--- a/src/components/ImagePreview/index.vue
+++ b/src/components/ImagePreview/index.vue
@@ -39,7 +39,8 @@ export default {
if (isExternal(real_src)) {
return real_src;
}
- return process.env.VUE_APP_BASE_API + real_src;
+
+ return process.env.VUE_APP_IMAGE_URL + real_src;
},
realSrcList() {
if (!this.src) {
diff --git a/src/views/company/staff/form/StaffForm.vue b/src/views/company/staff/form/StaffForm.vue
index 546a5f8..6c8c9a0 100644
--- a/src/views/company/staff/form/StaffForm.vue
+++ b/src/views/company/staff/form/StaffForm.vue
@@ -216,11 +216,7 @@ export default {
password: [
{ required: true, message: '登录密码不能为空', trigger: 'blur' },
{ min: 6, max: 20, message: '登录密码长度在6~20个字符', trigger: 'blur' },
- {
- pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+{}\[\]:;<>,.?~\\-])\S{6,}$/,
- message: '登录密码必须由大小写字母、数字、特殊字符组成',
- trigger: 'blur'
- }
+
],
workDate: [{ required: true, message: '工作日期不能为空', trigger: 'blur' }],
joinedDate: [{ required: true, message: '入职日期不能为空', trigger: 'blur' }]
diff --git a/src/views/login.vue b/src/views/login.vue
index 607ccb8..9200493 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -133,8 +133,7 @@ export default {
},
data() {
return {
- tenantCode:"lighting", // TODO 这里手动改还是不太合理
- // tenantCode:"lanan",
+ tenantCode:"lanan",
codeUrl: "",
//是否开启图形验证码
captchaEnable: false,
From 3572d75cbfc4a33fd1ce83992682c2d6dd4dd46a Mon Sep 17 00:00:00 2001
From: zhaotianfeng <12345678>
Date: Fri, 20 Sep 2024 15:39:19 +0800
Subject: [PATCH 2/4] =?UTF-8?q?1=E3=80=81=E5=AE=A2=E6=88=B7=E5=85=B3?=
=?UTF-8?q?=E8=81=94=E4=BC=9A=E5=91=98=EF=BC=9B2=E3=80=81=E8=90=A5?=
=?UTF-8?q?=E9=94=80=E6=B4=BB=E5=8A=A8=E4=B8=8B=E5=8A=A0=E4=B8=8A=E6=98=AF?=
=?UTF-8?q?=E5=90=A6=E9=87=8D=E5=A4=8D=E5=8F=82=E4=B8=8E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/member/level/index.js | 114 ++++++++++---------
src/views/base/customer/CustomerMainForm.vue | 35 ++++++
src/views/member/active/ActiveMainForm.vue | 12 ++
3 files changed, 108 insertions(+), 53 deletions(-)
diff --git a/src/api/member/level/index.js b/src/api/member/level/index.js
index 723b83c..325a20d 100644
--- a/src/api/member/level/index.js
+++ b/src/api/member/level/index.js
@@ -1,53 +1,61 @@
-import request from '@/utils/request'
-
-// 创建会员等级
-export function createLevel(data) {
- return request({
- url: '/member/level/create',
- method: 'post',
- data: data
- })
-}
-
-// 更新会员等级
-export function updateLevel(data) {
- return request({
- url: '/member/level/update',
- method: 'put',
- data: data
- })
-}
-
-// 删除会员等级
-export function deleteLevel(id) {
- return request({
- url: '/member/level/delete?id=' + id,
- method: 'delete'
- })
-}
-
-// 获得会员等级
-export function getLevel(id) {
- return request({
- url: '/member/level/get?id=' + id,
- method: 'get'
- })
-}
-
-// 获得会员等级分页
-export function getLevelPage(params) {
- return request({
- url: '/member/level/page',
- method: 'get',
- params
- })
-}
-// 导出会员等级 Excel
-export function exportLevelExcel(params) {
- return request({
- url: '/member/level/export-excel',
- method: 'get',
- params,
- responseType: 'blob'
- })
-}
\ No newline at end of file
+import request from '@/utils/request'
+
+// 创建会员等级
+export function createLevel(data) {
+ return request({
+ url: '/member/level/create',
+ method: 'post',
+ data: data
+ })
+}
+
+// 更新会员等级
+export function updateLevel(data) {
+ return request({
+ url: '/member/level/update',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除会员等级
+export function deleteLevel(id) {
+ return request({
+ url: '/member/level/delete?id=' + id,
+ method: 'delete'
+ })
+}
+
+// 获得会员等级
+export function getLevel(id) {
+ return request({
+ url: '/member/level/get?id=' + id,
+ method: 'get'
+ })
+}
+
+// 获得会员等级分页
+export function getLevelPage(params) {
+ return request({
+ url: '/member/level/page',
+ method: 'get',
+ params
+ })
+}
+// 导出会员等级 Excel
+export function exportLevelExcel(params) {
+ return request({
+ url: '/member/level/export-excel',
+ method: 'get',
+ params,
+ responseType: 'blob'
+ })
+}
+// 查询所有会员
+export function getLevelAll(params) {
+ return request({
+ url: '/member/level/all',
+ method: 'get',
+ params,
+ })
+}
diff --git a/src/views/base/customer/CustomerMainForm.vue b/src/views/base/customer/CustomerMainForm.vue
index 1bb7ec2..5982d1d 100644
--- a/src/views/base/customer/CustomerMainForm.vue
+++ b/src/views/base/customer/CustomerMainForm.vue
@@ -69,6 +69,16 @@
+
+
+
+
+
+
+
+
+
@@ -144,6 +154,7 @@