冲突合并

src/api/index.ts

@@ -1,26 +1,33 @@
+export { LoginApi } from './login/index'
+export {
+  productabsorbcontrast,
+  SelectProductListApi,
+  ColorListApi,
+  ColorDetailedApi,
+  ColorSamplingSaveApi,
+  TextureSaveApi,
+  FindColorListApi,
+} from './product/index'
 
-
-export {LoginApi} from './login/index'
-
-import { useRequest } from "@/use/useHttp"
+import { useRequest } from '@/use/useHttp'
 /**
  *  系列列表
- * @returns 
+ * @returns
  */
 export const kindListApi = () => {
-    return useRequest({
-        url: `/v1/mp/product/kind/list`,
-        method: "get",
-    })
+  return useRequest({
+    url: `/v1/mp/product/kind/list`,
+    method: 'get',
+  })
 }
 
 /**
  *  面料列表
- * @returns 
+ * @returns
  */
 export const ProductListApi = () => {
-    return useRequest({
-        url: `/v1/mp/product/list`,
-        method: "get",
-    })
+  return useRequest({
+    url: `/v1/mp/product/list`,
+    method: 'get',
+  })
 }

src/api/product/findColor.ts

@@ -0,0 +1,11 @@
+import { useRequest } from "@/use/useHttp"
+/**
+ *  颜色列表
+ * @returns
+ */
+export const FindColorListApi = () => {
+  return useRequest({
+    url: `/v1/mp/product/color/absorb/match`,
+    method: 'get',
+  })
+}

src/api/product/index.ts

@@ -0,0 +1,3 @@
+export { productabsorbcontrast, SelectProductListApi } from './product'
+export { ColorListApi, ColorDetailedApi, ColorSamplingSaveApi, TextureSaveApi } from './takeColor'
+export { FindColorListApi } from './findColor'

src/api/product/product.ts

@@ -0,0 +1,20 @@
+import { useRequest } from '@/use/useHttp'
+
+//取色对比
+export const productabsorbcontrast = () => {
+  return useRequest({
+    url: `/v1/mall/product/color/absorb/contrast`,
+    method: 'get',
+  })
+}
+
+/**
+ *  面料列表(下拉选择)
+ * @returns
+ */
+export const SelectProductListApi = () => {
+  return useRequest({
+    url: `/v1/mp/enum/product/list`,
+    method: 'get',
+  })
+}

src/api/product/takeColor.ts

@@ -0,0 +1,45 @@
+import { useRequest } from '@/use/useHttp'
+
+/**
+ *  颜色列表
+ * @returns
+ */
+export const ColorListApi = () => {
+  return useRequest({
+    url: `/v1/mp/product/color/absorb/list`,
+    method: 'get',
+  })
+}
+
+/**
+ *  颜色详细
+ * @returns
+ */
+export const ColorDetailedApi = () => {
+  return useRequest({
+    url: `/v1/mp/product/texture`,
+    method: 'get',
+  })
+}
+
+/**
+ *  取色存储
+ * @returns
+ */
+export const ColorSamplingSaveApi = () => {
+  return useRequest({
+    url: `/v1/mp/product/color/absorb`,
+    method: 'put',
+  })
+}
+
+/**
+ *  保存纹理
+ * @returns
+ */
+export const TextureSaveApi = () => {
+  return useRequest({
+    url: `/v1/mp/product/texture`,
+    method: 'put',
+  })
+}