📃 docs:解决冲突问题

src/api/index.ts

@@ -21,6 +21,17 @@ export {
   EnumSaleorderStatus,
 } from './delivery/index'
 
+export {
+  EnumTakeGoodsOrderStatus,
+  EnumTakeGoodsOrderTypeList,
+  TakeGoodsOrderList,
+  TakeGoodsOrderRefuse,
+  TakeGoodsOrderAudit,
+  TakeGoodsOrder,
+  UserInvitationInfoRecord,
+  GenBarCodeOrQrCode,
+} from './takeDelivery/index'
+
 import { useRequest } from '@/use/useHttp'
 /**
  *  系列列表

src/api/shopping/index.ts

@@ -25,7 +25,7 @@ export const ShoppingCartUpdateApi = () => {
  */
  export const ShoppingCartListApi = () => {
     return useRequest({
-        url: `/v1/mp/shoppingCart/productColor`,
+        url: `/v2/mp/shoppingCart/productColor`,
         method: "get",
     })
 }

src/api/takeDelivery/enum.ts

@@ -0,0 +1,15 @@
+import { useRequest } from '@/use/useHttp'
+//提货类型
+export const EnumTakeGoodsOrderTypeList = () => {
+  return useRequest({
+    url: `/v1/mp/enum/takeGoodsOrderType/list`,
+    method: 'get',
+  })
+}
+//tabs枚举
+export const EnumTakeGoodsOrderStatus = () => {
+  return useRequest({
+    url: `/v1/mp/enum/takeGoodsOrderStatus/list`,
+    method: 'get',
+  })
+}

src/api/takeDelivery/index.ts

@@ -0,0 +1,2 @@
+export { EnumTakeGoodsOrderStatus, EnumTakeGoodsOrderTypeList } from './enum'
+export { TakeGoodsOrderList, TakeGoodsOrderRefuse, TakeGoodsOrderAudit, TakeGoodsOrder, UserInvitationInfoRecord, GenBarCodeOrQrCode } from './takeDelivery'

src/api/takeDelivery/takeDelivery.ts

@@ -0,0 +1,45 @@
+import { useRequest } from '@/use/useHttp'
+import { CAP_HTML_TO_IMAGE_BASE_URL } from '@/common/constant'
+//列表
+export const TakeGoodsOrderList = () => {
+  return useRequest({
+    url: `/v1/mp/takeGoodsOrder/list`,
+    method: 'get',
+  })
+}
+//拒收提货
+export const TakeGoodsOrderRefuse = () => {
+  return useRequest({
+    url: `/v1/mp/takeGoodsOrder/refuse`,
+    method: 'put',
+  })
+}
+//审核提货单
+export const TakeGoodsOrderAudit = () => {
+  return useRequest({
+    url: `/v1/mp/takeGoodsOrder/audit`,
+    method: 'put',
+  })
+}
+//详情
+export const TakeGoodsOrder = () => {
+  return useRequest({
+    url: `/v1/mp/takeGoodsOrder`,
+    method: 'get',
+  })
+}
+//邀请码
+export const UserInvitationInfoRecord = () => {
+  return useRequest({
+    url: `/v1/mp/user/invitationInfoRecord`,
+    method: 'get',
+  })
+}
+//生成二维码
+export const GenBarCodeOrQrCode = () => {
+  return useRequest({
+    url: `/xima-caphtml/genBarcodeOrQrCode`,
+    base_url: CAP_HTML_TO_IMAGE_BASE_URL,
+    method: 'post',
+  })
+}