合并分支

manager/src/api/goods.js

@@ -5,6 +5,13 @@ import { getRequest, postRequest, putRequest, deleteRequest} from '@/libs/axios'
 export const getManagerBrandPage = (params) => {
     return getRequest('/goods/brand/getByPage', params)
 }
+
+// 批量删除
+export const delBrand = (ids) =>{
+  return deleteRequest(`/goods/brand/delByIds/${ids}`)
+}
+
+
 //  添加
 export const addBrand = (params) => {
     return postRequest('/goods/brand', params)
@@ -69,15 +76,15 @@ export const disableCategory = (id, type) => {
 
 //  获取商品规格分页列表
 export const getSpecListData = (params) => {
-    return getRequest('/goods/spec/page', params)
+    return getRequest('/goods/spec', params)
 }
 //  添加或修改规格设置
 export const insertSpec = (params) => {
     return postRequest('/goods/spec', params)
 }
 //  添加或修改规格设置
-export const updateSpec = (params) => {
-    return putRequest('/goods/spec', params)
+export const updateSpec = (id,params) => {
+    return putRequest(`/goods/spec/${id}`, params)
 }
 //根据分类id获取关联规格
 export const getCategorySpecListData = (category_id, params) => {
@@ -87,15 +94,6 @@ export const getCategorySpecListData = (category_id, params) => {
 export const delSpec = (id, params) => {
     return deleteRequest(`/goods/spec/${id}`, params)
 }
-//  获取商品规格值列表
-export const getSpecValuesListData = (id, params) => {
-    return getRequest(`/goods/specValues/values/${id}`, params)
-}
-//  添加商品规格值
-export const saveSpecValues = (id, params) => {
-    return postRequest(`/goods/specValues/save/${id}`, params)
-}
-
 
 // 查询某分类下的全部子分类列表
 export const getGoodsCategory = (parent_id) => {

manager/src/api/promotion.js

@@ -30,7 +30,7 @@ export const getLiveList = params => {
 
 // 获取直播间详情
 export const getLiveInfo = studioId => {
-  return getRequest(`/broadcast/studio/studioInfo/${studioId}`);
+  return getRequest(`/broadcast/studio/${studioId}`);
 };
 
 // 获取当前进行中的促销活动商品