From ba7e711a88251af3ab1e2bdae78db707313bede6 Mon Sep 17 00:00:00 2001 From: mabo Date: Fri, 6 Aug 2021 14:12:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/sys/user-manage/userManage.vue | 46 ++++++++----------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/manager/src/views/sys/user-manage/userManage.vue b/manager/src/views/sys/user-manage/userManage.vue index 268beaea..e419b46a 100644 --- a/manager/src/views/sys/user-manage/userManage.vue +++ b/manager/src/views/sys/user-manage/userManage.vue @@ -3,7 +3,7 @@
- + - + - + - - - -
@@ -143,8 +136,6 @@ export default { username: "", departmentId: "", mobile: "", - type: "", - status: "", pageNumber: 1, pageSize: 10, sort: "createTime", @@ -158,7 +149,6 @@ export default { mobile: "", email: "", sex: "", - type: 0, roles: [], departmentId: "", departmentTitle: "" @@ -388,13 +378,6 @@ export default { getUserList() { // 多条件搜索用户列表 this.loading = true; - // 避免后台默认值 - if (!this.searchForm.type) { - this.searchForm.type = ""; - } - if (!this.searchForm.status) { - this.searchForm.status = ""; - } getUserListData(this.searchForm).then(res => { this.loading = false; if (res.success) { @@ -461,21 +444,21 @@ export default { if (valid) { if (this.modalType == 0) { // 添加用户 避免编辑后传入id - delete this.form.id; - delete this.form.status; - if (this.form.password == "" || this.form.password == undefined) { + const params = JSON.parse(JSON.stringify(this.form)) + delete params.id; + delete params.status; + if (params.password == "" || params.password == undefined) { this.errorPass = "密码不能为空"; return; } - if (this.form.password.length < 6) { + if (params.password.length < 6) { this.errorPass = "密码长度不得少于6位"; return; } //todo - this.form.password = this.md5(this.form.password) - + params.password = this.md5(params.password) this.submitLoading = true; - addUser(this.form).then(res => { + addUser(params).then(res => { this.submitLoading = false; if (res.success) { this.$Message.success("操作成功"); @@ -503,6 +486,15 @@ export default { this.modalType = 0; this.modalTitle = "添加用户"; this.$refs.form.resetFields(); + this.form = { // 表单 + username: "", + mobile: "", + email: "", + sex: "", + roles: [], + departmentId: "", + departmentTitle: "" + }, this.$refs.depTree.setData("", ""); this.userModalVisible = true; }, From 5cfbfdf67c8e059585fafd1f74e52152611329ad Mon Sep 17 00:00:00 2001 From: mabo Date: Fri, 6 Aug 2021 15:35:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=A4=A7=E5=B0=8F=E9=99=90=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E6=9C=80=E5=A4=A71M?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/api/index.js | 7 ------- .../views/my-components/lili/upload-pic-input.vue | 8 ++------ .../views/my-components/lili/upload-pic-thumb.vue | 12 ++---------- manager/src/views/promotion/live/liveDetail.vue | 13 ++++++++++--- manager/src/views/sys/oss-manage/ossManage.vue | 4 ++-- .../src/views/change-password/change-password.vue | 4 +--- .../views/goods/goods-seller/goodsOperationSec.vue | 6 +++--- .../views/my-components/lili/upload-pic-input.vue | 8 ++------ .../views/my-components/lili/upload-pic-thumb.vue | 12 ++---------- .../order/after-order/orderComplaintDetail.vue | 4 ++-- seller/src/views/promotion/live/addLive.vue | 8 ++++---- 11 files changed, 30 insertions(+), 56 deletions(-) diff --git a/manager/src/api/index.js b/manager/src/api/index.js index a0af28cb..897f96c5 100644 --- a/manager/src/api/index.js +++ b/manager/src/api/index.js @@ -16,16 +16,9 @@ let commonUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.common // 文件上传接口 export const uploadFile = commonUrl+ "/common/upload/file"; -// 验证码渲染图片接口 -export const drawCodeImage = commonUrl + "/common/captcha/draw/"; -// 获取菜单 -export const getMenuList = managerUrl + "/permission/getMenuList"; // Websocket export const ws = managerUrl + "/ws"; -export const getMessageSendData = ""; - - //获取所有city export const getAllCity = (params) => { return getRequest(commonUrl + '/common/region/allCity', params) diff --git a/manager/src/views/my-components/lili/upload-pic-input.vue b/manager/src/views/my-components/lili/upload-pic-input.vue index 2db882e0..6ad5bddf 100644 --- a/manager/src/views/my-components/lili/upload-pic-input.vue +++ b/manager/src/views/my-components/lili/upload-pic-input.vue @@ -27,7 +27,7 @@ :on-error="handleError" :format="['jpg','jpeg','png','gif','bmp']" accept=".jpg, .jpeg, .png, .gif, .bmp" - :max-size="maxSize*1024" + :max-size="1024" :on-format-error="handleFormatError" :on-exceeded-size="handleMaxSize" :before-upload="beforeUpload" @@ -74,10 +74,6 @@ export default { type: Boolean, default: false }, - maxSize: { - type: Number, - default: 5 - }, maxlength: Number, icon: { type: String, @@ -116,7 +112,7 @@ export default { this.loading = false; this.$Notice.warning({ title: "文件大小过大", - desc: "所选文件‘ " + file.name + " ’大小过大, 不得超过 " + this.maxSize + "M." + desc: "所选文件大小过大, 不得超过1M." }); }, // 上传前 diff --git a/manager/src/views/my-components/lili/upload-pic-thumb.vue b/manager/src/views/my-components/lili/upload-pic-thumb.vue index 467c054b..55103adb 100644 --- a/manager/src/views/my-components/lili/upload-pic-thumb.vue +++ b/manager/src/views/my-components/lili/upload-pic-thumb.vue @@ -29,7 +29,7 @@ :on-success="handleSuccess" :on-error="handleError" :format="['jpg','jpeg','png','gif']" - :max-size="maxSize*1024" + :max-size="1024" :on-format-error="handleFormatError" :on-exceeded-size="handleMaxSize" :before-upload="handleBeforeUpload" @@ -72,10 +72,6 @@ export default { type: Boolean, default: true }, - maxSize: { - type: Number, - default: 5 - }, limit: { type: Number, default: 10 @@ -147,11 +143,7 @@ export default { this.$Notice.warning({ title: "文件大小过大", desc: - "所选文件‘ " + - file.name + - " ’大小过大, 不得超过 " + - this.maxSize + - "M." + "所选文件大小过大，不能超过1M." }); }, // 上传之前钩子 diff --git a/manager/src/views/promotion/live/liveDetail.vue b/manager/src/views/promotion/live/liveDetail.vue index a808aa83..38b8bde4 100644 --- a/manager/src/views/promotion/live/liveDetail.vue +++ b/manager/src/views/promotion/live/liveDetail.vue @@ -58,12 +58,12 @@ + :on-format-error="handleFormatError" :max-size="1024" :on-exceeded-size="handleMaxSize" type="drag" :action="action" :headers="accessToken" style="display: inline-block;width:58px;">
-
直播间背景图，图片规则：建议像素1080*1920，大小不超过2M
+
直播间背景图，图片规则：建议像素1080*1920，大小不超过1M
@@ -79,7 +79,7 @@ + :on-format-error="handleFormatError" :max-size="1024" :on-exceeded-size="handleMaxSize" type="drag" :action="action" :headers="accessToken" style="display: inline-block;width:58px;">
@@ -191,6 +191,13 @@ export default { this.imageVisible = true; this.imageSrc = src; }, + // 上传文件超过大小限制 + handleMaxSize(file) { + this.$Notice.warning({ + title: "文件大小过大", + desc: "所选文件大小过大, 不得超过 1M.", + }); + }, /** * 获取直播间详情 */ diff --git a/manager/src/views/sys/oss-manage/ossManage.vue b/manager/src/views/sys/oss-manage/ossManage.vue index 88fe7f52..ec7383fe 100644 --- a/manager/src/views/sys/oss-manage/ossManage.vue +++ b/manager/src/views/sys/oss-manage/ossManage.vue @@ -187,7 +187,7 @@ :headers="accessToken" :on-success="handleSuccess" :on-error="handleError" - :max-size="5120" + :max-size="1024" :on-exceeded-size="handleMaxSize" multiple type="drag" @@ -694,7 +694,7 @@ export default { handleMaxSize(file) { this.$Notice.warning({ title: "文件大小过大", - desc: "所选文件‘ " + file.name + " ’大小过大, 不得超过 5M.", + desc: "所选文件大小过大, 不得超过 1M.", }); }, // 上传成功回调 diff --git a/seller/src/views/change-password/change-password.vue b/seller/src/views/change-password/change-password.vue index 52f63c33..98c8799d 100644 --- a/seller/src/views/change-password/change-password.vue +++ b/seller/src/views/change-password/change-password.vue @@ -1,9 +1,7 @@
@@ -316,7 +316,7 @@ export default { handleMaxSize(file) { this.$Notice.warning({ title: "超过文件大小限制", - desc: "图片 " + file.name + " 不能超过2mb", + desc: "图片不能超过1mb", }); }, // 获取详情 diff --git a/seller/src/views/promotion/live/addLive.vue b/seller/src/views/promotion/live/addLive.vue index 220af7c8..1f9b78bc 100644 --- a/seller/src/views/promotion/live/addLive.vue +++ b/seller/src/views/promotion/live/addLive.vue @@ -67,12 +67,12 @@
+ :on-format-error="handleFormatError" :max-size="1024" :on-exceeded-size="handleMaxSize" type="drag" :action="action" :headers="accessToken" style="display: inline-block;width:58px;">
-
直播间背景图，图片规则：建议像素1080*1920，大小不超过2M
+
直播间背景图，图片规则：建议像素1080*1920，大小不超过1M
@@ -88,7 +88,7 @@ + :on-format-error="handleFormatError" :max-size="1024" :on-exceeded-size="handleMaxSize" type="drag" :action="action" :headers="accessToken" style="display: inline-block;width:58px;">
@@ -467,7 +467,7 @@ export default { handleMaxSize(file) { this.$Notice.warning({ title: "图片超过限制大小！", - desc: file.name + "图片超过规定限制大小，请重新上传", + desc: "图片超过规定限制大小，请重新上传", }); }, From 146854b0989f755e2bfe66b9af4f248cf6fcb204 Mon Sep 17 00:00:00 2001 From: mabo Date: Fri, 6 Aug 2021 16:12:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=AF=BC=E5=87=BA=E4=B8=80=E4=B8=87=E6=9D=A1?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/pages/Merchant.vue | 2 +- manager/src/views/order/order/orderList.vue | 22 +++++++++++++++++++-- seller/src/views/order/order/orderList.vue | 2 +- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/buyer/src/pages/Merchant.vue b/buyer/src/pages/Merchant.vue index 14db72cc..cdf934a9 100644 --- a/buyer/src/pages/Merchant.vue +++ b/buyer/src/pages/Merchant.vue @@ -20,7 +20,7 @@
  • 首页
    • -
  • +
  • {{cate.labelName}}
    diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue index 9b6530a9..14f67c1c 100644 --- a/manager/src/views/order/order/orderList.vue +++ b/manager/src/views/order/order/orderList.vue @@ -35,9 +35,9 @@
    - +
    @@ -269,6 +269,24 @@ export default { query: { sn: sn }, }); }, + // 导出订单 + async exportOrder () { + const params = JSON.parse(JSON.stringify(this.searchForm)) + params.pageNumber = 1; + params.pageSize = 10000 + const result = await API_Order.getOrderList(params) + if (result.success) { + if (result.result.records.length === 0) { + this.$Message.warning('暂无待发货订单') + return [] + } else { + return result.result.records + } + } else { + this.$Message.warning('导出订单失败，请重试') + } + + } }, mounted() { this.init(); diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue index 870a7bb7..288742f1 100644 --- a/seller/src/views/order/order/orderList.vue +++ b/seller/src/views/order/order/orderList.vue @@ -258,7 +258,7 @@ export default { const params = { // 搜索框初始化对象 pageNumber: 1, // 当前页数 - pageSize: 100, // 页面大小 + pageSize: 10000, // 页面大小 sort: "startDate", // 默认排序字段 order: "desc", // 默认排序方式 startDate: "", // 起始时间 From 4d26bf08b216780c379fdd40b34f2fec7bc58e09 Mon Sep 17 00:00:00 2001 From: mabo Date: Fri, 6 Aug 2021 16:13:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seller/src/views/order/order/orderList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue index 288742f1..a3f1f32b 100644 --- a/seller/src/views/order/order/orderList.vue +++ b/seller/src/views/order/order/orderList.vue @@ -284,7 +284,7 @@ export default { } return res.result } else { - this.$Message.warning('暂无待发货订单') + this.$Message.warning('导出订单失败，请重试') } },