feature:商品列表分类查询

src/pages/Goods/List/index.vue

@@ -200,11 +200,7 @@
 <style lang="less" src="./index.less" scope></style>
 
 <script>
-<<<<<<< HEAD:src/pages/Goods/List/index.vue
 import { getGoodsList, getList } from "@/service/Goods/goods";
-=======
-import { getGoodsList } from "@/service/Goods/goods";
->>>>>>> 23863bb (feature:商品管理详情):src/pages/Commodity/List/index.vue
 export default {
   name: "GoodsList",
 
@@ -289,17 +285,9 @@ export default {
     async getOptionList () {
       try {
         const res = await getGoodsList();
-<<<<<<< HEAD:src/pages/Goods/List/index.vue
         if (res.code !== 0) return this.$message.error(res.reason);
         this.labelOptions = res.result;
 
-=======
-        if (res.code !== 0) {
-          return this.$message.error(res.reason);
-        } else {
-          this.labelOptions = res.result;
-        }
->>>>>>> 23863bb (feature:商品管理详情):src/pages/Commodity/List/index.vue
         console.log(res);
       } catch (error) {
         console.error(error);