From 0c0e65be1c41d48bac3e6b1639db1aab863f9de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=A8=E6=A0=88=E5=B0=8F=E5=AD=A6=E7=94=9F?= <1518079521@qq.com> Date: Fri, 20 Mar 2026 15:59:46 +0800 Subject: [PATCH] up --- niucloud/addon/shop/admin/api/delivery.ts | 307 ++++- niucloud/addon/shop/admin/api/goods.ts | 2 +- niucloud/addon/shop/admin/api/order.ts | 16 + .../shop/admin/lang/zh-cn/delivery.local.json | 3 +- .../lang/zh-cn/delivery.local_config.json | 4 + .../delivery.local_delivery_service.json | 12 + .../lang/zh-cn/delivery.local_record.json | 33 + .../lang/zh-cn/delivery.merchant_record.json | 31 + .../zh-cn/delivery_store.delivery_set.json | 12 + .../admin/lang/zh-cn/delivery_store.edit.json | 103 ++ .../shop/admin/lang/zh-cn/order.detail.json | 16 + .../shop/admin/lang/zh-cn/order.list.json | 19 +- .../addon/shop/admin/views/address/list.vue | 4 +- .../shop/admin/views/delivery/company.vue | 6 +- .../admin/views/delivery/company_edit.vue | 4 +- .../local-delivery-service-dada.vue | 118 ++ .../components/local_record_detail.vue | 141 +++ .../components/shop_record_detail.vue | 139 +++ .../shop/admin/views/delivery/config.vue | 12 +- .../addon/shop/admin/views/delivery/local.vue | 685 ++++------- .../admin/views/delivery/local_config.vue | 80 ++ .../views/delivery/local_delivery_service.vue | 93 ++ .../admin/views/delivery/local_record.vue | 287 +++++ .../admin/views/delivery/merchant_record.vue | 249 ++++ .../shop/admin/views/delivery/search.vue | 2 +- .../shop/admin/views/delivery/template.vue | 6 +- .../admin/views/delivery/template_edit.vue | 4 +- .../views/delivery_store/delivery_set.vue | 164 +++ .../shop/admin/views/delivery_store/edit.vue | 898 ++++++++++++++ .../shop/admin/views/delivery_store/list.vue | 160 +++ .../views/diy/components/edit-goods-list.vue | 12 + .../diy/components/edit-many-goods-list.vue | 11 + .../components/edit-shop-exchange-goods.vue | 11 + .../diy/components/edit-shop-goods-hot.vue | 197 ++++ .../components/edit-shop-goods-ranking.vue | 11 + .../components/edit-shop-goods-recommend.vue | 11 + .../diy/components/edit-shop-newcomer.vue | 11 + .../diy/components/edit-single-recommend.vue | 11 + .../addon/shop/admin/views/goods/list.vue | 72 +- .../views/goods/public/js/useGoodsEdit.ts | 13 +- .../addon/shop/admin/views/index/index.vue | 23 + .../views/member/components/gift-coupon.vue | 17 +- .../order/components/delivery-action.vue | 301 ++++- .../views/order/components/refund-detail.vue | 2 +- .../addon/shop/admin/views/order/list.vue | 17 +- .../adminapi/controller/delivery/Delivery.php | 71 +- .../controller/delivery/ElectronicSheet.php | 16 +- .../adminapi/controller/delivery/Store.php | 148 --- .../delivery_store/DeliveryService.php | 63 + .../delivery_store/DeliveryStore.php | 177 +++ .../app/adminapi/controller/goods/Goods.php | 4 + .../controller/goods/VirtualGoods.php | 4 + .../local_delivery/config/Config.php | 49 + .../local_delivery/config/Local.php | 65 ++ .../order/LocalDeliveryOrder.php | 120 ++ .../service/LocalDeliveryService.php | 79 ++ .../app/adminapi/controller/order/Order.php | 32 + .../shop_delivery/deliver/Deliver.php | 109 ++ .../shop_delivery/order/ShopDeliveryOrder.php | 92 ++ .../addon/shop/app/adminapi/route/route.php | 151 ++- .../app/api/controller/delivery/Order.php | 47 + .../app/api/controller/order/OrderCreate.php | 1 + niucloud/addon/shop/app/api/route/route.php | 6 +- .../app/dict/delivery/ElectronicSheetDict.php | 3 + .../dict/delivery_store/DeliveryStoreDict.php | 44 + .../addon/shop/app/dict/diy/components.php | 87 +- niucloud/addon/shop/app/dict/diy/pages.php | 10 + .../dict/local_delivery/LocalDeliveryDict.php | 56 + .../LocalDeliveryPreStatusDict.php | 30 + .../LocalDeliveryStatusDict.php | 63 + .../local_delivery/OrderCancelReasonDict.php | 33 + .../app/dict/local_delivery/OrderLogDict.php | 121 ++ .../local_delivery/dada/DadaDeliveryDict.php | 25 + .../dada/DadaDeliveryStatusDict.php | 72 ++ .../dada/json/shop_catetory_dict.json | 1 + .../app/dict/member/account_change_type.php | 19 + niucloud/addon/shop/app/dict/menu/admin.php | 1028 ++++++++++------- .../dict/shop_delivery/ShopDeliveryDict.php | 42 + .../shop_delivery/ShopDeliveryStatusDict.php | 58 + niucloud/addon/shop/app/event.php | 15 + .../app/job/delivery/DeliveryShopEditJob.php | 27 + niucloud/addon/shop/app/lang/zh-cn/api.php | 37 +- niucloud/addon/shop/app/lang/zh-cn/dict.php | 48 + .../LocalDeliveryTypeListener.php | 43 + .../dada/order/GetLocalDeliveryTrack.php | 155 +++ .../dada/order/OrderCancelReasonListener.php | 42 + .../dada/order/OrderPreStatusListener.php | 51 + .../notice_template/OrderDelivery.php | 17 +- .../listener/order/AfterShopOrderClose.php | 5 + .../listener/order/AfterShopOrderDelivery.php | 2 +- .../listener/order/AfterShopOrderFinish.php | 4 +- .../ShopOrderExportDataListener.php | 31 +- .../ShopOrderGoodsExportDataListener.php | 34 +- .../point_exchange/AfterShopOrderClose.php | 5 +- .../point_exchange/AfterShopOrderCreate.php | 5 +- .../shop/app/listener/poster/ShopPoster.php | 3 +- .../refund/AfterShopOrderRefundFinish.php | 5 +- .../ShopOrderRefundExportDataListener.php | 2 +- .../shop_delivery/OrderPreStatusListener.php | 37 + .../order/OrderAmountServiceListener.php | 5 - niucloud/addon/shop/app/model/cart/Cart.php | 10 +- .../addon/shop/app/model/delivery/Store.php | 68 +- .../addon/shop/app/model/goods/GoodsSku.php | 18 +- .../shop/app/model/local_delivery/Local.php | 42 + .../local_delivery/LocalDeliveryOrder.php | 161 +++ .../local_delivery/LocalDeliveryOrderLog.php | 58 + .../local_delivery/LocalDeliveryService.php | 53 + .../shop/app/model/order/OrderDelivery.php | 6 + .../shop/app/model/shop_delivery/Deliver.php | 63 + .../model/shop_delivery/ShopDeliveryOrder.php | 146 +++ .../shop_delivery/ShopDeliveryOrderLog.php | 58 + .../service/admin/delivery/LocalService.php | 134 --- .../service/admin/delivery/StoreService.php | 135 --- .../delivery_store/DeliveryServiceService.php | 55 + .../delivery_store/DeliveryStoreService.php | 262 +++++ .../app/service/admin/goods/GoodsService.php | 36 +- .../admin/goods/VirtualGoodsService.php | 5 + .../local_delivery/config/ConfigService.php | 44 + .../local_delivery/config/LocalService.php | 80 ++ .../order/LocalDeliveryOrderService.php | 118 ++ .../service/LocalDeliveryServiceService.php | 150 +++ .../admin/marketing/DiscountService.php | 25 +- .../pointexchange/ExchangeService.php | 2 +- .../admin/order/OrderDeliveryService.php | 18 + .../app/service/admin/order/OrderService.php | 61 +- .../deliver}/DeliverService.php | 27 +- .../order/ShopDeliveryOrderService.php | 97 ++ .../app/service/api/delivery/OrderService.php | 39 + .../app/service/api/goods/EvaluateService.php | 2 +- .../app/service/api/goods/GoodsService.php | 31 +- .../app/service/api/goods/RankService.php | 2 +- .../service/api/marketing/NewcomerService.php | 2 +- .../service/api/order/OrderCreateService.php | 2 +- .../app/service/api/order/OrderService.php | 19 +- .../core/delivery/CoreConfigService.php | 35 +- .../delivery/CoreLocalDeliveryService.php | 197 ---- .../core/delivery/CoreStoreService.php | 2 +- .../core/delivery/third_delivery/Dada.php | 288 ----- .../CoreDeliveryServiceService.php | 166 +++ .../CoreLocalDeliveryEventService.php | 153 +++ .../CoreLocalDeliveryOrderCloseService.php | 77 ++ .../CoreLocalDeliveryOrderCreateService.php | 189 +++ .../CoreLocalDeliveryOrderFinishService.php | 74 ++ .../CoreLocalDeliveryOrderLogService.php | 51 + .../CoreLocalDeliveryOrderNotifyService.php | 45 + .../CoreLocalDeliveryOrderService.php | 202 ++++ .../CoreLocalDeliveryService.php | 217 ++++ .../dada/CoreOrderEventService.php | 441 +++++++ .../dada/CoreOrderMessageService.php | 107 ++ .../core/marketing/CoreManjianService.php | 5 +- .../core/order/CoreOrderCreateService.php | 18 +- .../core/order/CoreOrderCreateTrait.php | 89 +- .../core/order/CoreOrderDeliveryService.php | 70 +- .../pointexchange/CoreOrderCreateService.php | 4 +- .../service/core/refund/CoreRefundService.php | 4 +- .../CoreShopDeliveryOrderCloseService.php | 87 ++ .../CoreShopDeliveryOrderCreateService.php | 117 ++ .../CoreShopDeliveryOrderEventService.php | 147 +++ .../CoreShopDeliveryOrderFinishService.php | 85 ++ .../CoreShopDeliveryOrderLogService.php | 51 + .../CoreShopDeliveryOrderMessageService.php | 58 + .../CoreShopDeliveryOrderService.php | 35 + .../order/CoreCreateOrderService.php | 6 +- .../order/CoreSeckillOrderCreateService.php | 2 +- .../addon/shop/app/upgrade/v650/Upgrade.php | 35 + .../addon/shop/app/upgrade/v650/upgrade.sql | 176 +++ niucloud/addon/shop/config/local_delivery.php | 27 + .../local_delivery/BaseLocalDelivery.php} | 30 +- .../addon/shop/core/local_delivery/Dada.php | 507 ++++++++ .../local_delivery/LocalDeliveryLoader.php} | 17 +- .../shop/core/local_delivery/Merchant.php | 178 +++ .../local_delivery/sdk/dada}/BaseRequest.php | 71 +- .../sdk/dada}/ConfigRequest.php | 2 +- .../sdk/dada}/OrderCancelRequest.php | 13 +- .../dada}/OrderCreateByFeeOrderNoRequest.php | 4 +- .../sdk/dada}/OrderCreateRequest.php | 40 +- .../sdk/dada}/OrderFeeRequest.php | 4 +- .../sdk/dada}/OrderInfoRequest.php | 4 +- .../sdk/dada/OrderReCreateRequest.php | 472 ++++++++ .../OrderTransporterPositionH5Request.php | 4 +- .../dada}/OrderTransporterPositionRequest.php | 6 +- .../sdk/dada/ShopAddRequest.php | 228 ++++ .../sdk/dada/ShopEditRequest.php | 167 +++ niucloud/addon/shop/info.json | 4 +- .../shop/resource/diy/index/hot_btn_bg.png | Bin 0 -> 1875 bytes .../shop/resource/diy/index/hot_indicate.png | Bin 0 -> 397 bytes .../shop/resource/diy/member/nav_my_help.png | Bin 3120 -> 3475 bytes .../resource/local_delivery/in_delivery.png | Bin 0 -> 13911 bytes .../shop/resource/local_delivery/in_stock.png | Bin 0 -> 14227 bytes .../resource/local_delivery/picking_up.png | Bin 0 -> 10360 bytes .../shop/resource/payment/navigation.png | Bin 0 -> 2392 bytes .../addon/shop/resource/payment/phone.png | Bin 0 -> 2926 bytes .../addon/shop/resource/payment/store.png | Bin 0 -> 2529 bytes niucloud/addon/shop/resource/payment/time.png | Bin 0 -> 2121 bytes niucloud/addon/shop/sql/install.sql | 216 +++- niucloud/addon/shop/uni-app/api/order.ts | 7 + .../components/diy/goods-list/index.vue | 14 +- .../components/diy/many-goods-list/index.vue | 65 +- .../diy/shop-exchange-goods/index.vue | 23 +- .../diy/shop-goods-detail-attr/index.vue | 35 +- .../shop-goods-detail-basic-info/index.vue | 52 +- .../diy/shop-goods-detail-bottom/index.vue | 50 +- .../index.vue | 2 +- .../components/diy/shop-goods-hot/index.vue | 235 ++++ .../diy/shop-goods-ranking/index.vue | 2 +- .../diy/shop-goods-recommend/index.vue | 2 +- .../components/diy/shop-newcomer/index.vue | 10 +- .../components/diy/single-recommend/index.vue | 2 +- .../components/ns-goods-sku/ns-goods-sku.vue | 10 +- .../shop/uni-app/hooks/useDiyGoodsDetail.ts | 12 +- .../uni-app/pages/evaluate/order_evaluate.vue | 2 +- .../shop/uni-app/pages/goods/category.vue | 14 +- .../components/category-template-one-one.vue | 56 +- .../components/category-template-two-one.vue | 51 +- .../components/category-template-two-two.vue | 90 +- .../addon/shop/uni-app/pages/goods/detail.vue | 3 +- .../addon/shop/uni-app/pages/goods/list.vue | 4 +- niucloud/addon/shop/uni-app/pages/index.vue | 7 +- .../addon/shop/uni-app/pages/member/index.vue | 6 +- .../delivery-record/delivery-record.vue | 55 + .../order/components/map-show/map-show.vue | 156 +++ .../components/select-store/select-store.vue | 118 +- .../addon/shop/uni-app/pages/order/detail.vue | 63 +- .../addon/shop/uni-app/pages/order/list.vue | 26 +- .../shop/uni-app/pages/order/payment.vue | 191 +-- .../addon/shop/uni-app/pages/point/detail.vue | 47 +- .../addon/shop/uni-app/pages/point/index.vue | 5 + .../addon/shop/uni-app/pages/point/list.vue | 29 +- 228 files changed, 13911 insertions(+), 2618 deletions(-) create mode 100644 niucloud/addon/shop/admin/lang/zh-cn/delivery.local_config.json create mode 100644 niucloud/addon/shop/admin/lang/zh-cn/delivery.local_delivery_service.json create mode 100644 niucloud/addon/shop/admin/lang/zh-cn/delivery.local_record.json create mode 100644 niucloud/addon/shop/admin/lang/zh-cn/delivery.merchant_record.json create mode 100644 niucloud/addon/shop/admin/lang/zh-cn/delivery_store.delivery_set.json create mode 100644 niucloud/addon/shop/admin/lang/zh-cn/delivery_store.edit.json create mode 100644 niucloud/addon/shop/admin/views/delivery/components/local-delivery-service-dada.vue create mode 100644 niucloud/addon/shop/admin/views/delivery/components/local_record_detail.vue create mode 100644 niucloud/addon/shop/admin/views/delivery/components/shop_record_detail.vue create mode 100644 niucloud/addon/shop/admin/views/delivery/local_config.vue create mode 100644 niucloud/addon/shop/admin/views/delivery/local_delivery_service.vue create mode 100644 niucloud/addon/shop/admin/views/delivery/local_record.vue create mode 100644 niucloud/addon/shop/admin/views/delivery/merchant_record.vue create mode 100644 niucloud/addon/shop/admin/views/delivery_store/delivery_set.vue create mode 100644 niucloud/addon/shop/admin/views/delivery_store/edit.vue create mode 100644 niucloud/addon/shop/admin/views/delivery_store/list.vue create mode 100644 niucloud/addon/shop/admin/views/diy/components/edit-shop-goods-hot.vue delete mode 100644 niucloud/addon/shop/app/adminapi/controller/delivery/Store.php create mode 100644 niucloud/addon/shop/app/adminapi/controller/delivery_store/DeliveryService.php create mode 100644 niucloud/addon/shop/app/adminapi/controller/delivery_store/DeliveryStore.php create mode 100644 niucloud/addon/shop/app/adminapi/controller/local_delivery/config/Config.php create mode 100644 niucloud/addon/shop/app/adminapi/controller/local_delivery/config/Local.php create mode 100644 niucloud/addon/shop/app/adminapi/controller/local_delivery/order/LocalDeliveryOrder.php create mode 100644 niucloud/addon/shop/app/adminapi/controller/local_delivery/service/LocalDeliveryService.php create mode 100644 niucloud/addon/shop/app/adminapi/controller/shop_delivery/deliver/Deliver.php create mode 100644 niucloud/addon/shop/app/adminapi/controller/shop_delivery/order/ShopDeliveryOrder.php create mode 100644 niucloud/addon/shop/app/api/controller/delivery/Order.php create mode 100644 niucloud/addon/shop/app/dict/delivery_store/DeliveryStoreDict.php create mode 100644 niucloud/addon/shop/app/dict/local_delivery/LocalDeliveryDict.php create mode 100644 niucloud/addon/shop/app/dict/local_delivery/LocalDeliveryPreStatusDict.php create mode 100644 niucloud/addon/shop/app/dict/local_delivery/LocalDeliveryStatusDict.php create mode 100644 niucloud/addon/shop/app/dict/local_delivery/OrderCancelReasonDict.php create mode 100644 niucloud/addon/shop/app/dict/local_delivery/OrderLogDict.php create mode 100644 niucloud/addon/shop/app/dict/local_delivery/dada/DadaDeliveryDict.php create mode 100644 niucloud/addon/shop/app/dict/local_delivery/dada/DadaDeliveryStatusDict.php create mode 100644 niucloud/addon/shop/app/dict/local_delivery/dada/json/shop_catetory_dict.json create mode 100644 niucloud/addon/shop/app/dict/shop_delivery/ShopDeliveryDict.php create mode 100644 niucloud/addon/shop/app/dict/shop_delivery/ShopDeliveryStatusDict.php create mode 100644 niucloud/addon/shop/app/job/delivery/DeliveryShopEditJob.php create mode 100644 niucloud/addon/shop/app/listener/local_delivery/dada/local_delivery_type/LocalDeliveryTypeListener.php create mode 100644 niucloud/addon/shop/app/listener/local_delivery/dada/order/GetLocalDeliveryTrack.php create mode 100644 niucloud/addon/shop/app/listener/local_delivery/dada/order/OrderCancelReasonListener.php create mode 100644 niucloud/addon/shop/app/listener/local_delivery/dada/order/OrderPreStatusListener.php create mode 100644 niucloud/addon/shop/app/listener/shop_delivery/OrderPreStatusListener.php create mode 100644 niucloud/addon/shop/app/model/local_delivery/Local.php create mode 100644 niucloud/addon/shop/app/model/local_delivery/LocalDeliveryOrder.php create mode 100644 niucloud/addon/shop/app/model/local_delivery/LocalDeliveryOrderLog.php create mode 100644 niucloud/addon/shop/app/model/local_delivery/LocalDeliveryService.php create mode 100644 niucloud/addon/shop/app/model/shop_delivery/Deliver.php create mode 100644 niucloud/addon/shop/app/model/shop_delivery/ShopDeliveryOrder.php create mode 100644 niucloud/addon/shop/app/model/shop_delivery/ShopDeliveryOrderLog.php delete mode 100644 niucloud/addon/shop/app/service/admin/delivery/LocalService.php delete mode 100644 niucloud/addon/shop/app/service/admin/delivery/StoreService.php create mode 100644 niucloud/addon/shop/app/service/admin/delivery_store/DeliveryServiceService.php create mode 100644 niucloud/addon/shop/app/service/admin/delivery_store/DeliveryStoreService.php create mode 100644 niucloud/addon/shop/app/service/admin/local_delivery/config/ConfigService.php create mode 100644 niucloud/addon/shop/app/service/admin/local_delivery/config/LocalService.php create mode 100644 niucloud/addon/shop/app/service/admin/local_delivery/order/LocalDeliveryOrderService.php create mode 100644 niucloud/addon/shop/app/service/admin/local_delivery/service/LocalDeliveryServiceService.php rename niucloud/addon/shop/app/service/admin/{delivery => shop_delivery/deliver}/DeliverService.php (73%) create mode 100644 niucloud/addon/shop/app/service/admin/shop_delivery/order/ShopDeliveryOrderService.php create mode 100644 niucloud/addon/shop/app/service/api/delivery/OrderService.php delete mode 100644 niucloud/addon/shop/app/service/core/delivery/CoreLocalDeliveryService.php delete mode 100644 niucloud/addon/shop/app/service/core/delivery/third_delivery/Dada.php create mode 100644 niucloud/addon/shop/app/service/core/delivery_store/CoreDeliveryServiceService.php create mode 100644 niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryEventService.php create mode 100644 niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderCloseService.php create mode 100644 niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderCreateService.php create mode 100644 niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderFinishService.php create mode 100644 niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderLogService.php create mode 100644 niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderNotifyService.php create mode 100644 niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderService.php create mode 100644 niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryService.php create mode 100644 niucloud/addon/shop/app/service/core/local_delivery/dada/CoreOrderEventService.php create mode 100644 niucloud/addon/shop/app/service/core/local_delivery/dada/CoreOrderMessageService.php create mode 100644 niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderCloseService.php create mode 100644 niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderCreateService.php create mode 100644 niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderEventService.php create mode 100644 niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderFinishService.php create mode 100644 niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderLogService.php create mode 100644 niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderMessageService.php create mode 100644 niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderService.php create mode 100644 niucloud/addon/shop/app/upgrade/v650/Upgrade.php create mode 100644 niucloud/addon/shop/app/upgrade/v650/upgrade.sql create mode 100644 niucloud/addon/shop/config/local_delivery.php rename niucloud/addon/shop/{app/service/core/delivery/third_delivery/BaseThirdDelivery.php => core/local_delivery/BaseLocalDelivery.php} (56%) create mode 100644 niucloud/addon/shop/core/local_delivery/Dada.php rename niucloud/addon/shop/{app/service/core/delivery/third_delivery/ThirdDeliveryLoader.php => core/local_delivery/LocalDeliveryLoader.php} (72%) create mode 100644 niucloud/addon/shop/core/local_delivery/Merchant.php rename niucloud/addon/shop/{app/service/core/delivery/third_delivery/sdk/Dada => core/local_delivery/sdk/dada}/BaseRequest.php (58%) rename niucloud/addon/shop/{app/service/core/delivery/third_delivery/sdk/Dada => core/local_delivery/sdk/dada}/ConfigRequest.php (76%) rename niucloud/addon/shop/{app/service/core/delivery/third_delivery/sdk/Dada => core/local_delivery/sdk/dada}/OrderCancelRequest.php (81%) rename niucloud/addon/shop/{app/service/core/delivery/third_delivery/sdk/Dada => core/local_delivery/sdk/dada}/OrderCreateByFeeOrderNoRequest.php (93%) rename niucloud/addon/shop/{app/service/core/delivery/third_delivery/sdk/Dada => core/local_delivery/sdk/dada}/OrderCreateRequest.php (89%) rename niucloud/addon/shop/{app/service/core/delivery/third_delivery/sdk/Dada => core/local_delivery/sdk/dada}/OrderFeeRequest.php (98%) rename niucloud/addon/shop/{app/service/core/delivery/third_delivery/sdk/Dada => core/local_delivery/sdk/dada}/OrderInfoRequest.php (90%) create mode 100644 niucloud/addon/shop/core/local_delivery/sdk/dada/OrderReCreateRequest.php rename niucloud/addon/shop/{app/service/core/delivery/third_delivery/sdk/Dada => core/local_delivery/sdk/dada}/OrderTransporterPositionH5Request.php (90%) rename niucloud/addon/shop/{app/service/core/delivery/third_delivery/sdk/Dada => core/local_delivery/sdk/dada}/OrderTransporterPositionRequest.php (88%) create mode 100644 niucloud/addon/shop/core/local_delivery/sdk/dada/ShopAddRequest.php create mode 100644 niucloud/addon/shop/core/local_delivery/sdk/dada/ShopEditRequest.php create mode 100644 niucloud/addon/shop/resource/diy/index/hot_btn_bg.png create mode 100644 niucloud/addon/shop/resource/diy/index/hot_indicate.png create mode 100644 niucloud/addon/shop/resource/local_delivery/in_delivery.png create mode 100644 niucloud/addon/shop/resource/local_delivery/in_stock.png create mode 100644 niucloud/addon/shop/resource/local_delivery/picking_up.png create mode 100644 niucloud/addon/shop/resource/payment/navigation.png create mode 100644 niucloud/addon/shop/resource/payment/phone.png create mode 100644 niucloud/addon/shop/resource/payment/store.png create mode 100644 niucloud/addon/shop/resource/payment/time.png create mode 100644 niucloud/addon/shop/uni-app/components/diy/shop-goods-hot/index.vue create mode 100644 niucloud/addon/shop/uni-app/pages/order/components/delivery-record/delivery-record.vue create mode 100644 niucloud/addon/shop/uni-app/pages/order/components/map-show/map-show.vue diff --git a/niucloud/addon/shop/admin/api/delivery.ts b/niucloud/addon/shop/admin/api/delivery.ts index b05526c6c..050a22333 100644 --- a/niucloud/addon/shop/admin/api/delivery.ts +++ b/niucloud/addon/shop/admin/api/delivery.ts @@ -211,13 +211,23 @@ export function setShopDeliveryConfig(params: Record) { return request.put(`shop/delivery/setConfig`, params, { showSuccessMessage: true }) } +/********************************* 配送员 ***************************************/ /** * 获取 配送员列表 * @param params * @returns */ export function getShopDelivery(params: Record) { - return request.get('shop/delivery/staff', { params }) + return request.get('shop/shop_delivery/staff', { params }) +} + +/** + * 获取 配送员列表 + * @param params + * @returns + */ +export function getShopDeliverList(params: Record) { + return request.get('shop/shop_delivery/staff/list', { params }) } /** @@ -226,7 +236,7 @@ export function getShopDelivery(params: Record) { * @returns */ export function getShopDeliverInfo(staff_id: number) { - return request.get(`shop/delivery/staff/${ staff_id }`); + return request.get(`shop/shop_delivery/staff/${ staff_id }`); } /** @@ -235,7 +245,7 @@ export function getShopDeliverInfo(staff_id: number) { * @returns */ export function addShopDeliver(params: Record) { - return request.post('shop/delivery/staff', params, { showSuccessMessage: true }) + return request.post('shop/shop_delivery/staff', params, { showSuccessMessage: true }) } /** @@ -244,7 +254,7 @@ export function addShopDeliver(params: Record) { * @returns */ export function editShopDeliver(params: Record) { - return request.put(`shop/delivery/staff/${ params.deliver_id }`, params, { showSuccessMessage: true }) + return request.put(`shop/shop_delivery/staff/${ params.deliver_id }`, params, { showSuccessMessage: true }) } /** @@ -253,15 +263,48 @@ export function editShopDeliver(params: Record) { * @returns */ export function deleteShopDeliver(staff_id: number) { - return request.delete(`shop/delivery/staff/${ staff_id }`) + return request.delete(`shop/shop_delivery/staff/${ staff_id }`) } + +/********************************* 配送服务商 ***************************************/ + +/** + * 获取配送服务商列表 + * @param params + * @returns + */ +export function getDeliveryServiceList(id: number) { + return request.get(`shop/delivery_store/delivery_service_list/${id}`) +} + +/** + * 服务商开通门店 + * @param params + * @returns + */ +export function deliveryShopOpen(params: Record) { + return request.put(`shop/delivery_store/delivery_shop_open/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true }) +} + +/** + * 服务商门店品类修改 + * @param params + * @returns + */ +export function deliveryShopEdit(params: Record) { + return request.put(`shop/delivery_store/delivery_shop_edit/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true }) +} + + +/********************************* 同城配送设置 ***************************************/ + /** * 获取同城配送设置 * @returns */ export function getLocal() { - return request.get('shop/local'); + return request.get('shop/local_delivery/config'); } /** @@ -270,7 +313,42 @@ export function getLocal() { * @returns */ export function setLocal(params: Record) { - return request.put('shop/local', params, { showSuccessMessage: true }) + return request.put('shop/local_delivery/config', params, { showSuccessMessage: true }) +} + +/** + * 获取三方配送列表 + * @param params + * @returns + */ +export function getInUseLocalDeliveryList(params: Record) { + return request.get('shop/local_delivery/list', {params}) +} + +/** + * 获取同城配送平台列表 + */ +export function getLocalDeliveryServiceList() { + return request.get(`shop/local_delivery/service`) +} + + +/** + * 同城配送平台设置 + * @param params + * @returns + */ +export function setLocalDeliveryService(params: Record) { + return request.put(`shop/local_delivery/service/${params.delivery_type}`, params, {showSuccessMessage: true}) +} + +/** + * 同城配送平台详情 + * @param delivery_type + * @returns + */ +export function getLocalDeliveryServiceInfo(delivery_type: string) { + return request.get(`shop/local_delivery/service/${delivery_type}`,) } /** @@ -280,3 +358,218 @@ export function setLocal(params: Record) { export function getThird() { return request.get('shop/third/init') } + + + + +/********************************* 同城配送记录 ***************************************/ + +/** + * 获取配送记录状态 + * @param params + * @returns + */ +export function getLocalDeliveryStatus() { + return request.get('shop/local_delivery/order/status') +} + +/** + * 获取配送记录分页列表 + * @param params + * @returns + */ +export function getLocalDeliveryList(params: Record) { + return request.get(`shop/local_delivery/order`, {params}) +} + +/** + * 获取同城配送订单详情 + * @param id + * @returns + */ +export function getLocalDeliveryInfo(id: number) { + return request.get(`shop/local_delivery/order/${ id }`); +} + +/** + * 获取同城配送订单取消原因 + * @param params + * @returns + */ +export function getLocalDeliveryCancelReason(params: Record) { + return request.get('shop/local_delivery/order/cancel_reason', {params}) +} + +/** + * 获取同城配送订单同步 + * @param staff_id + * @returns + */ +export function getLocalDeliverySync(id: number) { + return request.put(`shop/local_delivery/order/sync/${ id }`); +} + +/** + * 同城配送订单取消 + * @param params + * @returns + */ +export function setLocalDeliveryCancel(params: Record) { + return request.put(`shop/local_delivery/order/cancel/${ params.id }`, params, { showSuccessMessage: true }) +} + + +/********************************* 商家配送记录 ***************************************/ +/** + * 获取配送记录状态 + * @param params + * @returns + */ +export function getShopDeliveryStatus() { + return request.get('shop/shop_delivery/order/status') +} + +/** + * 获取商家配送记录分页列表 + * @param params + * @returns + */ +export function getShopDeliveryOrderList(params: Record) { + return request.get(`shop/shop_delivery/order`, {params}) +} + +/** + * 获取同城配送订单详情 + * @param id + * @returns + */ +export function getShopDeliveryInfo(id: number) { + return request.get(`shop/shop_delivery/order/${ id }`); +} + +/** + * 获取商家配送记录订单完成 + * @param staff_id + * @returns + */ +export function getShopDeliveryFinish(id: number) { + return request.put(`shop/shop_delivery/order/finish/${ id }`); +} + +/** + * 获取商家配送记录订单完成 + * @param staff_id + * @returns + */ +export function getDeliveryFinish(id: number) { + return request.put(`shop/local_delivery/order/finish/${ id }`); +} + +/** + * 商家配送记录订单取消 + * @param params + * @returns + */ +export function setShopDeliveryCancel(params: Record) { + return request.put(`shop/shop_delivery/order/cancel/${ params.id }`, params, { showSuccessMessage: true }) +} + +/** + * 获取配送方式 + * @param id + * @returns + */ +export function getShopDeliveryType() { + return request.get(`shop/delivery/type`); +} + + +/********************************* 门店自提 ***************************************/ + +/** + * 获取门店自提分页列表 + * @param params + * @returns + */ +export function getDeliveryStoreList(params: Record) { + return request.get(`shop/delivery/store`, {params}) +} + +/** + * 获取门店选择列表 + * @param params + * @returns + */ +export function getDeliveryStoreListAll(params: Record) { + return request.get(`shop/delivery/store/list`, {params}) +} + +/** + * 获取提货方式 + * @returns + */ +export function getStorePickUpType() { + return request.get(`shop/delivery/store/pick_up_type`); +} + +/** + * 获取配送门店详情 + * @returns + */ +export function getDeliveryStoreDetail(id: number) { + return request.get(`shop/delivery/store/${ id }`); +} + +/** + * 添加配送门店 + * @param params + * @returns + */ +export function addDeliveryStore(params: Record) { + return request.post('shop/delivery/store', params, {showErrorMessage: true, showSuccessMessage: true}) +} + +/** + * 编辑配送门店 + * @param params + * @returns + */ +export function editDeliveryStore(params: Record) { + return request.put(`shop/delivery/store/${params.store_id}`, params, { showErrorMessage: true, showSuccessMessage: true }) +} +/** + * 删除运费模版 + * @param template_id + * @returns + */ +export function deleteDeliveryStore(store_id: number) { + return request.delete(`shop/delivery/store/${store_id}`, {showErrorMessage: true, showSuccessMessage: true}) +} + +/** + * 编辑配送门店状态 + * @param params + * @returns + */ +export function editDeliveryStoreStatus(params: Record) { + return request.put(`shop/delivery/store/modify_status`, params, { showErrorMessage: true, showSuccessMessage: true }) +} + +/** + * 获取距离配置 + * @returns + */ +export function getDeliveryConfig() { + return request.get('shop/local_delivery/base_config') +} + + +/** + * 编辑距离配置 + * @param params + * @returns + */ +export function setDeliveryConfig(params: Record) { + return request.put('shop/local_delivery/base_config', params, {showSuccessMessage: true}) +} + diff --git a/niucloud/addon/shop/admin/api/goods.ts b/niucloud/addon/shop/admin/api/goods.ts index 0ff4b7ecf..c61f69504 100644 --- a/niucloud/addon/shop/admin/api/goods.ts +++ b/niucloud/addon/shop/admin/api/goods.ts @@ -129,7 +129,7 @@ export function editGoodsStatus(params: Record) { * @param params */ export function copyGoods(params: Record) { - return request.put(`shop/goods/copy/${ params.goods_id }`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/copy/${ params.goods_id }`, params) } /** diff --git a/niucloud/addon/shop/admin/api/order.ts b/niucloud/addon/shop/admin/api/order.ts index fecc0a4fc..c8c3af39f 100644 --- a/niucloud/addon/shop/admin/api/order.ts +++ b/niucloud/addon/shop/admin/api/order.ts @@ -278,4 +278,20 @@ export function getOrderBatchDeliveryType() { */ export function closeRefund(order_refund_no: number) { return request.put(`shop/order/refund/close/${order_refund_no}`) +} + +/** + * 获取已选订单项总重量 + * @return + */ +export function getSelectOrderGoodsWeight(params: Record) { + return request.get(`shop/order/select/weight`, {params}) +} + +/** + * 获取已选订单项配送费用 + * @return + */ +export function getDeliveryFee(params: Record) { + return request.get(`shop/order/delivery/fee`, {params}) } \ No newline at end of file diff --git a/niucloud/addon/shop/admin/lang/zh-cn/delivery.local.json b/niucloud/addon/shop/admin/lang/zh-cn/delivery.local.json index b6fe7d276..40d7444e9 100644 --- a/niucloud/addon/shop/admin/lang/zh-cn/delivery.local.json +++ b/niucloud/addon/shop/admin/lang/zh-cn/delivery.local.json @@ -87,5 +87,6 @@ "notLessThanZero": "不能小于0", "mustBeGreaterThanZero": "必须大于0", "thridRequire": "请选择一个三方配送服务", - "thridSeting": "请填写完整的三方配送配置" + "thridSeting": "请填写完整的三方配送配置", + "deliveryArea": "配送区域" } \ No newline at end of file diff --git a/niucloud/addon/shop/admin/lang/zh-cn/delivery.local_config.json b/niucloud/addon/shop/admin/lang/zh-cn/delivery.local_config.json new file mode 100644 index 000000000..254cfe8c5 --- /dev/null +++ b/niucloud/addon/shop/admin/lang/zh-cn/delivery.local_config.json @@ -0,0 +1,4 @@ +{ + "isStoreSelect":"是否开启门店选择", + "isShowPolyline":"是否显示配送轨迹" +} \ No newline at end of file diff --git a/niucloud/addon/shop/admin/lang/zh-cn/delivery.local_delivery_service.json b/niucloud/addon/shop/admin/lang/zh-cn/delivery.local_delivery_service.json new file mode 100644 index 000000000..de3374c1a --- /dev/null +++ b/niucloud/addon/shop/admin/lang/zh-cn/delivery.local_delivery_service.json @@ -0,0 +1,12 @@ +{ + "name": "三方配送类型", + "dadaThirdDelivery":"达达秒送", + "isUse":"是否启用", + "config":"设置", + "dadaAppKey": "APP_KEY", + "dadaAppSecret":"APP_SECRET", + "dadaSourceId": "商户ID", + "dadaAppKeyPlaceholder": "请输入APP_KEY", + "dadaAppSecretPlaceholder":"请输入APP_SECRET", + "dadaSourceIdPlaceholder":"请输入商户ID" +} \ No newline at end of file diff --git a/niucloud/addon/shop/admin/lang/zh-cn/delivery.local_record.json b/niucloud/addon/shop/admin/lang/zh-cn/delivery.local_record.json new file mode 100644 index 000000000..ea204d695 --- /dev/null +++ b/niucloud/addon/shop/admin/lang/zh-cn/delivery.local_record.json @@ -0,0 +1,33 @@ +{ + "deliveryNo": "配送单号", + "tradeNo": "交易单号", + "tradeNoPlaceholder":"请输入交易单号", + "deliveryNoPlaceholder":"请输入配送单号", + "createTime":"配送时间", + "startDate":"开始日期", + "endDate":"结束日期", + "deliveryServiceName":"配送服务名称", + "goodsInfo":"商品信息", + "deliveryStart":"配送起点", + "deliveryEnd":"配送终点", + "deliveryStatus":"状态", + "deliveryStatusPlaceholder":"请选择状态", + "deliveryDistance":"配送距离", + "deliveryMoney":"配送费用", + "remark":"备注", + "detail": "详情", + "sync":"同步", + "syncTips":"您确定要同步配送订单吗？", + "finish":"完成", + "finishTips":"您确定要完成配送订单吗？", + "cancelTime":"取消时间", + "riderName":"配送员姓名", + "riderMobile":"配送员手机号", + "outDeliveryNo":"外部配送单号", + "deliveryCancel":"取消配送", + "cancelReasonSelectPlaceholder":"请选择取消原因类型", + "cancelReasonType":"取消原因类型", + "cancelReason":"取消原因", + "cancelReasonPlaceholder":"请输入取消原因" + +} \ No newline at end of file diff --git a/niucloud/addon/shop/admin/lang/zh-cn/delivery.merchant_record.json b/niucloud/addon/shop/admin/lang/zh-cn/delivery.merchant_record.json new file mode 100644 index 000000000..896564958 --- /dev/null +++ b/niucloud/addon/shop/admin/lang/zh-cn/delivery.merchant_record.json @@ -0,0 +1,31 @@ +{ + "deliveryNo": "配送单号", + "tradeNo": "交易单号", + "tradeNoPlaceholder":"请输入交易单号", + "deliveryNoPlaceholder":"请输入配送单号", + "createTime":"配送时间", + "startDate":"开始日期", + "endDate":"结束日期", + "deliveryServiceName":"配送服务名称", + "goodsInfo":"商品信息", + "deliveryStart":"配送起点", + "deliveryEnd":"配送终点", + "deliveryStatus":"状态", + "deliveryStatusPlaceholder":"请选择状态", + "deliveryDistance":"配送距离", + "deliveryMoney":"配送费用", + "remark":"备注", + "detail": "详情", + "finish":"完成", + "finishTips":"您确定要完成配送订单吗？", + "cancelTime":"取消时间", + "riderName":"配送员姓名", + "riderMobile":"配送员手机号", + "outDeliveryNo":"外部配送单号", + "deliveryCancel":"取消配送", + "cancelReasonSelectPlaceholder":"请选择取消原因类型", + "cancelReasonType":"取消原因类型", + "cancelReason":"取消原因", + "cancelReasonPlaceholder":"请输入取消原因" + +} \ No newline at end of file diff --git a/niucloud/addon/shop/admin/lang/zh-cn/delivery_store.delivery_set.json b/niucloud/addon/shop/admin/lang/zh-cn/delivery_store.delivery_set.json new file mode 100644 index 000000000..7cf284b31 --- /dev/null +++ b/niucloud/addon/shop/admin/lang/zh-cn/delivery_store.delivery_set.json @@ -0,0 +1,12 @@ +{ + "deliveryServiceName": "服务商", + "openService": "开通", + "editService": "修改品类", + "business": "门店品类", + "businessPlaceholder": "请选择门店品类", + "openStatus": "开通状态", + "editStatus": "门店信息变更状态", + "reason": "备注", + "pass": "通过", + "notPass": "未通过" +} \ No newline at end of file diff --git a/niucloud/addon/shop/admin/lang/zh-cn/delivery_store.edit.json b/niucloud/addon/shop/admin/lang/zh-cn/delivery_store.edit.json new file mode 100644 index 000000000..5373b7054 --- /dev/null +++ b/niucloud/addon/shop/admin/lang/zh-cn/delivery_store.edit.json @@ -0,0 +1,103 @@ +{ + "basicSettings": "同城配送基础设置", + "timeIsOpen": "配送时间设置", + "timeIsOpenTips": "开启后，买家下单选择同城配送时，可选择配送时间，提交订单后，将在买家备注中显示。关闭后，买家下单默认为立即配送", + "close": "关闭", + "open": "开启", + "everyDay": "每天", + "monday": "周一", + "tuesday": "周二", + "wednesday": "周三", + "thursday": "周四", + "friday": "周五", + "saturday": "周六", + "sunday": "周日", + "timeWeekRequire": "请选择配送时间", + "deliveryTimeSetting": "配送时间设置", + "feeType": "收费标准", + "region": "按区域收取配送费", + "distance": "按距离收取配送费", + "district": "按行政区域收取配送费", + "feeSetting": "费用设置", + "weightFee": "续重收费", + "feeSettingTextOne": "km内按", + "feeSettingTextTwo": "元收取配送费，每超出", + "feeSettingTextThree": "km费用增加", + "priceUnit": "元", + "weightFeeTextOne": "商品重量", + "weightFeeTextTwo": "kg 内不额外收费，每超出", + "weightFeeTextThree": "kg 费用增加", + "areaName": "区域名称", + "startPrice": "起送价", + "deliveryPrice": "配送费", + "areaType": "划分方式", + "radius": "半径", + "custom": "自定义", + "addDeliveryArea": "添加配送区域", + "baseDistRequire": "请输入起始公里数", + "gradDistRequire": "请输入超出公里数", + "basePriceRequire": "请输入起始公里内的配送费用", + "gradPriceRequire": "请输入每超出公里部分的费用", + "areaNameRequire": "请输入区域名称", + "startPriceRequire": "请输入起送价", + "startPriceMin": "起送价不能小于0", + "deliveryPriceRequire": "请输入配送费", + "deliveryPriceMin": "配送费不能小于0", + "areaPlaceholder": "请添加配送区域", + "deliveryType": "配送方式", + "business": "商家自配送", + "deliveryTypeRequire": "至少需选择一种配送方式", + "deliveryAddress": "取货地址", + "defaultDeliveryAddressEmpty": "请先配置默认发货地址", + "toSetting": "去配置", + "update": "修改", + "deliveryAddressChange": "取货地址已变更请注意是否需重新调整配送区域", + "tradeTimePlaceholderTwo": "请选择提货时段", + "tradeTimePlaceholderThree": "请选择细分时段", + "tradeTimePlaceholderFour": "结束时间不能小于或等于开始时间", + "tradeTimePlaceholderFive": "后一个时间段的开始时间不能小于前一个时间段的结束时间", + "thrid":"三方配送", + "AppKey":"AppKey", + "AppSecret":"AppSecret", + "shopId":"商户ID", + "shopStoreNo":"商户门店编号", + "AppKeyRequire":"请输入AppKey", + "AppSecretRequire":"请输入AppSecret", + "shopIdRequire":"请输入商户ID", + "shopStoreNoRequire":"请输入商户门店编号", + "deliveryTime":"配送时段设置", + "startTime":"开始时间", + "endTime":"结束时间", + "timeInterval":"细分时段", + "addTime":"添加配送时段", + "deliveryTimeTips":"配送时段设置，若不在配送时段内，则无法进行配送", + "30minute": "30分钟", + "90minute": "90分钟", + "oneHour": "一小时", + "twoHour": "两小时", + "advancaDay": "提前预约", + "advance": "提前", + "day": "天", + "reservationAvailable":"可预约", + "withinDays":"天内", + "advanceTips": "若设置了提前预约,则用户在当前日期前多少天可以预约配送，不可以立即配送", + "mostDays": "最长预约", + "mostDaysTips": "预约配送最长可预约多少天内进行提货", + "formatError": "格式不正确", + "notLessThanZero": "不能小于0", + "mustBeGreaterThanZero": "必须大于0", + "thridRequire": "请选择一个三方配送服务", + "thridSeting": "请填写完整的三方配送配置", + "addressPlaceholder":"请输入详细地址", + "fullAddressPlaceholder":"请输入地址", + "storeName": "提货点名称", + "storeNamePlaceholder": "请输入提货点名称", + "contactName": "联系人姓名", + "contactNamePlaceholder": "请输入联系人姓名", + "storeMobile": "联系人电话", + "storeMobilePlaceholder": "请输入联系人电话", + "tradeTime": "营业时间", + "tradeTimePlaceholder": "请输入营业时间", + "tradeTimeTips": "例：上午9:00-12:00，下午2:00-6:00", + "deliveryStoreTips": "当前提货点为系统自建提货点，无法删除且提货点名称、联系人电话、营业时间及地址只能在店铺设置中统一配置。" +} \ No newline at end of file diff --git a/niucloud/addon/shop/admin/lang/zh-cn/order.detail.json b/niucloud/addon/shop/admin/lang/zh-cn/order.detail.json index 622fd9be7..2f423f02f 100644 --- a/niucloud/addon/shop/admin/lang/zh-cn/order.detail.json +++ b/niucloud/addon/shop/admin/lang/zh-cn/order.detail.json @@ -116,6 +116,22 @@ "refundInstructionsOne": "1、如果是退部分金额，退款后可以是部分退款状态或退款完成状态", "refundInstructionsTwo": "2、如果是退全部金额，则退款后一定是退款完成状态", "refundInstructionsThree": "3、退款完成才会执行相关业务如核销码失效，卡包失效等操作", + "storeDeliveryWay": "商家配送", + "thirdPartyDeliveryWay": "第三方配送", + "deliverName": "配送员", + "deliverNamePlaceholder": "请选择配送员", + "deliverMobile": "配送员手机号", + "deliverMobilePlaceholder": "请输入配送员手机号", + "thirdDeliveryName": "配送平台", + "thirdDeliveryNamePlaceholder": "请选择配送平台", + "goodsWeight": "商品重量", + "goodsWeightPlaceholder": "请输入商品重量", + "weightTips": "[商品重量(kg)]格式输入错误", + "weightNotZeroTips": "商品重量(kg)必须大于0", + "deliveryAddress": "发货地址", + "deliveryPlatform": "配送平台", + "deliveryStatus": "配送状态", + "modifyDelivery": "修改发货信息", "backRefund": "原路退款", "offlineRefund": "线下退款", "refundToBalance": "退款到余额", diff --git a/niucloud/addon/shop/admin/lang/zh-cn/order.list.json b/niucloud/addon/shop/admin/lang/zh-cn/order.list.json index 93f90197b..a20f8181d 100644 --- a/niucloud/addon/shop/admin/lang/zh-cn/order.list.json +++ b/niucloud/addon/shop/admin/lang/zh-cn/order.list.json @@ -160,5 +160,22 @@ "orderInfoEmpty": "暂无数据", "buyerAskDeliveryTime": "要求自提时间", "deleteTips": "是否确认删除该订单？", - "batchDeleteTips": "是否确认批量删除选中的订单？" + "batchDeleteTips": "是否确认批量删除选中的订单？", + "storeDeliveryWay": "商家配送", + "thirdPartyDeliveryWay": "第三方配送", + "deliverName": "配送员", + "deliverNamePlaceholder": "请选择配送员", + "deliverMobile": "配送员手机号", + "deliverMobilePlaceholder": "请输入配送员手机号", + "thirdDeliveryName": "配送平台", + "thirdDeliveryNamePlaceholder": "请选择配送平台", + "goodsWeight": "商品重量", + "goodsWeightPlaceholder": "请输入商品重量", + "weightTips": "[商品重量(kg)]格式输入错误", + "weightNotZeroTips": "商品重量(kg)必须大于0", + "deliveryStore": "提货点", + "deliveryStorePlaceholder": "请选择提货点", + "deliveryPlatform": "配送平台", + "deliveryStatus": "配送状态", + "goActive":"去开通" } diff --git a/niucloud/addon/shop/admin/views/address/list.vue b/niucloud/addon/shop/admin/views/address/list.vue index b50b57526..2cec99c9c 100644 --- a/niucloud/addon/shop/admin/views/address/list.vue +++ b/niucloud/addon/shop/admin/views/address/list.vue @@ -117,7 +117,7 @@ const router = useRouter() * 添加商家地址库 */ const addEvent = () => { - router.push('/shop/order/address/edit') + router.push('/shop/address/edit') } /** @@ -125,7 +125,7 @@ const addEvent = () => { * @param data */ const editEvent = (data: any) => { - router.push('/shop/order/address/edit?id=' + data.id) + router.push('/shop/address/edit?id=' + data.id) } /** diff --git a/niucloud/addon/shop/admin/views/delivery/company.vue b/niucloud/addon/shop/admin/views/delivery/company.vue index f68afcf51..ec4fa4e2a 100644 --- a/niucloud/addon/shop/admin/views/delivery/company.vue +++ b/niucloud/addon/shop/admin/views/delivery/company.vue @@ -2,7 +2,7 @@
- + @@ -118,7 +118,7 @@ loadCompanyList(getTablePageStorage(companyTable.searchParam).page); * 添加物流公司 */ const addEvent = () => { - router.push('/shop/order/delivery/company_add') + router.push('/shop/delivery/company_add') } /** @@ -126,7 +126,7 @@ const addEvent = () => { * @param data */ const editEvent = (data: any) => { - router.push('/shop/order/delivery/company_edit?company_id=' + data.company_id) + router.push('/shop/delivery/company_edit?company_id=' + data.company_id) } /** diff --git a/niucloud/addon/shop/admin/views/delivery/company_edit.vue b/niucloud/addon/shop/admin/views/delivery/company_edit.vue index dfe4f45d1..2bbd1730d 100644 --- a/niucloud/addon/shop/admin/views/delivery/company_edit.vue +++ b/niucloud/addon/shop/admin/views/delivery/company_edit.vue @@ -135,7 +135,7 @@ const router = useRouter() const loading = ref(true) const back = () => { - router.push('/shop/order/delivery/company') + router.push('/shop/delivery/company') } /** @@ -301,7 +301,7 @@ const save = async(formEl: FormInstance | undefined) => { const data = formData api(data).then(res => { - router.push('/shop/order/delivery/company') + router.push('/shop/delivery/company') repeat.value = false }).catch(() => { repeat.value = false diff --git a/niucloud/addon/shop/admin/views/delivery/components/local-delivery-service-dada.vue b/niucloud/addon/shop/admin/views/delivery/components/local-delivery-service-dada.vue new file mode 100644 index 000000000..97f0798df --- /dev/null +++ b/niucloud/addon/shop/admin/views/delivery/components/local-delivery-service-dada.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/niucloud/addon/shop/admin/views/delivery/components/local_record_detail.vue b/niucloud/addon/shop/admin/views/delivery/components/local_record_detail.vue new file mode 100644 index 000000000..24e0fb8a7 --- /dev/null +++ b/niucloud/addon/shop/admin/views/delivery/components/local_record_detail.vue @@ -0,0 +1,141 @@ + + + + + \ No newline at end of file diff --git a/niucloud/addon/shop/admin/views/delivery/components/shop_record_detail.vue b/niucloud/addon/shop/admin/views/delivery/components/shop_record_detail.vue new file mode 100644 index 000000000..719efcd82 --- /dev/null +++ b/niucloud/addon/shop/admin/views/delivery/components/shop_record_detail.vue @@ -0,0 +1,139 @@ + + + + + \ No newline at end of file diff --git a/niucloud/addon/shop/admin/views/delivery/config.vue b/niucloud/addon/shop/admin/views/delivery/config.vue index da66460b7..15ba2e281 100644 --- a/niucloud/addon/shop/admin/views/delivery/config.vue +++ b/niucloud/addon/shop/admin/views/delivery/config.vue @@ -25,16 +25,16 @@ {{ t(item.key) }}
diff --git a/niucloud/addon/shop/admin/views/delivery/local.vue b/niucloud/addon/shop/admin/views/delivery/local.vue index d9feec95f..1dda31125 100644 --- a/niucloud/addon/shop/admin/views/delivery/local.vue +++ b/niucloud/addon/shop/admin/views/delivery/local.vue @@ -5,141 +5,7 @@ - - - - - - {{ t('business') }} - {{ t('thrid') }} - - - -
-
- {{ service.name }} - -
-
- - - -
- - {{ t('open') }} - {{ t('close') }} - -
{{t('timeIsOpenTips')}}
-
- - - - -
-
- {{ defaultDeliveryAddress ? defaultDeliveryAddress.full_address : - t('defaultDeliveryAddressEmpty') }} - {{ defaultDeliveryAddress ? t('update') : t('toSetting') - }} -
-
- {{ t('deliveryAddressChange') }}
-
- + {{ t('region') }} @@ -166,7 +32,7 @@ {{ t('priceUnit') }} - +
{{ t('weightFeeTextOne') }}
@@ -183,36 +49,53 @@ {{ t('priceUnit') }}
- - -
-
-
- -
- -
- - - + +
+
+
+
+
+
+ {{ item.store_name }} + 配置
-
- - +
地址：{{ item.full_address }}
+
+
+
+ 新增配送点 +
+
+
+ 请到配送点中添加配送区域 + {{ t('toSetting') }} +
+
+
+
+
+ +
+ +
+ + + +
+
+ +
- +
- + {{ t('radius') }} {{ t('custom') }} @@ -225,6 +108,7 @@ {{ t('addDeliveryArea') }}
+
@@ -240,111 +124,25 @@ @@ -746,4 +443,14 @@ const back = () => { #container :deep(div){ z-index: 2 !important; } + +.store-wrap::-webkit-scrollbar{ + width:4px; + border-radius:2px; + background-color:#f1f1f1; +} +.store-wrap::-webkit-scrollbar-thumb{ + background-color:#c1c1c1; + border-radius:2px; +} diff --git a/niucloud/addon/shop/admin/views/delivery/local_config.vue b/niucloud/addon/shop/admin/views/delivery/local_config.vue new file mode 100644 index 000000000..6ffcab073 --- /dev/null +++ b/niucloud/addon/shop/admin/views/delivery/local_config.vue @@ -0,0 +1,80 @@ + + + + + \ No newline at end of file diff --git a/niucloud/addon/shop/admin/views/delivery/local_delivery_service.vue b/niucloud/addon/shop/admin/views/delivery/local_delivery_service.vue new file mode 100644 index 000000000..573e4f2ee --- /dev/null +++ b/niucloud/addon/shop/admin/views/delivery/local_delivery_service.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/niucloud/addon/shop/admin/views/delivery/local_record.vue b/niucloud/addon/shop/admin/views/delivery/local_record.vue new file mode 100644 index 000000000..e0a50a1d0 --- /dev/null +++ b/niucloud/addon/shop/admin/views/delivery/local_record.vue @@ -0,0 +1,287 @@ + + + + + \ No newline at end of file diff --git a/niucloud/addon/shop/admin/views/delivery/merchant_record.vue b/niucloud/addon/shop/admin/views/delivery/merchant_record.vue new file mode 100644 index 000000000..9168fa441 --- /dev/null +++ b/niucloud/addon/shop/admin/views/delivery/merchant_record.vue @@ -0,0 +1,249 @@ + + + + + \ No newline at end of file diff --git a/niucloud/addon/shop/admin/views/delivery/search.vue b/niucloud/addon/shop/admin/views/delivery/search.vue index 801876024..1af326312 100644 --- a/niucloud/addon/shop/admin/views/delivery/search.vue +++ b/niucloud/addon/shop/admin/views/delivery/search.vue @@ -1,7 +1,7 @@