feature:商品管理详情

server/config.js

 const env = process.env.NODE_ENV || "development";
 const port = process.env.PORT || 8055;
 
+const LOGIN_URI = {
+  development: "http://bp-test.ini.yidian-inc.com ",
+  test: "http://web-rest.int.yidian-inc.com",
+  production: "http://web-rest.int.yidian-inc.com"
+};
+
 const PANDORA_URI = {
   development: "http://pandora.yidian-inc.com",
   test: "http://pandora.yidian-inc.com",
@@ -8,9 +14,9 @@ const PANDORA_URI = {
 };
 
 const API_INTERNAL_URI = {
-  'development': "http://bp-test.ini.yidian-inc.com",
-  'test': "http://bp-test.ini.yidian-inc.com",
-  'production': "http://bp-test.ini.yidian-inc.com"
+  development: "http://bp-test.ini.yidian-inc.com",
+  test: "http://bp-test.ini.yidian-inc.com",
+  production: "http://bp-test.ini.yidian-inc.com"
 };
 
 const GOODS_URI = {

src/pages/Goods/List/index.vue

@@ -200,7 +200,11 @@
 <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",
 
@@ -285,9 +289,17 @@ 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);
@@ -343,7 +355,7 @@ export default {
     handleCurrentChange (e) {
       this.currentPage = e;
       // 获取信息
-      this.getCommodityList();
+      this.getList();
     },
 
     // 去往详情页