diff --git a/http/yskApi/consumable.js b/http/yskApi/consumable.js index afbb1d8..09c9c05 100644 --- a/http/yskApi/consumable.js +++ b/http/yskApi/consumable.js @@ -47,7 +47,7 @@ export function gettbConsInfo(params) { // params // }); return request({ - url: "/api/viewConInfoFlow", + url: "/api/tbConsInfo", method: "get", params: { ...params, diff --git a/http/yskApi/goods.js b/http/yskApi/goods.js index 05a7af4..506fa7e 100644 --- a/http/yskApi/goods.js +++ b/http/yskApi/goods.js @@ -133,4 +133,8 @@ export function $tbProskuConV2(data) { export function $updateProductData(data) { return http.req('/api/stock/updateProductData', data, 'POST') } +/* 商品报损 */ +export function $frmLoss(data) { + return http.req('/api/tbProductStockDetail/frmLoss', {...data,shopId:uni.getStorageSync('shopId')}, 'POST') +} // v2 api end \ No newline at end of file diff --git a/http/yskApi/http.js b/http/yskApi/http.js index 18047f6..0fc5c3c 100644 --- a/http/yskApi/http.js +++ b/http/yskApi/http.js @@ -15,7 +15,12 @@ import { } from '@/commons/utils/encryptUtil.js' import infoBox from "@/commons/utils/infoBox.js" import go from '@/commons/utils/go.js'; +// 测试服 let baseUrl = 'https://admintestpapi.sxczgkj.cn' +// 王伟本地测 +// let baseUrl = '/ww' +// let baseUrl = 'http://192.168.1.15:8000' + // 多少 ms 以内, 不提示loading const loadingShowTime = 200 diff --git a/http/yskApi/order.js b/http/yskApi/order.js index c31569c..764344e 100644 --- a/http/yskApi/order.js +++ b/http/yskApi/order.js @@ -1,5 +1,5 @@ import http from './http.js' -const request=http.request +const request = http.request /** * 查询订单 @@ -7,14 +7,14 @@ const request=http.request * @returns */ export function tbOrderInfoData(data) { - return request({ - url: "/api/tbOrderInfo/date", - method: "post", - data: { - shopId: uni.getStorageSync('shopId'), - ...data - } - }); + return request({ + url: "/api/tbOrderInfo/date", + method: "post", + data: { + shopId: uni.getStorageSync('shopId'), + ...data + } + }); } /** @@ -23,15 +23,15 @@ export function tbOrderInfoData(data) { * @returns */ export function tbOrderInfoDownload(data) { - return request({ - url: "/api/tbOrderInfo/download", - method: "post", - data: { - shopId: uni.getStorageSync('shopId'), - ...data - }, - responseType: "blob" - }); + return request({ + url: "/api/tbOrderInfo/download", + method: "post", + data: { + shopId: uni.getStorageSync('shopId'), + ...data + }, + responseType: "blob" + }); } /** @@ -40,10 +40,10 @@ export function tbOrderInfoDownload(data) { * @returns */ export function tbOrderInfoDetail(id) { - return request({ - url: `/api/tbOrderInfo/${id}`, - method: "get" - }); + return request({ + url: `/api/tbOrderInfo/${id}`, + method: "get" + }); } /** @@ -52,15 +52,15 @@ export function tbOrderInfoDetail(id) { * @returns */ export function payCount(createdAt) { - console.log(createdAt); - return request({ - url: `/api/tbOrderInfo/payCount`, - method: "post", - data: { - shopId: uni.getStorageSync('shopId'), - createdAt: createdAt - } - }); + console.log(createdAt); + return request({ + url: `/api/tbOrderInfo/payCount`, + method: "post", + data: { + shopId: uni.getStorageSync('shopId'), + createdAt: createdAt + } + }); } /** @@ -69,14 +69,14 @@ export function payCount(createdAt) { * @returns */ export function tbGroupOrderInfo(params) { - return request({ - url: `/api/tbGroupOrderInfo`, - method: "post", - data: { - shopId: uni.getStorageSync('shopId'), - ...params - } - }); + return request({ + url: `/api/tbGroupOrderInfo`, + method: "post", + data: { + shopId: uni.getStorageSync('shopId'), + ...params + } + }); } /** @@ -85,9 +85,24 @@ export function tbGroupOrderInfo(params) { * @returns */ export function returnGpOrder(data) { - return request({ - url: `/api/tbGroupOrderInfo/returnGpOrder`, - method: "post", - data - }); + return request({ + url: `/api/tbGroupOrderInfo/returnGpOrder`, + method: "post", + data + }); } + + +/** + * 店铺订单支付获取链接 + */ +export function $getOrderPayUrl(data) { + return request({ + url: `/api/shopPayApi/getOrderPayUrl`, + method: "get", + data: { + shopId: uni.getStorageSync('shopId'), + ...data + } + }); +} \ No newline at end of file