From 3069b34763c83f84fae78d98d738de708a118a49 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 25 Sep 2024 17:41:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=92=8C=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=92=8C=E8=AE=A2=E5=8D=95=E8=8E=B7=E5=8F=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/store_order_cart_info.js | 9 ++ api/system_store_storage.js | 9 ++ pagesOrder/deliveryOrder/count.vue | 220 ++++++++--------------------- pagesOrder/deliveryOrder/index.vue | 123 +++++++++------- pagesOrder/productSales/count.vue | 216 +++++++++------------------- pagesOrder/productSales/index.vue | 216 +++++++++------------------- pagesOrder/store_product/index.vue | 12 -- 7 files changed, 279 insertions(+), 526 deletions(-) create mode 100644 api/store_order_cart_info.js create mode 100644 api/system_store_storage.js diff --git a/api/store_order_cart_info.js b/api/store_order_cart_info.js new file mode 100644 index 0000000..36e7664 --- /dev/null +++ b/api/store_order_cart_info.js @@ -0,0 +1,9 @@ +import request from '@/utils/request'; + +export const StoreOrderCartInfoLists = (data) => { + return request.get('/store_order_cart_info/StoreOrderCartInfo/lists', data); +} + +export const StoreOrderCartInfoGroupLists = (data) => { + return request.get('/store_order_cart_info/StoreOrderCartInfo/group_lists', data); +} \ No newline at end of file diff --git a/api/system_store_storage.js b/api/system_store_storage.js new file mode 100644 index 0000000..fdaf20b --- /dev/null +++ b/api/system_store_storage.js @@ -0,0 +1,9 @@ +import request from '@/utils/request'; + +export const SystemStoreStorageLists = (data) => { + return request.get('/system_store_storage/SystemStoreStorage/lists', data); +} + +export const SystemStoreStorageGroupLists = (data) => { + return request.get('/system_store_storage/SystemStoreStorage/group_lists', data); +} \ No newline at end of file diff --git a/pagesOrder/deliveryOrder/count.vue b/pagesOrder/deliveryOrder/count.vue index f56587d..db417a6 100644 --- a/pagesOrder/deliveryOrder/count.vue +++ b/pagesOrder/deliveryOrder/count.vue @@ -1,23 +1,24 @@ @@ -156,19 +117,19 @@ justify-content: space-between; font-size: 22rpx; color: #777; - + .nav-item { display: flex; flex-direction: column; align-items: center; justify-content: center; position: relative; - + image { height: 40rpx; width: 40rpx; } - + .badge { position: absolute; top: -10rpx; @@ -181,25 +142,7 @@ border-radius: 30rpx; font-size: 18rpx; } - - } - } - .head { - padding: 20rpx; - background-color: white; - position: relative; - .act { - color: #20B128; - } - - .line { - width: 26px; - height: 5rpx; - background-color: #20B128; - border-radius: 50rpx; - position: absolute; - transition: 300ms; } } @@ -223,18 +166,6 @@ .card-content-l { margin-right: 20rpx; position: relative; - - .status { - width: 152rpx; - height: 40rpx; - background-color: rgba(0, 0, 0, .3); - text-align: center; - color: white; - font-size: 24rpx; - line-height: 40rpx; - position: absolute; - bottom: 0; - } } .card-content-r { @@ -246,54 +177,21 @@ font-size: 30rpx; width: 500rpx; } - - .need { - color: #777777; - font-size: 24rpx; - } - .ipt { display: flex; height: 56rpx; } } - - .status-png { - position: absolute; - right: 20rpx; - } - } - .card-footer { - margin-top: 30rpx; - text-align: right; - font-size: 28rpx; - color: #060606; - } + } - .submit-btn { - position: fixed; - bottom: 50rpx; - width: 710rpx; - margin: 0 auto; - } + } - .detail { - width: 88rpx; - height: 88rpx; - border-radius: 88rpx; - text-align: center; - line-height: 88rpx; - background-color: #50C758; - color: white; - position: absolute; - bottom: 300rpx; - right: 20rpx; - } + .ellipsis { white-space: nowrap; diff --git a/pagesOrder/deliveryOrder/index.vue b/pagesOrder/deliveryOrder/index.vue index f56587d..23257f3 100644 --- a/pagesOrder/deliveryOrder/index.vue +++ b/pagesOrder/deliveryOrder/index.vue @@ -1,23 +1,24 @@ @@ -156,19 +176,19 @@ justify-content: space-between; font-size: 22rpx; color: #777; - + .nav-item { display: flex; flex-direction: column; align-items: center; justify-content: center; position: relative; - + image { height: 40rpx; width: 40rpx; } - + .badge { position: absolute; top: -10rpx; @@ -181,9 +201,10 @@ border-radius: 30rpx; font-size: 18rpx; } - + } } + .head { padding: 20rpx; background-color: white; diff --git a/pagesOrder/productSales/count.vue b/pagesOrder/productSales/count.vue index f56587d..ecb7bfd 100644 --- a/pagesOrder/productSales/count.vue +++ b/pagesOrder/productSales/count.vue @@ -1,23 +1,24 @@ @@ -156,19 +125,19 @@ justify-content: space-between; font-size: 22rpx; color: #777; - + .nav-item { display: flex; flex-direction: column; align-items: center; justify-content: center; position: relative; - + image { height: 40rpx; width: 40rpx; } - + .badge { position: absolute; top: -10rpx; @@ -181,27 +150,10 @@ border-radius: 30rpx; font-size: 18rpx; } - + } } - .head { - padding: 20rpx; - background-color: white; - position: relative; - .act { - color: #20B128; - } - - .line { - width: 26px; - height: 5rpx; - background-color: #20B128; - border-radius: 50rpx; - position: absolute; - transition: 300ms; - } - } .content { padding: 20rpx; @@ -224,17 +176,6 @@ margin-right: 20rpx; position: relative; - .status { - width: 152rpx; - height: 40rpx; - background-color: rgba(0, 0, 0, .3); - text-align: center; - color: white; - font-size: 24rpx; - line-height: 40rpx; - position: absolute; - bottom: 0; - } } .card-content-r { @@ -259,41 +200,14 @@ } } - .status-png { - position: absolute; - right: 20rpx; - } - } - .card-footer { - margin-top: 30rpx; - text-align: right; - font-size: 28rpx; - color: #060606; - } + } - .submit-btn { - position: fixed; - bottom: 50rpx; - width: 710rpx; - margin: 0 auto; - } } - .detail { - width: 88rpx; - height: 88rpx; - border-radius: 88rpx; - text-align: center; - line-height: 88rpx; - background-color: #50C758; - color: white; - position: absolute; - bottom: 300rpx; - right: 20rpx; - } + .ellipsis { white-space: nowrap; diff --git a/pagesOrder/productSales/index.vue b/pagesOrder/productSales/index.vue index f56587d..4be1009 100644 --- a/pagesOrder/productSales/index.vue +++ b/pagesOrder/productSales/index.vue @@ -1,23 +1,24 @@ @@ -156,19 +125,19 @@ justify-content: space-between; font-size: 22rpx; color: #777; - + .nav-item { display: flex; flex-direction: column; align-items: center; justify-content: center; position: relative; - + image { height: 40rpx; width: 40rpx; } - + .badge { position: absolute; top: -10rpx; @@ -181,27 +150,10 @@ border-radius: 30rpx; font-size: 18rpx; } - + } } - .head { - padding: 20rpx; - background-color: white; - position: relative; - .act { - color: #20B128; - } - - .line { - width: 26px; - height: 5rpx; - background-color: #20B128; - border-radius: 50rpx; - position: absolute; - transition: 300ms; - } - } .content { padding: 20rpx; @@ -224,17 +176,6 @@ margin-right: 20rpx; position: relative; - .status { - width: 152rpx; - height: 40rpx; - background-color: rgba(0, 0, 0, .3); - text-align: center; - color: white; - font-size: 24rpx; - line-height: 40rpx; - position: absolute; - bottom: 0; - } } .card-content-r { @@ -259,41 +200,14 @@ } } - .status-png { - position: absolute; - right: 20rpx; - } - } - .card-footer { - margin-top: 30rpx; - text-align: right; - font-size: 28rpx; - color: #060606; - } + } - .submit-btn { - position: fixed; - bottom: 50rpx; - width: 710rpx; - margin: 0 auto; - } } - .detail { - width: 88rpx; - height: 88rpx; - border-radius: 88rpx; - text-align: center; - line-height: 88rpx; - background-color: #50C758; - color: white; - position: absolute; - bottom: 300rpx; - right: 20rpx; - } + .ellipsis { white-space: nowrap; diff --git a/pagesOrder/store_product/index.vue b/pagesOrder/store_product/index.vue index 2fed9d2..74b9458 100644 --- a/pagesOrder/store_product/index.vue +++ b/pagesOrder/store_product/index.vue @@ -137,18 +137,6 @@ {{item.tag}} - - 原价 - ¥{{item[priceKey.op_price]}} - - - - 售价 - {{item[priceKey.op_price]}} - - -