From 5e56c31300eb62718853bcf74d13b59c7ddae67d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Fri, 27 Sep 2024 14:17:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 8 +- src/api/apps/bc/agent/index.ts | 91 ++ src/api/apps/bc/agent/model/index.ts | 23 + src/api/apps/bc/equipment/index.ts | 142 +++ src/api/apps/bc/equipment/model/index.ts | 31 + src/api/apps/bc/export/index.ts | 95 ++ src/api/apps/bc/export/model/index.ts | 41 + src/api/apps/bc/food/index.ts | 88 ++ src/api/apps/bc/food/model/index.ts | 21 + src/api/apps/bc/plan/index.ts | 88 ++ src/api/apps/bc/plan/model/index.ts | 28 + src/api/apps/bc/temporary/index.ts | 105 ++ src/api/apps/bc/temporary/model/index.ts | 25 + src/api/cms/ad/model/index.ts | 2 + src/api/cms/cmsArticle/index.ts | 13 +- src/api/cms/cmsArticleCategory/index.ts | 20 +- src/api/cms/cmsArticleCategory/model/index.ts | 2 + src/api/cms/cmsDesign/model/index.ts | 51 +- src/api/cms/cmsNavigation/index.ts | 16 + src/api/cms/cmsNavigation/model/index.ts | 1 + src/api/cms/cmsWebsite/index.ts | 2 +- src/api/cms/cmsWebsite/model/index.ts | 1 + src/api/cms/navigation/index.ts | 16 + src/api/mall/shopBrand/index.ts | 106 ++ src/api/mall/shopBrand/model/index.ts | 31 + src/api/mall/shopCart/index.ts | 106 ++ src/api/mall/shopCart/model/index.ts | 53 + src/api/mall/shopCashier/index.ts | 106 ++ src/api/mall/shopCashier/model/index.ts | 55 ++ src/api/mall/shopCount/index.ts | 106 ++ src/api/mall/shopCount/model/index.ts | 39 + .../{shop => mall}/shopDealerApply/index.ts | 14 +- .../shopDealerApply/model/index.ts | 0 .../{shop => mall}/shopDealerCapital/index.ts | 14 +- .../shopDealerCapital/model/index.ts | 0 .../{shop => mall}/shopDealerOrder/index.ts | 14 +- .../shopDealerOrder/model/index.ts | 0 .../{shop => mall}/shopDealerReferee/index.ts | 14 +- .../shopDealerReferee/model/index.ts | 0 .../{shop => mall}/shopDealerSetting/index.ts | 14 +- .../shopDealerSetting/model/index.ts | 0 .../{shop => mall}/shopDealerUser/index.ts | 14 +- .../shopDealerUser/model/index.ts | 0 .../shopDealerWithdraw/index.ts | 14 +- .../shopDealerWithdraw/model/index.ts | 0 src/api/{shop => mall}/shopGoods/index.ts | 14 +- .../{shop => mall}/shopGoods/model/index.ts | 0 .../{shop => mall}/shopGoodsCategory/index.ts | 14 +- .../shopGoodsCategory/model/index.ts | 0 .../{shop => mall}/shopGoodsComment/index.ts | 14 +- .../shopGoodsComment/model/index.ts | 0 .../{shop => mall}/shopGoodsCoupon/index.ts | 14 +- .../shopGoodsCoupon/model/index.ts | 0 src/api/{shop => mall}/shopGoodsLog/index.ts | 14 +- .../shopGoodsLog/model/index.ts | 0 .../{shop => mall}/shopGoodsRelation/index.ts | 14 +- .../shopGoodsRelation/model/index.ts | 0 src/api/{shop => mall}/shopGoodsSku/index.ts | 14 +- .../shopGoodsSku/model/index.ts | 0 src/api/{shop => mall}/shopGoodsSpec/index.ts | 14 +- .../shopGoodsSpec/model/index.ts | 0 src/api/{shop => mall}/shopMerchant/index.ts | 14 +- .../shopMerchant/model/index.ts | 2 + .../shopMerchantAccount/index.ts | 14 +- .../shopMerchantAccount/model/index.ts | 0 .../{shop => mall}/shopMerchantApply/index.ts | 14 +- .../shopMerchantApply/model/index.ts | 0 .../{shop => mall}/shopMerchantCount/index.ts | 14 +- .../shopMerchantCount/model/index.ts | 0 .../{shop => mall}/shopMerchantType/index.ts | 14 +- .../shopMerchantType/model/index.ts | 0 src/api/{shop => mall}/shopOrder/index.ts | 14 +- .../{shop => mall}/shopOrder/model/index.ts | 0 .../{shop => mall}/shopOrderCartInfo/index.ts | 14 +- .../shopOrderCartInfo/model/index.ts | 0 .../{shop => mall}/shopOrderGoods/index.ts | 14 +- .../shopOrderGoods/model/index.ts | 0 src/api/{shop => mall}/shopOrderInfo/index.ts | 14 +- .../shopOrderInfo/model/index.ts | 0 .../{shop => mall}/shopOrderInfoLog/index.ts | 14 +- .../shopOrderInfoLog/model/index.ts | 0 src/api/{shop => mall}/shopSpec/index.ts | 14 +- .../{shop => mall}/shopSpec/model/index.ts | 0 src/api/{shop => mall}/shopSpecValue/index.ts | 14 +- .../shopSpecValue/model/index.ts | 0 .../{shop => mall}/shopUserAddress/index.ts | 14 +- .../shopUserAddress/model/index.ts | 0 .../shopUserCollection/index.ts | 14 +- .../shopUserCollection/model/index.ts | 0 .../{shop => mall}/shopWechatDeposit/index.ts | 14 +- .../shopWechatDeposit/model/index.ts | 0 src/api/shop/express/index.ts | 106 ++ src/api/shop/express/model/index.ts | 31 + src/api/shop/shopBrand/index.ts | 14 +- src/api/shop/shopCart/index.ts | 14 +- src/api/shop/shopCashier/index.ts | 14 +- src/api/shop/shopCount/index.ts | 14 +- src/api/system/file/index.ts | 16 + src/api/system/user/model/index.ts | 1 + .../SelectExpress/components/select-data.vue | 140 +++ src/components/SelectExpress/index.vue | 59 ++ src/layout/components/header-tools.vue | 48 +- src/utils/common.ts | 32 +- src/utils/domain.ts | 2 +- src/utils/merchant.ts | 9 + src/utils/request.ts | 5 + src/views/baocan/agent/components/edit.vue | 170 ++++ src/views/baocan/agent/components/search.vue | 123 +++ src/views/baocan/agent/index.vue | 244 +++++ .../baocan/cookbook/components/photo-edit.vue | 256 +++++ src/views/baocan/cookbook/image.vue | 114 +++ src/views/baocan/cookbook/index.vue | 142 +++ src/views/baocan/cookbook/list.vue | 299 ++++++ src/views/baocan/cookbook/player/index.vue | 124 +++ .../baocan/department/components/org-edit.vue | 229 +++++ .../department/components/org-select.vue | 39 + .../department/components/org-type-select.vue | 39 + .../department/components/org-user-edit.vue | 295 ++++++ .../department/components/org-user-list.vue | 239 +++++ .../department/components/org-user-search.vue | 83 ++ .../department/components/role-select.vue | 71 ++ .../department/components/sex-select.vue | 45 + src/views/baocan/department/index.vue | 211 ++++ .../components/bc-equipment-edit.vue | 215 ++++ .../baocan/equipment/components/search.vue | 107 ++ src/views/baocan/equipment/index.vue | 225 +++++ .../baocan/export/components/order-info.vue | 391 ++++++++ src/views/baocan/export/components/search.vue | 184 ++++ src/views/baocan/export/index.vue | 266 +++++ .../baocan/food/components/order-info.vue | 391 ++++++++ src/views/baocan/food/components/search.vue | 313 ++++++ src/views/baocan/food/index.vue | 350 +++++++ .../goods/components/category-select.vue | 39 + .../baocan/goods/components/goods-edit.vue | 537 ++++++++++ .../baocan/goods/components/goods-search.vue | 65 ++ src/views/baocan/goods/components/search.vue | 131 +++ src/views/baocan/goods/index.vue | 344 +++++++ .../notice/components/bc-equipment-edit.vue | 215 ++++ src/views/baocan/notice/components/search.vue | 107 ++ src/views/baocan/notice/index.vue | 231 +++++ src/views/baocan/order/components/field.vue | 118 +++ .../baocan/order/components/markdown.vue | 139 +++ .../baocan/order/components/order-edit.vue | 289 ++++++ .../baocan/order/components/order-info.vue | 379 +++++++ src/views/baocan/order/components/search.vue | 161 +++ src/views/baocan/order/index.vue | 415 ++++++++ .../baocan/plan/components/order-info.vue | 376 +++++++ .../baocan/plan/components/plan-edit.vue | 343 +++++++ src/views/baocan/plan/components/search.vue | 131 +++ src/views/baocan/plan/index.vue | 287 ++++++ src/views/baocan/setting/index.vue | 228 +++++ src/views/baocan/setting/index2.vue | 189 ++++ .../baocan/temporary/components/edit.vue | 173 ++++ .../baocan/temporary/components/search.vue | 59 ++ src/views/baocan/temporary/index.vue | 285 ++++++ .../workplace/components/hot-search.vue | 72 ++ .../baocan/workplace/components/sale-card.vue | 248 +++++ .../workplace/components/statistics-card.vue | 246 +++++ .../workplace/components/visit-hour.vue | 101 ++ src/views/baocan/workplace/index.vue | 41 + src/views/cms/ad/components/ad-edit.vue | 5 +- src/views/cms/ad/index.vue | 2 + .../cms/article/components/articleEdit.vue | 4 +- src/views/cms/article/components/search.vue | 19 +- src/views/cms/article/index.vue | 541 +++++----- .../cms/cmsArticle/components/articleEdit.vue | 44 +- .../cms/cmsArticle/components/search.vue | 11 +- src/views/cms/cmsArticle/index.vue | 49 +- .../cmsNavigation/components/design-edit.vue | 5 +- .../components/navigation-edit.vue | 43 +- src/views/cms/cmsNavigation/index.vue | 51 +- src/views/cms/navigation/index.vue | 30 +- src/views/cms/photo/index.vue | 3 +- src/views/cms/photo/list.vue | 3 +- src/views/cms/website/components/search.vue | 35 +- src/views/cms/website/index.vue | 15 +- .../shopBrand/components/search.vue | 0 .../shopBrand/components/shopBrandEdit.vue | 4 +- src/views/{shop => mall}/shopBrand/index.vue | 4 +- .../shopCart/components/search.vue | 0 .../shopCart/components/shopCartEdit.vue | 4 +- src/views/{shop => mall}/shopCart/index.vue | 4 +- .../shopCashier/components/search.vue | 0 .../components/shopCashierEdit.vue | 4 +- .../{shop => mall}/shopCashier/index.vue | 4 +- .../shopCount/components/search.vue | 0 .../shopCount/components/shopCountEdit.vue | 4 +- src/views/{shop => mall}/shopCount/index.vue | 4 +- .../shopDealerApply/components/search.vue | 0 .../components/shopDealerApplyEdit.vue | 4 +- .../{shop => mall}/shopDealerApply/index.vue | 4 +- .../shopDealerCapital/components/search.vue | 0 .../components/shopDealerCapitalEdit.vue | 4 +- .../shopDealerCapital/index.vue | 4 +- .../shopDealerOrder/components/search.vue | 0 .../components/shopDealerOrderEdit.vue | 4 +- .../{shop => mall}/shopDealerOrder/index.vue | 4 +- .../shopDealerReferee/components/search.vue | 0 .../components/shopDealerRefereeEdit.vue | 4 +- .../shopDealerReferee/index.vue | 4 +- .../shopDealerSetting/components/search.vue | 0 .../components/shopDealerSettingEdit.vue | 4 +- .../shopDealerSetting/index.vue | 4 +- .../shopDealerUser/components/search.vue | 0 .../components/shopDealerUserEdit.vue | 4 +- .../{shop => mall}/shopDealerUser/index.vue | 4 +- .../shopDealerWithdraw/components/search.vue | 0 .../components/shopDealerWithdrawEdit.vue | 4 +- .../shopDealerWithdraw/index.vue | 4 +- .../shopGoods/components/search.vue | 0 .../shopGoods/components/shopGoodsEdit.vue | 4 +- src/views/{shop => mall}/shopGoods/index.vue | 78 +- .../shopGoodsCategory/components/search.vue | 0 .../components/shopGoodsCategoryEdit.vue | 4 +- .../shopGoodsCategory/index.vue | 4 +- .../shopGoodsComment/components/search.vue | 0 .../components/shopGoodsCommentEdit.vue | 4 +- .../{shop => mall}/shopGoodsComment/index.vue | 4 +- .../shopGoodsCoupon/components/search.vue | 0 .../components/shopGoodsCouponEdit.vue | 4 +- .../{shop => mall}/shopGoodsCoupon/index.vue | 4 +- .../shopGoodsLog/components/search.vue | 0 .../components/shopGoodsLogEdit.vue | 4 +- .../{shop => mall}/shopGoodsLog/index.vue | 4 +- .../shopGoodsRelation/components/search.vue | 0 .../components/shopGoodsRelationEdit.vue | 4 +- .../shopGoodsRelation/index.vue | 4 +- .../shopGoodsSku/components/search.vue | 0 .../components/shopGoodsSkuEdit.vue | 4 +- .../{shop => mall}/shopGoodsSku/index.vue | 4 +- .../shopGoodsSpec/components/search.vue | 0 .../components/shopGoodsSpecEdit.vue | 4 +- .../{shop => mall}/shopGoodsSpec/index.vue | 4 +- .../shopMerchant/components/search.vue | 0 .../components/shopMerchantEdit.vue | 12 +- .../{shop => mall}/shopMerchant/index.vue | 10 +- .../shopMerchantAccount/components/search.vue | 0 .../components/shopMerchantAccountEdit.vue | 4 +- .../shopMerchantAccount/index.vue | 4 +- .../shopMerchantApply/components/search.vue | 0 .../components/shopMerchantApplyEdit.vue | 4 +- .../shopMerchantApply/index.vue | 59 +- .../shopMerchantCount/components/search.vue | 0 .../components/shopMerchantCountEdit.vue | 4 +- .../shopMerchantCount/index.vue | 4 +- .../shopMerchantType/components/search.vue | 0 .../components/shopMerchantTypeEdit.vue | 4 +- .../{shop => mall}/shopMerchantType/index.vue | 4 +- .../shopOrder/components/search.vue | 0 .../shopOrder/components/shopOrderEdit.vue | 4 +- src/views/{shop => mall}/shopOrder/index.vue | 4 +- .../shopOrderCartInfo/components/search.vue | 0 .../components/shopOrderCartInfoEdit.vue | 4 +- .../shopOrderCartInfo/index.vue | 4 +- .../shopOrderGoods/components/search.vue | 0 .../components/shopOrderGoodsEdit.vue | 4 +- .../{shop => mall}/shopOrderGoods/index.vue | 4 +- .../shopOrderInfo/components/search.vue | 0 .../components/shopOrderInfoEdit.vue | 4 +- .../{shop => mall}/shopOrderInfo/index.vue | 4 +- .../shopOrderInfoLog/components/search.vue | 0 .../components/shopOrderInfoLogEdit.vue | 4 +- .../{shop => mall}/shopOrderInfoLog/index.vue | 4 +- .../shopSpec/components/search.vue | 0 .../shopSpec/components/shopSpecEdit.vue | 4 +- src/views/{shop => mall}/shopSpec/index.vue | 4 +- .../shopSpecValue/components/search.vue | 0 .../components/shopSpecValueEdit.vue | 4 +- .../{shop => mall}/shopSpecValue/index.vue | 4 +- .../shopUserAddress/components/search.vue | 0 .../components/shopUserAddressEdit.vue | 4 +- .../{shop => mall}/shopUserAddress/index.vue | 4 +- .../shopUserCollection/components/search.vue | 0 .../components/shopUserCollectionEdit.vue | 4 +- .../shopUserCollection/index.vue | 4 +- .../shopWechatDeposit/components/search.vue | 0 .../components/shopWechatDepositEdit.vue | 4 +- .../shopWechatDeposit/index.vue | 4 +- .../category/components/category-edit.vue | 302 ++++++ .../components/merchant-category-edit.vue | 294 ++++++ .../product/category/components/search.vue | 186 ++++ src/views/product/category/index.vue | 424 ++++++++ src/views/product/category/preview/index.vue | 124 +++ .../product/goods/components/goodsEdit.vue | 924 ++++++++++++++++++ src/views/product/goods/components/search.vue | 155 +++ src/views/product/goods/index.vue | 410 ++++++++ src/views/shop/goods/components/goodsEdit.vue | 3 +- src/views/shop/goods/index.vue | 13 +- .../components/category-edit.vue | 5 +- .../components/merchant-category-edit.vue | 5 +- .../components/merchantAccountEdit.vue | 27 +- src/views/shop/merchantAccount/index.vue | 15 +- src/views/shop/order/components/delivery.vue | 173 ++++ src/views/shop/order/index.vue | 43 +- src/views/shop/spec/components/specEdit.vue | 2 + .../system/express/components/expressEdit.vue | 188 ++++ .../system/express/components/search.vue | 42 + src/views/system/express/index.vue | 230 +++++ src/views/user/profile/index.vue | 106 +- 299 files changed, 17512 insertions(+), 987 deletions(-) create mode 100644 src/api/apps/bc/agent/index.ts create mode 100644 src/api/apps/bc/agent/model/index.ts create mode 100644 src/api/apps/bc/equipment/index.ts create mode 100644 src/api/apps/bc/equipment/model/index.ts create mode 100644 src/api/apps/bc/export/index.ts create mode 100644 src/api/apps/bc/export/model/index.ts create mode 100644 src/api/apps/bc/food/index.ts create mode 100644 src/api/apps/bc/food/model/index.ts create mode 100644 src/api/apps/bc/plan/index.ts create mode 100644 src/api/apps/bc/plan/model/index.ts create mode 100644 src/api/apps/bc/temporary/index.ts create mode 100644 src/api/apps/bc/temporary/model/index.ts create mode 100644 src/api/mall/shopBrand/index.ts create mode 100644 src/api/mall/shopBrand/model/index.ts create mode 100644 src/api/mall/shopCart/index.ts create mode 100644 src/api/mall/shopCart/model/index.ts create mode 100644 src/api/mall/shopCashier/index.ts create mode 100644 src/api/mall/shopCashier/model/index.ts create mode 100644 src/api/mall/shopCount/index.ts create mode 100644 src/api/mall/shopCount/model/index.ts rename src/api/{shop => mall}/shopDealerApply/index.ts (86%) rename src/api/{shop => mall}/shopDealerApply/model/index.ts (100%) rename src/api/{shop => mall}/shopDealerCapital/index.ts (86%) rename src/api/{shop => mall}/shopDealerCapital/model/index.ts (100%) rename src/api/{shop => mall}/shopDealerOrder/index.ts (86%) rename src/api/{shop => mall}/shopDealerOrder/model/index.ts (100%) rename src/api/{shop => mall}/shopDealerReferee/index.ts (86%) rename src/api/{shop => mall}/shopDealerReferee/model/index.ts (100%) rename src/api/{shop => mall}/shopDealerSetting/index.ts (86%) rename src/api/{shop => mall}/shopDealerSetting/model/index.ts (100%) rename src/api/{shop => mall}/shopDealerUser/index.ts (87%) rename src/api/{shop => mall}/shopDealerUser/model/index.ts (100%) rename src/api/{shop => mall}/shopDealerWithdraw/index.ts (86%) rename src/api/{shop => mall}/shopDealerWithdraw/model/index.ts (100%) rename src/api/{shop => mall}/shopGoods/index.ts (87%) rename src/api/{shop => mall}/shopGoods/model/index.ts (100%) rename src/api/{shop => mall}/shopGoodsCategory/index.ts (86%) rename src/api/{shop => mall}/shopGoodsCategory/model/index.ts (100%) rename src/api/{shop => mall}/shopGoodsComment/index.ts (86%) rename src/api/{shop => mall}/shopGoodsComment/model/index.ts (100%) rename src/api/{shop => mall}/shopGoodsCoupon/index.ts (86%) rename src/api/{shop => mall}/shopGoodsCoupon/model/index.ts (100%) rename src/api/{shop => mall}/shopGoodsLog/index.ts (87%) rename src/api/{shop => mall}/shopGoodsLog/model/index.ts (100%) rename src/api/{shop => mall}/shopGoodsRelation/index.ts (86%) rename src/api/{shop => mall}/shopGoodsRelation/model/index.ts (100%) rename src/api/{shop => mall}/shopGoodsSku/index.ts (87%) rename src/api/{shop => mall}/shopGoodsSku/model/index.ts (100%) rename src/api/{shop => mall}/shopGoodsSpec/index.ts (86%) rename src/api/{shop => mall}/shopGoodsSpec/model/index.ts (100%) rename src/api/{shop => mall}/shopMerchant/index.ts (86%) rename src/api/{shop => mall}/shopMerchant/model/index.ts (97%) rename src/api/{shop => mall}/shopMerchantAccount/index.ts (85%) rename src/api/{shop => mall}/shopMerchantAccount/model/index.ts (100%) rename src/api/{shop => mall}/shopMerchantApply/index.ts (86%) rename src/api/{shop => mall}/shopMerchantApply/model/index.ts (100%) rename src/api/{shop => mall}/shopMerchantCount/index.ts (86%) rename src/api/{shop => mall}/shopMerchantCount/model/index.ts (100%) rename src/api/{shop => mall}/shopMerchantType/index.ts (86%) rename src/api/{shop => mall}/shopMerchantType/model/index.ts (100%) rename src/api/{shop => mall}/shopOrder/index.ts (87%) rename src/api/{shop => mall}/shopOrder/model/index.ts (100%) rename src/api/{shop => mall}/shopOrderCartInfo/index.ts (86%) rename src/api/{shop => mall}/shopOrderCartInfo/model/index.ts (100%) rename src/api/{shop => mall}/shopOrderGoods/index.ts (86%) rename src/api/{shop => mall}/shopOrderGoods/model/index.ts (100%) rename src/api/{shop => mall}/shopOrderInfo/index.ts (86%) rename src/api/{shop => mall}/shopOrderInfo/model/index.ts (100%) rename src/api/{shop => mall}/shopOrderInfoLog/index.ts (86%) rename src/api/{shop => mall}/shopOrderInfoLog/model/index.ts (100%) rename src/api/{shop => mall}/shopSpec/index.ts (87%) rename src/api/{shop => mall}/shopSpec/model/index.ts (100%) rename src/api/{shop => mall}/shopSpecValue/index.ts (86%) rename src/api/{shop => mall}/shopSpecValue/model/index.ts (100%) rename src/api/{shop => mall}/shopUserAddress/index.ts (86%) rename src/api/{shop => mall}/shopUserAddress/model/index.ts (100%) rename src/api/{shop => mall}/shopUserCollection/index.ts (86%) rename src/api/{shop => mall}/shopUserCollection/model/index.ts (100%) rename src/api/{shop => mall}/shopWechatDeposit/index.ts (85%) rename src/api/{shop => mall}/shopWechatDeposit/model/index.ts (100%) create mode 100644 src/api/shop/express/index.ts create mode 100644 src/api/shop/express/model/index.ts create mode 100644 src/components/SelectExpress/components/select-data.vue create mode 100644 src/components/SelectExpress/index.vue create mode 100644 src/views/baocan/agent/components/edit.vue create mode 100644 src/views/baocan/agent/components/search.vue create mode 100644 src/views/baocan/agent/index.vue create mode 100644 src/views/baocan/cookbook/components/photo-edit.vue create mode 100644 src/views/baocan/cookbook/image.vue create mode 100644 src/views/baocan/cookbook/index.vue create mode 100644 src/views/baocan/cookbook/list.vue create mode 100644 src/views/baocan/cookbook/player/index.vue create mode 100644 src/views/baocan/department/components/org-edit.vue create mode 100644 src/views/baocan/department/components/org-select.vue create mode 100644 src/views/baocan/department/components/org-type-select.vue create mode 100644 src/views/baocan/department/components/org-user-edit.vue create mode 100644 src/views/baocan/department/components/org-user-list.vue create mode 100644 src/views/baocan/department/components/org-user-search.vue create mode 100644 src/views/baocan/department/components/role-select.vue create mode 100644 src/views/baocan/department/components/sex-select.vue create mode 100644 src/views/baocan/department/index.vue create mode 100644 src/views/baocan/equipment/components/bc-equipment-edit.vue create mode 100644 src/views/baocan/equipment/components/search.vue create mode 100644 src/views/baocan/equipment/index.vue create mode 100644 src/views/baocan/export/components/order-info.vue create mode 100644 src/views/baocan/export/components/search.vue create mode 100644 src/views/baocan/export/index.vue create mode 100644 src/views/baocan/food/components/order-info.vue create mode 100644 src/views/baocan/food/components/search.vue create mode 100644 src/views/baocan/food/index.vue create mode 100644 src/views/baocan/goods/components/category-select.vue create mode 100644 src/views/baocan/goods/components/goods-edit.vue create mode 100644 src/views/baocan/goods/components/goods-search.vue create mode 100644 src/views/baocan/goods/components/search.vue create mode 100644 src/views/baocan/goods/index.vue create mode 100644 src/views/baocan/notice/components/bc-equipment-edit.vue create mode 100644 src/views/baocan/notice/components/search.vue create mode 100644 src/views/baocan/notice/index.vue create mode 100644 src/views/baocan/order/components/field.vue create mode 100644 src/views/baocan/order/components/markdown.vue create mode 100644 src/views/baocan/order/components/order-edit.vue create mode 100644 src/views/baocan/order/components/order-info.vue create mode 100644 src/views/baocan/order/components/search.vue create mode 100644 src/views/baocan/order/index.vue create mode 100644 src/views/baocan/plan/components/order-info.vue create mode 100644 src/views/baocan/plan/components/plan-edit.vue create mode 100644 src/views/baocan/plan/components/search.vue create mode 100644 src/views/baocan/plan/index.vue create mode 100644 src/views/baocan/setting/index.vue create mode 100644 src/views/baocan/setting/index2.vue create mode 100644 src/views/baocan/temporary/components/edit.vue create mode 100644 src/views/baocan/temporary/components/search.vue create mode 100644 src/views/baocan/temporary/index.vue create mode 100644 src/views/baocan/workplace/components/hot-search.vue create mode 100644 src/views/baocan/workplace/components/sale-card.vue create mode 100644 src/views/baocan/workplace/components/statistics-card.vue create mode 100644 src/views/baocan/workplace/components/visit-hour.vue create mode 100644 src/views/baocan/workplace/index.vue rename src/views/{shop => mall}/shopBrand/components/search.vue (100%) rename src/views/{shop => mall}/shopBrand/components/shopBrandEdit.vue (97%) rename src/views/{shop => mall}/shopBrand/index.vue (98%) rename src/views/{shop => mall}/shopCart/components/search.vue (100%) rename src/views/{shop => mall}/shopCart/components/shopCartEdit.vue (98%) rename src/views/{shop => mall}/shopCart/index.vue (98%) rename src/views/{shop => mall}/shopCashier/components/search.vue (100%) rename src/views/{shop => mall}/shopCashier/components/shopCashierEdit.vue (98%) rename src/views/{shop => mall}/shopCashier/index.vue (98%) rename src/views/{shop => mall}/shopCount/components/search.vue (100%) rename src/views/{shop => mall}/shopCount/components/shopCountEdit.vue (98%) rename src/views/{shop => mall}/shopCount/index.vue (98%) rename src/views/{shop => mall}/shopDealerApply/components/search.vue (100%) rename src/views/{shop => mall}/shopDealerApply/components/shopDealerApplyEdit.vue (98%) rename src/views/{shop => mall}/shopDealerApply/index.vue (98%) rename src/views/{shop => mall}/shopDealerCapital/components/search.vue (100%) rename src/views/{shop => mall}/shopDealerCapital/components/shopDealerCapitalEdit.vue (98%) rename src/views/{shop => mall}/shopDealerCapital/index.vue (98%) rename src/views/{shop => mall}/shopDealerOrder/components/search.vue (100%) rename src/views/{shop => mall}/shopDealerOrder/components/shopDealerOrderEdit.vue (98%) rename src/views/{shop => mall}/shopDealerOrder/index.vue (98%) rename src/views/{shop => mall}/shopDealerReferee/components/search.vue (100%) rename src/views/{shop => mall}/shopDealerReferee/components/shopDealerRefereeEdit.vue (98%) rename src/views/{shop => mall}/shopDealerReferee/index.vue (98%) rename src/views/{shop => mall}/shopDealerSetting/components/search.vue (100%) rename src/views/{shop => mall}/shopDealerSetting/components/shopDealerSettingEdit.vue (98%) rename src/views/{shop => mall}/shopDealerSetting/index.vue (98%) rename src/views/{shop => mall}/shopDealerUser/components/search.vue (100%) rename src/views/{shop => mall}/shopDealerUser/components/shopDealerUserEdit.vue (98%) rename src/views/{shop => mall}/shopDealerUser/index.vue (98%) rename src/views/{shop => mall}/shopDealerWithdraw/components/search.vue (100%) rename src/views/{shop => mall}/shopDealerWithdraw/components/shopDealerWithdrawEdit.vue (98%) rename src/views/{shop => mall}/shopDealerWithdraw/index.vue (98%) rename src/views/{shop => mall}/shopGoods/components/search.vue (100%) rename src/views/{shop => mall}/shopGoods/components/shopGoodsEdit.vue (98%) rename src/views/{shop => mall}/shopGoods/index.vue (89%) rename src/views/{shop => mall}/shopGoodsCategory/components/search.vue (100%) rename src/views/{shop => mall}/shopGoodsCategory/components/shopGoodsCategoryEdit.vue (98%) rename src/views/{shop => mall}/shopGoodsCategory/index.vue (98%) rename src/views/{shop => mall}/shopGoodsComment/components/search.vue (100%) rename src/views/{shop => mall}/shopGoodsComment/components/shopGoodsCommentEdit.vue (98%) rename src/views/{shop => mall}/shopGoodsComment/index.vue (98%) rename src/views/{shop => mall}/shopGoodsCoupon/components/search.vue (100%) rename src/views/{shop => mall}/shopGoodsCoupon/components/shopGoodsCouponEdit.vue (98%) rename src/views/{shop => mall}/shopGoodsCoupon/index.vue (98%) rename src/views/{shop => mall}/shopGoodsLog/components/search.vue (100%) rename src/views/{shop => mall}/shopGoodsLog/components/shopGoodsLogEdit.vue (98%) rename src/views/{shop => mall}/shopGoodsLog/index.vue (98%) rename src/views/{shop => mall}/shopGoodsRelation/components/search.vue (100%) rename src/views/{shop => mall}/shopGoodsRelation/components/shopGoodsRelationEdit.vue (98%) rename src/views/{shop => mall}/shopGoodsRelation/index.vue (98%) rename src/views/{shop => mall}/shopGoodsSku/components/search.vue (100%) rename src/views/{shop => mall}/shopGoodsSku/components/shopGoodsSkuEdit.vue (98%) rename src/views/{shop => mall}/shopGoodsSku/index.vue (98%) rename src/views/{shop => mall}/shopGoodsSpec/components/search.vue (100%) rename src/views/{shop => mall}/shopGoodsSpec/components/shopGoodsSpecEdit.vue (97%) rename src/views/{shop => mall}/shopGoodsSpec/index.vue (98%) rename src/views/{shop => mall}/shopMerchant/components/search.vue (100%) rename src/views/{shop => mall}/shopMerchant/components/shopMerchantEdit.vue (96%) rename src/views/{shop => mall}/shopMerchant/index.vue (97%) rename src/views/{shop => mall}/shopMerchantAccount/components/search.vue (100%) rename src/views/{shop => mall}/shopMerchantAccount/components/shopMerchantAccountEdit.vue (98%) rename src/views/{shop => mall}/shopMerchantAccount/index.vue (98%) rename src/views/{shop => mall}/shopMerchantApply/components/search.vue (100%) rename src/views/{shop => mall}/shopMerchantApply/components/shopMerchantApplyEdit.vue (98%) rename src/views/{shop => mall}/shopMerchantApply/index.vue (88%) rename src/views/{shop => mall}/shopMerchantCount/components/search.vue (100%) rename src/views/{shop => mall}/shopMerchantCount/components/shopMerchantCountEdit.vue (98%) rename src/views/{shop => mall}/shopMerchantCount/index.vue (98%) rename src/views/{shop => mall}/shopMerchantType/components/search.vue (100%) rename src/views/{shop => mall}/shopMerchantType/components/shopMerchantTypeEdit.vue (98%) rename src/views/{shop => mall}/shopMerchantType/index.vue (98%) rename src/views/{shop => mall}/shopOrder/components/search.vue (100%) rename src/views/{shop => mall}/shopOrder/components/shopOrderEdit.vue (99%) rename src/views/{shop => mall}/shopOrder/index.vue (99%) rename src/views/{shop => mall}/shopOrderCartInfo/components/search.vue (100%) rename src/views/{shop => mall}/shopOrderCartInfo/components/shopOrderCartInfoEdit.vue (98%) rename src/views/{shop => mall}/shopOrderCartInfo/index.vue (98%) rename src/views/{shop => mall}/shopOrderGoods/components/search.vue (100%) rename src/views/{shop => mall}/shopOrderGoods/components/shopOrderGoodsEdit.vue (99%) rename src/views/{shop => mall}/shopOrderGoods/index.vue (99%) rename src/views/{shop => mall}/shopOrderInfo/components/search.vue (100%) rename src/views/{shop => mall}/shopOrderInfo/components/shopOrderInfoEdit.vue (98%) rename src/views/{shop => mall}/shopOrderInfo/index.vue (99%) rename src/views/{shop => mall}/shopOrderInfoLog/components/search.vue (100%) rename src/views/{shop => mall}/shopOrderInfoLog/components/shopOrderInfoLogEdit.vue (98%) rename src/views/{shop => mall}/shopOrderInfoLog/index.vue (98%) rename src/views/{shop => mall}/shopSpec/components/search.vue (100%) rename src/views/{shop => mall}/shopSpec/components/shopSpecEdit.vue (97%) rename src/views/{shop => mall}/shopSpec/index.vue (98%) rename src/views/{shop => mall}/shopSpecValue/components/search.vue (100%) rename src/views/{shop => mall}/shopSpecValue/components/shopSpecValueEdit.vue (97%) rename src/views/{shop => mall}/shopSpecValue/index.vue (98%) rename src/views/{shop => mall}/shopUserAddress/components/search.vue (100%) rename src/views/{shop => mall}/shopUserAddress/components/shopUserAddressEdit.vue (98%) rename src/views/{shop => mall}/shopUserAddress/index.vue (98%) rename src/views/{shop => mall}/shopUserCollection/components/search.vue (100%) rename src/views/{shop => mall}/shopUserCollection/components/shopUserCollectionEdit.vue (97%) rename src/views/{shop => mall}/shopUserCollection/index.vue (98%) rename src/views/{shop => mall}/shopWechatDeposit/components/search.vue (100%) rename src/views/{shop => mall}/shopWechatDeposit/components/shopWechatDepositEdit.vue (98%) rename src/views/{shop => mall}/shopWechatDeposit/index.vue (98%) create mode 100644 src/views/product/category/components/category-edit.vue create mode 100644 src/views/product/category/components/merchant-category-edit.vue create mode 100644 src/views/product/category/components/search.vue create mode 100644 src/views/product/category/index.vue create mode 100644 src/views/product/category/preview/index.vue create mode 100644 src/views/product/goods/components/goodsEdit.vue create mode 100644 src/views/product/goods/components/search.vue create mode 100644 src/views/product/goods/index.vue create mode 100644 src/views/shop/order/components/delivery.vue create mode 100644 src/views/system/express/components/expressEdit.vue create mode 100644 src/views/system/express/components/search.vue create mode 100644 src/views/system/express/index.vue diff --git a/.env.development b/.env.development index aa39b41..9c0c795 100644 --- a/.env.development +++ b/.env.development @@ -1,11 +1,11 @@ VITE_APP_NAME=后台管理系统 VITE_SOCKET_URL=wss://server.gxwebsoft.com -VITE_SERVER_URL=https://server.gxwebsoft.com/api +#VITE_SERVER_URL=https://server.gxwebsoft.com/api VITE_THINK_URL=https://gxtyzx-api.websoft.top/api -#VITE_API_URL=https://modules.gxwebsoft.com/api +VITE_API_URL=https://modules.gxwebsoft.com/api -#VITE_SERVER_URL=http://127.0.0.1:9090/api -VITE_API_URL=http://127.0.0.1:9001/api +VITE_SERVER_URL=http://127.0.0.1:9090/api +#VITE_API_URL=http://127.0.0.1:9001/api #VITE_THINK_URL=http://127.0.0.1:9099/api #/booking/bookingItem diff --git a/src/api/apps/bc/agent/index.ts b/src/api/apps/bc/agent/index.ts new file mode 100644 index 0000000..4b436f2 --- /dev/null +++ b/src/api/apps/bc/agent/index.ts @@ -0,0 +1,91 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { BCAgent, BCAgentParam } from '@/api/apps/bc/agent/model'; +/** + * 分页查询设备 + */ +export async function pageBCAgent(params: BCAgentParam) { + const res = await request.get>>( + '/apps/bc-agent/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询设备列表 + */ +export async function listBCAgent(params?: BCAgentParam) { + const res = await request.get>('/apps/bc-agent', { + params + }); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加设备 + */ +export async function addBCAgent(data: BCAgent) { + const res = await request.post>('/apps/bc-agent', data); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改设备 + */ +export async function updateBCAgent(data: BCAgent) { + const res = await request.put>('/apps/bc-agent', data); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 绑定设备 + */ +export async function bindBCAgent(data: BCAgent) { + const res = await request.put>( + '/apps/bc-agent/bind', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除设备 + */ +export async function removeBCAgent(id?: number) { + const res = await request.delete>('/apps/bc-agent/' + id); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除设备 + */ +export async function removeBatchBCAgent(data: (number | undefined)[]) { + const res = await request.delete>('/apps/bc-agent/batch', { + data + }); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/apps/bc/agent/model/index.ts b/src/api/apps/bc/agent/model/index.ts new file mode 100644 index 0000000..81db111 --- /dev/null +++ b/src/api/apps/bc/agent/model/index.ts @@ -0,0 +1,23 @@ +import type { PageParam } from '@/api'; + +/** + * 代理报餐 + */ +export interface BCAgent { + agentId?: number; + userId?: number; + parentId?: number; + sortNumber?: number; + status?: number; + comments?: string; + createTime?: string; + tenantId?: number; +} + +/** + * 订单搜索条件 + */ +export interface BCAgentParam extends PageParam { + status?: number; + userId?: number; +} diff --git a/src/api/apps/bc/equipment/index.ts b/src/api/apps/bc/equipment/index.ts new file mode 100644 index 0000000..0be3276 --- /dev/null +++ b/src/api/apps/bc/equipment/index.ts @@ -0,0 +1,142 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { BcEquipment, BcEquipmentParam } from './model'; +/** + * 分页查询设备 + */ +export async function pageBcEquipment(params: BcEquipmentParam) { + const res = await request.get>>( + '/apps/bc-equipment/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询设备列表 + */ +export async function listBcEquipment(params?: BcEquipmentParam) { + const res = await request.get>( + '/apps/bc-equipment', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加设备 + */ +export async function addBcEquipment(data: BcEquipment) { + const merchantCode = localStorage.getItem('merchantCode'); + console.log(merchantCode); + if (merchantCode !== null && merchantCode != '') { + console.log(merchantCode); + data.merchantCode = String(merchantCode); + } + const res = await request.post>( + '/apps/bc-equipment', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改设备 + */ +export async function updateBcEquipment(data: BcEquipment) { + const res = await request.put>('/apps/bc-equipment', data); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 绑定设备 + */ +export async function bindBcEquipment(data: BcEquipment) { + const res = await request.put>( + '/apps/bc-equipment/bind', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除设备 + */ +export async function removeBcEquipment(id?: number) { + const res = await request.delete>( + '/apps/bc-equipment/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除设备 + */ +export async function removeBatchBcEquipment(data: (number | undefined)[]) { + const res = await request.delete>( + '/apps/bc-equipment/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 检查IP是否存在 + */ +export async function checkExistence( + field: string, + value: string, + id?: number +) { + const res = await request.get>( + '/apps/bc-equipment/existence', + { + params: { field, value, id } + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 发送企业微信消息推送 + */ +export async function addSend(data: BcEquipment) { + const res = await request.post>( + '/apps/bc-equipment/addSend', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/apps/bc/equipment/model/index.ts b/src/api/apps/bc/equipment/model/index.ts new file mode 100644 index 0000000..729d617 --- /dev/null +++ b/src/api/apps/bc/equipment/model/index.ts @@ -0,0 +1,31 @@ +import type { PageParam } from '@/api'; + +/** + * 设备 + */ +export interface BcEquipment { + bcEquipmentId?: number; + equipmentName?: string; + equipmentCode?: string; + gear?: number; + describe?: string; + sortNumber?: number; + status?: number; + comments?: string; + createTime?: string; + tenantId?: number; + content?: string; + merchantCode?: string; +} + +/** + * 订单搜索条件 + */ +export interface BcEquipmentParam extends PageParam { + bcEquipmentId?: number; + equipmentName?: string; + equipmentCode?: string; + status?: number; + merchantCode?: string; + userId?: number; +} diff --git a/src/api/apps/bc/export/index.ts b/src/api/apps/bc/export/index.ts new file mode 100644 index 0000000..e26fb69 --- /dev/null +++ b/src/api/apps/bc/export/index.ts @@ -0,0 +1,95 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { BcExport, BcExportParam } from '@/api/apps/bc/export/model'; + +/** + * 分页查询计划 + */ +export async function pageBcExport(params: BcExportParam) { + const res = await request.get>>( + '/apps/bc-export/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询计划列表 + */ +export async function listBcExport(params?: BcExportParam) { + const res = await request.get>('/apps/bc-export', { + params + }); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加计划 + */ +export async function addBcExport(data: BcExport) { + const res = await request.post>('/apps/bc-export', data); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改计划 + */ +export async function updateBcExport(data: BcExport) { + const res = await request.put>('/apps/bc-export', data); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 绑定计划 + */ +export async function bindBcExport(data: BcExport) { + const res = await request.put>( + '/apps/bc-export/bind', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除计划 + */ +export async function removeBcExport(id?: number) { + const res = await request.delete>('/apps/bc-export/' + id); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除计划 + */ +export async function removeBatchBcExport(data: (number | undefined)[]) { + const res = await request.delete>( + '/apps/bc-export/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/apps/bc/export/model/index.ts b/src/api/apps/bc/export/model/index.ts new file mode 100644 index 0000000..2f25945 --- /dev/null +++ b/src/api/apps/bc/export/model/index.ts @@ -0,0 +1,41 @@ +import type { PageParam } from '@/api'; + +export interface BcExport { + exportId?: number; + organizationName?: string; + nickname?: string; + breakfastPost?: number; + breakfastSign?: number; + lunchPost?: number; + lunchSign?: number; + dinnerPost?: number; + dinnerSign?: number; + gear10?: number; + gear20?: number; + signGear10?: number; + signGear20?: number; + createTime?: string; + tenantId?: number; + expendMoney?: number; + userId?: number; + lunchPostText?: string; + lunchSignText?: string; +} + +/** + * 搜索条件 + */ +export interface BcExportParam extends PageParam { + exportId?: number; + organizationName?: string; + organizationId?: number; + dayTime?: string; + week?: number; + status?: number; + userId?: number; + deliveryTime?: string; + createTimeStart?: string; + createTimeEnd?: string; + deliveryTimeStart?: string; + deliveryTimeEnd?: string; +} diff --git a/src/api/apps/bc/food/index.ts b/src/api/apps/bc/food/index.ts new file mode 100644 index 0000000..d9343a0 --- /dev/null +++ b/src/api/apps/bc/food/index.ts @@ -0,0 +1,88 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { BCFood, BCFoodParam } from '@/api/apps/bc/food/model'; +/** + * 分页查询计划 + */ +export async function pageBCFood(params: BCFoodParam) { + const res = await request.get>>( + '/apps/bc-food/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询计划列表 + */ +export async function listBCFood(params?: BCFoodParam) { + const res = await request.get>('/apps/bc-food', { + params + }); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加计划 + */ +export async function addBCFood(data: BCFood) { + const res = await request.post>('/apps/bc-food', data); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改计划 + */ +export async function updateBCFood(data: BCFood) { + const res = await request.put>('/apps/bc-food', data); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 绑定计划 + */ +export async function bindBCFood(data: BCFood) { + const res = await request.put>('/apps/bc-food/bind', data); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除计划 + */ +export async function removeBCFood(id?: number) { + const res = await request.delete>('/apps/bc-food/' + id); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除计划 + */ +export async function removeBatchBCFood(data: (number | undefined)[]) { + const res = await request.delete>('/apps/bc-food/batch', { + data + }); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/apps/bc/food/model/index.ts b/src/api/apps/bc/food/model/index.ts new file mode 100644 index 0000000..85ae0ef --- /dev/null +++ b/src/api/apps/bc/food/model/index.ts @@ -0,0 +1,21 @@ +import type { PageParam } from '@/api'; + +export interface BCFood { + temporaryId?: number; + userId?: number; + parentId?: number; + sortNumber?: number; + status?: number; + comments?: string; + expirationTime?: string; + createTime?: string; + tenantId?: number; +} + +/** + * 搜索条件 + */ +export interface BCFoodParam extends PageParam { + status?: number; + userId?: number; +} diff --git a/src/api/apps/bc/plan/index.ts b/src/api/apps/bc/plan/index.ts new file mode 100644 index 0000000..43069ce --- /dev/null +++ b/src/api/apps/bc/plan/index.ts @@ -0,0 +1,88 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { BCPlan, BCPlanParam } from '@/api/apps/bc/plan/model'; +/** + * 分页查询计划 + */ +export async function pageBCPlan(params: BCPlanParam) { + const res = await request.get>>( + '/apps/bc-plan/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询计划列表 + */ +export async function listBCPlan(params?: BCPlanParam) { + const res = await request.get>('/apps/bc-plan', { + params + }); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加计划 + */ +export async function addBCPlan(data: BCPlan) { + const res = await request.post>('/apps/bc-plan', data); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改计划 + */ +export async function updateBCPlan(data: BCPlan) { + const res = await request.put>('/apps/bc-plan', data); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 绑定计划 + */ +export async function bindBCPlan(data: BCPlan) { + const res = await request.put>('/apps/bc-plan/bind', data); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除计划 + */ +export async function removeBCPlan(id?: number) { + const res = await request.delete>('/apps/bc-plan/' + id); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除计划 + */ +export async function removeBatchBCPlan(data: (number | undefined)[]) { + const res = await request.delete>('/apps/bc-plan/batch', { + data + }); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/apps/bc/plan/model/index.ts b/src/api/apps/bc/plan/model/index.ts new file mode 100644 index 0000000..0795676 --- /dev/null +++ b/src/api/apps/bc/plan/model/index.ts @@ -0,0 +1,28 @@ +import type { PageParam } from '@/api'; + +export interface BCPlan { + bcPlanId?: number; + dayTime?: any; + oldTime?: string; + type?: string; + userId?: number; + goodsIds?: any; + status?: number; + period?: string; + comments?: string; + createTime?: string; + tenantId?: number; + isRepeat?: number; +} + +/** + * 搜索条件 + */ +export interface BCPlanParam extends PageParam { + bcPlanId?: number; + dayTime?: string; + week?: number; + status?: number; + userId?: number; + oldTime?: string; +} diff --git a/src/api/apps/bc/temporary/index.ts b/src/api/apps/bc/temporary/index.ts new file mode 100644 index 0000000..272fc91 --- /dev/null +++ b/src/api/apps/bc/temporary/index.ts @@ -0,0 +1,105 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { + BCTemporary, + BCTemporaryParam +} from '@/api/apps/bc/temporary/model'; +/** + * 分页查询设备 + */ +export async function pageBCTemporary(params: BCTemporaryParam) { + const res = await request.get>>( + '/apps/bc-temporary/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询设备列表 + */ +export async function listBCTemporary(params?: BCTemporaryParam) { + const res = await request.get>( + '/apps/bc-temporary', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加设备 + */ +export async function addBCTemporary(data: BCTemporary) { + const res = await request.post>( + '/apps/bc-temporary', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改设备 + */ +export async function updateBCTemporary(data: BCTemporary) { + const res = await request.put>('/apps/bc-temporary', data); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 绑定设备 + */ +export async function bindBCTemporary(data: BCTemporary) { + const res = await request.put>( + '/apps/bc-temporary/bind', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除设备 + */ +export async function removeBCTemporary(id?: number) { + const res = await request.delete>( + '/apps/bc-temporary/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除设备 + */ +export async function removeBatchBCTemporary(data: (number | undefined)[]) { + const res = await request.delete>( + '/apps/bc-temporary/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/apps/bc/temporary/model/index.ts b/src/api/apps/bc/temporary/model/index.ts new file mode 100644 index 0000000..6cdc69b --- /dev/null +++ b/src/api/apps/bc/temporary/model/index.ts @@ -0,0 +1,25 @@ +import type { PageParam } from '@/api'; + +/** + * 代理报餐 + */ +export interface BCTemporary { + temporaryId?: number; + userId?: number; + parentId?: number; + sortNumber?: number; + applyStatus?: number; + status?: number; + comments?: string; + expirationTime?: string; + createTime?: string; + tenantId?: number; +} + +/** + * 订单搜索条件 + */ +export interface BCTemporaryParam extends PageParam { + status?: number; + userId?: number; +} diff --git a/src/api/cms/ad/model/index.ts b/src/api/cms/ad/model/index.ts index efee907..8e6e222 100644 --- a/src/api/cms/ad/model/index.ts +++ b/src/api/cms/ad/model/index.ts @@ -13,6 +13,7 @@ export interface Ad { path?: string; images?: string; userId?: number; + merchantId?: number; sortNumber?: number; comments?: string; status?: number; @@ -29,6 +30,7 @@ export interface AdParam extends PageParam { adId?: string; name?: number; type?: number; + merchantId?: number; adType?: string; userId?: number; } diff --git a/src/api/cms/cmsArticle/index.ts b/src/api/cms/cmsArticle/index.ts index 20aef13..8d0541b 100644 --- a/src/api/cms/cmsArticle/index.ts +++ b/src/api/cms/cmsArticle/index.ts @@ -1,7 +1,8 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { CmsArticle, CmsArticleParam } from './model'; -import { SERVER_API_URL } from '@/config/setting'; +import { MODULES_API_URL, SERVER_API_URL } from "@/config/setting"; +import type { ArticleParam } from "@/api/cms/article/model"; /** * 分页查询文章 @@ -104,3 +105,13 @@ export async function getCmsArticle(id: number) { } return Promise.reject(new Error(res.data.message)); } + +export async function getCount(params: ArticleParam) { + const res = await request.get(SERVER_API_URL + '/cms/cms-article/data', { + params + }); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/cms/cmsArticleCategory/index.ts b/src/api/cms/cmsArticleCategory/index.ts index 8e89b2a..7fae78d 100644 --- a/src/api/cms/cmsArticleCategory/index.ts +++ b/src/api/cms/cmsArticleCategory/index.ts @@ -1,14 +1,14 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { CmsArticleCategory, CmsArticleCategoryParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import { SERVER_API_URL } from '@/config/setting'; /** * 分页查询文章分类表 */ export async function pageCmsArticleCategory(params: CmsArticleCategoryParam) { const res = await request.get>>( - MODULES_API_URL + '/cms/cms-article-category/page', + SERVER_API_URL + '/cms/cms-article-category/page', { params } @@ -24,7 +24,7 @@ export async function pageCmsArticleCategory(params: CmsArticleCategoryParam) { */ export async function listCmsArticleCategory(params?: CmsArticleCategoryParam) { const res = await request.get>( - MODULES_API_URL + '/cms/cms-article-category', + SERVER_API_URL + '/cms/cms-article-category', { params } @@ -40,7 +40,7 @@ export async function listCmsArticleCategory(params?: CmsArticleCategoryParam) { */ export async function addCmsArticleCategory(data: CmsArticleCategory) { const res = await request.post>( - MODULES_API_URL + '/cms/cms-article-category', + SERVER_API_URL + '/cms/cms-article-category', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addCmsArticleCategory(data: CmsArticleCategory) { */ export async function updateCmsArticleCategory(data: CmsArticleCategory) { const res = await request.put>( - MODULES_API_URL + '/cms/cms-article-category', + SERVER_API_URL + '/cms/cms-article-category', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateCmsArticleCategory(data: CmsArticleCategory) { */ export async function removeCmsArticleCategory(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/cms/cms-article-category/' + id + SERVER_API_URL + '/cms/cms-article-category/' + id ); if (res.data.code === 0) { return res.data.message; @@ -79,9 +79,11 @@ export async function removeCmsArticleCategory(id?: number) { /** * 批量删除文章分类表 */ -export async function removeBatchCmsArticleCategory(data: (number | undefined)[]) { +export async function removeBatchCmsArticleCategory( + data: (number | undefined)[] +) { const res = await request.delete>( - MODULES_API_URL + '/cms/cms-article-category/batch', + SERVER_API_URL + '/cms/cms-article-category/batch', { data } @@ -97,7 +99,7 @@ export async function removeBatchCmsArticleCategory(data: (number | undefined)[] */ export async function getCmsArticleCategory(id: number) { const res = await request.get>( - MODULES_API_URL + '/cms/cms-article-category/' + id + SERVER_API_URL + '/cms/cms-article-category/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/cms/cmsArticleCategory/model/index.ts b/src/api/cms/cmsArticleCategory/model/index.ts index 2e9aa8f..7f8b2a8 100644 --- a/src/api/cms/cmsArticleCategory/model/index.ts +++ b/src/api/cms/cmsArticleCategory/model/index.ts @@ -46,6 +46,8 @@ export interface CmsArticleCategory { createTime?: string; // 修改时间 updateTime?: string; + value?: number; + label?: string; } /** diff --git a/src/api/cms/cmsDesign/model/index.ts b/src/api/cms/cmsDesign/model/index.ts index 1e09f95..48f10ce 100644 --- a/src/api/cms/cmsDesign/model/index.ts +++ b/src/api/cms/cmsDesign/model/index.ts @@ -4,46 +4,51 @@ import type { PageParam } from '@/api'; * 页面管理记录表 */ export interface CmsDesign { - // ID pageId?: number; - // 页面标题 name?: string; - // 所属栏目ID - categoryId?: number; - // 页面关键词 keywords?: string; - // 页面描述 description?: string; - // 缩列图 + path?: string; + component?: string; photo?: string; - // 购买链接 - buyUrl?: string; + content?: string; + // 类型 + type?: string; + categoryId?: number; + // 宽 + width?: string; + // 高 + height?: string; // 页面样式 style?: string; - // 页面内容 - content?: string; - // 是否开启布局 - showLayout?: number; - // 页面布局 - layout?: string; - // 上级id, 0是顶级 - parentId?: number; + // 附件 + images?: string; // 用户ID userId?: number; // 设为首页 home?: number; - // 排序(数字越小越靠前) + // 排序 sortNumber?: number; // 备注 comments?: string; - // 状态, 0正常, 1冻结 + // 状态 status?: number; - // 是否删除, 0否, 1是 - deleted?: number; - // 租户id - tenantId?: number; // 创建时间 createTime?: string; + // 更新时间 + updateTime?: string; + // 页面布局 + layout?: string; + backgroundColor?: string; + // 关联网站导航ID + navigationId?: number; + showLayout?: boolean; + btn?: any[]; + showBanner?: boolean; + buyUrl?: string; + demoUrl?: string; + account?: string; + docUrl?: string; } /** diff --git a/src/api/cms/cmsNavigation/index.ts b/src/api/cms/cmsNavigation/index.ts index aebbfb3..47ddf03 100644 --- a/src/api/cms/cmsNavigation/index.ts +++ b/src/api/cms/cmsNavigation/index.ts @@ -2,6 +2,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { CmsNavigation, CmsNavigationParam } from './model'; import { SERVER_API_URL } from '@/config/setting'; +import type { Navigation, NavigationParam } from '@/api/cms/navigation/model'; /** * 分页查询网站导航记录表 @@ -35,6 +36,21 @@ export async function listCmsNavigation(params?: CmsNavigationParam) { return Promise.reject(new Error(res.data.message)); } +/** + * 查询导航列表（树形结构） + */ +export async function treeNavigation(params?: NavigationParam) { + const res = await request.get>( + SERVER_API_URL + '/cms/cms-navigation/tree', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} /** * 添加网站导航记录表 */ diff --git a/src/api/cms/cmsNavigation/model/index.ts b/src/api/cms/cmsNavigation/model/index.ts index 061984c..829d9aa 100644 --- a/src/api/cms/cmsNavigation/model/index.ts +++ b/src/api/cms/cmsNavigation/model/index.ts @@ -18,6 +18,7 @@ export interface CmsNavigation { path?: string; // 菜单组件地址, 目录可为空 component?: string; + componentPath?: string; // 打开位置 target?: string; // 菜单图标 diff --git a/src/api/cms/cmsWebsite/index.ts b/src/api/cms/cmsWebsite/index.ts index 8d17c32..9c04f04 100644 --- a/src/api/cms/cmsWebsite/index.ts +++ b/src/api/cms/cmsWebsite/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { CmsWebsite, CmsWebsiteParam } from './model'; -import { MODULES_API_URL, SERVER_API_URL } from '@/config/setting'; +import { SERVER_API_URL } from '@/config/setting'; /** * 分页查询网站信息记录表 diff --git a/src/api/cms/cmsWebsite/model/index.ts b/src/api/cms/cmsWebsite/model/index.ts index 92e335c..a6499ec 100644 --- a/src/api/cms/cmsWebsite/model/index.ts +++ b/src/api/cms/cmsWebsite/model/index.ts @@ -93,5 +93,6 @@ export interface CmsWebsite { */ export interface CmsWebsiteParam extends PageParam { websiteId?: number; + status?: number; keywords?: string; } diff --git a/src/api/cms/navigation/index.ts b/src/api/cms/navigation/index.ts index e064e14..2bc2fda 100644 --- a/src/api/cms/navigation/index.ts +++ b/src/api/cms/navigation/index.ts @@ -35,6 +35,22 @@ export async function listNavigation(params?: NavigationParam) { return Promise.reject(new Error(res.data.message)); } +/** + * 查询导航列表（树形结构） + */ +export async function treeNavigation(params?: NavigationParam) { + const res = await request.get>( + MODULES_API_URL + '/cms/navigation/tree', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + /** * 添加导航 */ diff --git a/src/api/mall/shopBrand/index.ts b/src/api/mall/shopBrand/index.ts new file mode 100644 index 0000000..9aac2d8 --- /dev/null +++ b/src/api/mall/shopBrand/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { ShopBrand, ShopBrandParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询品牌 + */ +export async function pageShopBrand(params: ShopBrandParam) { + const res = await request.get>>( + MODULES_API_URL + '/mall/shop-brand/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询品牌列表 + */ +export async function listShopBrand(params?: ShopBrandParam) { + const res = await request.get>( + MODULES_API_URL + '/mall/shop-brand', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加品牌 + */ +export async function addShopBrand(data: ShopBrand) { + const res = await request.post>( + MODULES_API_URL + '/mall/shop-brand', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改品牌 + */ +export async function updateShopBrand(data: ShopBrand) { + const res = await request.put>( + MODULES_API_URL + '/mall/shop-brand', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除品牌 + */ +export async function removeShopBrand(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/mall/shop-brand/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除品牌 + */ +export async function removeBatchShopBrand(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/mall/shop-brand/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询品牌 + */ +export async function getShopBrand(id: number) { + const res = await request.get>( + MODULES_API_URL + '/mall/shop-brand/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/mall/shopBrand/model/index.ts b/src/api/mall/shopBrand/model/index.ts new file mode 100644 index 0000000..4286aa9 --- /dev/null +++ b/src/api/mall/shopBrand/model/index.ts @@ -0,0 +1,31 @@ +import type { PageParam } from '@/api'; + +/** + * 品牌 + */ +export interface ShopBrand { + // ID + brandId?: number; + // 品牌名称 + brandName?: string; + // 图标 + image?: string; + // 备注 + comments?: string; + // 状态 + status?: number; + // 排序号 + sortNumber?: number; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; +} + +/** + * 品牌搜索条件 + */ +export interface ShopBrandParam extends PageParam { + brandId?: number; + keywords?: string; +} diff --git a/src/api/mall/shopCart/index.ts b/src/api/mall/shopCart/index.ts new file mode 100644 index 0000000..c0156dd --- /dev/null +++ b/src/api/mall/shopCart/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { ShopCart, ShopCartParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询购物车 + */ +export async function pageShopCart(params: ShopCartParam) { + const res = await request.get>>( + MODULES_API_URL + '/mall/shop-cart/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询购物车列表 + */ +export async function listShopCart(params?: ShopCartParam) { + const res = await request.get>( + MODULES_API_URL + '/mall/shop-cart', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加购物车 + */ +export async function addShopCart(data: ShopCart) { + const res = await request.post>( + MODULES_API_URL + '/mall/shop-cart', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改购物车 + */ +export async function updateShopCart(data: ShopCart) { + const res = await request.put>( + MODULES_API_URL + '/mall/shop-cart', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除购物车 + */ +export async function removeShopCart(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/mall/shop-cart/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除购物车 + */ +export async function removeBatchShopCart(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/mall/shop-cart/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询购物车 + */ +export async function getShopCart(id: number) { + const res = await request.get>( + MODULES_API_URL + '/mall/shop-cart/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/mall/shopCart/model/index.ts b/src/api/mall/shopCart/model/index.ts new file mode 100644 index 0000000..b8487f4 --- /dev/null +++ b/src/api/mall/shopCart/model/index.ts @@ -0,0 +1,53 @@ +import type { PageParam } from '@/api'; + +/** + * 购物车 + */ +export interface ShopCart { + // 购物车表ID + id?: string; + // 类型 0商城 1外卖 + type?: number; + // 唯一标识 + code?: string; + // 商品ID + goodsId?: string; + // 商品规格 + spec?: string; + // 商品价格 + price?: string; + // 商品数量 + cartNum?: number; + // 单商品合计 + totalPrice?: string; + // 0 = 未购买 1 = 已购买 + isPay?: string; + // 是否为立即购买 + isNew?: string; + // 拼团id + combinationId?: number; + // 秒杀产品ID + seckillId?: number; + // 砍价id + bargainId?: number; + // 是否选中 + selected?: string; + // 商户ID + merchantId?: string; + // 用户ID + userId?: string; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + // 修改时间 + updateTime?: string; +} + +/** + * 购物车搜索条件 + */ +export interface ShopCartParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/mall/shopCashier/index.ts b/src/api/mall/shopCashier/index.ts new file mode 100644 index 0000000..d0b755d --- /dev/null +++ b/src/api/mall/shopCashier/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { ShopCashier, ShopCashierParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询收银 + */ +export async function pageShopCashier(params: ShopCashierParam) { + const res = await request.get>>( + MODULES_API_URL + '/mall/shop-cashier/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询收银列表 + */ +export async function listShopCashier(params?: ShopCashierParam) { + const res = await request.get>( + MODULES_API_URL + '/mall/shop-cashier', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加收银 + */ +export async function addShopCashier(data: ShopCashier) { + const res = await request.post>( + MODULES_API_URL + '/mall/shop-cashier', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改收银 + */ +export async function updateShopCashier(data: ShopCashier) { + const res = await request.put>( + MODULES_API_URL + '/mall/shop-cashier', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除收银 + */ +export async function removeShopCashier(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/mall/shop-cashier/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除收银 + */ +export async function removeBatchShopCashier(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/mall/shop-cashier/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询收银 + */ +export async function getShopCashier(id: number) { + const res = await request.get>( + MODULES_API_URL + '/mall/shop-cashier/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/mall/shopCashier/model/index.ts b/src/api/mall/shopCashier/model/index.ts new file mode 100644 index 0000000..dab68e4 --- /dev/null +++ b/src/api/mall/shopCashier/model/index.ts @@ -0,0 +1,55 @@ +import type { PageParam } from '@/api'; + +/** + * 收银 + */ +export interface ShopCashier { + // 收银单ID + id?: string; + // 类型 0商城 1外卖 + type?: number; + // 唯一标识 + code?: string; + // 商品ID + goodsId?: string; + // 商品名称 + name?: string; + // 商品规格 + spec?: string; + // 商品价格 + price?: string; + // 商品数量 + cartNum?: number; + // 单商品合计 + totalPrice?: string; + // 0 = 未购买 1 = 已购买 + isPay?: string; + // 是否为立即购买 + isNew?: string; + // 是否选中 + selected?: string; + // 商户ID + merchantId?: string; + // 备注 + comments?: string; + // 用户ID + userId?: string; + // 收银员ID + cashierId?: string; + // 分组取单 + groupId?: string; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + // 修改时间 + updateTime?: string; +} + +/** + * 收银搜索条件 + */ +export interface ShopCashierParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/mall/shopCount/index.ts b/src/api/mall/shopCount/index.ts new file mode 100644 index 0000000..398cc2d --- /dev/null +++ b/src/api/mall/shopCount/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { ShopCount, ShopCountParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询商城销售统计表 + */ +export async function pageShopCount(params: ShopCountParam) { + const res = await request.get>>( + MODULES_API_URL + '/mall/shop-count/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询商城销售统计表列表 + */ +export async function listShopCount(params?: ShopCountParam) { + const res = await request.get>( + MODULES_API_URL + '/mall/shop-count', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加商城销售统计表 + */ +export async function addShopCount(data: ShopCount) { + const res = await request.post>( + MODULES_API_URL + '/mall/shop-count', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改商城销售统计表 + */ +export async function updateShopCount(data: ShopCount) { + const res = await request.put>( + MODULES_API_URL + '/mall/shop-count', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除商城销售统计表 + */ +export async function removeShopCount(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/mall/shop-count/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除商城销售统计表 + */ +export async function removeBatchShopCount(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/mall/shop-count/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询商城销售统计表 + */ +export async function getShopCount(id: number) { + const res = await request.get>( + MODULES_API_URL + '/mall/shop-count/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/mall/shopCount/model/index.ts b/src/api/mall/shopCount/model/index.ts new file mode 100644 index 0000000..c3aca05 --- /dev/null +++ b/src/api/mall/shopCount/model/index.ts @@ -0,0 +1,39 @@ +import type { PageParam } from '@/api'; + +/** + * 商城销售统计表 + */ +export interface ShopCount { + // ID + id?: number; + // 统计日期 + dateTime?: string; + // 总销售额 + totalPrice?: string; + // 今日销售额 + todayPrice?: string; + // 总会员数 + totalUsers?: string; + // 今日新增 + todayUsers?: string; + // 总订单笔数 + totalOrders?: string; + // 今日订单笔数 + todayOrders?: string; + // 备注 + comments?: string; + // 状态, 0正常, 1冻结 + status?: number; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; +} + +/** + * 商城销售统计表搜索条件 + */ +export interface ShopCountParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/shop/shopDealerApply/index.ts b/src/api/mall/shopDealerApply/index.ts similarity index 86% rename from src/api/shop/shopDealerApply/index.ts rename to src/api/mall/shopDealerApply/index.ts index e89f49e..2332542 100644 --- a/src/api/shop/shopDealerApply/index.ts +++ b/src/api/mall/shopDealerApply/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopDealerApply(params: ShopDealerApplyParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-dealer-apply/page', + MODULES_API_URL + '/mall/shop-dealer-apply/page', { params } @@ -24,7 +24,7 @@ export async function pageShopDealerApply(params: ShopDealerApplyParam) { */ export async function listShopDealerApply(params?: ShopDealerApplyParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-dealer-apply', + MODULES_API_URL + '/mall/shop-dealer-apply', { params } @@ -40,7 +40,7 @@ export async function listShopDealerApply(params?: ShopDealerApplyParam) { */ export async function addShopDealerApply(data: ShopDealerApply) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-dealer-apply', + MODULES_API_URL + '/mall/shop-dealer-apply', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopDealerApply(data: ShopDealerApply) { */ export async function updateShopDealerApply(data: ShopDealerApply) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-dealer-apply', + MODULES_API_URL + '/mall/shop-dealer-apply', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopDealerApply(data: ShopDealerApply) { */ export async function removeShopDealerApply(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-dealer-apply/' + id + MODULES_API_URL + '/mall/shop-dealer-apply/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopDealerApply(id?: number) { */ export async function removeBatchShopDealerApply(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-dealer-apply/batch', + MODULES_API_URL + '/mall/shop-dealer-apply/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopDealerApply(data: (number | undefined)[]) { */ export async function getShopDealerApply(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-dealer-apply/' + id + MODULES_API_URL + '/mall/shop-dealer-apply/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopDealerApply/model/index.ts b/src/api/mall/shopDealerApply/model/index.ts similarity index 100% rename from src/api/shop/shopDealerApply/model/index.ts rename to src/api/mall/shopDealerApply/model/index.ts diff --git a/src/api/shop/shopDealerCapital/index.ts b/src/api/mall/shopDealerCapital/index.ts similarity index 86% rename from src/api/shop/shopDealerCapital/index.ts rename to src/api/mall/shopDealerCapital/index.ts index 780b628..6024f95 100644 --- a/src/api/shop/shopDealerCapital/index.ts +++ b/src/api/mall/shopDealerCapital/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopDealerCapital(params: ShopDealerCapitalParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-dealer-capital/page', + MODULES_API_URL + '/mall/shop-dealer-capital/page', { params } @@ -24,7 +24,7 @@ export async function pageShopDealerCapital(params: ShopDealerCapitalParam) { */ export async function listShopDealerCapital(params?: ShopDealerCapitalParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-dealer-capital', + MODULES_API_URL + '/mall/shop-dealer-capital', { params } @@ -40,7 +40,7 @@ export async function listShopDealerCapital(params?: ShopDealerCapitalParam) { */ export async function addShopDealerCapital(data: ShopDealerCapital) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-dealer-capital', + MODULES_API_URL + '/mall/shop-dealer-capital', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopDealerCapital(data: ShopDealerCapital) { */ export async function updateShopDealerCapital(data: ShopDealerCapital) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-dealer-capital', + MODULES_API_URL + '/mall/shop-dealer-capital', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopDealerCapital(data: ShopDealerCapital) { */ export async function removeShopDealerCapital(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-dealer-capital/' + id + MODULES_API_URL + '/mall/shop-dealer-capital/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopDealerCapital(id?: number) { */ export async function removeBatchShopDealerCapital(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-dealer-capital/batch', + MODULES_API_URL + '/mall/shop-dealer-capital/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopDealerCapital(data: (number | undefined)[]) */ export async function getShopDealerCapital(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-dealer-capital/' + id + MODULES_API_URL + '/mall/shop-dealer-capital/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopDealerCapital/model/index.ts b/src/api/mall/shopDealerCapital/model/index.ts similarity index 100% rename from src/api/shop/shopDealerCapital/model/index.ts rename to src/api/mall/shopDealerCapital/model/index.ts diff --git a/src/api/shop/shopDealerOrder/index.ts b/src/api/mall/shopDealerOrder/index.ts similarity index 86% rename from src/api/shop/shopDealerOrder/index.ts rename to src/api/mall/shopDealerOrder/index.ts index 535a32f..56b7916 100644 --- a/src/api/shop/shopDealerOrder/index.ts +++ b/src/api/mall/shopDealerOrder/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopDealerOrder(params: ShopDealerOrderParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-dealer-order/page', + MODULES_API_URL + '/mall/shop-dealer-order/page', { params } @@ -24,7 +24,7 @@ export async function pageShopDealerOrder(params: ShopDealerOrderParam) { */ export async function listShopDealerOrder(params?: ShopDealerOrderParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-dealer-order', + MODULES_API_URL + '/mall/shop-dealer-order', { params } @@ -40,7 +40,7 @@ export async function listShopDealerOrder(params?: ShopDealerOrderParam) { */ export async function addShopDealerOrder(data: ShopDealerOrder) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-dealer-order', + MODULES_API_URL + '/mall/shop-dealer-order', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopDealerOrder(data: ShopDealerOrder) { */ export async function updateShopDealerOrder(data: ShopDealerOrder) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-dealer-order', + MODULES_API_URL + '/mall/shop-dealer-order', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopDealerOrder(data: ShopDealerOrder) { */ export async function removeShopDealerOrder(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-dealer-order/' + id + MODULES_API_URL + '/mall/shop-dealer-order/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopDealerOrder(id?: number) { */ export async function removeBatchShopDealerOrder(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-dealer-order/batch', + MODULES_API_URL + '/mall/shop-dealer-order/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopDealerOrder(data: (number | undefined)[]) { */ export async function getShopDealerOrder(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-dealer-order/' + id + MODULES_API_URL + '/mall/shop-dealer-order/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopDealerOrder/model/index.ts b/src/api/mall/shopDealerOrder/model/index.ts similarity index 100% rename from src/api/shop/shopDealerOrder/model/index.ts rename to src/api/mall/shopDealerOrder/model/index.ts diff --git a/src/api/shop/shopDealerReferee/index.ts b/src/api/mall/shopDealerReferee/index.ts similarity index 86% rename from src/api/shop/shopDealerReferee/index.ts rename to src/api/mall/shopDealerReferee/index.ts index fdf5265..1c68f52 100644 --- a/src/api/shop/shopDealerReferee/index.ts +++ b/src/api/mall/shopDealerReferee/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopDealerReferee(params: ShopDealerRefereeParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-dealer-referee/page', + MODULES_API_URL + '/mall/shop-dealer-referee/page', { params } @@ -24,7 +24,7 @@ export async function pageShopDealerReferee(params: ShopDealerRefereeParam) { */ export async function listShopDealerReferee(params?: ShopDealerRefereeParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-dealer-referee', + MODULES_API_URL + '/mall/shop-dealer-referee', { params } @@ -40,7 +40,7 @@ export async function listShopDealerReferee(params?: ShopDealerRefereeParam) { */ export async function addShopDealerReferee(data: ShopDealerReferee) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-dealer-referee', + MODULES_API_URL + '/mall/shop-dealer-referee', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopDealerReferee(data: ShopDealerReferee) { */ export async function updateShopDealerReferee(data: ShopDealerReferee) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-dealer-referee', + MODULES_API_URL + '/mall/shop-dealer-referee', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopDealerReferee(data: ShopDealerReferee) { */ export async function removeShopDealerReferee(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-dealer-referee/' + id + MODULES_API_URL + '/mall/shop-dealer-referee/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopDealerReferee(id?: number) { */ export async function removeBatchShopDealerReferee(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-dealer-referee/batch', + MODULES_API_URL + '/mall/shop-dealer-referee/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopDealerReferee(data: (number | undefined)[]) */ export async function getShopDealerReferee(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-dealer-referee/' + id + MODULES_API_URL + '/mall/shop-dealer-referee/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopDealerReferee/model/index.ts b/src/api/mall/shopDealerReferee/model/index.ts similarity index 100% rename from src/api/shop/shopDealerReferee/model/index.ts rename to src/api/mall/shopDealerReferee/model/index.ts diff --git a/src/api/shop/shopDealerSetting/index.ts b/src/api/mall/shopDealerSetting/index.ts similarity index 86% rename from src/api/shop/shopDealerSetting/index.ts rename to src/api/mall/shopDealerSetting/index.ts index 83e31ca..fe7632c 100644 --- a/src/api/shop/shopDealerSetting/index.ts +++ b/src/api/mall/shopDealerSetting/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopDealerSetting(params: ShopDealerSettingParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-dealer-setting/page', + MODULES_API_URL + '/mall/shop-dealer-setting/page', { params } @@ -24,7 +24,7 @@ export async function pageShopDealerSetting(params: ShopDealerSettingParam) { */ export async function listShopDealerSetting(params?: ShopDealerSettingParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-dealer-setting', + MODULES_API_URL + '/mall/shop-dealer-setting', { params } @@ -40,7 +40,7 @@ export async function listShopDealerSetting(params?: ShopDealerSettingParam) { */ export async function addShopDealerSetting(data: ShopDealerSetting) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-dealer-setting', + MODULES_API_URL + '/mall/shop-dealer-setting', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopDealerSetting(data: ShopDealerSetting) { */ export async function updateShopDealerSetting(data: ShopDealerSetting) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-dealer-setting', + MODULES_API_URL + '/mall/shop-dealer-setting', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopDealerSetting(data: ShopDealerSetting) { */ export async function removeShopDealerSetting(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-dealer-setting/' + id + MODULES_API_URL + '/mall/shop-dealer-setting/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopDealerSetting(id?: number) { */ export async function removeBatchShopDealerSetting(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-dealer-setting/batch', + MODULES_API_URL + '/mall/shop-dealer-setting/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopDealerSetting(data: (number | undefined)[]) */ export async function getShopDealerSetting(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-dealer-setting/' + id + MODULES_API_URL + '/mall/shop-dealer-setting/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopDealerSetting/model/index.ts b/src/api/mall/shopDealerSetting/model/index.ts similarity index 100% rename from src/api/shop/shopDealerSetting/model/index.ts rename to src/api/mall/shopDealerSetting/model/index.ts diff --git a/src/api/shop/shopDealerUser/index.ts b/src/api/mall/shopDealerUser/index.ts similarity index 87% rename from src/api/shop/shopDealerUser/index.ts rename to src/api/mall/shopDealerUser/index.ts index e06664a..414dcda 100644 --- a/src/api/shop/shopDealerUser/index.ts +++ b/src/api/mall/shopDealerUser/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopDealerUser(params: ShopDealerUserParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-dealer-user/page', + MODULES_API_URL + '/mall/shop-dealer-user/page', { params } @@ -24,7 +24,7 @@ export async function pageShopDealerUser(params: ShopDealerUserParam) { */ export async function listShopDealerUser(params?: ShopDealerUserParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-dealer-user', + MODULES_API_URL + '/mall/shop-dealer-user', { params } @@ -40,7 +40,7 @@ export async function listShopDealerUser(params?: ShopDealerUserParam) { */ export async function addShopDealerUser(data: ShopDealerUser) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-dealer-user', + MODULES_API_URL + '/mall/shop-dealer-user', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopDealerUser(data: ShopDealerUser) { */ export async function updateShopDealerUser(data: ShopDealerUser) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-dealer-user', + MODULES_API_URL + '/mall/shop-dealer-user', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopDealerUser(data: ShopDealerUser) { */ export async function removeShopDealerUser(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-dealer-user/' + id + MODULES_API_URL + '/mall/shop-dealer-user/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopDealerUser(id?: number) { */ export async function removeBatchShopDealerUser(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-dealer-user/batch', + MODULES_API_URL + '/mall/shop-dealer-user/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopDealerUser(data: (number | undefined)[]) { */ export async function getShopDealerUser(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-dealer-user/' + id + MODULES_API_URL + '/mall/shop-dealer-user/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopDealerUser/model/index.ts b/src/api/mall/shopDealerUser/model/index.ts similarity index 100% rename from src/api/shop/shopDealerUser/model/index.ts rename to src/api/mall/shopDealerUser/model/index.ts diff --git a/src/api/shop/shopDealerWithdraw/index.ts b/src/api/mall/shopDealerWithdraw/index.ts similarity index 86% rename from src/api/shop/shopDealerWithdraw/index.ts rename to src/api/mall/shopDealerWithdraw/index.ts index d39ccc0..ea6cb68 100644 --- a/src/api/shop/shopDealerWithdraw/index.ts +++ b/src/api/mall/shopDealerWithdraw/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopDealerWithdraw(params: ShopDealerWithdrawParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-dealer-withdraw/page', + MODULES_API_URL + '/mall/shop-dealer-withdraw/page', { params } @@ -24,7 +24,7 @@ export async function pageShopDealerWithdraw(params: ShopDealerWithdrawParam) { */ export async function listShopDealerWithdraw(params?: ShopDealerWithdrawParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-dealer-withdraw', + MODULES_API_URL + '/mall/shop-dealer-withdraw', { params } @@ -40,7 +40,7 @@ export async function listShopDealerWithdraw(params?: ShopDealerWithdrawParam) { */ export async function addShopDealerWithdraw(data: ShopDealerWithdraw) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-dealer-withdraw', + MODULES_API_URL + '/mall/shop-dealer-withdraw', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopDealerWithdraw(data: ShopDealerWithdraw) { */ export async function updateShopDealerWithdraw(data: ShopDealerWithdraw) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-dealer-withdraw', + MODULES_API_URL + '/mall/shop-dealer-withdraw', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopDealerWithdraw(data: ShopDealerWithdraw) { */ export async function removeShopDealerWithdraw(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-dealer-withdraw/' + id + MODULES_API_URL + '/mall/shop-dealer-withdraw/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopDealerWithdraw(id?: number) { */ export async function removeBatchShopDealerWithdraw(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-dealer-withdraw/batch', + MODULES_API_URL + '/mall/shop-dealer-withdraw/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopDealerWithdraw(data: (number | undefined)[] */ export async function getShopDealerWithdraw(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-dealer-withdraw/' + id + MODULES_API_URL + '/mall/shop-dealer-withdraw/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopDealerWithdraw/model/index.ts b/src/api/mall/shopDealerWithdraw/model/index.ts similarity index 100% rename from src/api/shop/shopDealerWithdraw/model/index.ts rename to src/api/mall/shopDealerWithdraw/model/index.ts diff --git a/src/api/shop/shopGoods/index.ts b/src/api/mall/shopGoods/index.ts similarity index 87% rename from src/api/shop/shopGoods/index.ts rename to src/api/mall/shopGoods/index.ts index 2907322..5eb059d 100644 --- a/src/api/shop/shopGoods/index.ts +++ b/src/api/mall/shopGoods/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopGoods(params: ShopGoodsParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-goods/page', + MODULES_API_URL + '/mall/shop-goods/page', { params } @@ -24,7 +24,7 @@ export async function pageShopGoods(params: ShopGoodsParam) { */ export async function listShopGoods(params?: ShopGoodsParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-goods', + MODULES_API_URL + '/mall/shop-goods', { params } @@ -40,7 +40,7 @@ export async function listShopGoods(params?: ShopGoodsParam) { */ export async function addShopGoods(data: ShopGoods) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-goods', + MODULES_API_URL + '/mall/shop-goods', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopGoods(data: ShopGoods) { */ export async function updateShopGoods(data: ShopGoods) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-goods', + MODULES_API_URL + '/mall/shop-goods', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopGoods(data: ShopGoods) { */ export async function removeShopGoods(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-goods/' + id + MODULES_API_URL + '/mall/shop-goods/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopGoods(id?: number) { */ export async function removeBatchShopGoods(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-goods/batch', + MODULES_API_URL + '/mall/shop-goods/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopGoods(data: (number | undefined)[]) { */ export async function getShopGoods(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-goods/' + id + MODULES_API_URL + '/mall/shop-goods/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopGoods/model/index.ts b/src/api/mall/shopGoods/model/index.ts similarity index 100% rename from src/api/shop/shopGoods/model/index.ts rename to src/api/mall/shopGoods/model/index.ts diff --git a/src/api/shop/shopGoodsCategory/index.ts b/src/api/mall/shopGoodsCategory/index.ts similarity index 86% rename from src/api/shop/shopGoodsCategory/index.ts rename to src/api/mall/shopGoodsCategory/index.ts index dbdf598..2153d6b 100644 --- a/src/api/shop/shopGoodsCategory/index.ts +++ b/src/api/mall/shopGoodsCategory/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopGoodsCategory(params: ShopGoodsCategoryParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-goods-category/page', + MODULES_API_URL + '/mall/shop-goods-category/page', { params } @@ -24,7 +24,7 @@ export async function pageShopGoodsCategory(params: ShopGoodsCategoryParam) { */ export async function listShopGoodsCategory(params?: ShopGoodsCategoryParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-goods-category', + MODULES_API_URL + '/mall/shop-goods-category', { params } @@ -40,7 +40,7 @@ export async function listShopGoodsCategory(params?: ShopGoodsCategoryParam) { */ export async function addShopGoodsCategory(data: ShopGoodsCategory) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-goods-category', + MODULES_API_URL + '/mall/shop-goods-category', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopGoodsCategory(data: ShopGoodsCategory) { */ export async function updateShopGoodsCategory(data: ShopGoodsCategory) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-goods-category', + MODULES_API_URL + '/mall/shop-goods-category', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopGoodsCategory(data: ShopGoodsCategory) { */ export async function removeShopGoodsCategory(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-goods-category/' + id + MODULES_API_URL + '/mall/shop-goods-category/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopGoodsCategory(id?: number) { */ export async function removeBatchShopGoodsCategory(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-goods-category/batch', + MODULES_API_URL + '/mall/shop-goods-category/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopGoodsCategory(data: (number | undefined)[]) */ export async function getShopGoodsCategory(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-goods-category/' + id + MODULES_API_URL + '/mall/shop-goods-category/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopGoodsCategory/model/index.ts b/src/api/mall/shopGoodsCategory/model/index.ts similarity index 100% rename from src/api/shop/shopGoodsCategory/model/index.ts rename to src/api/mall/shopGoodsCategory/model/index.ts diff --git a/src/api/shop/shopGoodsComment/index.ts b/src/api/mall/shopGoodsComment/index.ts similarity index 86% rename from src/api/shop/shopGoodsComment/index.ts rename to src/api/mall/shopGoodsComment/index.ts index 9457233..ed2ad3e 100644 --- a/src/api/shop/shopGoodsComment/index.ts +++ b/src/api/mall/shopGoodsComment/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopGoodsComment(params: ShopGoodsCommentParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-goods-comment/page', + MODULES_API_URL + '/mall/shop-goods-comment/page', { params } @@ -24,7 +24,7 @@ export async function pageShopGoodsComment(params: ShopGoodsCommentParam) { */ export async function listShopGoodsComment(params?: ShopGoodsCommentParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-goods-comment', + MODULES_API_URL + '/mall/shop-goods-comment', { params } @@ -40,7 +40,7 @@ export async function listShopGoodsComment(params?: ShopGoodsCommentParam) { */ export async function addShopGoodsComment(data: ShopGoodsComment) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-goods-comment', + MODULES_API_URL + '/mall/shop-goods-comment', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopGoodsComment(data: ShopGoodsComment) { */ export async function updateShopGoodsComment(data: ShopGoodsComment) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-goods-comment', + MODULES_API_URL + '/mall/shop-goods-comment', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopGoodsComment(data: ShopGoodsComment) { */ export async function removeShopGoodsComment(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-goods-comment/' + id + MODULES_API_URL + '/mall/shop-goods-comment/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopGoodsComment(id?: number) { */ export async function removeBatchShopGoodsComment(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-goods-comment/batch', + MODULES_API_URL + '/mall/shop-goods-comment/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopGoodsComment(data: (number | undefined)[]) */ export async function getShopGoodsComment(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-goods-comment/' + id + MODULES_API_URL + '/mall/shop-goods-comment/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopGoodsComment/model/index.ts b/src/api/mall/shopGoodsComment/model/index.ts similarity index 100% rename from src/api/shop/shopGoodsComment/model/index.ts rename to src/api/mall/shopGoodsComment/model/index.ts diff --git a/src/api/shop/shopGoodsCoupon/index.ts b/src/api/mall/shopGoodsCoupon/index.ts similarity index 86% rename from src/api/shop/shopGoodsCoupon/index.ts rename to src/api/mall/shopGoodsCoupon/index.ts index 790ccf3..6e9346b 100644 --- a/src/api/shop/shopGoodsCoupon/index.ts +++ b/src/api/mall/shopGoodsCoupon/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopGoodsCoupon(params: ShopGoodsCouponParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-goods-coupon/page', + MODULES_API_URL + '/mall/shop-goods-coupon/page', { params } @@ -24,7 +24,7 @@ export async function pageShopGoodsCoupon(params: ShopGoodsCouponParam) { */ export async function listShopGoodsCoupon(params?: ShopGoodsCouponParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-goods-coupon', + MODULES_API_URL + '/mall/shop-goods-coupon', { params } @@ -40,7 +40,7 @@ export async function listShopGoodsCoupon(params?: ShopGoodsCouponParam) { */ export async function addShopGoodsCoupon(data: ShopGoodsCoupon) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-goods-coupon', + MODULES_API_URL + '/mall/shop-goods-coupon', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopGoodsCoupon(data: ShopGoodsCoupon) { */ export async function updateShopGoodsCoupon(data: ShopGoodsCoupon) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-goods-coupon', + MODULES_API_URL + '/mall/shop-goods-coupon', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopGoodsCoupon(data: ShopGoodsCoupon) { */ export async function removeShopGoodsCoupon(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-goods-coupon/' + id + MODULES_API_URL + '/mall/shop-goods-coupon/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopGoodsCoupon(id?: number) { */ export async function removeBatchShopGoodsCoupon(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-goods-coupon/batch', + MODULES_API_URL + '/mall/shop-goods-coupon/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopGoodsCoupon(data: (number | undefined)[]) { */ export async function getShopGoodsCoupon(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-goods-coupon/' + id + MODULES_API_URL + '/mall/shop-goods-coupon/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopGoodsCoupon/model/index.ts b/src/api/mall/shopGoodsCoupon/model/index.ts similarity index 100% rename from src/api/shop/shopGoodsCoupon/model/index.ts rename to src/api/mall/shopGoodsCoupon/model/index.ts diff --git a/src/api/shop/shopGoodsLog/index.ts b/src/api/mall/shopGoodsLog/index.ts similarity index 87% rename from src/api/shop/shopGoodsLog/index.ts rename to src/api/mall/shopGoodsLog/index.ts index f81a1fe..b2c57fd 100644 --- a/src/api/shop/shopGoodsLog/index.ts +++ b/src/api/mall/shopGoodsLog/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopGoodsLog(params: ShopGoodsLogParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-goods-log/page', + MODULES_API_URL + '/mall/shop-goods-log/page', { params } @@ -24,7 +24,7 @@ export async function pageShopGoodsLog(params: ShopGoodsLogParam) { */ export async function listShopGoodsLog(params?: ShopGoodsLogParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-goods-log', + MODULES_API_URL + '/mall/shop-goods-log', { params } @@ -40,7 +40,7 @@ export async function listShopGoodsLog(params?: ShopGoodsLogParam) { */ export async function addShopGoodsLog(data: ShopGoodsLog) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-goods-log', + MODULES_API_URL + '/mall/shop-goods-log', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopGoodsLog(data: ShopGoodsLog) { */ export async function updateShopGoodsLog(data: ShopGoodsLog) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-goods-log', + MODULES_API_URL + '/mall/shop-goods-log', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopGoodsLog(data: ShopGoodsLog) { */ export async function removeShopGoodsLog(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-goods-log/' + id + MODULES_API_URL + '/mall/shop-goods-log/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopGoodsLog(id?: number) { */ export async function removeBatchShopGoodsLog(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-goods-log/batch', + MODULES_API_URL + '/mall/shop-goods-log/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopGoodsLog(data: (number | undefined)[]) { */ export async function getShopGoodsLog(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-goods-log/' + id + MODULES_API_URL + '/mall/shop-goods-log/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopGoodsLog/model/index.ts b/src/api/mall/shopGoodsLog/model/index.ts similarity index 100% rename from src/api/shop/shopGoodsLog/model/index.ts rename to src/api/mall/shopGoodsLog/model/index.ts diff --git a/src/api/shop/shopGoodsRelation/index.ts b/src/api/mall/shopGoodsRelation/index.ts similarity index 86% rename from src/api/shop/shopGoodsRelation/index.ts rename to src/api/mall/shopGoodsRelation/index.ts index 698e114..2e7842e 100644 --- a/src/api/shop/shopGoodsRelation/index.ts +++ b/src/api/mall/shopGoodsRelation/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopGoodsRelation(params: ShopGoodsRelationParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-goods-relation/page', + MODULES_API_URL + '/mall/shop-goods-relation/page', { params } @@ -24,7 +24,7 @@ export async function pageShopGoodsRelation(params: ShopGoodsRelationParam) { */ export async function listShopGoodsRelation(params?: ShopGoodsRelationParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-goods-relation', + MODULES_API_URL + '/mall/shop-goods-relation', { params } @@ -40,7 +40,7 @@ export async function listShopGoodsRelation(params?: ShopGoodsRelationParam) { */ export async function addShopGoodsRelation(data: ShopGoodsRelation) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-goods-relation', + MODULES_API_URL + '/mall/shop-goods-relation', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopGoodsRelation(data: ShopGoodsRelation) { */ export async function updateShopGoodsRelation(data: ShopGoodsRelation) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-goods-relation', + MODULES_API_URL + '/mall/shop-goods-relation', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopGoodsRelation(data: ShopGoodsRelation) { */ export async function removeShopGoodsRelation(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-goods-relation/' + id + MODULES_API_URL + '/mall/shop-goods-relation/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopGoodsRelation(id?: number) { */ export async function removeBatchShopGoodsRelation(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-goods-relation/batch', + MODULES_API_URL + '/mall/shop-goods-relation/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopGoodsRelation(data: (number | undefined)[]) */ export async function getShopGoodsRelation(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-goods-relation/' + id + MODULES_API_URL + '/mall/shop-goods-relation/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopGoodsRelation/model/index.ts b/src/api/mall/shopGoodsRelation/model/index.ts similarity index 100% rename from src/api/shop/shopGoodsRelation/model/index.ts rename to src/api/mall/shopGoodsRelation/model/index.ts diff --git a/src/api/shop/shopGoodsSku/index.ts b/src/api/mall/shopGoodsSku/index.ts similarity index 87% rename from src/api/shop/shopGoodsSku/index.ts rename to src/api/mall/shopGoodsSku/index.ts index 78babf9..be5ca3a 100644 --- a/src/api/shop/shopGoodsSku/index.ts +++ b/src/api/mall/shopGoodsSku/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopGoodsSku(params: ShopGoodsSkuParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-goods-sku/page', + MODULES_API_URL + '/mall/shop-goods-sku/page', { params } @@ -24,7 +24,7 @@ export async function pageShopGoodsSku(params: ShopGoodsSkuParam) { */ export async function listShopGoodsSku(params?: ShopGoodsSkuParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-goods-sku', + MODULES_API_URL + '/mall/shop-goods-sku', { params } @@ -40,7 +40,7 @@ export async function listShopGoodsSku(params?: ShopGoodsSkuParam) { */ export async function addShopGoodsSku(data: ShopGoodsSku) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-goods-sku', + MODULES_API_URL + '/mall/shop-goods-sku', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopGoodsSku(data: ShopGoodsSku) { */ export async function updateShopGoodsSku(data: ShopGoodsSku) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-goods-sku', + MODULES_API_URL + '/mall/shop-goods-sku', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopGoodsSku(data: ShopGoodsSku) { */ export async function removeShopGoodsSku(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-goods-sku/' + id + MODULES_API_URL + '/mall/shop-goods-sku/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopGoodsSku(id?: number) { */ export async function removeBatchShopGoodsSku(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-goods-sku/batch', + MODULES_API_URL + '/mall/shop-goods-sku/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopGoodsSku(data: (number | undefined)[]) { */ export async function getShopGoodsSku(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-goods-sku/' + id + MODULES_API_URL + '/mall/shop-goods-sku/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopGoodsSku/model/index.ts b/src/api/mall/shopGoodsSku/model/index.ts similarity index 100% rename from src/api/shop/shopGoodsSku/model/index.ts rename to src/api/mall/shopGoodsSku/model/index.ts diff --git a/src/api/shop/shopGoodsSpec/index.ts b/src/api/mall/shopGoodsSpec/index.ts similarity index 86% rename from src/api/shop/shopGoodsSpec/index.ts rename to src/api/mall/shopGoodsSpec/index.ts index f096575..cc42dec 100644 --- a/src/api/shop/shopGoodsSpec/index.ts +++ b/src/api/mall/shopGoodsSpec/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopGoodsSpec(params: ShopGoodsSpecParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-goods-spec/page', + MODULES_API_URL + '/mall/shop-goods-spec/page', { params } @@ -24,7 +24,7 @@ export async function pageShopGoodsSpec(params: ShopGoodsSpecParam) { */ export async function listShopGoodsSpec(params?: ShopGoodsSpecParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-goods-spec', + MODULES_API_URL + '/mall/shop-goods-spec', { params } @@ -40,7 +40,7 @@ export async function listShopGoodsSpec(params?: ShopGoodsSpecParam) { */ export async function addShopGoodsSpec(data: ShopGoodsSpec) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-goods-spec', + MODULES_API_URL + '/mall/shop-goods-spec', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopGoodsSpec(data: ShopGoodsSpec) { */ export async function updateShopGoodsSpec(data: ShopGoodsSpec) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-goods-spec', + MODULES_API_URL + '/mall/shop-goods-spec', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopGoodsSpec(data: ShopGoodsSpec) { */ export async function removeShopGoodsSpec(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-goods-spec/' + id + MODULES_API_URL + '/mall/shop-goods-spec/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopGoodsSpec(id?: number) { */ export async function removeBatchShopGoodsSpec(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-goods-spec/batch', + MODULES_API_URL + '/mall/shop-goods-spec/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopGoodsSpec(data: (number | undefined)[]) { */ export async function getShopGoodsSpec(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-goods-spec/' + id + MODULES_API_URL + '/mall/shop-goods-spec/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopGoodsSpec/model/index.ts b/src/api/mall/shopGoodsSpec/model/index.ts similarity index 100% rename from src/api/shop/shopGoodsSpec/model/index.ts rename to src/api/mall/shopGoodsSpec/model/index.ts diff --git a/src/api/shop/shopMerchant/index.ts b/src/api/mall/shopMerchant/index.ts similarity index 86% rename from src/api/shop/shopMerchant/index.ts rename to src/api/mall/shopMerchant/index.ts index 5ed8e11..3789a3d 100644 --- a/src/api/shop/shopMerchant/index.ts +++ b/src/api/mall/shopMerchant/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopMerchant(params: ShopMerchantParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-merchant/page', + MODULES_API_URL + '/mall/shop-merchant/page', { params } @@ -24,7 +24,7 @@ export async function pageShopMerchant(params: ShopMerchantParam) { */ export async function listShopMerchant(params?: ShopMerchantParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-merchant', + MODULES_API_URL + '/mall/shop-merchant', { params } @@ -40,7 +40,7 @@ export async function listShopMerchant(params?: ShopMerchantParam) { */ export async function addShopMerchant(data: ShopMerchant) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-merchant', + MODULES_API_URL + '/mall/shop-merchant', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopMerchant(data: ShopMerchant) { */ export async function updateShopMerchant(data: ShopMerchant) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-merchant', + MODULES_API_URL + '/mall/shop-merchant', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopMerchant(data: ShopMerchant) { */ export async function removeShopMerchant(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-merchant/' + id + MODULES_API_URL + '/mall/shop-merchant/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopMerchant(id?: number) { */ export async function removeBatchShopMerchant(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-merchant/batch', + MODULES_API_URL + '/mall/shop-merchant/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopMerchant(data: (number | undefined)[]) { */ export async function getShopMerchant(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-merchant/' + id + MODULES_API_URL + '/mall/shop-merchant/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopMerchant/model/index.ts b/src/api/mall/shopMerchant/model/index.ts similarity index 97% rename from src/api/shop/shopMerchant/model/index.ts rename to src/api/mall/shopMerchant/model/index.ts index 8917492..ae2dfdf 100644 --- a/src/api/shop/shopMerchant/model/index.ts +++ b/src/api/mall/shopMerchant/model/index.ts @@ -16,6 +16,8 @@ export interface ShopMerchant { image?: string; // 商户手机号 phone?: string; + // 座机电话 + tel?: string; // 商户姓名 realName?: string; // 店铺类型 diff --git a/src/api/shop/shopMerchantAccount/index.ts b/src/api/mall/shopMerchantAccount/index.ts similarity index 85% rename from src/api/shop/shopMerchantAccount/index.ts rename to src/api/mall/shopMerchantAccount/index.ts index eff50c4..e710c52 100644 --- a/src/api/shop/shopMerchantAccount/index.ts +++ b/src/api/mall/shopMerchantAccount/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopMerchantAccount(params: ShopMerchantAccountParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-merchant-account/page', + MODULES_API_URL + '/mall/shop-merchant-account/page', { params } @@ -24,7 +24,7 @@ export async function pageShopMerchantAccount(params: ShopMerchantAccountParam) */ export async function listShopMerchantAccount(params?: ShopMerchantAccountParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-merchant-account', + MODULES_API_URL + '/mall/shop-merchant-account', { params } @@ -40,7 +40,7 @@ export async function listShopMerchantAccount(params?: ShopMerchantAccountParam) */ export async function addShopMerchantAccount(data: ShopMerchantAccount) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-merchant-account', + MODULES_API_URL + '/mall/shop-merchant-account', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopMerchantAccount(data: ShopMerchantAccount) { */ export async function updateShopMerchantAccount(data: ShopMerchantAccount) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-merchant-account', + MODULES_API_URL + '/mall/shop-merchant-account', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopMerchantAccount(data: ShopMerchantAccount) { */ export async function removeShopMerchantAccount(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-merchant-account/' + id + MODULES_API_URL + '/mall/shop-merchant-account/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopMerchantAccount(id?: number) { */ export async function removeBatchShopMerchantAccount(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-merchant-account/batch', + MODULES_API_URL + '/mall/shop-merchant-account/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopMerchantAccount(data: (number | undefined)[ */ export async function getShopMerchantAccount(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-merchant-account/' + id + MODULES_API_URL + '/mall/shop-merchant-account/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopMerchantAccount/model/index.ts b/src/api/mall/shopMerchantAccount/model/index.ts similarity index 100% rename from src/api/shop/shopMerchantAccount/model/index.ts rename to src/api/mall/shopMerchantAccount/model/index.ts diff --git a/src/api/shop/shopMerchantApply/index.ts b/src/api/mall/shopMerchantApply/index.ts similarity index 86% rename from src/api/shop/shopMerchantApply/index.ts rename to src/api/mall/shopMerchantApply/index.ts index b26ed11..5cf95ac 100644 --- a/src/api/shop/shopMerchantApply/index.ts +++ b/src/api/mall/shopMerchantApply/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopMerchantApply(params: ShopMerchantApplyParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-merchant-apply/page', + MODULES_API_URL + '/mall/shop-merchant-apply/page', { params } @@ -24,7 +24,7 @@ export async function pageShopMerchantApply(params: ShopMerchantApplyParam) { */ export async function listShopMerchantApply(params?: ShopMerchantApplyParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-merchant-apply', + MODULES_API_URL + '/mall/shop-merchant-apply', { params } @@ -40,7 +40,7 @@ export async function listShopMerchantApply(params?: ShopMerchantApplyParam) { */ export async function addShopMerchantApply(data: ShopMerchantApply) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-merchant-apply', + MODULES_API_URL + '/mall/shop-merchant-apply', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopMerchantApply(data: ShopMerchantApply) { */ export async function updateShopMerchantApply(data: ShopMerchantApply) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-merchant-apply', + MODULES_API_URL + '/mall/shop-merchant-apply', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopMerchantApply(data: ShopMerchantApply) { */ export async function removeShopMerchantApply(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-merchant-apply/' + id + MODULES_API_URL + '/mall/shop-merchant-apply/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopMerchantApply(id?: number) { */ export async function removeBatchShopMerchantApply(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-merchant-apply/batch', + MODULES_API_URL + '/mall/shop-merchant-apply/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopMerchantApply(data: (number | undefined)[]) */ export async function getShopMerchantApply(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-merchant-apply/' + id + MODULES_API_URL + '/mall/shop-merchant-apply/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopMerchantApply/model/index.ts b/src/api/mall/shopMerchantApply/model/index.ts similarity index 100% rename from src/api/shop/shopMerchantApply/model/index.ts rename to src/api/mall/shopMerchantApply/model/index.ts diff --git a/src/api/shop/shopMerchantCount/index.ts b/src/api/mall/shopMerchantCount/index.ts similarity index 86% rename from src/api/shop/shopMerchantCount/index.ts rename to src/api/mall/shopMerchantCount/index.ts index 74229e9..6e5c9fa 100644 --- a/src/api/shop/shopMerchantCount/index.ts +++ b/src/api/mall/shopMerchantCount/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopMerchantCount(params: ShopMerchantCountParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-merchant-count/page', + MODULES_API_URL + '/mall/shop-merchant-count/page', { params } @@ -24,7 +24,7 @@ export async function pageShopMerchantCount(params: ShopMerchantCountParam) { */ export async function listShopMerchantCount(params?: ShopMerchantCountParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-merchant-count', + MODULES_API_URL + '/mall/shop-merchant-count', { params } @@ -40,7 +40,7 @@ export async function listShopMerchantCount(params?: ShopMerchantCountParam) { */ export async function addShopMerchantCount(data: ShopMerchantCount) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-merchant-count', + MODULES_API_URL + '/mall/shop-merchant-count', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopMerchantCount(data: ShopMerchantCount) { */ export async function updateShopMerchantCount(data: ShopMerchantCount) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-merchant-count', + MODULES_API_URL + '/mall/shop-merchant-count', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopMerchantCount(data: ShopMerchantCount) { */ export async function removeShopMerchantCount(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-merchant-count/' + id + MODULES_API_URL + '/mall/shop-merchant-count/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopMerchantCount(id?: number) { */ export async function removeBatchShopMerchantCount(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-merchant-count/batch', + MODULES_API_URL + '/mall/shop-merchant-count/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopMerchantCount(data: (number | undefined)[]) */ export async function getShopMerchantCount(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-merchant-count/' + id + MODULES_API_URL + '/mall/shop-merchant-count/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopMerchantCount/model/index.ts b/src/api/mall/shopMerchantCount/model/index.ts similarity index 100% rename from src/api/shop/shopMerchantCount/model/index.ts rename to src/api/mall/shopMerchantCount/model/index.ts diff --git a/src/api/shop/shopMerchantType/index.ts b/src/api/mall/shopMerchantType/index.ts similarity index 86% rename from src/api/shop/shopMerchantType/index.ts rename to src/api/mall/shopMerchantType/index.ts index 2070c5e..c3daf39 100644 --- a/src/api/shop/shopMerchantType/index.ts +++ b/src/api/mall/shopMerchantType/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopMerchantType(params: ShopMerchantTypeParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-merchant-type/page', + MODULES_API_URL + '/mall/shop-merchant-type/page', { params } @@ -24,7 +24,7 @@ export async function pageShopMerchantType(params: ShopMerchantTypeParam) { */ export async function listShopMerchantType(params?: ShopMerchantTypeParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-merchant-type', + MODULES_API_URL + '/mall/shop-merchant-type', { params } @@ -40,7 +40,7 @@ export async function listShopMerchantType(params?: ShopMerchantTypeParam) { */ export async function addShopMerchantType(data: ShopMerchantType) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-merchant-type', + MODULES_API_URL + '/mall/shop-merchant-type', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopMerchantType(data: ShopMerchantType) { */ export async function updateShopMerchantType(data: ShopMerchantType) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-merchant-type', + MODULES_API_URL + '/mall/shop-merchant-type', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopMerchantType(data: ShopMerchantType) { */ export async function removeShopMerchantType(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-merchant-type/' + id + MODULES_API_URL + '/mall/shop-merchant-type/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopMerchantType(id?: number) { */ export async function removeBatchShopMerchantType(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-merchant-type/batch', + MODULES_API_URL + '/mall/shop-merchant-type/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopMerchantType(data: (number | undefined)[]) */ export async function getShopMerchantType(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-merchant-type/' + id + MODULES_API_URL + '/mall/shop-merchant-type/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopMerchantType/model/index.ts b/src/api/mall/shopMerchantType/model/index.ts similarity index 100% rename from src/api/shop/shopMerchantType/model/index.ts rename to src/api/mall/shopMerchantType/model/index.ts diff --git a/src/api/shop/shopOrder/index.ts b/src/api/mall/shopOrder/index.ts similarity index 87% rename from src/api/shop/shopOrder/index.ts rename to src/api/mall/shopOrder/index.ts index 50c9b1f..f9ed01d 100644 --- a/src/api/shop/shopOrder/index.ts +++ b/src/api/mall/shopOrder/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopOrder(params: ShopOrderParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-order/page', + MODULES_API_URL + '/mall/shop-order/page', { params } @@ -24,7 +24,7 @@ export async function pageShopOrder(params: ShopOrderParam) { */ export async function listShopOrder(params?: ShopOrderParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-order', + MODULES_API_URL + '/mall/shop-order', { params } @@ -40,7 +40,7 @@ export async function listShopOrder(params?: ShopOrderParam) { */ export async function addShopOrder(data: ShopOrder) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-order', + MODULES_API_URL + '/mall/shop-order', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopOrder(data: ShopOrder) { */ export async function updateShopOrder(data: ShopOrder) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-order', + MODULES_API_URL + '/mall/shop-order', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopOrder(data: ShopOrder) { */ export async function removeShopOrder(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-order/' + id + MODULES_API_URL + '/mall/shop-order/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopOrder(id?: number) { */ export async function removeBatchShopOrder(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-order/batch', + MODULES_API_URL + '/mall/shop-order/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopOrder(data: (number | undefined)[]) { */ export async function getShopOrder(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-order/' + id + MODULES_API_URL + '/mall/shop-order/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopOrder/model/index.ts b/src/api/mall/shopOrder/model/index.ts similarity index 100% rename from src/api/shop/shopOrder/model/index.ts rename to src/api/mall/shopOrder/model/index.ts diff --git a/src/api/shop/shopOrderCartInfo/index.ts b/src/api/mall/shopOrderCartInfo/index.ts similarity index 86% rename from src/api/shop/shopOrderCartInfo/index.ts rename to src/api/mall/shopOrderCartInfo/index.ts index db8ee45..2c4f633 100644 --- a/src/api/shop/shopOrderCartInfo/index.ts +++ b/src/api/mall/shopOrderCartInfo/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopOrderCartInfo(params: ShopOrderCartInfoParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-order-cart-info/page', + MODULES_API_URL + '/mall/shop-order-cart-info/page', { params } @@ -24,7 +24,7 @@ export async function pageShopOrderCartInfo(params: ShopOrderCartInfoParam) { */ export async function listShopOrderCartInfo(params?: ShopOrderCartInfoParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-order-cart-info', + MODULES_API_URL + '/mall/shop-order-cart-info', { params } @@ -40,7 +40,7 @@ export async function listShopOrderCartInfo(params?: ShopOrderCartInfoParam) { */ export async function addShopOrderCartInfo(data: ShopOrderCartInfo) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-order-cart-info', + MODULES_API_URL + '/mall/shop-order-cart-info', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopOrderCartInfo(data: ShopOrderCartInfo) { */ export async function updateShopOrderCartInfo(data: ShopOrderCartInfo) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-order-cart-info', + MODULES_API_URL + '/mall/shop-order-cart-info', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopOrderCartInfo(data: ShopOrderCartInfo) { */ export async function removeShopOrderCartInfo(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-order-cart-info/' + id + MODULES_API_URL + '/mall/shop-order-cart-info/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopOrderCartInfo(id?: number) { */ export async function removeBatchShopOrderCartInfo(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-order-cart-info/batch', + MODULES_API_URL + '/mall/shop-order-cart-info/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopOrderCartInfo(data: (number | undefined)[]) */ export async function getShopOrderCartInfo(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-order-cart-info/' + id + MODULES_API_URL + '/mall/shop-order-cart-info/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopOrderCartInfo/model/index.ts b/src/api/mall/shopOrderCartInfo/model/index.ts similarity index 100% rename from src/api/shop/shopOrderCartInfo/model/index.ts rename to src/api/mall/shopOrderCartInfo/model/index.ts diff --git a/src/api/shop/shopOrderGoods/index.ts b/src/api/mall/shopOrderGoods/index.ts similarity index 86% rename from src/api/shop/shopOrderGoods/index.ts rename to src/api/mall/shopOrderGoods/index.ts index 2973147..bf97ab4 100644 --- a/src/api/shop/shopOrderGoods/index.ts +++ b/src/api/mall/shopOrderGoods/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopOrderGoods(params: ShopOrderGoodsParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-order-goods/page', + MODULES_API_URL + '/mall/shop-order-goods/page', { params } @@ -24,7 +24,7 @@ export async function pageShopOrderGoods(params: ShopOrderGoodsParam) { */ export async function listShopOrderGoods(params?: ShopOrderGoodsParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-order-goods', + MODULES_API_URL + '/mall/shop-order-goods', { params } @@ -40,7 +40,7 @@ export async function listShopOrderGoods(params?: ShopOrderGoodsParam) { */ export async function addShopOrderGoods(data: ShopOrderGoods) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-order-goods', + MODULES_API_URL + '/mall/shop-order-goods', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopOrderGoods(data: ShopOrderGoods) { */ export async function updateShopOrderGoods(data: ShopOrderGoods) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-order-goods', + MODULES_API_URL + '/mall/shop-order-goods', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopOrderGoods(data: ShopOrderGoods) { */ export async function removeShopOrderGoods(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-order-goods/' + id + MODULES_API_URL + '/mall/shop-order-goods/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopOrderGoods(id?: number) { */ export async function removeBatchShopOrderGoods(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-order-goods/batch', + MODULES_API_URL + '/mall/shop-order-goods/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopOrderGoods(data: (number | undefined)[]) { */ export async function getShopOrderGoods(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-order-goods/' + id + MODULES_API_URL + '/mall/shop-order-goods/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopOrderGoods/model/index.ts b/src/api/mall/shopOrderGoods/model/index.ts similarity index 100% rename from src/api/shop/shopOrderGoods/model/index.ts rename to src/api/mall/shopOrderGoods/model/index.ts diff --git a/src/api/shop/shopOrderInfo/index.ts b/src/api/mall/shopOrderInfo/index.ts similarity index 86% rename from src/api/shop/shopOrderInfo/index.ts rename to src/api/mall/shopOrderInfo/index.ts index ae59fda..1e11904 100644 --- a/src/api/shop/shopOrderInfo/index.ts +++ b/src/api/mall/shopOrderInfo/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopOrderInfo(params: ShopOrderInfoParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-order-info/page', + MODULES_API_URL + '/mall/shop-order-info/page', { params } @@ -24,7 +24,7 @@ export async function pageShopOrderInfo(params: ShopOrderInfoParam) { */ export async function listShopOrderInfo(params?: ShopOrderInfoParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-order-info', + MODULES_API_URL + '/mall/shop-order-info', { params } @@ -40,7 +40,7 @@ export async function listShopOrderInfo(params?: ShopOrderInfoParam) { */ export async function addShopOrderInfo(data: ShopOrderInfo) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-order-info', + MODULES_API_URL + '/mall/shop-order-info', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopOrderInfo(data: ShopOrderInfo) { */ export async function updateShopOrderInfo(data: ShopOrderInfo) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-order-info', + MODULES_API_URL + '/mall/shop-order-info', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopOrderInfo(data: ShopOrderInfo) { */ export async function removeShopOrderInfo(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-order-info/' + id + MODULES_API_URL + '/mall/shop-order-info/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopOrderInfo(id?: number) { */ export async function removeBatchShopOrderInfo(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-order-info/batch', + MODULES_API_URL + '/mall/shop-order-info/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopOrderInfo(data: (number | undefined)[]) { */ export async function getShopOrderInfo(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-order-info/' + id + MODULES_API_URL + '/mall/shop-order-info/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopOrderInfo/model/index.ts b/src/api/mall/shopOrderInfo/model/index.ts similarity index 100% rename from src/api/shop/shopOrderInfo/model/index.ts rename to src/api/mall/shopOrderInfo/model/index.ts diff --git a/src/api/shop/shopOrderInfoLog/index.ts b/src/api/mall/shopOrderInfoLog/index.ts similarity index 86% rename from src/api/shop/shopOrderInfoLog/index.ts rename to src/api/mall/shopOrderInfoLog/index.ts index 80e97bb..d87a689 100644 --- a/src/api/shop/shopOrderInfoLog/index.ts +++ b/src/api/mall/shopOrderInfoLog/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopOrderInfoLog(params: ShopOrderInfoLogParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-order-info-log/page', + MODULES_API_URL + '/mall/shop-order-info-log/page', { params } @@ -24,7 +24,7 @@ export async function pageShopOrderInfoLog(params: ShopOrderInfoLogParam) { */ export async function listShopOrderInfoLog(params?: ShopOrderInfoLogParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-order-info-log', + MODULES_API_URL + '/mall/shop-order-info-log', { params } @@ -40,7 +40,7 @@ export async function listShopOrderInfoLog(params?: ShopOrderInfoLogParam) { */ export async function addShopOrderInfoLog(data: ShopOrderInfoLog) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-order-info-log', + MODULES_API_URL + '/mall/shop-order-info-log', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopOrderInfoLog(data: ShopOrderInfoLog) { */ export async function updateShopOrderInfoLog(data: ShopOrderInfoLog) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-order-info-log', + MODULES_API_URL + '/mall/shop-order-info-log', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopOrderInfoLog(data: ShopOrderInfoLog) { */ export async function removeShopOrderInfoLog(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-order-info-log/' + id + MODULES_API_URL + '/mall/shop-order-info-log/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopOrderInfoLog(id?: number) { */ export async function removeBatchShopOrderInfoLog(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-order-info-log/batch', + MODULES_API_URL + '/mall/shop-order-info-log/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopOrderInfoLog(data: (number | undefined)[]) */ export async function getShopOrderInfoLog(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-order-info-log/' + id + MODULES_API_URL + '/mall/shop-order-info-log/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopOrderInfoLog/model/index.ts b/src/api/mall/shopOrderInfoLog/model/index.ts similarity index 100% rename from src/api/shop/shopOrderInfoLog/model/index.ts rename to src/api/mall/shopOrderInfoLog/model/index.ts diff --git a/src/api/shop/shopSpec/index.ts b/src/api/mall/shopSpec/index.ts similarity index 87% rename from src/api/shop/shopSpec/index.ts rename to src/api/mall/shopSpec/index.ts index aecae2c..43c61fa 100644 --- a/src/api/shop/shopSpec/index.ts +++ b/src/api/mall/shopSpec/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopSpec(params: ShopSpecParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-spec/page', + MODULES_API_URL + '/mall/shop-spec/page', { params } @@ -24,7 +24,7 @@ export async function pageShopSpec(params: ShopSpecParam) { */ export async function listShopSpec(params?: ShopSpecParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-spec', + MODULES_API_URL + '/mall/shop-spec', { params } @@ -40,7 +40,7 @@ export async function listShopSpec(params?: ShopSpecParam) { */ export async function addShopSpec(data: ShopSpec) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-spec', + MODULES_API_URL + '/mall/shop-spec', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopSpec(data: ShopSpec) { */ export async function updateShopSpec(data: ShopSpec) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-spec', + MODULES_API_URL + '/mall/shop-spec', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopSpec(data: ShopSpec) { */ export async function removeShopSpec(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-spec/' + id + MODULES_API_URL + '/mall/shop-spec/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopSpec(id?: number) { */ export async function removeBatchShopSpec(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-spec/batch', + MODULES_API_URL + '/mall/shop-spec/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopSpec(data: (number | undefined)[]) { */ export async function getShopSpec(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-spec/' + id + MODULES_API_URL + '/mall/shop-spec/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopSpec/model/index.ts b/src/api/mall/shopSpec/model/index.ts similarity index 100% rename from src/api/shop/shopSpec/model/index.ts rename to src/api/mall/shopSpec/model/index.ts diff --git a/src/api/shop/shopSpecValue/index.ts b/src/api/mall/shopSpecValue/index.ts similarity index 86% rename from src/api/shop/shopSpecValue/index.ts rename to src/api/mall/shopSpecValue/index.ts index 0864afe..c471bbc 100644 --- a/src/api/shop/shopSpecValue/index.ts +++ b/src/api/mall/shopSpecValue/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopSpecValue(params: ShopSpecValueParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-spec-value/page', + MODULES_API_URL + '/mall/shop-spec-value/page', { params } @@ -24,7 +24,7 @@ export async function pageShopSpecValue(params: ShopSpecValueParam) { */ export async function listShopSpecValue(params?: ShopSpecValueParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-spec-value', + MODULES_API_URL + '/mall/shop-spec-value', { params } @@ -40,7 +40,7 @@ export async function listShopSpecValue(params?: ShopSpecValueParam) { */ export async function addShopSpecValue(data: ShopSpecValue) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-spec-value', + MODULES_API_URL + '/mall/shop-spec-value', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopSpecValue(data: ShopSpecValue) { */ export async function updateShopSpecValue(data: ShopSpecValue) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-spec-value', + MODULES_API_URL + '/mall/shop-spec-value', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopSpecValue(data: ShopSpecValue) { */ export async function removeShopSpecValue(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-spec-value/' + id + MODULES_API_URL + '/mall/shop-spec-value/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopSpecValue(id?: number) { */ export async function removeBatchShopSpecValue(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-spec-value/batch', + MODULES_API_URL + '/mall/shop-spec-value/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopSpecValue(data: (number | undefined)[]) { */ export async function getShopSpecValue(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-spec-value/' + id + MODULES_API_URL + '/mall/shop-spec-value/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopSpecValue/model/index.ts b/src/api/mall/shopSpecValue/model/index.ts similarity index 100% rename from src/api/shop/shopSpecValue/model/index.ts rename to src/api/mall/shopSpecValue/model/index.ts diff --git a/src/api/shop/shopUserAddress/index.ts b/src/api/mall/shopUserAddress/index.ts similarity index 86% rename from src/api/shop/shopUserAddress/index.ts rename to src/api/mall/shopUserAddress/index.ts index 2a0d186..8c67237 100644 --- a/src/api/shop/shopUserAddress/index.ts +++ b/src/api/mall/shopUserAddress/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopUserAddress(params: ShopUserAddressParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-user-address/page', + MODULES_API_URL + '/mall/shop-user-address/page', { params } @@ -24,7 +24,7 @@ export async function pageShopUserAddress(params: ShopUserAddressParam) { */ export async function listShopUserAddress(params?: ShopUserAddressParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-user-address', + MODULES_API_URL + '/mall/shop-user-address', { params } @@ -40,7 +40,7 @@ export async function listShopUserAddress(params?: ShopUserAddressParam) { */ export async function addShopUserAddress(data: ShopUserAddress) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-user-address', + MODULES_API_URL + '/mall/shop-user-address', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopUserAddress(data: ShopUserAddress) { */ export async function updateShopUserAddress(data: ShopUserAddress) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-user-address', + MODULES_API_URL + '/mall/shop-user-address', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopUserAddress(data: ShopUserAddress) { */ export async function removeShopUserAddress(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-user-address/' + id + MODULES_API_URL + '/mall/shop-user-address/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopUserAddress(id?: number) { */ export async function removeBatchShopUserAddress(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-user-address/batch', + MODULES_API_URL + '/mall/shop-user-address/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopUserAddress(data: (number | undefined)[]) { */ export async function getShopUserAddress(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-user-address/' + id + MODULES_API_URL + '/mall/shop-user-address/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopUserAddress/model/index.ts b/src/api/mall/shopUserAddress/model/index.ts similarity index 100% rename from src/api/shop/shopUserAddress/model/index.ts rename to src/api/mall/shopUserAddress/model/index.ts diff --git a/src/api/shop/shopUserCollection/index.ts b/src/api/mall/shopUserCollection/index.ts similarity index 86% rename from src/api/shop/shopUserCollection/index.ts rename to src/api/mall/shopUserCollection/index.ts index 6b9e161..482d681 100644 --- a/src/api/shop/shopUserCollection/index.ts +++ b/src/api/mall/shopUserCollection/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopUserCollection(params: ShopUserCollectionParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-user-collection/page', + MODULES_API_URL + '/mall/shop-user-collection/page', { params } @@ -24,7 +24,7 @@ export async function pageShopUserCollection(params: ShopUserCollectionParam) { */ export async function listShopUserCollection(params?: ShopUserCollectionParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-user-collection', + MODULES_API_URL + '/mall/shop-user-collection', { params } @@ -40,7 +40,7 @@ export async function listShopUserCollection(params?: ShopUserCollectionParam) { */ export async function addShopUserCollection(data: ShopUserCollection) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-user-collection', + MODULES_API_URL + '/mall/shop-user-collection', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopUserCollection(data: ShopUserCollection) { */ export async function updateShopUserCollection(data: ShopUserCollection) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-user-collection', + MODULES_API_URL + '/mall/shop-user-collection', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopUserCollection(data: ShopUserCollection) { */ export async function removeShopUserCollection(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-user-collection/' + id + MODULES_API_URL + '/mall/shop-user-collection/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopUserCollection(id?: number) { */ export async function removeBatchShopUserCollection(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-user-collection/batch', + MODULES_API_URL + '/mall/shop-user-collection/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopUserCollection(data: (number | undefined)[] */ export async function getShopUserCollection(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-user-collection/' + id + MODULES_API_URL + '/mall/shop-user-collection/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopUserCollection/model/index.ts b/src/api/mall/shopUserCollection/model/index.ts similarity index 100% rename from src/api/shop/shopUserCollection/model/index.ts rename to src/api/mall/shopUserCollection/model/index.ts diff --git a/src/api/shop/shopWechatDeposit/index.ts b/src/api/mall/shopWechatDeposit/index.ts similarity index 85% rename from src/api/shop/shopWechatDeposit/index.ts rename to src/api/mall/shopWechatDeposit/index.ts index de2b0bf..e7dde65 100644 --- a/src/api/shop/shopWechatDeposit/index.ts +++ b/src/api/mall/shopWechatDeposit/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopWechatDeposit(params: ShopWechatDepositParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-wechat-deposit/page', + MODULES_API_URL + '/mall/shop-wechat-deposit/page', { params } @@ -24,7 +24,7 @@ export async function pageShopWechatDeposit(params: ShopWechatDepositParam) { */ export async function listShopWechatDeposit(params?: ShopWechatDepositParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-wechat-deposit', + MODULES_API_URL + '/mall/shop-wechat-deposit', { params } @@ -40,7 +40,7 @@ export async function listShopWechatDeposit(params?: ShopWechatDepositParam) { */ export async function addShopWechatDeposit(data: ShopWechatDeposit) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-wechat-deposit', + MODULES_API_URL + '/mall/shop-wechat-deposit', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopWechatDeposit(data: ShopWechatDeposit) { */ export async function updateShopWechatDeposit(data: ShopWechatDeposit) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-wechat-deposit', + MODULES_API_URL + '/mall/shop-wechat-deposit', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopWechatDeposit(data: ShopWechatDeposit) { */ export async function removeShopWechatDeposit(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-wechat-deposit/' + id + MODULES_API_URL + '/mall/shop-wechat-deposit/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopWechatDeposit(id?: number) { */ export async function removeBatchShopWechatDeposit(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-wechat-deposit/batch', + MODULES_API_URL + '/mall/shop-wechat-deposit/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopWechatDeposit(data: (number | undefined)[]) */ export async function getShopWechatDeposit(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-wechat-deposit/' + id + MODULES_API_URL + '/mall/shop-wechat-deposit/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopWechatDeposit/model/index.ts b/src/api/mall/shopWechatDeposit/model/index.ts similarity index 100% rename from src/api/shop/shopWechatDeposit/model/index.ts rename to src/api/mall/shopWechatDeposit/model/index.ts diff --git a/src/api/shop/express/index.ts b/src/api/shop/express/index.ts new file mode 100644 index 0000000..29487bf --- /dev/null +++ b/src/api/shop/express/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { Express, ExpressParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询物流公司 + */ +export async function pageExpress(params: ExpressParam) { + const res = await request.get>>( + MODULES_API_URL + '/shop/express/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询物流公司列表 + */ +export async function listExpress(params?: ExpressParam) { + const res = await request.get>( + MODULES_API_URL + '/shop/express', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加物流公司 + */ +export async function addExpress(data: Express) { + const res = await request.post>( + MODULES_API_URL + '/shop/express', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改物流公司 + */ +export async function updateExpress(data: Express) { + const res = await request.put>( + MODULES_API_URL + '/shop/express', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除物流公司 + */ +export async function removeExpress(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/shop/express/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除物流公司 + */ +export async function removeBatchExpress(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/shop/express/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询物流公司 + */ +export async function getExpress(id: number) { + const res = await request.get>( + MODULES_API_URL + '/shop/express/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/shop/express/model/index.ts b/src/api/shop/express/model/index.ts new file mode 100644 index 0000000..dcc1d37 --- /dev/null +++ b/src/api/shop/express/model/index.ts @@ -0,0 +1,31 @@ +import type { PageParam } from '@/api'; + +/** + * 物流公司 + */ +export interface Express { + // 物流公司ID + expressId?: number; + // 物流公司名称 + expressName?: string; + // 物流公司编码 (快递100) + kuaidi100Code?: string; + // 物流公司编码 (快递鸟) + kdniaoCode?: string; + // 是否删除, 0否, 1是 + deleted?: number; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + // 修改时间 + updateTime?: string; +} + +/** + * 物流公司搜索条件 + */ +export interface ExpressParam extends PageParam { + expressId?: number; + keywords?: string; +} diff --git a/src/api/shop/shopBrand/index.ts b/src/api/shop/shopBrand/index.ts index a061c83..9aac2d8 100644 --- a/src/api/shop/shopBrand/index.ts +++ b/src/api/shop/shopBrand/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopBrand(params: ShopBrandParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-brand/page', + MODULES_API_URL + '/mall/shop-brand/page', { params } @@ -24,7 +24,7 @@ export async function pageShopBrand(params: ShopBrandParam) { */ export async function listShopBrand(params?: ShopBrandParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-brand', + MODULES_API_URL + '/mall/shop-brand', { params } @@ -40,7 +40,7 @@ export async function listShopBrand(params?: ShopBrandParam) { */ export async function addShopBrand(data: ShopBrand) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-brand', + MODULES_API_URL + '/mall/shop-brand', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopBrand(data: ShopBrand) { */ export async function updateShopBrand(data: ShopBrand) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-brand', + MODULES_API_URL + '/mall/shop-brand', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopBrand(data: ShopBrand) { */ export async function removeShopBrand(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-brand/' + id + MODULES_API_URL + '/mall/shop-brand/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopBrand(id?: number) { */ export async function removeBatchShopBrand(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-brand/batch', + MODULES_API_URL + '/mall/shop-brand/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopBrand(data: (number | undefined)[]) { */ export async function getShopBrand(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-brand/' + id + MODULES_API_URL + '/mall/shop-brand/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopCart/index.ts b/src/api/shop/shopCart/index.ts index 54a0840..c0156dd 100644 --- a/src/api/shop/shopCart/index.ts +++ b/src/api/shop/shopCart/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopCart(params: ShopCartParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-cart/page', + MODULES_API_URL + '/mall/shop-cart/page', { params } @@ -24,7 +24,7 @@ export async function pageShopCart(params: ShopCartParam) { */ export async function listShopCart(params?: ShopCartParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-cart', + MODULES_API_URL + '/mall/shop-cart', { params } @@ -40,7 +40,7 @@ export async function listShopCart(params?: ShopCartParam) { */ export async function addShopCart(data: ShopCart) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-cart', + MODULES_API_URL + '/mall/shop-cart', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopCart(data: ShopCart) { */ export async function updateShopCart(data: ShopCart) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-cart', + MODULES_API_URL + '/mall/shop-cart', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopCart(data: ShopCart) { */ export async function removeShopCart(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-cart/' + id + MODULES_API_URL + '/mall/shop-cart/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopCart(id?: number) { */ export async function removeBatchShopCart(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-cart/batch', + MODULES_API_URL + '/mall/shop-cart/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopCart(data: (number | undefined)[]) { */ export async function getShopCart(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-cart/' + id + MODULES_API_URL + '/mall/shop-cart/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopCashier/index.ts b/src/api/shop/shopCashier/index.ts index b2ffedf..d0b755d 100644 --- a/src/api/shop/shopCashier/index.ts +++ b/src/api/shop/shopCashier/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopCashier(params: ShopCashierParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-cashier/page', + MODULES_API_URL + '/mall/shop-cashier/page', { params } @@ -24,7 +24,7 @@ export async function pageShopCashier(params: ShopCashierParam) { */ export async function listShopCashier(params?: ShopCashierParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-cashier', + MODULES_API_URL + '/mall/shop-cashier', { params } @@ -40,7 +40,7 @@ export async function listShopCashier(params?: ShopCashierParam) { */ export async function addShopCashier(data: ShopCashier) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-cashier', + MODULES_API_URL + '/mall/shop-cashier', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopCashier(data: ShopCashier) { */ export async function updateShopCashier(data: ShopCashier) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-cashier', + MODULES_API_URL + '/mall/shop-cashier', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopCashier(data: ShopCashier) { */ export async function removeShopCashier(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-cashier/' + id + MODULES_API_URL + '/mall/shop-cashier/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopCashier(id?: number) { */ export async function removeBatchShopCashier(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-cashier/batch', + MODULES_API_URL + '/mall/shop-cashier/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopCashier(data: (number | undefined)[]) { */ export async function getShopCashier(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-cashier/' + id + MODULES_API_URL + '/mall/shop-cashier/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopCount/index.ts b/src/api/shop/shopCount/index.ts index b596ebf..398cc2d 100644 --- a/src/api/shop/shopCount/index.ts +++ b/src/api/shop/shopCount/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageShopCount(params: ShopCountParam) { const res = await request.get>>( - MODULES_API_URL + '/shop/shop-count/page', + MODULES_API_URL + '/mall/shop-count/page', { params } @@ -24,7 +24,7 @@ export async function pageShopCount(params: ShopCountParam) { */ export async function listShopCount(params?: ShopCountParam) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-count', + MODULES_API_URL + '/mall/shop-count', { params } @@ -40,7 +40,7 @@ export async function listShopCount(params?: ShopCountParam) { */ export async function addShopCount(data: ShopCount) { const res = await request.post>( - MODULES_API_URL + '/shop/shop-count', + MODULES_API_URL + '/mall/shop-count', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addShopCount(data: ShopCount) { */ export async function updateShopCount(data: ShopCount) { const res = await request.put>( - MODULES_API_URL + '/shop/shop-count', + MODULES_API_URL + '/mall/shop-count', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateShopCount(data: ShopCount) { */ export async function removeShopCount(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-count/' + id + MODULES_API_URL + '/mall/shop-count/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeShopCount(id?: number) { */ export async function removeBatchShopCount(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/shop/shop-count/batch', + MODULES_API_URL + '/mall/shop-count/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchShopCount(data: (number | undefined)[]) { */ export async function getShopCount(id: number) { const res = await request.get>( - MODULES_API_URL + '/shop/shop-count/' + id + MODULES_API_URL + '/mall/shop-count/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/system/file/index.ts b/src/api/system/file/index.ts index 7a63932..20d4334 100644 --- a/src/api/system/file/index.ts +++ b/src/api/system/file/index.ts @@ -195,6 +195,22 @@ export async function uploadOss(file: File) { return Promise.reject(new Error(res.data.message)); } +/** + * 上传阿里云OSS + */ +export async function uploadOssAvatar(file: File, fileName: string) { + const formData = new FormData(); + formData.append('file', file, fileName); + const res = await request.post>( + SERVER_API_URL + '/oss/upload', + formData + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + /** * 上传阿里云OSS */ diff --git a/src/api/system/user/model/index.ts b/src/api/system/user/model/index.ts index b72bf94..39a5bb5 100644 --- a/src/api/system/user/model/index.ts +++ b/src/api/system/user/model/index.ts @@ -88,6 +88,7 @@ export interface User { realName?: string; companyName?: string; merchantName?: string; + merchantAvatar?: string; gradeName?: string; idCard?: string; comments?: string; diff --git a/src/components/SelectExpress/components/select-data.vue b/src/components/SelectExpress/components/select-data.vue new file mode 100644 index 0000000..c1aa317 --- /dev/null +++ b/src/components/SelectExpress/components/select-data.vue @@ -0,0 +1,140 @@ + + + + diff --git a/src/components/SelectExpress/index.vue b/src/components/SelectExpress/index.vue new file mode 100644 index 0000000..28072db --- /dev/null +++ b/src/components/SelectExpress/index.vue @@ -0,0 +1,59 @@ + + + diff --git a/src/layout/components/header-tools.vue b/src/layout/components/header-tools.vue index 2c8b4b5..38cbbfa 100644 --- a/src/layout/components/header-tools.vue +++ b/src/layout/components/header-tools.vue @@ -52,13 +52,13 @@
- - @@ -205,8 +231,11 @@ ExclamationCircleOutlined, CheckOutlined, CloseOutlined, - AlipayCircleOutlined + AlipayCircleOutlined, + EllipsisOutlined, + DownOutlined } from '@ant-design/icons-vue'; + import { EleProTable, toDateString } from 'ele-admin-pro'; import type { DatasourceFunction, @@ -214,10 +243,11 @@ } from 'ele-admin-pro/es/ele-pro-table/types'; import Search from './components/search.vue'; import OrderInfo from './components/orderInfo.vue'; + import Delivery from './components/delivery.vue'; import { pageOrder, removeOrder, removeBatchOrder } from '@/api/shop/order'; import type { Order, OrderParam } from '@/api/shop/order/model'; import { formatNumber } from 'ele-admin-pro/es'; - import { getMerchantId } from "@/utils/merchant"; + import { getMerchantId } from '@/utils/merchant'; // 表格实例 const tableRef = ref | null>(null); @@ -228,6 +258,8 @@ const current = ref(null); // 是否显示编辑弹窗 const showEdit = ref(false); + // 是否显示发货弹窗 + const showDelivery = ref(false); // 是否显示批量移动弹窗 const showMove = ref(false); // 加载状态 @@ -359,7 +391,7 @@ { title: '操作', key: 'action', - width: 120, + width: 180, fixed: 'right', align: 'center', hideInSetting: true @@ -378,6 +410,11 @@ showEdit.value = true; }; + const openDelivery = (row?: Order) => { + current.value = row ?? null; + showDelivery.value = true; + }; + /* 打开批量移动弹窗 */ const openMove = () => { showMove.value = true; diff --git a/src/views/shop/spec/components/specEdit.vue b/src/views/shop/spec/components/specEdit.vue index 33b6962..8e381bf 100644 --- a/src/views/shop/spec/components/specEdit.vue +++ b/src/views/shop/spec/components/specEdit.vue @@ -83,6 +83,7 @@ import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types'; import { FormInstance } from 'ant-design-vue/es/form'; import { SpecValue } from '@/api/shop/specValue/model'; + import { getMerchantId } from '@/utils/merchant'; // 是否是修改 const isUpdate = ref(false); @@ -196,6 +197,7 @@ } const formData = { ...form, + merchantId: getMerchantId(), specValue: JSON.stringify(spec.value) }; const saveOrUpdate = isUpdate.value ? updateSpec : addSpec; diff --git a/src/views/system/express/components/expressEdit.vue b/src/views/system/express/components/expressEdit.vue new file mode 100644 index 0000000..be2bb58 --- /dev/null +++ b/src/views/system/express/components/expressEdit.vue @@ -0,0 +1,188 @@ + + + + diff --git a/src/views/system/express/components/search.vue b/src/views/system/express/components/search.vue new file mode 100644 index 0000000..82fea9d --- /dev/null +++ b/src/views/system/express/components/search.vue @@ -0,0 +1,42 @@ + + + + diff --git a/src/views/system/express/index.vue b/src/views/system/express/index.vue new file mode 100644 index 0000000..95a811b --- /dev/null +++ b/src/views/system/express/index.vue @@ -0,0 +1,230 @@ + + + + + + + diff --git a/src/views/user/profile/index.vue b/src/views/user/profile/index.vue index 626f6b8..4df02aa 100644 --- a/src/views/user/profile/index.vue +++ b/src/views/user/profile/index.vue @@ -23,17 +23,49 @@