From 2357f5ed50714cbefbef5a09f2eab3a1433f4fa5 Mon Sep 17 00:00:00 2001 From: From-wh Date: Thu, 15 Jun 2023 15:12:02 +0800 Subject: [PATCH] =?UTF-8?q?improve:=20=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/api/order.js | 11 + template/admin/src/api/setting.js | 31 +++ template/admin/src/api/uploadPictures.js | 11 + template/admin/src/assets/images/success.jpg | Bin 0 -> 649 bytes .../admin/src/components/uploadImg/index.vue | 121 +++++++--- .../src/components/uploadPictures/index.vue | 8 +- template/admin/src/pages/app/upload/index.vue | 210 ++++++++++++++++++ .../order/orderList/handle/orderSend.vue | 47 +++- template/admin/src/router/modules/frameOut.js | 10 + 9 files changed, 414 insertions(+), 35 deletions(-) create mode 100644 template/admin/src/assets/images/success.jpg create mode 100644 template/admin/src/pages/app/upload/index.vue diff --git a/template/admin/src/api/order.js b/template/admin/src/api/order.js index 6ba1e119c..36a66ad50 100644 --- a/template/admin/src/api/order.js +++ b/template/admin/src/api/order.js @@ -534,6 +534,17 @@ export function stopWrongQueue(id) { }); } +/** + * @description 上架寄件快递列表 + * @param {Object} param data {Object} 传值参数 + */ +export function kuaidiComsList() { + return request({ + url: `order/kuaidi_coms`, + method: 'get', + }); +} + /** * @description 修改退款订单备注信息 * @param {Number} param data.id {Number} 订单id diff --git a/template/admin/src/api/setting.js b/template/admin/src/api/setting.js index fe8914ce6..4705cc02f 100644 --- a/template/admin/src/api/setting.js +++ b/template/admin/src/api/setting.js @@ -1123,6 +1123,24 @@ export function codeCrud(data) { data, }); } +/** + * @description 扫码上传链接获取 + */ +export function scanUploadQrcode() { + return request({ + url: `file/scan_upload/qrcode`, + method: 'get', + }); +} +/** + * @description 扫码上传图片获取 + */ +export function scanUploadGet(scan_token) { + return request({ + url: `file/scan_upload/image/${scan_token}`, + method: 'get', + }); +} /** * @description 图片上传 */ @@ -1137,3 +1155,16 @@ export function fileUpload(data) { data, }); } +/** + * @description 扫码图片上传 + */ +export function scanUpload(data) { + return request({ + url: `image/scan_upload`, + method: 'post', + headers: { + 'content-type': 'multipart/form-data;', + }, + data, + }); +} diff --git a/template/admin/src/api/uploadPictures.js b/template/admin/src/api/uploadPictures.js index d70de56bc..95276417c 100644 --- a/template/admin/src/api/uploadPictures.js +++ b/template/admin/src/api/uploadPictures.js @@ -102,3 +102,14 @@ export function fileDelApi(ids) { data: ids, }); } +/** + * @description 网络图片上传 + * @param {String} param ids {String} 图片id拼接成的字符串 + */ +export function onlineUpload(data) { + return request({ + url: 'file/online_upload', + method: 'post', + data, + }); +} diff --git a/template/admin/src/assets/images/success.jpg b/template/admin/src/assets/images/success.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d228f7c0012617ec62b88a0e123dfb59bd8f6590 GIT binary patch literal 649 zcmV;40(Sk0P)Px#1am@3R0s$N2z&@+hyVZrGf6~2RA_NGcE&6%`c~6(=eXCn`?-5WAaR*grFO-Md+m zetLJ`H?uQu-mf;IfC zkcSC2QajdyO}FDpW3xVE`J`7A7MSUYl%qt8$3?!S|VTbrvZ7`OYK@h+=hh@ zsa;FR^8EJ*`Js+xoZ|@jYdlEpS^}>lRgxtHL!-!G5dqQxY*bdxG7Hd*4UOpDaXv zO5`X~fs3)sXTtR)-3)F7?`qIE1L=g*38xlzTLE_GP4QX!^9E?EA?4dJ$5 z2=OJgYc1H-T>RbWVt+dgUNj8gZEC+La8MyXGDjDe4CS8^-TnPjhuaGFLYLC!EXaz# jozxz4^WV<=J$K+QjrTOeZR~{L00000NkvXXu0mjfaz-G& literal 0 HcmV?d00001 diff --git a/template/admin/src/components/uploadImg/index.vue b/template/admin/src/components/uploadImg/index.vue index 1272ea210..6ccc1bb5c 100644 --- a/template/admin/src/components/uploadImg/index.vue +++ b/template/admin/src/components/uploadImg/index.vue @@ -6,6 +6,7 @@ :modal-append-to-body="false" :visible.sync="uploadModal" width="1024px" + @closed="closed" >
@@ -16,7 +17,7 @@ 扫码上传 - + - +
+ + +
建议上传图片最大宽度750px,不超过3MB;仅支持jpeg、png格式
-
+
-
+
扫描二维码,快速上传手机图片
- 刷新图库 + 刷新图库
刷新图库按钮,可显示移动端上传成功的图片
- +
@@ -124,10 +123,11 @@ + diff --git a/template/admin/src/pages/order/orderList/handle/orderSend.vue b/template/admin/src/pages/order/orderList/handle/orderSend.vue index ed68c3cd5..fb633636e 100644 --- a/template/admin/src/pages/order/orderList/handle/orderSend.vue +++ b/template/admin/src/pages/order/orderList/handle/orderSend.vue @@ -20,6 +20,7 @@ 手动填写 电子面单打印 + 商家寄件
@@ -31,7 +32,12 @@ style="width: 80%" @on-change="expressChange" > - + @@ -41,7 +47,7 @@

例如:SF000000000000:3941

-