Merge branch 'vue3'

manager/src/api/goods.js

@@ -93,27 +93,10 @@ export const disableCategory = (id, type) => {
     return putRequest(`/goods/category/disable/${id}`, type)
 }
 
-
-//  获取商品规格分页列表
-export const getSpecListData = (params) => {
-    return getRequest('/goods/spec', params)
-}
-//  添加或修改规格设置
-export const insertSpec = (params) => {
-    return postRequest('/goods/spec', params)
-}
-//  添加或修改规格设置
-export const updateSpec = (id,params) => {
-    return putRequest(`/goods/spec/${id}`, params)
-}
 //根据分类id获取关联规格
 export const getCategorySpecListData = (category_id, params) => {
     return getRequest(`/goods/categorySpec/${category_id}`, params)
 }
-//删除gUI个
-export const delSpec = (id, params) => {
-    return deleteRequest(`/goods/spec/${id}`, params)
-}
 
 // 查询某分类下的全部子分类列表
 export const getGoodsCategory = (parent_id) => {

manager/src/libs/util.js

@@ -4,9 +4,15 @@ import Cookies from "js-cookie";
 
 let util = {};
 
+<<<<<<< HEAD
 /** 已弃用、前端未实现的菜单 frontRoute，注册路由时跳过 */
 const DEPRECATED_FRONT_ROUTES = new Set([
   "distribution/distrbutionGrade",
+=======
+/** 已弃用、前端已移除的菜单 frontRoute，注册路由时跳过 */
+const DEPRECATED_FRONT_ROUTES = new Set([
+  "goods/goods-manage/spec",
+>>>>>>> vue3
 ]);
 
 function isDeprecatedMenu(menu) {