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

src/api/index.ts

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

src/api/order.ts

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

src/api/shopping/index.ts

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

src/pages/shopping/components/colorKindItem/index.tsx

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