Merge branch 'dev' of http://git.online.zzfzyc.com/mp/EShop into dev

src/api/material.ts

@@ -45,3 +45,13 @@ export const GetProductDetailApi = () => {
     })
 }
 
+/**
+ *  根据LAB匹配色卡基础资料
+ * @returns 
+*/
+export const GetLabProductApi = () => {
+    return useRequest({
+        url: `/v1/mall/product/color/absorb/match`,
+        method: "get",
+    })
+}

src/api/onlinePay.ts

@@ -0,0 +1,13 @@
+import { useRequest } from "@/use/useHttp"
+
+/**
+ * 获取在线支付二维码
+ */
+ export const GetPayCode = () => {
+    return useRequest({
+        url: `/`,
+        base_url: 'http://192.168.1.127:8081/caphtml',
+        method: "post",
+    })
+}
+

src/api/order.ts

@@ -3,7 +3,7 @@ import { useRequest } from "@/use/useHttp"
 /**
  * 下单现货销售单
  */
- export const SaleOrderApi = () => {
+export const SaleOrderApi = () => {
     return useRequest({
         url: `/v1/mall/saleOrder`,
         method: "post",
@@ -18,4 +18,75 @@ import { useRequest } from "@/use/useHttp"
         url: `/v1/mall/saleOrder/preView`,
         method: "put",
     })
+}
+
+/**
+ * 获取商城订单详情
+ */
+ export const GetSaleOrderDetailApi = () => {
+    return useRequest({
+        url: `/v1/mall/saleOrder/detail`,
+        method: "get",
+    })
+}
+
+
+/**
+ * 修改销售单备注
+ */
+ export const EditSaleOrderRemarkApi = () => {
+    return useRequest({
+        url: `/v1/mall/saleOrder/remark`,
+        method: "put",
+    })
+}
+
+/**
+ * 修改销售单地址
+ */
+ export const EditSaleOrderAddressApi = () => {
+    return useRequest({
+        url: `/v1/mall/saleOrder/address`,
+        method: "put",
+    })
+}
+
+/**
+ * 修改销售单收货方法
+ */
+ export const EditSaleOrderShipmentModeApi = () => {
+    return useRequest({
+        url: `/v1/mall/saleOrder/shipmentMode`,
+        method: "put",
+    })
+}
+
+/**
+ * 获取订单状态枚举
+ */
+ export const GetOrderStatusListApi = () => {
+    return useRequest({
+        url: `/v1/mall/enum/sale/order/status`,
+        method: "get",
+    })
+}
+
+/**
+ * 获取订单列表
+ */
+ export const GetOrderListApi = () => {
+    return useRequest({
+        url: `/v1/mall/saleOrder/list`,
+        method: "get",
+    })
+}
+
+/**
+ * 作废销售单
+ */
+ export const CancelOrderApi = () => {
+    return useRequest({
+        url: `/v1/mall/saleOrder/cancel`,
+        method: "put",
+    })
 }

src/api/orderPay.ts

@@ -0,0 +1,21 @@
+import { useRequest } from "@/use/useHttp"
+
+/**
+ * 获取订单支付方式信息
+ */
+ export const GetOrderPayApi = () => {
+    return useRequest({
+        url: `/v1/mall/orderPayment/orderPaymentMethodInfo`,
+        method: "get",
+    })
+}
+
+/**
+ * 订单支付提交
+ */
+ export const SubmitOrderPayApi = () => {
+    return useRequest({
+        url: `/v1/mall/orderPayment/orderPaymentSubmission`,
+        method: "put",
+    })
+}

src/api/search.ts

@@ -3,9 +3,31 @@ import { useRequest } from "@/use/useHttp"
 /**
  * 获取热门搜索
  */
- export const getHotSearchApi = () => {
+ export const GetHotSearchApi = () => {
     return useRequest({
-        url: `/v1/mall/hotSearch`,
+        url: `/v1/mall/hotSearch/list`,
         method: "get",
     })
+}
+
+
+/**
+ * 获取历史搜索
+ */
+ export const GetSearchHistoryApi = () => {
+    return useRequest({
+        url: `/v1/mall/searchHistory/list`,
+        method: "get",
+    })
+}
+
+
+/**
+ * 添加搜索关键字
+ */
+ export const AddSearchHistoryApi = () => {
+    return useRequest({
+        url: `/v1/mall/searchHistory`,
+        method: "post",
+    })
 }

src/api/subjectMaterial.ts

@@ -0,0 +1,13 @@
+import { useRequest } from "@/use/useHttp"
+
+/**
+ *  获取专题列表
+ * @returns 
+*/
+export const GetSubjectList = () => {
+    return useRequest({
+        url: `/v1/mall/subject/list`,
+        method: "get",
+    })
+}
+