From 3ed6c21e2da3ec31d3d97bdd07035cbbe137510e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AE=87?= <2020377497@qq.com> Date: Fri, 29 Dec 2023 15:34:53 +0800 Subject: [PATCH] upda --- App.vue | 65 +++++ api/modules/system.js | 14 + api/store/goods.js | 12 +- api/store/index.js | 16 ++ api/store/order.js | 56 ++++ components/myList/index.vue | 10 + pages.json | 12 + store/goods/edit.vue | 134 ++++++++++ store/goods/index copy.vue | 149 ----------- store/goods/index.vue | 39 ++- store/index/index.vue | 95 ++++--- store/order/index.vue | 491 +++++++++++++++++++++++++++++++++++- utils/request.js | 1 - 13 files changed, 879 insertions(+), 215 deletions(-) create mode 100644 api/modules/system.js create mode 100644 api/store/index.js create mode 100644 api/store/order.js create mode 100644 store/goods/edit.vue delete mode 100644 store/goods/index copy.vue diff --git a/App.vue b/App.vue index 69e3c87..e999e4a 100644 --- a/App.vue +++ b/App.vue @@ -17,9 +17,74 @@ export default { @import "tailwindcss/base"; @import "tailwindcss/utilities"; +* { + box-sizing: border-box; + margin: 0; + padding: 0; +} + + + +*::-webkit-scrollbar { + height: 0px; + width: 0px; + /* 横向滚动条高度 */ +} + +*::-webkit-scrollbar-thumb { + background: #fff; + border-radius: 0px; +} + +*::-webkit-scrollbar-track { + background: #fff; + border-radius: 0px; +} + +*::-webkit-scrollbar-thumb:horizontal { + background: #fff; + /* 横向滚动条thumb颜色 */ +} + +*::-webkit-scrollbar-track:horizontal { + background: #fff; + /* 横向滚动条轨道颜色 */ +} + page { // min-height: calc(100vh - 44px); min-height: calc(100vh); background-color: rgb(247 248 250); + box-sizing: border-box; + display: flex; + flex-direction: column; +} + +.content { + display: flex; + height: 100%; + flex: 1; + flex-direction: column; +} + +.line2 { + display: -webkit-box; + margin-bottom: 5px; + max-height: 44px; + white-space: normal; + text-overflow: ellipsis; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + word-break: break-all; + overflow: hidden; + display: -webkit-box; + margin-bottom: 5px; + max-height: 44px; + white-space: normal; + text-overflow: ellipsis; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + word-break: break-all; + overflow: hidden; } diff --git a/api/modules/system.js b/api/modules/system.js new file mode 100644 index 0000000..ae86708 --- /dev/null +++ b/api/modules/system.js @@ -0,0 +1,14 @@ +import { + request +} from "@/utils/request"; + +export default { + uploadImage(data) { + return request({ + url: "/admin/system/uploadImage", + method: "POST", + data, + }); + }, + +}; \ No newline at end of file diff --git a/api/store/goods.js b/api/store/goods.js index 68a85fe..5113068 100644 --- a/api/store/goods.js +++ b/api/store/goods.js @@ -27,5 +27,15 @@ export default { data, }); }, - } + + }, + + freightRules(data) { + return request({ + url: "/admin/freightRules/list", + method: "POST", + data, + }); + }, + }; \ No newline at end of file diff --git a/api/store/index.js b/api/store/index.js new file mode 100644 index 0000000..bfeb813 --- /dev/null +++ b/api/store/index.js @@ -0,0 +1,16 @@ +import { + request +} from "@/utils/request"; + +export default { + dataCount: { + oneLine(data) { + return request({ + url: "/admin/dataCount/oneLine", + method: "POST", + data, + }); + }, + } + +}; \ No newline at end of file diff --git a/api/store/order.js b/api/store/order.js new file mode 100644 index 0000000..de64128 --- /dev/null +++ b/api/store/order.js @@ -0,0 +1,56 @@ +import { + request +} from "@/utils/request"; + +export default { + orderList(data) { + return request({ + url: "/admin/order/orderList", + method: "POST", + data, + }); + }, + + orderSend(data) { + return request({ + url: "/admin/order/orderSend", + method: "POST", + data, + }); + }, + + GetExpressList(data) { + return request({ + url: "/admin/order/GetExpressList", + method: "POST", + data, + }); + }, + + printOrder(data) { + return request({ + url: "/admin/order/printOrder", + method: "POST", + data, + }); + }, + + updateNotes(data) { + return request({ + url: "/admin/order/updateNotes", + method: "POST", + data, + }); + }, + + confirmCancel(data) { + return request({ + url: "/admin/order/confirmCancel", + method: "POST", + data, + }); + }, + + + +}; \ No newline at end of file diff --git a/components/myList/index.vue b/components/myList/index.vue index 4b105a0..0300bbc 100644 --- a/components/myList/index.vue +++ b/components/myList/index.vue @@ -4,6 +4,10 @@ + + + + @@ -66,6 +70,12 @@ const upData = async (upParams = {}) => { ...upParams }) + console.log({ + ...query.value, + ...props.params, + ...upParams + }); + query.value.pageSize = res.data.pageSize total.value = res.data.total list.value = res.data.rows diff --git a/pages.json b/pages.json index 6c72520..f1d409e 100644 --- a/pages.json +++ b/pages.json @@ -41,6 +41,18 @@ } } }, + { + "path": "goods/edit", + "style": { + "navigationBarTitleText": "修改商品", + "enablePullDownRefresh": false, + "mp-alipay": { + "transparentTitle": "always", + "titlePenetrate": "YES", + "gestureBack": "YES" + } + } + }, { "path": "order/index", "style": { diff --git a/store/goods/edit.vue b/store/goods/edit.vue new file mode 100644 index 0000000..bea6289 --- /dev/null +++ b/store/goods/edit.vue @@ -0,0 +1,134 @@ + + + + + diff --git a/store/goods/index copy.vue b/store/goods/index copy.vue deleted file mode 100644 index 612aaed..0000000 --- a/store/goods/index copy.vue +++ /dev/null @@ -1,149 +0,0 @@ - - - - - diff --git a/store/goods/index.vue b/store/goods/index.vue index 51a716a..090f9d7 100644 --- a/store/goods/index.vue +++ b/store/goods/index.vue @@ -1,7 +1,7 @@