Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen

src/api/dish/material.js

@@ -66,7 +66,7 @@ export function addMaterialApi(data) {
     },
     data: data
   })
-}  
+}
 
 // 编辑原料
 export function updateMaterialApi(data) {
@@ -78,7 +78,7 @@ export function updateMaterialApi(data) {
     },
     data: data
   })
-} 
+}
 
 // 删除原料
 export function removeMaterialApi(data) {
@@ -89,7 +89,7 @@ export function removeMaterialApi(data) {
         "merchant-id":"378915229716713472",
     }
   })
-} 
+}
 
 
 
@@ -105,7 +105,7 @@ export function batchRemoveMaterialApi(data) {
     },
     data: data
   })
-} 
+}
 // 批量修改原料
 export function batchUpdateMaterialApi(data) {
   return request({
@@ -116,19 +116,19 @@ export function batchUpdateMaterialApi(data) {
     },
     data: data
   })
-}  
+}
 // 根据区域ID-获取原料单位下拉选
 //{current: 1, size: -1, ifListUse: 1, areaId: '421488254718578688'}
 export function getDrpUnitListApi(data) {
     return request({
-      url: '/smart-canteen/supply_product_unit/list',
+      url: '/smart-canteen/ims_unit/list',
       method: 'get',
       headers: {
           "merchant-id":"378915229716713472",
       },
       params: data
     })
-} 
+}
 
 // 下载模板
 export function downLoadExportTemplate(data) {
@@ -140,7 +140,7 @@ export function downLoadExportTemplate(data) {
     },
     data: data
   })
-}  
+}
 // export function downLoadExportTemplate(data) {
 //   return request({
 //     url: '/smart-canteen/api/v4/export/downLoad',

src/api/superStore/shopMaterial.js

@@ -43,7 +43,7 @@ export function removeMaterialTypeApi(data) {
     }
   })
 }
- 
+
 
 // 查询商品列表
 export function getMaterialListApi(data) {
@@ -67,7 +67,7 @@ export function addMaterialApi(data) {
     },
     data: data
   })
-}  
+}
 
 // 编辑商品
 export function updateMaterialApi(data) {
@@ -79,7 +79,7 @@ export function updateMaterialApi(data) {
     },
     data: data
   })
-} 
+}
 
 // 删除商品
 export function removeMaterialApi(data) {
@@ -108,11 +108,11 @@ export function batchRemoveMaterialApi(data) {
 //{current: 1, size: -1, ifListUse: 1, areaId: '421488254718578688'}
 export function getDrpUnitListApi(data) {
   return request({
-    url: '/smart-canteen/supply_product_unit/list',
+    url: '/smart-canteen/ims_unit/list',
     method: 'get',
     headers: {
         "merchant-id":"378915229716713472",
     },
     params: data
   })
-} 
+}

src/api/superStore/super.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 仓库
 export function drpWareHousePageApi(data) {
   return request({
-    url: '/smart-canteen/supply_warehouse_info/list',
+    url: '/smart-canteen/ims_warehouse_info/list',
     method: 'get',
     headers: {
       "merchant-id":"378915229716713472",

src/api/superStore/superUitId.js

@@ -1,9 +1,9 @@
-import request from '@/utils/request' 
+import request from '@/utils/request'
 
 // 单位列表-分页
 export function drpUnitPageListApi(data) {
     return request({
-      url: '/smart-canteen/supply_product_unit/list',
+      url: '/smart-canteen/ims_unit/list',
       method: 'get',
       headers: {
         "merchant-id":"378915229716713472",
@@ -11,11 +11,11 @@ export function drpUnitPageListApi(data) {
       params: data
     })
   }
- 
+
 // 单位列表-新增
 export function addDrpUnitApi(data) {
     return request({
-      url: '/smart-canteen/supply_product_unit',
+      url: '/smart-canteen/ims_unit',
       method: 'post',
       headers: {
         "merchant-id":"378915229716713472",
@@ -23,11 +23,11 @@ export function addDrpUnitApi(data) {
       data: data
     })
 }
- 
+
 // 单位列表-编辑
 export function editDrpUnitApi(data) {
     return request({
-      url: '/smart-canteen/supply_product_unit/edit',
+      url: '/smart-canteen/ims_unit/edit',
       method: 'post',
       headers: {
         "merchant-id":"378915229716713472",
@@ -39,7 +39,7 @@ export function editDrpUnitApi(data) {
 // 单位列表-删除
 export function removeDrpUnitApi(unitId) {
     return request({
-      url: '/smart-canteen/supply_product_unit/del/'+unitId,
+      url: '/smart-canteen/ims_unit/del/'+unitId,
       method: 'post',
       headers: {
         "merchant-id":"378915229716713472",