xuan/TestRestructureWechatLymarketDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 订单页

Browse Source
This commit is contained in:
Haiyi 2022-11-08 18:54:55 +08:00
commit 41467256b0
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/index.ts
View File

@ -12,7 +12,7 @@ export {
} from './product/index' } from './product/index'
// 关于购物页面 // 关于购物页面
export { ShoppingCartUpdateApi, ShoppingCartDeleteApi, ShoppingCartListApi } from './shopping/index' export { ShoppingCartDeleteApi, ShoppingCartListApi } from './shopping/index'
// 关于发货列表 // 关于发货列表
export { export {

2
src/api/order.ts
View File

@ -67,7 +67,7 @@ export const mpsaleOrdercancel = () => {
//再次购买 //再次购买
export const mpshoppingCartproductColorlist = () => { export const mpshoppingCartproductColorlist = () => {
return useRequest({ return useRequest({
url: `/v1/mp/shoppingCart/productColor/list`, url: `/v2/mp/shoppingCart/productColor/list`,
method: "post", method: "post",
}) })
} }

16
src/api/shopping/index.ts
View File

@ -3,12 +3,12 @@ import { useRequest } from '@/use/useHttp'
* 修改购物车 * 修改购物车
* @returns * @returns
*/ */
export const ShoppingCartUpdateApi = () => { // export const ShoppingCartUpdateApi = () => {
return useRequest({ // return useRequest({
url: `/v1/mp/shoppingCart/productColor`, // url: `/v1/mp/shoppingCart/productColor`,
method: 'put', // method: 'put',
}) // })
} // }
/** /**
* 删除购物车商品 * 删除购物车商品
* @returns * @returns
@ -35,7 +35,7 @@ export const ShoppingCartListApi = () => {
*/ */
export const AdjestShoppingCartApi = () => { export const AdjestShoppingCartApi = () => {
return useRequest({ return useRequest({
url: `/v2/mp/shoppingCart/productColor/list`, url: `/v2/mp/shoppingCart/productColor`,
method: 'post', method: 'put',
}) })
} }

15
src/pages/shopping/components/colorKindItem/index.tsx
View File

@ -81,10 +81,13 @@ let ColorKindItem: FC<PropsType> = props => {
targetColor.length = formatMeterMul(num) targetColor.length = formatMeterMul(num)
} }
const res = await fetchData({ const res = await fetchData({
color_list: [targetColor], // color_list: [targetColor],
purchaser_id: purchaserId, // purchaser_id: purchaserId,
sale_mode: itemData.sale_mode, // sale_mode: itemData.sale_mode,
sale_offset: itemData.sale_offset, // sale_offset: itemData.sale_offset,
id: itemData.id,
roll: targetColor.roll,
length: targetColor.length,
}) })
if (res.success) { if (res.success) {
state?.Observer?.notify(purchaserId) state?.Observer?.notify(purchaserId)
@ -118,8 +121,8 @@ let ColorKindItem: FC<PropsType> = props => {
<Counter <Counter
onBlue={e => getInputValue(e, itemData)} onBlue={e => getInputValue(e, itemData)}
defaultNum={formatCount(itemData)} defaultNum={formatCount(itemData)}
step={selectList[orderType].step} step={itemData.step}
digits={selectList[orderType].digits} digits={itemData.digits}
onClickBtn={e => getInputValue(e, itemData)} onClickBtn={e => getInputValue(e, itemData)}
unit={formatUnit(itemData)} unit={formatUnit(itemData)}
minNum={itemData.sale_mode == EnumSaleMode.Bulk ? itemData.min_num : formatMeterDiv(itemData.min_num)} minNum={itemData.sale_mode == EnumSaleMode.Bulk ? itemData.min_num : formatMeterDiv(itemData.min_num)}